Skip to content

Commit

Permalink
Test JDK 24-ea beta 20
Browse files Browse the repository at this point in the history
  • Loading branch information
wendigo committed Oct 20, 2024
1 parent 24078e0 commit 770e66e
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ jobs:
fail-fast: false
matrix:
include:
- { java-version: 23, cache: 'true', cleanup-node: true }
- { java-version: 24-ea, cache: 'restore', cleanup-node: true }
- { java-version: 24-ea, cache: 'true', cleanup-node: true }
timeout-minutes: 45
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -515,7 +514,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}"
Expand Down
1 change: 1 addition & 0 deletions .mvn/rrf/groupId-asm.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.ow2.asm
2 changes: 1 addition & 1 deletion core/jdk/current
Original file line number Diff line number Diff line change
@@ -1 +1 @@
temurin/jdk-23+37
temurin/jdk-24+20-ea-beta
1 change: 0 additions & 1 deletion core/jdk/temurin/jdk-23+37/arm64

This file was deleted.

1 change: 0 additions & 1 deletion core/jdk/temurin/jdk-23+37/ppc64le

This file was deleted.

Original file line number Diff line number Diff line change
@@ -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+20-ea-beta/linux/x64/jdk/hotspot/normal/eclipse?project=jdk
1 change: 1 addition & 0 deletions core/jdk/temurin/jdk-24+20-ea-beta/arm64
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-24+20-ea-beta/linux/aarch64/jdk/hotspot/normal/eclipse?project=jdk
1 change: 1 addition & 0 deletions core/jdk/temurin/jdk-24+20-ea-beta/ppc64le
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-24+20-ea-beta/linux/ppc64le/jdk/hotspot/normal/eclipse?project=jdk
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ else if ("Mac OS X".equals(osName)) {

private static void verifyJavaVersion()
{
Version required = Version.parse("22.0.1");
Version required = Version.parse("24-beta+20-ea");

if (Runtime.version().compareTo(required) < 0) {
failRequirement("Trino requires Java %s at minimum (found %s)", required, Runtime.version());
Expand Down
16 changes: 6 additions & 10 deletions core/trino-server-rpm/src/main/rpm/preinstall
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
/ \
Expand All @@ -61,7 +57,7 @@ if [ "$java_found" = false ]; then
+======================================================================+
| 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/ |
| |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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+20-ea-beta", "/usr/lib/jvm/temurin-24", "24");
testUninstall("jdk-24+20-ea-beta", "/usr/lib/jvm/temurin-24");
}

private void testInstall(String temurinReleaseName, String javaHome, String expectedJavaVersion)
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,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-10-16T21:09:18Z</project.build.outputTimestamp>
<!-- TODO remove this property when no module overrides it -->
Expand All @@ -153,7 +153,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>
Expand Down

0 comments on commit 770e66e

Please sign in to comment.