Attempt to use jakarta.activation 1.2.1

Signed-off-by: Tomas Kraus <Tomas.Kraus@oracle.com>

jaxb-api-test/pom.xml

@@ -40,8 +40,8 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>javax.activation-api</artifactId>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
         </dependency>
     </dependencies>
 
@@ -51,6 +51,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
                     <release>9</release>
+                    <compilerArgs>
+                        <arg>-verbose</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
             <plugin>
@@ -76,7 +79,7 @@
                 <executions>
                     <execution>
                         <id>copy</id>
-                        <phase>test-compile</phase>
+                        <phase>process-resources</phase>
                         <goals>
                             <goal>copy</goal>
                         </goals>
@@ -87,14 +90,14 @@
                                     <artifactId>jaxb-api</artifactId>
                                     <version>${project.version}</version>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/mods</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/modules</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>javax.activation</groupId>
-                                    <artifactId>javax.activation-api</artifactId>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
                                     <version>${activation.version}</version>
                                     <overWrite>true</overWrite>
-                                    <outputDirectory>${project.build.directory}/mods</outputDirectory>
+                                    <outputDirectory>${project.build.directory}/modules</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -127,10 +130,11 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <!--module-path ${project.build.directory}/modules/jakarta.activation-api-${activation.version}.jar -->
                     <argLine>
                         --add-modules java.xml.bind
-                        --upgrade-module-path ${project.build.directory}/mods/jaxb-api-${project.version}.jar
-                        --module-path ${project.build.directory}/mods/javax.activation-api-${activation.version}.jar
+                        --upgrade-module-path ${project.build.directory}/modules/jaxb-api-${project.version}.jar
+                        --module-path ${project.build.directory}/modules/jakarta.activation-api-${activation.version}.jar
                         --add-reads java.xml.bind=ALL-UNNAMED
                     </argLine>
                     <systemPropertyVariables>

jaxb-api/pom.xml

@@ -30,8 +30,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.activation</groupId>
-            <artifactId>javax.activation-api</artifactId>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
         </dependency>
     </dependencies>
 
@@ -362,8 +362,8 @@ href='http://jaxb.java.net'><i>http://jaxb.java.net</i></a>
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>javax.activation</groupId>
-                                    <artifactId>javax.activation-api</artifactId>
+                                    <groupId>jakarta.activation</groupId>
+                                    <artifactId>jakarta.activation-api</artifactId>
                                     <outputDirectory>${project.build.directory}/modules</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
@@ -422,8 +422,6 @@ href='http://jaxb.java.net'><i>http://jaxb.java.net</i></a>
                                        classpath="${project.build.outputDirectory}"
                                        modulepath="${project.build.directory}/modules"
                                        includeantruntime="false" source="9" target="9">
-                                    <compilerarg value="--add-modules"/>
-                                    <compilerarg value="java.activation"/>
                                 </javac>
                             </tasks>
                         </configuration>

jaxb-api/src/main/java/module-info.java

@@ -9,7 +9,7 @@
  */
 
 module java.xml.bind {
-    requires transitive java.activation;
+    requires transitive jakarta.activation;
     requires transitive java.xml;
     requires java.logging;
     requires java.desktop;

pom.xml

@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.eclipse.ee4j</groupId>
         <artifactId>project</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.3</version>
     </parent>
 
     <groupId>jakarta.xml.bind</groupId>
@@ -77,7 +77,7 @@
         <extension.name>javax.xml.bind</extension.name>
         <spec.version>2.3</spec.version>
         <impl.version>0</impl.version>
-        <activation.version>1.2.0</activation.version>
+        <activation.version>1.2.1</activation.version>
         <config.dir>${project.basedir}/etc/config</config.dir>
     </properties>
 
@@ -89,8 +89,8 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>javax.activation</groupId>
-                <artifactId>javax.activation-api</artifactId>
+                <groupId>jakarta.activation</groupId>
+                <artifactId>jakarta.activation-api</artifactId>
                 <version>${activation.version}</version>
             </dependency>
         </dependencies>