Skip to content

Commit 0918302

Browse files
committed
Test JDK 25-beta+14-ea
1 parent dacfff3 commit 0918302

File tree

11 files changed

+12
-12
lines changed

11 files changed

+12
-12
lines changed

.github/actions/setup/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "Verify checked out commits and setup Java"
33
inputs:
44
java-version:
55
description: "Java version to setup"
6-
default: 24
6+
default: 25-ea
77
cache:
88
description: "Cache Maven repo (true/false/restore)"
99
default: restore

.github/workflows/ci.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ jobs:
5757
fail-fast: false
5858
matrix:
5959
include:
60-
- { java-version: 24, cache: 'true', cleanup-node: true }
61-
- { java-version: 25-ea, cache: 'false', cleanup-node: true }
60+
- { java-version: 25-ea, cache: 'true', cleanup-node: true }
6261
timeout-minutes: 45
6362
steps:
6463
- uses: actions/checkout@v4
@@ -188,7 +187,7 @@ jobs:
188187
timeout-minutes: 10
189188
with:
190189
cache: restore
191-
java-version: '23'
190+
java-version: '25-ea'
192191
- name: Maven Install
193192
run: |
194193
# build everything to make sure dependencies of impacted modules are present
@@ -518,7 +517,7 @@ jobs:
518517
with:
519518
cache: restore
520519
cleanup-node: ${{ format('{0}', matrix.modules == 'plugin/trino-singlestore' || matrix.modules == 'plugin/trino-exasol') }}
521-
java-version: ${{ matrix.jdk != '' && matrix.jdk || '24' }}
520+
java-version: ${{ matrix.jdk != '' && matrix.jdk || '25-ea' }}
522521
- name: Maven Install
523522
run: |
524523
export MAVEN_OPTS="${MAVEN_INSTALL_OPTS}"

core/jdk/current

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
temurin/jdk-24+36
1+
temurin/jdk-25+14-ea-beta

core/jdk/temurin/jdk-24+36/arm64

-1
This file was deleted.

core/jdk/temurin/jdk-24+36/ppc64le

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-24+36/linux/x64/jdk/hotspot/normal/eclipse?project=jdk
1+
distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-25+14-ea-beta/linux/x64/jdk/hotspot/normal/eclipse?project=jdk
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-25+14-ea-beta/linux/aarch64/jdk/hotspot/normal/eclipse?project=jdk
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-25+14-ea-beta/linux/ppc64le/jdk/hotspot/normal/eclipse?project=jdk

core/trino-main/src/main/java/io/trino/server/TrinoSystemRequirements.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ else if ("Mac OS X".equals(osName)) {
100100

101101
private static void verifyJavaVersion()
102102
{
103-
Version required = Version.parse("23");
103+
Version required = Version.parse("25-beta+14-ea");
104104
if (Runtime.version().compareTo(required) < 0) {
105105
failRequirement("Trino requires Java %s at minimum (found %s)", required, Runtime.version());
106106
}

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
</scm>
148148

149149
<properties>
150-
<project.build.targetJdk>23</project.build.targetJdk>
150+
<project.build.targetJdk>25</project.build.targetJdk>
151151
<!-- for reproducible build support, updated by release plugin -->
152152
<project.build.outputTimestamp>2025-03-22T03:10:43Z</project.build.outputTimestamp>
153153
<!-- TODO remove this property when no module overrides it -->
@@ -156,7 +156,7 @@
156156
<air.check.skip-spotbugs>true</air.check.skip-spotbugs>
157157
<air.check.skip-pmd>true</air.check.skip-pmd>
158158
<air.check.skip-jacoco>true</air.check.skip-jacoco>
159-
<air.java.version>23</air.java.version>
159+
<air.java.version>25</air.java.version>
160160
<air.javadoc.lint>syntax,reference,html,-missing</air.javadoc.lint>
161161
<air.modernizer.java-version>8</air.modernizer.java-version>
162162
<air.release.preparation-goals>clean verify -DskipTests</air.release.preparation-goals>

testing/trino-product-tests/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,7 @@
394394
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
395395
<manifestEntries>
396396
<Main-Class>${main-class}</Main-Class>
397+
<Multi-Release>true</Multi-Release>
397398
</manifestEntries>
398399
</transformer>
399400
</transformers>

0 commit comments

Comments
 (0)