Jakarta Namespace - jakarta.xml.bind module name - minor fixes

GedMarc · GedMarc · commit d72f6f0af9ae · 2020-11-12T21:06:40.000+02:00
diff --git a/apache-cxf/src/jre8/resources/META-INF/services/jakarta.ws.rs.client.ClientBuilder b/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
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
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
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
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
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
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
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -115,6 +115,12 @@
                                     <include>com.hazelcast:hazelcast:*</include>
                                 </includes>
                             </artifactSet>
+                            <relocations>
+                                <relocation>
+                                    <pattern>javax.xml.bind</pattern>
+                                    <shadedPattern>jakarta.xml.bind</shadedPattern>
+                                </relocation>
+                            </relocations>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/hibernate-core/src/moditect/module-info.java b/hibernate-core/src/moditect/module-info.java
@@ -10,7 +10,7 @@
 	requires com.fasterxml.classmate;
 	requires javassist;
 	requires static antlr;
-	requires transitive java.xml.bind;
+	requires transitive jakarta.xml.bind;
 	requires java.desktop;
 	requires net.bytebuddy;
 
diff --git a/hibernate-metamodel-generator/src/moditect/module-info.java b/hibernate-metamodel-generator/src/moditect/module-info.java
@@ -3,7 +3,7 @@
 	requires java.compiler;
 	requires java.xml;
 	requires java.sql;
-	requires java.xml.bind;
+	requires jakarta.xml.bind;
 
 	requires java.desktop;
 
diff --git a/jakarta-faces/src/moditect/module-info.java b/jakarta-faces/src/moditect/module-info.java
@@ -28,7 +28,7 @@
 
 	exports com.sun.faces.config;
 	requires transitive jakarta.servlet.jsp.jstl;
-	requires transitive java.xml.bind;
+	requires transitive jakarta.xml.bind;
 
 	requires java.sql;
 	requires java.naming;
diff --git a/jakarta-jstl/src/moditect/module-info.java b/jakarta-jstl/src/moditect/module-info.java
@@ -3,7 +3,7 @@
 	requires java.xml;
 	requires static java.sql;
 
-	requires static java.xml.bind;
+	requires static jakarta.xml.bind;
 
 	requires java.desktop;
 	requires java.naming;
diff --git a/jakarta-security-jacc/pom.xml b/jakarta-security-jacc/pom.xml
@@ -69,7 +69,7 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>org.glassfish:javax.security.jacc:*</include>
+                                    <include>jakarta.security.jacc:jakarta.security.jacc-api:*</include>
                                 </includes>
                             </artifactSet>
                         </configuration>
diff --git a/jakarta-security-jacc/src/moditect/module-info.java b/jakarta-security-jacc/src/moditect/module-info.java
@@ -1,4 +1,4 @@
 module jakarta.security.jacc.api {
 	requires java.servlet;
-	exports jakarta.security.jacc;
+	exports javax.security.jacc;
 }
diff --git a/jakarta-xml-bind-api/src/moditect/module-info.java b/jakarta-xml-bind-api/src/moditect/module-info.java
@@ -14,7 +14,7 @@
  * <p>
  * 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
@@ -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
@@ -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
@@ -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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@`
`18`	`18`	`# under the License.`
`19`	`19`	`#`
`20`	`20`	`#`
`21`		`-product.version=3.4.0`
	`21`	`+product.version=3.4.1`
`22`	`22`	`product.name=Apache CXF`
`23`	`23`	`build.number=1568553`