From f187dbb6b62ddf5aad43ff3f17c46620beeacde0 Mon Sep 17 00:00:00 2001
From: marko-bekhta <marko.prykladna@gmail.com>
Date: Thu, 12 Dec 2024 15:31:27 +0100
Subject: [PATCH] HV-2069 Test against JDK 25

---
 Jenkinsfile |  3 +++
 pom.xml     | 15 +++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index a5af5f8b0..6dbc1f638 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -128,6 +128,9 @@ stage('Configure') {
 							testLauncherArgs: '--enable-preview',
 							condition: TestCondition.AFTER_MERGE),
 					new JdkBuildEnvironment(testJavaVersion: '24', testCompilerTool: 'OpenJDK 24 Latest',
+							testLauncherArgs: '--enable-preview',
+							condition: TestCondition.AFTER_MERGE),
+					new JdkBuildEnvironment(testJavaVersion: '25', testCompilerTool: 'OpenJDK 25 Latest',
 							testLauncherArgs: '--enable-preview',
 							condition: TestCondition.AFTER_MERGE)
 			],
diff --git a/pom.xml b/pom.xml
index 74161ca4f..4777281fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1813,6 +1813,21 @@
                 <surefire.jvm.args.java-version>-Dnet.bytebuddy.experimental=true</surefire.jvm.args.java-version>
             </properties>
         </profile>
+        <profile>
+            <id>testWithJdk25</id>
+            <activation>
+                <property>
+                    <name>java-version.test.release</name>
+                    <value>25</value>
+                </property>
+            </activation>
+            <properties>
+                <!-- ForbiddenAPIs doesn't work with JDK25+ yet -->
+                <forbiddenapis.skip>true</forbiddenapis.skip>
+                <!-- We need net.bytebuddy.experimental=true to make Bytebuddy work with JDK25+ -->
+                <surefire.jvm.args.java-version>-Dnet.bytebuddy.experimental=true</surefire.jvm.args.java-version>
+            </properties>
+        </profile>
         <profile>
             <!--
                 This profile set some properties to make running reproducibility check build easier.