From 66f9adde7336962f522db50516b89d8ddd5fc58b Mon Sep 17 00:00:00 2001
From: Christian Ortlepp <christian.ortlepp@hypergene.com>
Date: Mon, 10 Mar 2025 09:22:17 +0100
Subject: [PATCH 1/3] Update ci.yml

- update tested Java version to `[17,21]` from `[17,19]` since Java 19 is no longer supported
- update base images to ubuntu 24.04 (the current latest version)
---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f001b52e03..deec61b8ae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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
@@ -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
@@ -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

From c1b05531783d5268bee3558539c7dd61591e5b27 Mon Sep 17 00:00:00 2001
From: Christian Ortlepp <christian.ortlepp@hypergene.com>
Date: Mon, 10 Mar 2025 09:44:52 +0100
Subject: [PATCH 2/3] fix: compile to java 8 as 1.7 is no longer supported in
 JDK 21

---
 modules/fastinfoset/pom.xml                                     | 2 +-
 .../test-resources/jaxrs/archiveTestModule/build.xml            | 2 +-
 .../integration/test-resources/jaxrs/pojoTestModule/build.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/fastinfoset/pom.xml b/modules/fastinfoset/pom.xml
index 5a6b80ad8a..9a5a4543e2 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="1.7" target="1.7">
+                                <javac fork="true" destdir="target/test-classes" debug="on" source="8" target="8">
                                     <classpath refid="maven.dependency.classpath" />
                                     <classpath location="${compiled.classes.dir}" />
                                     <include name="**/*SimpleAddService.java" />
diff --git a/modules/integration/test-resources/jaxrs/archiveTestModule/build.xml b/modules/integration/test-resources/jaxrs/archiveTestModule/build.xml
index 7b5d310d5a..6675962ad5 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="1.7" target="1.7">
+        <javac fork="true" destdir="${build.classes}" debug="on" source="8" target="8">
             <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 75a8a7f8dc..1201f4a8b6 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="1.7" target="1.7">
+        <javac fork="true" destdir="${pojo.dir}" debug="on" source="8" target="8">
             <classpath refid="axis.test.classpath"/>
             <src path="${src}"/>
         </javac>

From 9700cd023c946196b1e05acb43e0ef8a039f5c85 Mon Sep 17 00:00:00 2001
From: Christian Ortlepp <christian.ortlepp@hypergene.com>
Date: Sat, 22 Mar 2025 11:36:26 +0100
Subject: [PATCH 3/3] fix: compile to default language level in ant build files

---
 modules/fastinfoset/pom.xml                                     | 2 +-
 .../test-resources/jaxrs/archiveTestModule/build.xml            | 2 +-
 .../integration/test-resources/jaxrs/pojoTestModule/build.xml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/fastinfoset/pom.xml b/modules/fastinfoset/pom.xml
index 9a5a4543e2..f4fb63e928 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="8" target="8">
+                                <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" />
diff --git a/modules/integration/test-resources/jaxrs/archiveTestModule/build.xml b/modules/integration/test-resources/jaxrs/archiveTestModule/build.xml
index 6675962ad5..cb436ccdf8 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="8" target="8">
+        <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>
diff --git a/modules/integration/test-resources/jaxrs/pojoTestModule/build.xml b/modules/integration/test-resources/jaxrs/pojoTestModule/build.xml
index 1201f4a8b6..4ec78c0e06 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="8" target="8">
+        <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>