Test JDK 24-ea

trinodb · Sep 19, 2024 · 9f6711d · 9f6711d
1 parent 3c1b11c
commit 9f6711d
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 21 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -3,7 +3,7 @@ description: "Verify checked out commits and setup Java"
 inputs:
   java-version:
     description: "Java version to setup"
-    default: 23
+    default: 24-ea
   cache:
     description: "Cache Maven repo (true/false/restore)"
     default: restore

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -57,7 +57,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { java-version: 23, cache: 'restore', cleanup-node: true }
+          - { java-version: 24-ea, cache: 'restore', cleanup-node: true }
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v4
@@ -516,7 +516,7 @@ jobs:
         with:
           cache: restore
           cleanup-node: ${{ format('{0}', matrix.modules == 'plugin/trino-singlestore' || matrix.modules == 'plugin/trino-exasol') }}
-          java-version: ${{ matrix.jdk != '' && matrix.jdk || '23' }}
+          java-version: ${{ matrix.jdk != '' && matrix.jdk || '24-ea' }}
       - name: Maven Install
         run: |
           export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"

diff --git a/.mvn/rrf/groupId-asm.txt b/.mvn/rrf/groupId-asm.txt
@@ -0,0 +1 @@
+org.ow2.asm
diff --git a/core/jdk/current b/core/jdk/current
@@ -1 +1 @@
-temurin/jdk-23+37
+temurin/jdk-24+15-ea-beta
diff --git a/core/jdk/temurin/jdk-23+37/arm64 b/core/jdk/temurin/jdk-23+37/arm64
diff --git a/core/jdk/temurin/jdk-23+37/ppc64le b/core/jdk/temurin/jdk-23+37/ppc64le
diff --git a/core/jdk/temurin/jdk-23+37/amd64 → core/jdk/temurin/jdk-24+15-ea-beta/amd64 b/core/jdk/temurin/jdk-23+37/amd64 → core/jdk/temurin/jdk-24+15-ea-beta/amd64
@@ -1 +1 @@
-distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-23+37/linux/x64/jdk/hotspot/normal/eclipse?project=jdk
+distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-24+15-ea-beta/linux/x64/jdk/hotspot/normal/eclipse?project=jdk
diff --git a/core/jdk/temurin/jdk-24+15-ea-beta/arm64 b/core/jdk/temurin/jdk-24+15-ea-beta/arm64
@@ -0,0 +1 @@
+distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-24+15-ea-beta/linux/aarch64/jdk/hotspot/normal/eclipse?project=jdk
diff --git a/core/jdk/temurin/jdk-24+15-ea-beta/ppc64le b/core/jdk/temurin/jdk-24+15-ea-beta/ppc64le
@@ -0,0 +1 @@
+distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-24+15-ea-beta/linux/ppc64le/jdk/hotspot/normal/eclipse?project=jdk
diff --git a/core/trino-server-rpm/src/main/rpm/preinstall b/core/trino-server-rpm/src/main/rpm/preinstall
@@ -22,7 +22,7 @@ check_if_correct_java_version() {
     # candidate for JAVA_HOME).
     JAVA_VERSION=$(java_version "$1")
     JAVA_MAJOR=$(echo "$JAVA_VERSION" | cut -d'-' -f1 | cut -d'.' -f1)
-    if [ "$JAVA_MAJOR" -ge "22" ]; then
+    if [ "$JAVA_MAJOR" -ge "24" ]; then
         echo "$1" >/tmp/trino-rpm-install-java-home
         return 0
     else
@@ -34,14 +34,10 @@ check_if_correct_java_version() {
 if ! check_if_correct_java_version "$JAVA_HOME"; then
     java_found=false
     for candidate in \
-        /usr/lib/jvm/java-22-* \
-        /usr/lib/jvm/zulu-22 \
-        /usr/lib/jvm/temurin-22 \
-        /usr/lib/jvm/temurin-22-* \
-        /usr/lib/jvm/java-23-* \
-        /usr/lib/jvm/zulu-23 \
-        /usr/lib/jvm/temurin-23 \
-        /usr/lib/jvm/temurin-23-* \
+        /usr/lib/jvm/java-24-* \
+        /usr/lib/jvm/zulu-24 \
+        /usr/lib/jvm/temurin-24 \
+        /usr/lib/jvm/temurin-24-* \
         /usr/lib/jvm/default-java \
         /usr/java/default \
         / \
@@ -57,11 +53,12 @@ fi
 
 # if no appropriate java found
 if [ "$java_found" = false ]; then
+    ls -laR /usr/lib/jvm
     cat 1>&2 <<EOF
 +======================================================================+
 |            Error: Required Java version could not be found           |
 +----------------------------------------------------------------------+
-|                    JDK 22 or 23 was not detected.                    |
+|                       JDK 24 was not detected.                       |
 |           Recommended JDK distribution is Eclipse Temurin.           |
 |     Installation guide: https://adoptium.net/installation/linux/     |
 |                                                                      |

diff --git a/core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java b/core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java
@@ -75,8 +75,8 @@ public void testInstallUninstall()
             throws Exception
     {
         // Release names as in the https://api.adoptium.net/q/swagger-ui/#/Release%20Info/getReleaseNames
-        testInstall("jdk-23+37", "/usr/lib/jvm/temurin-23", "23");
-        testUninstall("jdk-23+37", "/usr/lib/jvm/temurin-23");
+        testInstall("jdk-24+15-ea-beta", "/usr/lib/jvm/temurin-23", "23");
+        testUninstall("jdk-24+15-ea-beta", "/usr/lib/jvm/temurin-23");
     }
 
     private void testInstall(String temurinReleaseName, String javaHome, String expectedJavaVersion)

diff --git a/pom.xml b/pom.xml
@@ -146,7 +146,7 @@
     </scm>
 
     <properties>
-        <project.build.targetJdk>22</project.build.targetJdk>
+        <project.build.targetJdk>24</project.build.targetJdk>
         <!-- for reproducible build support, updated by release plugin -->
         <project.build.outputTimestamp>2024-09-18T01:24:05Z</project.build.outputTimestamp>
         <!-- TODO remove this property when no module overrides it -->
@@ -155,7 +155,7 @@
         <air.check.skip-spotbugs>true</air.check.skip-spotbugs>
         <air.check.skip-pmd>true</air.check.skip-pmd>
         <air.check.skip-jacoco>true</air.check.skip-jacoco>
-        <air.java.version>22.0.0</air.java.version>
+        <air.java.version>24</air.java.version>
         <air.javadoc.lint>syntax,reference,html,-missing</air.javadoc.lint>
         <air.modernizer.java-version>8</air.modernizer.java-version>
         <air.release.preparation-goals>clean verify -DskipTests</air.release.preparation-goals>
@@ -189,6 +189,8 @@
         <dep.airlift.version>268</dep.airlift.version>
         <dep.alluxio.version>2.9.6</dep.alluxio.version>
         <dep.antlr.version>4.13.2</dep.antlr.version>
+        <!-- temporary until 9.8 is released -->
+        <dep.asm.version>9.8-SNAPSHOT</dep.asm.version>
         <dep.avro.version>1.12.0</dep.avro.version>
         <dep.aws-sdk.version>1.12.772</dep.aws-sdk.version>
         <dep.cassandra.version>4.17.0</dep.cassandra.version>
@@ -2341,6 +2343,20 @@
         </dependencies>
     </dependencyManagement>
 
+    <repositories>
+        <repository>
+            <id>asm</id>
+            <url>https://repository.ow2.org/nexus/content/repositories/snapshots</url>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>asm</id>
+            <url>https://repository.ow2.org/nexus/content/repositories/snapshots</url>
+        </pluginRepository>
+    </pluginRepositories>
+
     <build>
         <pluginManagement>
             <plugins>
@@ -2460,6 +2476,8 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
                     <configuration>
+                        <!-- temporary until extra-enforcer-rules is released -->
+                        <skip>true</skip>
                         <rules>
                             <bannedDependencies>
                                 <excludes combine.children="append">
@@ -2496,6 +2514,10 @@
                             <requirePropertyDiverges>
                                 <property>project.description</property>
                             </requirePropertyDiverges>
+                            <!-- temporary until https://github.com/mojohaus/extra-enforcer-rules/pull/308 lands -->
+                            <enforceBytecodeVersion>
+                                <maxJdkVersion>23</maxJdkVersion>
+                            </enforceBytecodeVersion>
                         </rules>
                     </configuration>
                 </plugin>