Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Forward testing] Test JDK 24-ea #23501

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+39 −21
Open

[Forward testing] Test JDK 24-ea #23501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
View file
Open in desktop
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
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ 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:
Expand Down Expand Up @@ -517,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}"
Expand Down
1 change: 1 addition & 0 deletions .mvn/rrf/groupId-asm.txt
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
temurin/jdk-23+37
temurin/jdk-24+15-ea-beta
1 change: 0 additions & 1 deletion core/jdk/temurin/jdk-23+37/arm64
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion core/jdk/temurin/jdk-23+37/ppc64le
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion core/jdk/temurin/jdk-23+37/amd64 → core/jdk/temurin/jdk-24+15-ea-beta/amd64
View file
Open in desktop
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+15-ea-beta/linux/x64/jdk/hotspot/normal/eclipse?project=jdk
1 change: 1 addition & 0 deletions core/jdk/temurin/jdk-24+15-ea-beta/arm64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-24+15-ea-beta/linux/aarch64/jdk/hotspot/normal/eclipse?project=jdk
1 change: 1 addition & 0 deletions core/jdk/temurin/jdk-24+15-ea-beta/ppc64le
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-24+15-ea-beta/linux/ppc64le/jdk/hotspot/normal/eclipse?project=jdk
16 changes: 6 additions & 10 deletions core/trino-server-rpm/src/main/rpm/preinstall
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java
View file
Open in desktop
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+15-ea-beta", "/usr/lib/jvm/temurin-24", "24");
testUninstall("jdk-24+15-ea-beta", "/usr/lib/jvm/temurin-24");
}

private void testInstall(String temurinReleaseName, String javaHome, String expectedJavaVersion)
Expand Down
26 changes: 24 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Copy link
Member

@mosabua mosabua Sep 20, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this might break when the snapshot gets cleaned up .. but good for now.. when we update we should remove repo again as well

<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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand Down