GH-168 change artefacts to prepare jakarta migration - align with jax…

…b-maven-plugin (#169) Co-authored-by: Laurent SCHOELENS <[email protected]>
highsource · Jun 30, 2023 · 10c885e · 10c885e
1 parent 9d02758
commit 10c885e
Show file tree

Hide file tree

Showing 23 changed files with 68 additions and 66 deletions.
diff --git a/ant/pom.xml b/ant/pom.xml
@@ -16,7 +16,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.sun.activation</groupId>
-			<artifactId>javax.activation</artifactId>
+			<artifactId>jakarta.activation</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -22,9 +22,9 @@
 			<artifactId>jaxb2-basics-tools</artifactId>
 		</dependency>
 		<dependency>
-            <groupId>com.sun.activation</groupId>
-            <artifactId>javax.activation</artifactId>
-        </dependency>
+			<groupId>com.sun.activation</groupId>
+			<artifactId>jakarta.activation</artifactId>
+    </dependency>
 	</dependencies>
 	<build>
 		<plugins>

diff --git a/pom.xml b/pom.xml
@@ -170,10 +170,10 @@
 	</profiles>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<jaxb.version>2.3.6</jaxb.version>
-		<jaxb-api.version>2.3.1</jaxb-api.version>
+		<jaxb.version>2.3.7</jaxb.version>
+		<jaxb-api.version>2.3.3</jaxb-api.version>
 		<jaxb-core.version>2.3.0.1</jaxb-core.version>
-		<activation.version>1.2.0</activation.version>
+		<activation.version>1.2.2</activation.version>
 		<maven-jaxb2-plugin.version>0.15.1</maven-jaxb2-plugin.version>
         <maven-nexus-staging-maven-plugin.version>1.6.8</maven-nexus-staging-maven-plugin.version>
 		<cxf-codegen-plugin.version>3.3.13</cxf-codegen-plugin.version>
@@ -244,9 +244,10 @@
 				<version>${maven-jaxb2-plugin.version}</version>
 			</dependency>
 			<!-- JAXB -->
+			<!-- Start of jaxb-runtime dependencies -->
 			<dependency>
-				<groupId>javax.xml.bind</groupId>
-				<artifactId>jaxb-api</artifactId>
+				<groupId>jakarta.xml.bind</groupId>
+				<artifactId>jakarta.xml.bind-api</artifactId>
 				<version>${jaxb-api.version}</version>
 			</dependency>
 			<dependency>
@@ -266,7 +267,7 @@
 			</dependency>
 			<dependency>
 				<groupId>com.sun.activation</groupId>
-				<artifactId>javax.activation</artifactId>
+				<artifactId>jakarta.activation</artifactId>
 				<version>${activation.version}</version>
 			</dependency>
 			<!-- JUnit -->

diff --git a/runtime/pom.xml b/runtime/pom.xml
@@ -10,8 +10,8 @@
 	</parent>
 	<dependencies>
 		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -26,7 +26,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.sun.activation</groupId>
-			<artifactId>javax.activation</artifactId>
+			<artifactId>jakarta.activation</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -56,17 +56,17 @@
 						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
 					</archive> 
 				</configuration>
-			</plugin>  
-			<plugin>   
+			</plugin>
+			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
 				<executions>
 					<execution>
 						<id>bundle-manifest</id>
 						<phase>process-classes</phase>
-						<goals>    
+						<goals>
 							<goal>manifest</goal>
-						</goals>   
+						</goals>
 					</execution>
 				</executions>
 			</plugin>

diff --git a/samples/basic/pom.xml b/samples/basic/pom.xml
@@ -33,7 +33,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.sun.activation</groupId>
-			<artifactId>javax.activation</artifactId>
+			<artifactId>jakarta.activation</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>

diff --git a/samples/basic/project-build.xml b/samples/basic/project-build.xml
@@ -18,7 +18,7 @@
 	<path id="test-compile.path">
 		<fileset dir="${basedir}/lib">
 	        	<include name="istack-commons-*.jar"/>
-			<include name="javax.activation-*.jar"/>
+			<include name="jakarta.activation-*.jar"/>
 			<include name="jakarta.xml.bind-api-*.jar"/>
 			<include name="jaxb-runtime-*.jar"/>
 			<include name="jaxb-core-*.jar"/>
@@ -42,7 +42,7 @@
 	<path id="test.path">
 		<fileset dir="${basedir}/lib">
 	                <include name="istack-commons-*.jar"/>
-			<include name="javax.activation-*.jar"/>
+			<include name="jakarta.activation-*.jar"/>
 			<include name="jakarta.xml.bind-api-*.jar"/>
 			<include name="jaxb-runtime-*.jar"/>
 			<include name="jaxb-core-*.jar"/>
@@ -75,7 +75,7 @@
 				<fileset dir="${basedir}/lib">
 					<include name="codemodel-*.jar"/>
                          		<include name="istack-commons-*.jar"/>
-					<include name="javax.activation-*.jar"/>
+					<include name="jakarta.activation-*.jar"/>
 					<include name="jakarta.xml.bind-api-*.jar"/>
 					<include name="jaxb-runtime-*.jar"/>
 					<include name="jaxb-core-*.jar"/>

diff --git a/samples/basic/project-pom.xml b/samples/basic/project-pom.xml
@@ -16,7 +16,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.sun.activation</groupId>
-			<artifactId>javax.activation</artifactId>
+			<artifactId>jakarta.activation</artifactId>
 			<version>${activation.version}</version>
 			<scope>provided</scope>
 		</dependency>

diff --git a/samples/cxf/pom.xml b/samples/cxf/pom.xml
@@ -33,7 +33,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.sun.activation</groupId>
-			<artifactId>javax.activation</artifactId>
+			<artifactId>jakarta.activation</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
@@ -43,10 +43,11 @@
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
 		</dependency>
-		<dependency>      <groupId>org.apache.cxf</groupId>
-                <artifactId>cxf-codegen-plugin</artifactId>
-                <version>${cxf-codegen-plugin.version}</version>
-                </dependency>
+		<dependency>
+			<groupId>org.apache.cxf</groupId>
+			<artifactId>cxf-codegen-plugin</artifactId>
+			<version>${cxf-codegen-plugin.version}</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<defaultGoal>install</defaultGoal>

diff --git a/samples/cxf/project-pom.xml b/samples/cxf/project-pom.xml
@@ -8,18 +8,18 @@
 	<packaging>jar</packaging>
 	<name>JAXB2 Basics - Sample [cxf-maven]</name>
 	<dependencies>
-        <dependency>
-            <groupId>javax.xml.ws</groupId>
-            <artifactId>jaxws-api</artifactId>
-            <version>2.3.1</version>
-            <scope>provided</scope>
-        </dependency>
-<dependency>
-    <groupId>javax.jws</groupId>
-    <artifactId>javax.jws-api</artifactId>
-    <version>1.1</version>
-    <scope>provided</scope>
-</dependency>
+		<dependency>
+			<groupId>jakarta.xml.ws</groupId>
+			<artifactId>jakarta.xml.ws-api</artifactId>
+			<version>2.3.3</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>jakarta.jws</groupId>
+			<artifactId>jakarta.jws-api</artifactId>
+			<version>1.1.1</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>
 			<artifactId>jaxb-runtime</artifactId>
@@ -28,7 +28,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.sun.activation</groupId>
-			<artifactId>javax.activation</artifactId>
+			<artifactId>jakarta.activation</artifactId>
 			<version>${activation.version}</version>
 			<scope>provided</scope>
 		</dependency>
@@ -83,17 +83,17 @@
 				</configuration>
 				<dependencies>
 					<dependency>
-			                        <groupId>org.glassfish.jaxb</groupId>
-			                        <artifactId>jaxb-runtime</artifactId>
-			                        <version>${jaxb.version}</version>
-                			</dependency>
+						<groupId>org.glassfish.jaxb</groupId>
+						<artifactId>jaxb-runtime</artifactId>
+						<version>${jaxb.version}</version>
+						</dependency>
 					<dependency>
-			                        <groupId>org.glassfish.jaxb</groupId>
+						<groupId>org.glassfish.jaxb</groupId>
 						<artifactId>jaxb-xjc</artifactId>
 						<version>${jaxb.version}</version>
 					</dependency>
 					<dependency>
-			                        <groupId>org.glassfish.jaxb</groupId>
+						<groupId>org.glassfish.jaxb</groupId>
 						<artifactId>jaxb-core</artifactId>
 						<version>${jaxb-core.version}</version>
 					</dependency>

diff --git a/samples/po-simple/pom.xml b/samples/po-simple/pom.xml
@@ -37,7 +37,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.sun.activation</groupId>
-			<artifactId>javax.activation</artifactId>
+			<artifactId>jakarta.activation</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>

diff --git a/samples/po-simple/project-build.xml b/samples/po-simple/project-build.xml
@@ -18,7 +18,7 @@
 		<fileset dir="${basedir}/lib">
 			<include name="codemodel-*.jar"/>
 			<include name="istack-commons-*.jar"/>
-			<include name="javax.activation-*.jar"/>
+			<include name="jakarta.activation-*.jar"/>
 			<include name="jakarta.xml.bind-api-*.jar"/>
 			<include name="jaxb-runtime-*.jar"/>
 			<include name="jaxb-core-*.jar"/>
@@ -42,7 +42,7 @@
 		<fileset dir="${basedir}/lib">
 		    <include name="codemodel-*.jar"/>
 	        <include name="istack-commons-*.jar"/>
-		    <include name="javax.activation-*.jar"/>
+		    <include name="jakarta.activation-*.jar"/>
 		    <include name="jakarta.xml.bind-api-*.jar"/>
 		    <include name="jaxb-runtime-*.jar"/>
 		    <include name="jaxb-core-*.jar"/>
@@ -74,7 +74,7 @@
 				<fileset dir="${basedir}/lib">
 					<include name="codemodel-*.jar"/>
 				    <include name="istack-commons-*.jar"/>
-					<include name="javax.activation-*.jar"/>
+					<include name="jakarta.activation-*.jar"/>
 					<include name="jakarta.xml.bind-api-*.jar"/>
 					<include name="jaxb-runtime-*.jar"/>
 					<include name="jaxb-core-*.jar"/>

diff --git a/samples/po-simple/project-pom.xml b/samples/po-simple/project-pom.xml
@@ -16,7 +16,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.sun.activation</groupId>
-			<artifactId>javax.activation</artifactId>
+			<artifactId>jakarta.activation</artifactId>
 			<version>${activation.version}</version>
 			<scope>provided</scope>
 		</dependency>

diff --git a/samples/po/pom.xml b/samples/po/pom.xml
@@ -33,7 +33,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.sun.activation</groupId>
-			<artifactId>javax.activation</artifactId>
+			<artifactId>jakarta.activation</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jaxb</groupId>

diff --git a/samples/po/project-build.xml b/samples/po/project-build.xml
@@ -18,7 +18,7 @@
 	<path id="test-compile.path">
 		<fileset dir="${basedir}/lib">
 			<include name="istack-commons-*.jar"/>
-			<include name="javax.activation-*.jar"/>
+			<include name="jakarta.activation-*.jar"/>
 			<include name="jakarta.xml.bind-api-*.jar"/>
 			<include name="jaxb-runtime-*.jar"/>
 			<include name="jaxb-core-*.jar"/>
@@ -42,7 +42,7 @@
 	<path id="test.path">
 		<fileset dir="${basedir}/lib">
 		    <include name="istack-commons-*.jar"/>
-			<include name="javax.activation-*.jar"/>
+			<include name="jakarta.activation-*.jar"/>
 			<include name="jakarta.xml.bind-api-*.jar"/>
 			<include name="jaxb-runtime-*.jar"/>
 			<include name="jaxb-core-*.jar"/>
@@ -75,7 +75,7 @@
 				<fileset dir="${basedir}/lib">
 					<include name="codemodel-*.jar"/>
 				    <include name="istack-commons-*.jar"/>
-					<include name="javax.activation-*.jar"/>
+					<include name="jakarta.activation-*.jar"/>
 					<include name="jakarta.xml.bind-api-*.jar"/>
 					<include name="jaxb-runtime-*.jar"/>
 					<include name="jaxb-core-*.jar"/>

diff --git a/samples/po/project-pom.xml b/samples/po/project-pom.xml
@@ -16,7 +16,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.sun.activation</groupId>
-			<artifactId>javax.activation</artifactId>
+			<artifactId>jakarta.activation</artifactId>
 			<version>${activation.version}</version>
 			<scope>provided</scope>
 		</dependency>

diff --git a/testing/pom.xml b/testing/pom.xml
@@ -32,8 +32,8 @@
 			<artifactId>jaxb2-basics-runtime</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>javax.xml.bind</groupId>
-			<artifactId>jaxb-api</artifactId>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>

diff --git a/tests/episodes/a/pom.xml b/tests/episodes/a/pom.xml
@@ -28,7 +28,7 @@
 					<plugins>
 						<plugin>
 							<groupId>org.jvnet.jaxb2_commons</groupId>
-                                                	<artifactId>jaxb2-basics</artifactId>
+							<artifactId>jaxb2-basics</artifactId>
 						</plugin>
 					</plugins>
 				</configuration>

diff --git a/tests/episodes/b/pom.xml b/tests/episodes/b/pom.xml
@@ -35,7 +35,7 @@
 					<plugins>
 						<plugin>
 							<groupId>org.jvnet.jaxb2_commons</groupId>
-                                                	<artifactId>jaxb2-basics</artifactId>
+							<artifactId>jaxb2-basics</artifactId>
 						</plugin>
 					</plugins>
 					<episodes>

diff --git a/tests/ignoring/pom.xml b/tests/ignoring/pom.xml
@@ -28,7 +28,7 @@
 					<plugins>
 						<plugin>
 							<groupId>org.jvnet.jaxb2_commons</groupId>
-                                                	<artifactId>jaxb2-basics</artifactId>
+							<artifactId>jaxb2-basics</artifactId>
 						</plugin>
 					</plugins>
 				</configuration>

diff --git a/tests/pom.xml b/tests/pom.xml
@@ -34,7 +34,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.sun.activation</groupId>
-			<artifactId>javax.activation</artifactId>
+			<artifactId>jakarta.activation</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.jvnet.jaxb2_commons</groupId>

diff --git a/tests/superclass/a/pom.xml b/tests/superclass/a/pom.xml
@@ -28,7 +28,7 @@
 					<plugins>
 						<plugin>
 							<groupId>org.jvnet.jaxb2_commons</groupId>
-                                                	<artifactId>jaxb2-basics</artifactId>
+							<artifactId>jaxb2-basics</artifactId>
 						</plugin>
 					</plugins>
 				</configuration>

diff --git a/tests/zj/pom.xml b/tests/zj/pom.xml
@@ -24,8 +24,8 @@
 						<arg>-Xcopyable</arg>
 					</args>
 					<plugins>
-                                        	<plugin>
-                                                	<groupId>org.jvnet.jaxb2_commons</groupId>
+						<plugin>
+							<groupId>org.jvnet.jaxb2_commons</groupId>
 							<artifactId>jaxb2-basics</artifactId>
 						</plugin>
 					</plugins>

diff --git a/tools/pom.xml b/tools/pom.xml
@@ -41,7 +41,7 @@
 		</dependency>
 		<dependency>
 			<groupId>com.sun.activation</groupId>
-			<artifactId>javax.activation</artifactId>
+			<artifactId>jakarta.activation</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>