Skip to content

Update CI, add support for building with Java 21 #868

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

Merged
cortlepp merged 3 commits into from
Mar 22, 2025
Merged

Update CI, add support for building with Java 21 #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66f9add
Update ci.yml
cortlepp Mar 10, 2025
c1b0553
fix: compile to java 8 as 1.7 is no longer supported in JDK 21
cortlepp Mar 10, 2025
9700cd0
fix: compile to default language level in ant build files
cortlepp Mar 22, 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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ 17, 19 ]
java: [ 17, 21 ]
name: "Java ${{ matrix.java }}"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -53,7 +53,7 @@ jobs:
run: find ~/.m2/repository -name '*-SNAPSHOT' -a -type d -print0 | xargs -0 rm -rf
site:
name: Site
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -77,7 +77,7 @@ jobs:
deploy:
if: github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'apache/axis-axis2-java-core'
name: Deploy
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- build
- site
Expand Down
2 changes: 1 addition & 1 deletion 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="1.7" target="1.7">
<javac fork="true" destdir="target/test-classes" debug="on" source="${maven.compiler.source}" target="${maven.compiler.target}">
<classpath refid="maven.dependency.classpath" />
<classpath location="${compiled.classes.dir}" />
<include name="**/*SimpleAddService.java" />
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="1.7" target="1.7">
<javac fork="true" destdir="${build.classes}" debug="on" source="${maven.compiler.source}" target="${maven.compiler.target}">
<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="1.7" target="1.7">
<javac fork="true" destdir="${pojo.dir}" debug="on" source="${maven.compiler.source}" target="${maven.compiler.target}">
<classpath refid="axis.test.classpath"/>
<src path="${src}"/>
</javac>
Expand Down