trinodb · wendigo · Mar 20, 2025
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: 24
+    default: 25-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,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { java-version: 24, cache: 'true', cleanup-node: true }
           - { java-version: 25-ea, cache: 'restore', cleanup-node: true }
     timeout-minutes: 45
     steps:
@@ -188,7 +187,7 @@ jobs:
         timeout-minutes: 10
         with:
           cache: restore
-          java-version: '23'
+          java-version: '25-ea'
       - name: Maven Install
         run: |
           # build everything to make sure dependencies of impacted modules are present
@@ -518,7 +517,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 || '24' }}
+          java-version: ${{ matrix.jdk != '' && matrix.jdk || '25-ea' }}
       - name: Maven Install
         run: |
           export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"

diff --git a/core/jdk/current b/core/jdk/current
@@ -1 +1 @@
-temurin/jdk-24+36
+temurin/jdk-25+16-ea-beta
diff --git a/core/jdk/temurin/jdk-24+36/arm64 b/core/jdk/temurin/jdk-24+36/arm64
diff --git a/core/jdk/temurin/jdk-24+36/ppc64le b/core/jdk/temurin/jdk-24+36/ppc64le
diff --git a/core/jdk/temurin/jdk-24+36/amd64 → core/jdk/temurin/jdk-25+16-ea-beta/amd64 b/core/jdk/temurin/jdk-24+36/amd64 → core/jdk/temurin/jdk-25+16-ea-beta/amd64
@@ -1 +1 @@
-distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-24+36/linux/x64/jdk/hotspot/normal/eclipse?project=jdk
+distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-25+16-ea-beta/linux/x64/jdk/hotspot/normal/eclipse?project=jdk
diff --git a/core/jdk/temurin/jdk-25+16-ea-beta/arm64 b/core/jdk/temurin/jdk-25+16-ea-beta/arm64
@@ -0,0 +1 @@
+distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-25+16-ea-beta/linux/aarch64/jdk/hotspot/normal/eclipse?project=jdk
diff --git a/core/jdk/temurin/jdk-25+16-ea-beta/ppc64le b/core/jdk/temurin/jdk-25+16-ea-beta/ppc64le
@@ -0,0 +1 @@
+distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-25+16-ea-beta/linux/ppc64le/jdk/hotspot/normal/eclipse?project=jdk
diff --git a/core/trino-main/src/main/java/io/trino/server/TrinoSystemRequirements.java b/core/trino-main/src/main/java/io/trino/server/TrinoSystemRequirements.java
@@ -100,7 +100,7 @@ else if ("Mac OS X".equals(osName)) {
 
     private static void verifyJavaVersion()
     {
-        Version required = Version.parse("23");
+        Version required = Version.parse("25-beta+16-ea");
         if (Runtime.version().compareTo(required) < 0) {
             failRequirement("Trino requires Java %s at minimum (found %s)", required, Runtime.version());
         }

diff --git a/pom.xml b/pom.xml
@@ -147,7 +147,7 @@
     </scm>
 
     <properties>
-        <project.build.targetJdk>23</project.build.targetJdk>
+        <project.build.targetJdk>25</project.build.targetJdk>
         <!-- for reproducible build support, updated by release plugin -->
         <project.build.outputTimestamp>2025-03-22T03:10:43Z</project.build.outputTimestamp>
         <!-- TODO remove this property when no module overrides it -->
@@ -156,7 +156,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>23</air.java.version>
+        <air.java.version>25</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>

diff --git a/testing/trino-product-tests/pom.xml b/testing/trino-product-tests/pom.xml
@@ -394,6 +394,7 @@
                                 <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                     <manifestEntries>
                                         <Main-Class>${main-class}</Main-Class>
+                                        <Multi-Release>true</Multi-Release>
                                     </manifestEntries>
                                 </transformer>
                             </transformers>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-24+36/linux/x64/jdk/hotspot/normal/eclipse?project=jdk
		distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-25+16-ea-beta/linux/x64/jdk/hotspot/normal/eclipse?project=jdk
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-25+16-ea-beta/linux/aarch64/jdk/hotspot/normal/eclipse?project=jdk