From d7f61ff3459f2b5269cc8df4f8a3ee753f03413a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Fri, 20 Dec 2024 10:46:59 +0100 Subject: [PATCH 1/2] Add JDK 25-ea testing --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 575683419d24..66e391d1dacf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,12 +36,12 @@ stage('Configure') { // even if we don't use these features, just enabling them can cause side effects // and it's useful to test that. new BuildEnvironment( testJdkVersion: '23', testJdkLauncherArgs: '--enable-preview' ), - new BuildEnvironment( testJdkVersion: '23', testJdkLauncherArgs: '--enable-preview' ), // The following JDKs aren't supported by Hibernate ORM out-of-the box yet: // they require the use of -Dnet.bytebuddy.experimental=true. // Make sure to remove that argument as soon as possible // -- generally that requires upgrading bytebuddy after the JDK goes GA. - new BuildEnvironment( testJdkVersion: '24', testJdkLauncherArgs: '--enable-preview -Dnet.bytebuddy.experimental=true' ) + new BuildEnvironment( testJdkVersion: '24', testJdkLauncherArgs: '--enable-preview -Dnet.bytebuddy.experimental=true' ), + new BuildEnvironment( testJdkVersion: '25', testJdkLauncherArgs: '--enable-preview -Dnet.bytebuddy.experimental=true' ) ]; helper.configure { From afa211354325113b1a23f6569a178d19b4b73676 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= Date: Fri, 20 Dec 2024 10:22:16 +0100 Subject: [PATCH 2/2] HHH-18972 Upgrade to ByteBuddy 1.15.11 --- Jenkinsfile | 2 +- settings.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 66e391d1dacf..a2e819dee622 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,11 +36,11 @@ stage('Configure') { // even if we don't use these features, just enabling them can cause side effects // and it's useful to test that. new BuildEnvironment( testJdkVersion: '23', testJdkLauncherArgs: '--enable-preview' ), + new BuildEnvironment( testJdkVersion: '24', testJdkLauncherArgs: '--enable-preview' ), // The following JDKs aren't supported by Hibernate ORM out-of-the box yet: // they require the use of -Dnet.bytebuddy.experimental=true. // Make sure to remove that argument as soon as possible // -- generally that requires upgrading bytebuddy after the JDK goes GA. - new BuildEnvironment( testJdkVersion: '24', testJdkLauncherArgs: '--enable-preview -Dnet.bytebuddy.experimental=true' ), new BuildEnvironment( testJdkVersion: '25', testJdkLauncherArgs: '--enable-preview -Dnet.bytebuddy.experimental=true' ) ]; diff --git a/settings.gradle b/settings.gradle index 64ffb9db15f5..a6a5c3c4e9af 100644 --- a/settings.gradle +++ b/settings.gradle @@ -70,7 +70,7 @@ dependencyResolutionManagement { def antlrVersion = version "antlr", "4.13.0" // WARNING: When upgrading to a version of bytebuddy that supports a new bytecode version, // make sure to remove the now unnecessary net.bytebuddy.experimental=true in relevant CI jobs (Jenkinsfile). - def byteBuddyVersion = version "byteBuddy", "1.14.18" + def byteBuddyVersion = version "byteBuddy", "1.15.11" def classmateVersion = version "classmate", "1.5.1" def geolatteVersion = version "geolatte", "1.9.1" def hcannVersion = version "hcann", "7.0.3.Final"