ci: add JDK 25, switch to temurin distribution, refactor

.github/workflows/ci.yml

@@ -22,13 +22,14 @@ on:
 
 env:
   MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
-
+  BASE_JAVA_VERSION: 17
+  DEFAULT_JAVA_DISTRIBUTION: 'temurin'
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
-        java: [ 17, 21 ]
+        java: [ 17, 21, 25 ]
     name: "Java ${{ matrix.java }}"
     runs-on: ubuntu-24.04
     steps:
@@ -46,9 +47,9 @@ jobs:
       uses: actions/setup-java@v5
       with:
         java-version: ${{ matrix.java }}
-        distribution: 'zulu'
+        distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}
     - name: Build
-      run: mvn -B -e -Papache-release -Dgpg.skip=true verify
+      run: mvn -B -e -Papache-release -Dgpg.skip=true -Dmaven.compiler.release=${{ matrix.java }} verify
     - name: Remove Snapshots
       run: find ~/.m2/repository -name '*-SNAPSHOT' -a -type d -print0 | xargs -0 rm -rf
   site:
@@ -68,10 +69,10 @@ jobs:
     - name: Set up Java
       uses: actions/setup-java@v5
       with:
-        distribution: 'zulu'
-        java-version: 17
+        java-version: ${{ env.BASE_JAVA_VERSION }}
+        distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}
     - name: Build
-      run: mvn -B -e -Dmaven.test.skip=true package site-deploy
+      run: mvn -B -e -Dmaven.test.skip=true -Dmaven.compiler.release=${{ env.BASE_JAVA_VERSION }} package site-deploy
     - name: Remove Snapshots
       run: find ~/.m2/repository -name '*-SNAPSHOT' -a -type d -print0 | xargs -0 rm -rf
   deploy:
@@ -95,13 +96,13 @@ jobs:
     - name: Set up Java
       uses: actions/setup-java@v5
       with:
-        java-version: 17
-        distribution: 'zulu'
+        java-version: ${{ env.BASE_JAVA_VERSION }}
+        distribution: ${{ env.DEFAULT_JAVA_DISTRIBUTION }}
         server-id: apache.snapshots.https
         server-username: NEXUS_USER
         server-password: NEXUS_PW
     - name: Deploy
-      run: mvn -B -e -Papache-release -Dgpg.skip=true -Dmaven.test.skip=true deploy
+      run: mvn -B -e -Papache-release -Dgpg.skip=true -Dmaven.test.skip=true -Dmaven.compiler.release=${{ env.BASE_JAVA_VERSION }} deploy
       env:
         NEXUS_USER: ${{ secrets.NEXUS_USER }}
         NEXUS_PW: ${{ secrets.NEXUS_PW }}

modules/codegen/build-wsdls.xml

@@ -45,7 +45,7 @@
 			<classpath location="${compiled.classes.dir}" />
 			<arg line="-ap -o ${wsdl.output.base.dir}/version -d none -s -u -uri test-resources/wsdls/Version.wsdl" />
 		</java>
-		<javac fork="yes" destdir="target/test-classes" debug="on">
+		<javac fork="yes" destdir="target/test-classes" debug="on" includeantruntime="false">
 			<classpath refid="maven.test.classpath" />
 			<classpath location="${compiled.classes.dir}" />
 			<src path="${wsdl.output.base.dir}/version" />

modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl

@@ -125,7 +125,7 @@
 
             <target name="compile.src" depends="pre.compile.test">
                 <xsl:attribute name="if">jars.ok</xsl:attribute>
-                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
+                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
                     <xsl:attribute name="destdir">${classes}</xsl:attribute>
                     <xsl:attribute name="srcdir">${src}</xsl:attribute>
                     <classpath>
@@ -136,7 +136,7 @@
 
             <target name="compile.test" depends="compile.src">
                 <xsl:attribute name="if">jars.ok</xsl:attribute>
-                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
+                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
                     <xsl:attribute name="destdir">${classes}</xsl:attribute>
                     <src>
                         <xsl:attribute name="path">${test}</xsl:attribute>

modules/codegen/src/org/apache/axis2/wsdl/template/general/defaultAntBuildTemplate.xsl

@@ -122,7 +122,7 @@
 
             <target name="compile.src" depends="echo.classpath.problem">
                 <xsl:attribute name="if">jars.ok</xsl:attribute>
-                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
+                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
                     <xsl:attribute name="destdir">${classes}</xsl:attribute>
                     <xsl:attribute name="srcdir">${src}</xsl:attribute>
                     <classpath>
@@ -133,7 +133,7 @@
 
             <target name="compile.test" depends="compile.src">
                 <xsl:attribute name="if">jars.ok</xsl:attribute>
-                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
+                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
                     <xsl:attribute name="destdir">${classes}</xsl:attribute>
                     <xsl:attribute name="srcdir">${test}</xsl:attribute>
                     <classpath>

modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxbriAntBuildTemplate.xsl

@@ -131,7 +131,7 @@
 
             <target name="compile.src" depends="pre.compile.test" >
                 <xsl:attribute name="if">jars.ok</xsl:attribute>
-                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
+                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
                     <xsl:attribute name="destdir">${classes}</xsl:attribute>
                     <xsl:attribute name="srcdir">${src}</xsl:attribute>
                     <classpath>
@@ -143,7 +143,7 @@
 
             <target name="compile.test" depends="compile.src">
                 <xsl:attribute name="if">jars.ok</xsl:attribute>
-                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
+                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
                     <xsl:attribute name="destdir">${classes}</xsl:attribute>
 
                     <src>

modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxmeAntBuildTemplate.xsl

@@ -134,7 +134,7 @@
 
             <target name="compile.all" depends="pre.compile.test">
                 <xsl:attribute name="if">jars.ok</xsl:attribute>
-                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
+                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
                     <xsl:attribute name="destdir">${classes}</xsl:attribute>
                     <xsl:attribute name="srcdir">${src}</xsl:attribute>
                     <classpath>
@@ -147,7 +147,7 @@
             </target>
             <target name="compile.test" depends="pre.compile.test">
                 <xsl:attribute name="if">jars.ok</xsl:attribute>
-                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
+                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
                     <xsl:attribute name="destdir">${classes}</xsl:attribute>
                     <src>
                         <xsl:attribute name="path">${src}</xsl:attribute>

modules/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl

@@ -130,7 +130,7 @@
 
             <target name="compile.src" depends="pre.compile.test">
                 <xsl:attribute name="if">jars.ok</xsl:attribute>
-                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
+                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
                     <xsl:attribute name="destdir">${classes}</xsl:attribute>
                     <xsl:attribute name="srcdir">${src}</xsl:attribute>
                     <classpath>
@@ -141,7 +141,7 @@
 
             <target name="compile.test" depends="compile.src">
                 <xsl:attribute name="if">jars.ok</xsl:attribute>
-                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
+                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
                     <xsl:attribute name="destdir">${classes}</xsl:attribute>
                     <src>
                         <xsl:attribute name="path">${test}</xsl:attribute>

modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl

@@ -142,7 +142,7 @@
 
             <target name="compile.src" depends="pre.compile.test" >
                 <xsl:attribute name="if">jars.ok</xsl:attribute>
-                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
+                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
                     <xsl:attribute name="destdir">${classes}</xsl:attribute>
                     <xsl:attribute name="srcdir">${src}</xsl:attribute>
                     <classpath>
@@ -157,7 +157,7 @@
 
             <target name="compile.test" depends="compile.src">
                 <xsl:attribute name="if">jars.ok</xsl:attribute>
-                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on">
+                <javac fork="true" memoryInitialSize="256m" memoryMaximumSize="256m" debug="on" includeantruntime="false">
                     <xsl:attribute name="destdir">${classes}</xsl:attribute>
 
                     <src>

modules/fastinfoset/pom.xml

@@ -196,7 +196,7 @@
                                 <!-- make the dirs -->
                                 <mkdir dir="${wsdl.output.base.dir}" />
                                 <echo>Compiling Service class</echo>
-                                <javac fork="true" destdir="target/test-classes" debug="on" source="${maven.compiler.source}" target="${maven.compiler.target}">
+                                <javac fork="true" destdir="target/test-classes" debug="on" release="${maven.compiler.release}" includeantruntime="false">
                                     <classpath refid="maven.dependency.classpath" />
                                     <classpath location="${compiled.classes.dir}" />
                                     <include name="**/*SimpleAddService.java" />
@@ -249,10 +249,6 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>
-                    <!-- The pertest forkMode is not ideal but seems to be necessary
-                         because the test server doesn't shut down properly :-(
-                         Should be removed if possible -->
-                    <forkMode>pertest</forkMode>
                     <argLine>${argLine} -Xms256m -Xmx512m</argLine>
                     <!-- Enable the next 2 lines if you want to attach a debugger
                    <argLine>-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006</argLine>-->

modules/integration/test-resources/jaxrs/archiveTestModule/build.xml

@@ -36,7 +36,7 @@
 
     <target name="compile" depends="init" unless="jars.uptodate">
         <mkdir dir="${build.classes}"/>
-        <javac fork="true" destdir="${build.classes}" debug="on" source="${maven.compiler.source}" target="${maven.compiler.target}">
+        <javac fork="true" destdir="${build.classes}" debug="on" release="${maven.compiler.release}" includeantruntime="false">
             <classpath refid="axis.test.classpath"/>
             <src path="${src}"/>
         </javac>

modules/integration/test-resources/jaxrs/pojoTestModule/build.xml

@@ -32,7 +32,7 @@
 
     <target name="compile" depends="init" unless="pojo.uptodate">
         <mkdir dir="${pojo.dir}"/>
-        <javac fork="true" destdir="${pojo.dir}" debug="on" source="${maven.compiler.source}" target="${maven.compiler.target}">
+        <javac fork="true" destdir="${pojo.dir}" debug="on" release="${maven.compiler.release}" includeantruntime="false">
             <classpath refid="axis.test.classpath"/>
             <src path="${src}"/>
         </javac>

modules/kernel/src/org/apache/axis2/java/security/AccessController.java

@@ -35,7 +35,7 @@
  * accessing system resources (ie, read/write files, opening ports, and etc).
  * <p/>
  * This class provides a consistent security model across Java versions by
- * always using doPrivileged(), ensuring proper privilege elevation regardless
+ * always using doPrivileged(), if it is available, ensuring proper privilege elevation regardless
  * of SecurityManager presence (which was deprecated in Java 17 and removed in Java 21).
  * <p/>
  * Note: This utility should be used properly, otherwise might introduce
@@ -56,14 +56,13 @@
  * }
  * </code>
  */
-
-
 public class AccessController {
+    private static final boolean SUPPORTS_SECURITY_MANAGER = Runtime.version().feature() < 24;
 
     /**
      * Performs the specified <code>PrivilegedAction</code> with privileges
      * enabled. This method always uses doPrivileged for security consistency
-     * across Java versions.
+     * across Java versions, if it is available.
      * <p/>
      * If the action's <code>run</code> method throws an (unchecked) exception,
      * it will propagate through this method.
@@ -74,7 +73,11 @@ public class AccessController {
      * @see #doPrivileged(PrivilegedExceptionAction)
      */
     public static <T> T doPrivileged(PrivilegedAction<T> action) {
-        return java.security.AccessController.doPrivileged(action);
+        if (!SUPPORTS_SECURITY_MANAGER) {
+            return (action.run());
+        } else {
+            return java.security.AccessController.doPrivileged(action);
+        }
     }
 
 
@@ -97,7 +100,11 @@ public static <T> T doPrivileged(PrivilegedAction<T> action) {
      * @see #doPrivileged(PrivilegedExceptionAction,AccessControlContext)
      */
     public static <T> T doPrivileged(PrivilegedAction<T> action, AccessControlContext context) {
-        return java.security.AccessController.doPrivileged(action, context);
+        if (!SUPPORTS_SECURITY_MANAGER) {
+            return action.run();
+        } else {
+            return java.security.AccessController.doPrivileged(action, context);
+        }
     }
 
     /**
@@ -117,7 +124,17 @@ public static <T> T doPrivileged(PrivilegedAction<T> action, AccessControlContex
      */
     public static <T> T doPrivileged(PrivilegedExceptionAction<T> action)
             throws PrivilegedActionException {
-        return java.security.AccessController.doPrivileged(action);
+        if (!SUPPORTS_SECURITY_MANAGER) {
+            try {
+                return action.run();
+            } catch (java.lang.RuntimeException e) {
+                throw e;
+            } catch (Exception e) {
+                throw new PrivilegedActionException(e);
+            }
+        } else {
+            return java.security.AccessController.doPrivileged(action);
+        }
     }
 
 
@@ -146,7 +163,18 @@ public static <T> T doPrivileged(PrivilegedExceptionAction<T> action)
     public static <T> T doPrivileged(PrivilegedExceptionAction<T> action,
                                       AccessControlContext context)
             throws PrivilegedActionException {
-        return java.security.AccessController.doPrivileged(action, context);
+
+        if (!SUPPORTS_SECURITY_MANAGER) {
+            try {
+                return action.run();
+            } catch (java.lang.RuntimeException e) {
+                throw e;
+            } catch (Exception e) {
+                throw new PrivilegedActionException(e);
+            }
+        } else {
+            return java.security.AccessController.doPrivileged(action, context);
+        }
     }
 
     /**
@@ -174,7 +202,9 @@ public static AccessControlContext getContext() {
      *                                is not permitted, based on the current security policy.
      */
     public static void checkPermission(Permission perm) throws AccessControlException {
-        java.security.AccessController.checkPermission(perm);
+        if (SUPPORTS_SECURITY_MANAGER) {
+            java.security.AccessController.checkPermission(perm);
+        }
     }
 
     /**

modules/kernel/test-resources/deployment/echo/build.xml

@@ -36,7 +36,7 @@
     <target name="compile" depends="init" unless="jars.uptodate">
         <mkdir dir="${build.classes}"/>
         <mkdir dir="${build.lib}"/>
-        <javac destdir="${build.classes}" debug="on" fork="true">
+        <javac destdir="${build.classes}" debug="on" fork="true" includeantruntime="false">
             <classpath refid="axis.test.classpath"/>
             <src path="${src}"/>
         </javac>

modules/kernel/test-resources/deployment/invalidservice/build.xml

@@ -37,7 +37,7 @@
     <target name="compile" depends="init" unless="jars.uptodate">
         <mkdir dir="${build.classes}"/>
         <mkdir dir="${build.lib}"/>
-        <javac destdir="${build.classes}" debug="on" fork="true">
+        <javac destdir="${build.classes}" debug="on" fork="true" includeantruntime="false">
             <classpath refid="axis.test.classpath"/>
             <src path="${src}"/>
         </javac>

modules/kernel/test-resources/deployment/module1/build.xml

@@ -36,7 +36,7 @@
     <target name="compile" depends="init" unless="jars.uptodate">
         <mkdir dir="${build.classes}"/>
         <mkdir dir="${build.lib}"/>
-        <javac destdir="${build.classes}" debug="on" fork="true">
+        <javac destdir="${build.classes}" debug="on" fork="true" includeantruntime="false">
             <classpath refid="axis.test.classpath"/>
             <src path="${src}"/>
         </javac>

modules/kernel/test-resources/deployment/service1/build.xml

@@ -37,7 +37,7 @@
     <target name="compile" depends="init" unless="jars.uptodate">
         <mkdir dir="${build.classes}"/>
         <mkdir dir="${build.lib}"/>
-        <javac destdir="${build.classes}" debug="on">
+        <javac destdir="${build.classes}" debug="on" includeantruntime="false">
             <classpath refid="axis.test.classpath"/>
             <src path="${src}"/>
         </javac>

modules/kernel/test-resources/deployment/service2/build.xml

@@ -36,7 +36,7 @@
     <target name="compile" depends="init" unless="jars.uptodate">
         <mkdir dir="${build.classes}"/>
         <mkdir dir="${build.lib}"/>
-        <javac destdir="${build.classes}" debug="on" fork="true">
+        <javac destdir="${build.classes}" debug="on" fork="true" includeantruntime="false">
             <classpath refid="axis.test.classpath"/>
             <src path="${src}"/>
         </javac>

modules/kernel/test-resources/deployment/serviceModule/build.xml

@@ -36,7 +36,7 @@
     <target name="compile" depends="init" unless="jars.uptodate">
         <mkdir dir="${build.classes}"/>
         <mkdir dir="${build.lib}"/>
-        <javac destdir="${build.classes}" debug="on" fork="true">
+        <javac destdir="${build.classes}" debug="on" fork="true" includeantruntime="false">
             <classpath refid="axis.test.classpath"/>
             <src path="${src}"/>
         </javac>

modules/kernel/test/org/apache/axis2/java/security/driver/Java2SecTest.java

@@ -38,6 +38,8 @@
 import java.util.Calendar;
 import java.util.TimeZone;
 
+import static org.junit.Assume.assumeTrue;
+
 /**
  * Java2SecTest demonstrates the usages of AccessController class for privileged operations.
  *
@@ -69,6 +71,12 @@ public Java2SecTest() {
         System.out.println("Current time => " + sdf.format(cal.getTime()) + "\n");
     }
 
+    @Override
+    public void setUp() throws Exception {
+        // Security Manager was removed after that
+        assumeTrue(Runtime.version().feature() < 24);
+    }
+
     // Constructor
     public Java2SecTest(String arg) {
         super(arg);