diff --git a/apache-cxf/src/jre8/resources/META-INF/services/javax.ws.rs.client.ClientBuilder b/apache-cxf/src/jre8/resources/META-INF/services/jakarta.ws.rs.client.ClientBuilder
similarity index 100%
rename from apache-cxf/src/jre8/resources/META-INF/services/javax.ws.rs.client.ClientBuilder
rename to apache-cxf/src/jre8/resources/META-INF/services/jakarta.ws.rs.client.ClientBuilder
diff --git a/apache-cxf/src/jre8/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate b/apache-cxf/src/jre8/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate
deleted file mode 100644
index fdd29663..00000000
--- a/apache-cxf/src/jre8/resources/META-INF/services/javax.ws.rs.ext.RuntimeDelegate
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl
\ No newline at end of file
diff --git a/apache-cxf/src/jre8/resources/META-INF/services/javax.ws.rs.sse.SseEventSource$Builder b/apache-cxf/src/jre8/resources/META-INF/services/javax.ws.rs.sse.SseEventSource$Builder
deleted file mode 100644
index ad2d85ae..00000000
--- a/apache-cxf/src/jre8/resources/META-INF/services/javax.ws.rs.sse.SseEventSource$Builder
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.cxf.jaxrs.sse.client.SseEventSourceBuilderImpl
\ No newline at end of file
diff --git a/apache-cxf/src/jre8/resources/META-INF/services/javax.xml.soap.MessageFactory b/apache-cxf/src/jre8/resources/META-INF/services/javax.xml.soap.MessageFactory
deleted file mode 100644
index 5e7eb7ca..00000000
--- a/apache-cxf/src/jre8/resources/META-INF/services/javax.xml.soap.MessageFactory
+++ /dev/null
@@ -1,2 +0,0 @@
-com.sun.xml.messaging.saaj.soap.ver1_1.SOAPMessageFactory1_1Impl
-com.sun.xml.messaging.saaj.soap.ver1_2.SOAPMessageFactory1_2Impl
\ No newline at end of file
diff --git a/apache-cxf/src/jre8/resources/META-INF/services/javax.xml.soap.SAAJMetaFactory b/apache-cxf/src/jre8/resources/META-INF/services/javax.xml.soap.SAAJMetaFactory
deleted file mode 100644
index a09cd2b1..00000000
--- a/apache-cxf/src/jre8/resources/META-INF/services/javax.xml.soap.SAAJMetaFactory
+++ /dev/null
@@ -1 +0,0 @@
-com.sun.xml.messaging.saaj.soap.SAAJMetaFactoryImpl
diff --git a/apache-cxf/src/jre8/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory b/apache-cxf/src/jre8/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory
deleted file mode 100644
index 0b7aac8e..00000000
--- a/apache-cxf/src/jre8/resources/META-INF/services/javax.xml.soap.SOAPConnectionFactory
+++ /dev/null
@@ -1 +0,0 @@
-com.sun.xml.messaging.saaj.client.p2p.HttpSOAPConnectionFactory
diff --git a/apache-cxf/src/jre8/resources/META-INF/services/javax.xml.soap.SOAPFactory b/apache-cxf/src/jre8/resources/META-INF/services/javax.xml.soap.SOAPFactory
deleted file mode 100644
index d1434b9d..00000000
--- a/apache-cxf/src/jre8/resources/META-INF/services/javax.xml.soap.SOAPFactory
+++ /dev/null
@@ -1,2 +0,0 @@
-com.sun.xml.messaging.saaj.soap.ver1_1.SOAPFactory1_1Impl
-com.sun.xml.messaging.saaj.soap.ver1_2.SOAPFactory1_2Impl
diff --git a/apache-cxf/src/jre8/resources/META-INF/services/javax.xml.ws.spi.Provider b/apache-cxf/src/jre8/resources/META-INF/services/javax.xml.ws.spi.Provider
deleted file mode 100644
index b328b641..00000000
--- a/apache-cxf/src/jre8/resources/META-INF/services/javax.xml.ws.spi.Provider
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.cxf.jaxws22.spi.ProviderImpl
diff --git a/apache-cxf/src/main/java/org/apache/cxf/version/version.properties b/apache-cxf/src/main/java/org/apache/cxf/version/version.properties
index ec16142f..7af4fa8c 100644
--- a/apache-cxf/src/main/java/org/apache/cxf/version/version.properties
+++ b/apache-cxf/src/main/java/org/apache/cxf/version/version.properties
@@ -18,6 +18,6 @@
# under the License.
#
#
-product.version=3.4.0
+product.version=3.4.1
product.name=Apache CXF
build.number=1568553
diff --git a/apache-cxf/src/moditect/module-info.java b/apache-cxf/src/moditect/module-info.java
index 068313d7..f80d79bc 100644
--- a/apache-cxf/src/moditect/module-info.java
+++ b/apache-cxf/src/moditect/module-info.java
@@ -99,7 +99,7 @@
// opens org.glassfish.jersey.server.wadl.internal to java.ws.rs;
- opens org.apache.cxf.ws.addressing to java.xml.bind;
+ opens org.apache.cxf.ws.addressing to jakarta.xml.bind;
provides jakarta.xml.ws.spi.Provider with org.apache.cxf.jaxws22.spi.ProviderImpl;
diff --git a/apache-poi/src/moditect/module-info.java b/apache-poi/src/moditect/module-info.java
index 9c8286d5..a1e39ac1 100644
--- a/apache-poi/src/moditect/module-info.java
+++ b/apache-poi/src/moditect/module-info.java
@@ -1,6 +1,6 @@
module org.apache.poi {
requires java.desktop;
- requires java.xml.bind;
+ requires jakarta.xml.bind;
requires static org.apache.commons.math3;
requires static org.apache.commons.codec;
requires static org.apache.commons.collections4;
diff --git a/dom4j/src/moditect/module-info.java b/dom4j/src/moditect/module-info.java
index 6e202abe..26b967ec 100644
--- a/dom4j/src/moditect/module-info.java
+++ b/dom4j/src/moditect/module-info.java
@@ -1,6 +1,6 @@
module dom4j {
requires transitive java.xml;
- requires transitive java.xml.bind;
+ requires transitive jakarta.xml.bind;
requires java.desktop;
requires static jaxen;
diff --git a/ehcache/src/moditect/module-info.java b/ehcache/src/moditect/module-info.java
index adb457b8..ada4478a 100644
--- a/ehcache/src/moditect/module-info.java
+++ b/ehcache/src/moditect/module-info.java
@@ -31,7 +31,7 @@
exports org.ehcache.xml;
requires transitive cache.api;
- requires transitive java.xml.bind;
+ requires transitive jakarta.xml.bind;
requires org.slf4j;
requires jdk.unsupported;
@@ -66,6 +66,6 @@
uses org.ehcache.xml.CacheResourceConfigurationParser;
- opens org.ehcache.xml.model to java.xml.bind;
+ opens org.ehcache.xml.model to jakarta.xml.bind;
}
diff --git a/hazelcast/pom.xml b/hazelcast/pom.xml
index 2ee2f41c..348f9e33 100644
--- a/hazelcast/pom.xml
+++ b/hazelcast/pom.xml
@@ -115,6 +115,12 @@
* References in this document to JAXB refer to the Jakarta XML Binding unless otherwise noted. */ -module java.xml.bind { +module jakarta.xml.bind { requires transitive jakarta.activation; requires transitive java.xml; requires transitive java.validation; diff --git a/jakarta-xml-rs-api/src/moditect/module-info.java b/jakarta-xml-rs-api/src/moditect/module-info.java index a8a55661..084863e0 100644 --- a/jakarta-xml-rs-api/src/moditect/module-info.java +++ b/jakarta-xml-rs-api/src/moditect/module-info.java @@ -1,5 +1,5 @@ module jakarta.ws.rs { - requires transitive java.xml.bind; + requires transitive jakarta.xml.bind; requires java.logging; exports jakarta.ws.rs; diff --git a/jakarta-xml-ws-api/src/moditect/module-info.java b/jakarta-xml-ws-api/src/moditect/module-info.java index 2374476b..bbc321db 100644 --- a/jakarta-xml-ws-api/src/moditect/module-info.java +++ b/jakarta-xml-ws-api/src/moditect/module-info.java @@ -1,6 +1,6 @@ module jakarta.xml.ws { requires transitive java.xml; - requires transitive java.xml.bind; + requires transitive jakarta.xml.bind; requires transitive jakarta.xml.soap; requires java.logging; diff --git a/primefaces/src/moditect/module-info.java b/primefaces/src/moditect/module-info.java index 0062e745..065a6867 100644 --- a/primefaces/src/moditect/module-info.java +++ b/primefaces/src/moditect/module-info.java @@ -7,7 +7,7 @@ requires transitive jakarta.el; requires transitive java.validation; - requires transitive java.xml.bind; + requires transitive jakarta.xml.bind; requires transitive com.guicedee.guicedservlets.jsf; requires static com.hazelcast.all; diff --git a/swagger/src/moditect/module-info.java b/swagger/src/moditect/module-info.java index 9e2c9374..d48e371b 100644 --- a/swagger/src/moditect/module-info.java +++ b/swagger/src/moditect/module-info.java @@ -1,6 +1,6 @@ module com.guicedee.services.openapi { - requires java.xml.bind; + requires jakarta.xml.bind; requires java.servlet; requires org.slf4j; requires com.fasterxml.jackson.databind;