diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c241db57c9..eea5ba57c2 100644
--- a/.github/workflows/ci.yml
+++ b/.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 }}
diff --git a/modules/codegen/build-wsdls.xml b/modules/codegen/build-wsdls.xml
index e58e941a1a..da5270844b 100644
--- a/modules/codegen/build-wsdls.xml
+++ b/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" />
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl
index 300cf36793..30972d64ec 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl
+++ b/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>
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/general/defaultAntBuildTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/general/defaultAntBuildTemplate.xsl
index 89c1ac1485..b7f3cfecf1 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/general/defaultAntBuildTemplate.xsl
+++ b/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>
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxbriAntBuildTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxbriAntBuildTemplate.xsl
index 6a109fd359..4f5e5a06c2 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxbriAntBuildTemplate.xsl
+++ b/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>
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxmeAntBuildTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxmeAntBuildTemplate.xsl
index 104f07031c..d4dc9da07b 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxmeAntBuildTemplate.xsl
+++ b/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>
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl
index 1fe4f9b177..43a01000f3 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl
+++ b/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>
diff --git a/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl b/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl
index 7535c9d70c..17f34fea49 100644
--- a/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl
+++ b/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>
diff --git a/modules/fastinfoset/pom.xml b/modules/fastinfoset/pom.xml
index 99b68a9dac..06c4e605da 100644
--- a/modules/fastinfoset/pom.xml
+++ b/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>-->
diff --git a/modules/integration/test-resources/jaxrs/archiveTestModule/build.xml b/modules/integration/test-resources/jaxrs/archiveTestModule/build.xml
index cb436ccdf8..4a94ac4089 100644
--- a/modules/integration/test-resources/jaxrs/archiveTestModule/build.xml
+++ b/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" source="${maven.compiler.source}" target="${maven.compiler.target}" includeantruntime="false">
             <classpath refid="axis.test.classpath"/>
             <src path="${src}"/>
         </javac>
diff --git a/modules/integration/test-resources/jaxrs/pojoTestModule/build.xml b/modules/integration/test-resources/jaxrs/pojoTestModule/build.xml
index 4ec78c0e06..62ecce4241 100644
--- a/modules/integration/test-resources/jaxrs/pojoTestModule/build.xml
+++ b/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" source="${maven.compiler.source}" target="${maven.compiler.target}" includeantruntime="false">
             <classpath refid="axis.test.classpath"/>
             <src path="${src}"/>
         </javac>
diff --git a/modules/kernel/test-resources/deployment/echo/build.xml b/modules/kernel/test-resources/deployment/echo/build.xml
index 84f50beea8..81a305c813 100644
--- a/modules/kernel/test-resources/deployment/echo/build.xml
+++ b/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>
diff --git a/modules/kernel/test-resources/deployment/invalidservice/build.xml b/modules/kernel/test-resources/deployment/invalidservice/build.xml
index 8ea069e6ba..729bfd915a 100644
--- a/modules/kernel/test-resources/deployment/invalidservice/build.xml
+++ b/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>
diff --git a/modules/kernel/test-resources/deployment/module1/build.xml b/modules/kernel/test-resources/deployment/module1/build.xml
index a1133b2d62..fcffe826b5 100644
--- a/modules/kernel/test-resources/deployment/module1/build.xml
+++ b/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>
diff --git a/modules/kernel/test-resources/deployment/service1/build.xml b/modules/kernel/test-resources/deployment/service1/build.xml
index cf1541e99d..de52ae598b 100644
--- a/modules/kernel/test-resources/deployment/service1/build.xml
+++ b/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>
diff --git a/modules/kernel/test-resources/deployment/service2/build.xml b/modules/kernel/test-resources/deployment/service2/build.xml
index 554dfed1be..cce094cd4b 100644
--- a/modules/kernel/test-resources/deployment/service2/build.xml
+++ b/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>
diff --git a/modules/kernel/test-resources/deployment/serviceModule/build.xml b/modules/kernel/test-resources/deployment/serviceModule/build.xml
index 591be3d043..b2be9af5f8 100644
--- a/modules/kernel/test-resources/deployment/serviceModule/build.xml
+++ b/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>
diff --git a/modules/samples/advanced-rmi/build.xml b/modules/samples/advanced-rmi/build.xml
index 9b3022b403..1fb9f9223d 100644
--- a/modules/samples/advanced-rmi/build.xml
+++ b/modules/samples/advanced-rmi/build.xml
@@ -51,7 +51,7 @@
         <mkdir dir="${deploy_dir}/META-INF"/>
 
         <!-- compiling the classes -->
-        <javac  destdir="${deploy_dir}" srcdir="${src_dir}" debug="on">
+        <javac  destdir="${deploy_dir}" srcdir="${src_dir}" debug="on" includeantruntime="false">
             <exclude name="**/client/*"/>
             <classpath>
                 <fileset dir="${lib_dir}" includes="*.jar"/>
@@ -77,7 +77,7 @@
         <mkdir dir="${dist_dir}"/>
 
         <!-- compiling the classes -->
-        <javac  destdir="${classes_dir}" srcdir="${src_dir}" debug="on">
+        <javac  destdir="${classes_dir}" srcdir="${src_dir}" debug="on" includeantruntime="false">
             <classpath>
                 <fileset dir="${lib_dir}" includes="*.jar"/>
             </classpath>
diff --git a/modules/samples/build.xml b/modules/samples/build.xml
index 143297ac02..78c7d377ad 100644
--- a/modules/samples/build.xml
+++ b/modules/samples/build.xml
@@ -86,7 +86,7 @@
     </target>
 
     <target name="compile" depends="clean,createDir">
-        <javac srcdir="${src.dir}" destdir="${classes.dir}">
+        <javac srcdir="${src.dir}" destdir="${classes.dir}" includeantruntime="false">
             <classpath refid="classpath.library"/>
         </javac>
         <jar destfile="${lib.dir}/${ant.project.name}-all.jar">
diff --git a/modules/samples/databinding/build.xml b/modules/samples/databinding/build.xml
index 66228d3d25..538cd0bacf 100644
--- a/modules/samples/databinding/build.xml
+++ b/modules/samples/databinding/build.xml
@@ -106,7 +106,7 @@
         <!--First let's compile the classes-->
         <javac debug="on" memoryMaximumSize="256m" memoryInitialSize="256m" fork="true"
                destdir="${service.target}/classes" srcdir="${service.target}/src"
-               classpathref="axis2.classpath">
+               classpathref="axis2.classpath" includeantruntime="false">
         </javac>
 
         <!--aar them up -->
@@ -160,7 +160,8 @@
                srcdir="${client.target}/src"
                excludes="**/StockClient2*.*"
                destdir="${client.target}/classes"
-               classpathref="axis2.classpath">
+               classpathref="axis2.classpath"
+               includeantruntime="false">
         </javac>
 
         <!--jar the compiled stuff-->
diff --git a/modules/samples/faulthandling/build.xml b/modules/samples/faulthandling/build.xml
index e8a89f2665..a4798e6f72 100644
--- a/modules/samples/faulthandling/build.xml
+++ b/modules/samples/faulthandling/build.xml
@@ -81,7 +81,7 @@
 
         <!--First let's compile the classes-->
         <javac debug="on" memoryMaximumSize="256m" memoryInitialSize="256m" fork="true"
-               destdir="${service.target}/classes" srcdir="${service.target}/src">
+               destdir="${service.target}/classes" srcdir="${service.target}/src" includeantruntime="false">
             <classpath>
                 <fileset dir="../../lib">
                     <include name="*.jar"/>
@@ -125,7 +125,7 @@
 
         <!--now compile the stub classes-->
         <javac debug="on" memoryMaximumSize="256m" memoryInitialSize="256m" fork="true"
-               destdir="${client.target}/classes">
+               destdir="${client.target}/classes" includeantruntime="false">
             <src path="${client.target}/src"/>
             <classpath>
                 <fileset dir="../../lib">
diff --git a/modules/samples/googlespellcheck/build.xml b/modules/samples/googlespellcheck/build.xml
index abeac95244..815cb66931 100644
--- a/modules/samples/googlespellcheck/build.xml
+++ b/modules/samples/googlespellcheck/build.xml
@@ -90,7 +90,7 @@
 	
 	<target name="client.compile">
 		
-		<javac srcdir="src" destdir="${dest.dir.classes}">
+		<javac srcdir="src" destdir="${dest.dir.classes}" includeantruntime="false">
 			<classpath refid="build.class.path" />
 		</javac>
 	
diff --git a/modules/samples/jaxws-version/build.xml b/modules/samples/jaxws-version/build.xml
index e9d9881791..6943654c8d 100644
--- a/modules/samples/jaxws-version/build.xml
+++ b/modules/samples/jaxws-version/build.xml
@@ -50,7 +50,7 @@
 	
 	<target name="generate.service" depends="clean,prepare">
 		
-		<javac srcdir="src" destdir="${dest.dir.classes}" includes="sample/jaxws/**">
+		<javac srcdir="src" destdir="${dest.dir.classes}" includes="sample/jaxws/**" includeantruntime="false">
 			<classpath refid="build.class.path" />
 		</javac>
 		
diff --git a/modules/samples/json/build.xml b/modules/samples/json/build.xml
index f1fc7d3c1c..040bf11127 100644
--- a/modules/samples/json/build.xml
+++ b/modules/samples/json/build.xml
@@ -52,7 +52,7 @@
     <target name="generate.service" depends="clean,prepare">
         <copy file="src/META-INF/services.xml" tofile="${dest.dir.classes}/META-INF/services.xml" overwrite="true" />
 
-        <javac srcdir="src" destdir="${dest.dir.classes}" fork="true">
+        <javac srcdir="src" destdir="${dest.dir.classes}" fork="true" includeantruntime="false">
             <classpath refid="axis.classpath" />
         </javac>
 
@@ -63,7 +63,7 @@
     </target>
 
     <target name="client.compile">
-        <javac srcdir="src" destdir="${dest.dir.classes}" includes="sample.json.client/**" fork="true">
+        <javac srcdir="src" destdir="${dest.dir.classes}" includes="sample.json.client/**" fork="true" includeantruntime="false">
             <classpath refid="axis.classpath"/>
         </javac>
     </target>
@@ -73,7 +73,7 @@
     </target>
 
     <target name="run.client" depends="client.jar">
-        <java classname="sample.json.client.JsonClient"  fork="true">
+        <java classname="sample.json.client.JsonClient" fork="true">
             <classpath refid="axis.classpath"  />
         </java>
     </target>
diff --git a/modules/samples/mex/build.xml b/modules/samples/mex/build.xml
index 6395661fe8..71cc0b3394 100644
--- a/modules/samples/mex/build.xml
+++ b/modules/samples/mex/build.xml
@@ -33,7 +33,7 @@
     
     <target name="compile">
     		<mkdir dir="${classes.dir}" />
-		<javac srcdir="src" destdir="${classes.dir}">
+		<javac srcdir="src" destdir="${classes.dir}" includeantruntime="false">
 			<classpath refid="axis.classpath" />
 		</javac>
 		<jar destfile="build/userguideMex.jar">
diff --git a/modules/samples/mtom/build.xml b/modules/samples/mtom/build.xml
index d52eae03ac..7d6d6be43a 100755
--- a/modules/samples/mtom/build.xml
+++ b/modules/samples/mtom/build.xml
@@ -86,7 +86,7 @@
 
 		<mkdir dir="${client.classes.dir}" />
 		<!-- Compile client -->
-		<javac srcdir="${client.dir}/src" destdir="${client.classes.dir}" fork="true">
+		<javac srcdir="${client.dir}/src" destdir="${client.classes.dir}" fork="true" includeantruntime="false">
 			<classpath refid="class.path" />
 		</javac>
     </target>	
@@ -109,7 +109,7 @@
 	</target>
 	<target  name="jar.server">
 		<mkdir dir="${service.dir}/classes" />
-		<javac debug="on" memoryMaximumSize="256m" memoryInitialSize="256m" fork="true" 		destdir="${service.dir}/classes" srcdir="${service.dir}/src">
+		<javac debug="on" memoryMaximumSize="256m" memoryInitialSize="256m" fork="true" destdir="${service.dir}/classes" srcdir="${service.dir}/src"  includeantruntime="false">
 		<classpath refid="class.path"/>
 		</javac>
 
diff --git a/modules/samples/ping/build.xml b/modules/samples/ping/build.xml
index 6788f7edd9..119bfec073 100644
--- a/modules/samples/ping/build.xml
+++ b/modules/samples/ping/build.xml
@@ -45,7 +45,8 @@
                fork="true"
                destdir="${build.dir}/classes"
                srcdir="${basedir}/src"
-               classpathref="axis2.classpath">
+               classpathref="axis2.classpath"
+               includeantruntime="false">
         </javac>
     </target>
 
diff --git a/modules/samples/pojo/build.xml b/modules/samples/pojo/build.xml
index 704695e294..bbf7e7566e 100644
--- a/modules/samples/pojo/build.xml
+++ b/modules/samples/pojo/build.xml
@@ -65,7 +65,7 @@
 
 		<copy file="src/META-INF/services.xml" tofile="${dest.dir.classes}/META-INF/services.xml" overwrite="true" />
 
-		<javac srcdir="src" destdir="${dest.dir.classes}" includes="sample/addressbook/service/**,sample/addressbook/entry/**">
+		<javac srcdir="src" destdir="${dest.dir.classes}" includes="sample/addressbook/service/**,sample/addressbook/entry/**" includeantruntime="false">
 			<classpath refid="build.class.path" />
 		</javac>
 
@@ -88,7 +88,7 @@
 	</target>
 
 	<target name="rpc.client.compile">
-		<javac srcdir="src" destdir="${dest.dir.classes}" includes="sample/addressbook/rpcclient/**,sample/addressbook/entry/**">
+		<javac srcdir="src" destdir="${dest.dir.classes}" includes="sample/addressbook/rpcclient/**,sample/addressbook/entry/**" includeantruntime="false">
 			<classpath refid="build.class.path" />
 		</javac>
 	</target>
@@ -148,7 +148,7 @@
 	</target>
 
 	<target name="adb.client.compile">
-		<javac srcdir="src" destdir="${dest.dir.classes}" includes="sample/addressbook/adbclient/**,sample/addressbook/stub/**">
+		<javac srcdir="src" destdir="${dest.dir.classes}" includes="sample/addressbook/adbclient/**,sample/addressbook/stub/**" includeantruntime="false">
 			<classpath refid="build.class.path" />
 		</javac>
 	</target>
diff --git a/modules/samples/pojoguide/build.xml b/modules/samples/pojoguide/build.xml
index 5510876b0f..08b2ab143c 100644
--- a/modules/samples/pojoguide/build.xml
+++ b/modules/samples/pojoguide/build.xml
@@ -57,7 +57,7 @@
 
 		<copy file="src/META-INF/services.xml" tofile="${dest.dir.classes}/META-INF/services.xml" overwrite="true" />
 
-		<javac srcdir="src" destdir="${dest.dir.classes}" includes="sample/pojo/service/**,sample/pojo/data/**">
+		<javac srcdir="src" destdir="${dest.dir.classes}" includes="sample/pojo/service/**,sample/pojo/data/**" includeantruntime="false">
 			<classpath refid="build.class.path" />
 		</javac>
 		
@@ -78,7 +78,7 @@
 	</target>
 
 	<target name="rpc.client.compile">
-		<javac srcdir="src" destdir="${dest.dir.classes}" includes="sample/pojo/rpcclient/**,sample/pojo/data/**">
+		<javac srcdir="src" destdir="${dest.dir.classes}" includes="sample/pojo/rpcclient/**,sample/pojo/data/**" includeantruntime="false">
 			<classpath refid="build.class.path" />
 		</javac>
 	</target>
diff --git a/modules/samples/pojoguidespring/build.xml b/modules/samples/pojoguidespring/build.xml
index 0894acce93..b44ba84c18 100644
--- a/modules/samples/pojoguidespring/build.xml
+++ b/modules/samples/pojoguidespring/build.xml
@@ -77,7 +77,7 @@
 		<copy file="src/META-INF/services.xml" tofile="${dest.dir.classes}/META-INF/services.xml" overwrite="true" />
 		<copy file="src/applicationContext.xml" tofile="${dest.dir.classes}/applicationContext.xml" overwrite="true" />
 
-		<javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="sample/**">
+		<javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="sample/**" includeantruntime="false">
 			<classpath refid="build.class.path" />
 		</javac>
 
@@ -92,7 +92,7 @@
 	</target>
 
 	<target name="rpc.client.compile" depends="prepare">
-		<javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="client/**">
+		<javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="client/**" includeantruntime="false">
 			<classpath refid="build.class.path" />
 		</javac>
 	</target>
diff --git a/modules/samples/quickstart/build.xml b/modules/samples/quickstart/build.xml
index 1dd4209258..c0aaeb6b47 100644
--- a/modules/samples/quickstart/build.xml
+++ b/modules/samples/quickstart/build.xml
@@ -39,7 +39,8 @@
                fork="true"
                destdir="${build.dir}/classes" 
                srcdir="${basedir}/src"
-               classpathref="axis2.classpath">
+               classpathref="axis2.classpath"
+               includeantruntime="false">
         </javac>
     </target>
 
diff --git a/modules/samples/quickstartaxiom/build.xml b/modules/samples/quickstartaxiom/build.xml
index f9fc23a087..8bb46b0ca2 100644
--- a/modules/samples/quickstartaxiom/build.xml
+++ b/modules/samples/quickstartaxiom/build.xml
@@ -45,7 +45,8 @@
                fork="true"
                destdir="${build.dir}/classes" 
                srcdir="${basedir}/src"
-               classpathref="axis2.classpath">
+               classpathref="axis2.classpath"
+               includeantruntime="false">
         </javac>
     </target>
 
diff --git a/modules/samples/servicelifecycle/build.xml b/modules/samples/servicelifecycle/build.xml
index cd522645e5..978cd19651 100644
--- a/modules/samples/servicelifecycle/build.xml
+++ b/modules/samples/servicelifecycle/build.xml
@@ -63,7 +63,7 @@
               tofile="${dest.dir.classes}/META-INF/services.xml"
               overwrite="true"/>
 
-        <javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="sample/**">
+        <javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="sample/**" includeantruntime="false">
             <classpath refid="build.class.path"/>
         </javac>
 
@@ -83,7 +83,7 @@
               tofile="${dest.dir.classes}/META-INF/services.xml"
               overwrite="true"/>
 
-        <javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="sample/**">
+        <javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="sample/**" includeantruntime="false">
             <classpath refid="build.class.path"/>
         </javac>
 
@@ -97,7 +97,7 @@
     <target name="run.client" depends="prepare">
         <mkdir dir="${dest.dir}"/>
         <mkdir dir="${dest.dir.classes}"/>
-        <javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="client/**">
+        <javac debug="on" srcdir="src" destdir="${dest.dir.classes}" includes="client/**" includeantruntime="false">
             <classpath>
                 <fileset dir="../../lib">
                     <include name="*.jar"/>
diff --git a/modules/samples/soapwithattachments/build.xml b/modules/samples/soapwithattachments/build.xml
index edfec40838..33be43e7b5 100644
--- a/modules/samples/soapwithattachments/build.xml
+++ b/modules/samples/soapwithattachments/build.xml
@@ -45,7 +45,7 @@
 	<target name="compile">
 		<mkdir dir="${client.classes.dir}" />
 		<!-- Compile client -->
-		<javac debug="on"  srcdir="src" destdir="${client.classes.dir}">
+		<javac debug="on"  srcdir="src" destdir="${client.classes.dir}" includeantruntime="false">
 			<classpath refid="axis.classpath" />
 		</javac>
 	</target>
diff --git a/modules/samples/userguide/build.xml b/modules/samples/userguide/build.xml
index a42406a16e..634c20f76a 100644
--- a/modules/samples/userguide/build.xml
+++ b/modules/samples/userguide/build.xml
@@ -35,7 +35,7 @@
     
     <target name="compile">
     		<mkdir dir="${classes.dir}" />
-		<javac srcdir="src" destdir="${classes.dir}">
+		<javac srcdir="src" destdir="${classes.dir}" includeantruntime="false">
                         <exclude name="**/springboot/**/*.java" />
 			<classpath refid="axis.classpath" />
 		</javac>
diff --git a/modules/samples/version/build.xml b/modules/samples/version/build.xml
index 5869a2f299..cf2514a7f2 100644
--- a/modules/samples/version/build.xml
+++ b/modules/samples/version/build.xml
@@ -51,7 +51,7 @@
 		
 		<copy file="src/sample/axisversion/META-INF/services.xml" tofile="${dest.dir.classes}/META-INF/services.xml" overwrite="true" />
 		
-		<javac srcdir="src" destdir="${dest.dir.classes}" includes="sample/axisversion/**">
+		<javac srcdir="src" destdir="${dest.dir.classes}" includes="sample/axisversion/**" includeantruntime="false">
 			<classpath refid="build.class.path" />
 		</javac>
 		
diff --git a/modules/samples/yahoojsonsearch/build.xml b/modules/samples/yahoojsonsearch/build.xml
index 7d8f78042b..c478d4e111 100644
--- a/modules/samples/yahoojsonsearch/build.xml
+++ b/modules/samples/yahoojsonsearch/build.xml
@@ -33,7 +33,7 @@
 	<target name="compile">
 		<mkdir dir="${client.classes.dir}" />
 		<!-- Compile client -->
-		<javac srcdir="src" destdir="${client.classes.dir}">
+		<javac srcdir="src" destdir="${client.classes.dir}" includeantruntime="false">
 			<classpath refid="axis.classpath" />
 		</javac>
 		<jar destfile="${build.dir}/yahooJSONSearch.jar">
diff --git a/modules/samples/yahoorestsearch/build.xml b/modules/samples/yahoorestsearch/build.xml
index f69a4c8332..43822f236b 100755
--- a/modules/samples/yahoorestsearch/build.xml
+++ b/modules/samples/yahoorestsearch/build.xml
@@ -33,7 +33,7 @@
 	<target name="compile">
 		<mkdir dir="${client.classes.dir}" />
 		<!-- Compile client -->
-		<javac srcdir="src" destdir="${client.classes.dir}">
+		<javac srcdir="src" destdir="${client.classes.dir}" includeantruntime="false">
 			<classpath refid="axis.classpath" />
 		</javac>
 		<jar destfile="${build.dir}/yahooRESTSearch.jar">
diff --git a/pom.xml b/pom.xml
index bd5a8683db..66dd4e3494 100644
--- a/pom.xml
+++ b/pom.xml
@@ -507,7 +507,7 @@
              http://maven.apache.org/plugins/maven-site-plugin/examples/creating-content.html -->
         <axis2_version>${project.version}</axis2_version>
         <project.build.outputTimestamp>2025-03-04T22:45:29Z</project.build.outputTimestamp>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
     </properties>
 
     <dependencyManagement>