Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
183f315
ci: add JDK 25, switch to temurin distribution, refactor
cortlepp Sep 24, 2025
8e6d7fe
fix: add `includeantruntime="false"` parameter to javac ant builds
cortlepp Sep 24, 2025
eb59da2
fix: remove unsupported parameter
cortlepp Sep 24, 2025
5054f25
fix: correctly set Java version in maven and CI
cortlepp Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion modules/codegen/build-wsdls.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions modules/codegen/src/org/apache/axis2/wsdl/template/general/defaultAntBuildTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxbriAntBuildTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions modules/codegen/src/org/apache/axis2/wsdl/template/general/jaxmeAntBuildTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions modules/codegen/src/org/apache/axis2/wsdl/template/general/jibxAntBuildTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
6 changes: 1 addition & 5 deletions modules/fastinfoset/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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>-->
Expand Down
2 changes: 1 addition & 1 deletion modules/integration/test-resources/jaxrs/archiveTestModule/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion modules/integration/test-resources/jaxrs/pojoTestModule/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion modules/kernel/test-resources/deployment/echo/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion modules/kernel/test-resources/deployment/invalidservice/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion modules/kernel/test-resources/deployment/module1/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion modules/kernel/test-resources/deployment/service1/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion modules/kernel/test-resources/deployment/service2/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion modules/kernel/test-resources/deployment/serviceModule/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions modules/samples/advanced-rmi/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion modules/samples/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
5 changes: 3 additions & 2 deletions modules/samples/databinding/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand 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-->
Expand Down
4 changes: 2 additions & 2 deletions modules/samples/faulthandling/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand Down Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion modules/samples/googlespellcheck/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion modules/samples/jaxws-version/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions modules/samples/json/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion modules/samples/mex/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Loading
Loading