[integration-tests] Add java 22

projectlombok · Jan 12, 2024 · 4625adc · 4625adc
1 parent 5a21470
commit 4625adc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
@@ -42,7 +42,7 @@ jobs:
     needs: build
     strategy: 
       matrix: 
-        jdk: [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21]
+        jdk: [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22]
         goal: [javacCurrent]
         include:
           - jdk: 11
@@ -56,18 +56,18 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up JDK ${{ matrix.jdk }}
-        if: ${{ matrix.jdk != 21 }}
+        if: ${{ matrix.jdk < 21 }}
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.jdk }}
           distribution: 'zulu'
 
-      - name: Set up JDK 21-ea
-        if: ${{ matrix.jdk == 21 }}
+      - name: Set up JDK 21 and up including Early Access releases
+        if: ${{ matrix.jdk >= 21 }}
         uses: oracle-actions/setup-java@v1
         with:
           website: jdk.java.net
-          release: 21
+          release: ${{ matrix.jdk }}
           version: latest
 
       - name: Install Ant
@@ -156,7 +156,7 @@ jobs:
     needs: build
     strategy: 
       matrix: 
-        jdk: [8, 11, 17, 21]
+        jdk: [8, 11, 17, 21, 22]
         tool: 
           - {name: "maven",  cmd: "mvn compile"}
           - {name: "gradle", cmd: "gradle assemble"}

diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
@@ -38,7 +38,7 @@
 	</configurations>
 	<dependencies>
 
-		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.48" conf="build,stripe->default" />
+		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.50" conf="build,stripe->default" />
 		<dependency org="zwitserloot.com" name="cmdreader" rev="1.2" conf="build,stripe->runtime" />
 		<dependency org="org.apache.ant" name="ant" rev="1.10.5" conf="build->default" />
 		<dependency org="org.apache.ant" name="ant-junit" rev="1.10.5" conf="build->default" />

diff --git a/docker/provision/jdk/java-22.sh b/docker/provision/jdk/java-22.sh
@@ -1,4 +1,4 @@
 apt-get update && apt-get install -y wget
-wget https://download.java.net/java/early_access/jdk22/15/GPL/openjdk-22-ea+15_linux-x64_bin.tar.gz -O jdk.tar.gz
+wget https://download.java.net/java/early_access/jdk22/31/GPL/openjdk-22-ea+31_linux-x64_bin.tar.gz -O jdk.tar.gz
 tar -xzf jdk.tar.gz -C /opt/
-mv /opt/jdk-22 /opt/jdk
+mv /opt/jdk-22 /opt/jdk