From eaa7fd2a37ae6bdcc8b17cd6c0eaaf360837ee38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Mon, 11 Jul 2022 10:49:50 +0200
Subject: [PATCH] HSEARCH-4632 Test against JDK 20 (early access)

---
 Jenkinsfile |  3 +++
 pom.xml     | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index f5c6244aded..64e2d4ec395 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -185,6 +185,9 @@ 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 JdkBuildEnvironment(version: '19', testCompilerTool: 'OpenJDK 19 Latest',
+							testLauncherArgs: '--enable-preview',
+							condition: TestCondition.AFTER_MERGE),
+					new JdkBuildEnvironment(version: '20', testCompilerTool: 'OpenJDK 20 Latest',
 							testLauncherArgs: '--enable-preview',
 							condition: TestCondition.AFTER_MERGE)
 			],
diff --git a/pom.xml b/pom.xml
index 7406fc0d531..ca80587ec9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2513,6 +2513,25 @@
             </properties>
         </profile>
 
+        <profile>
+            <id>testWithJdk20</id>
+            <activation>
+                <property>
+                    <name>java-version.test.release</name>
+                    <value>20</value>
+                </property>
+            </activation>
+            <properties>
+                <!-- We need net.bytebuddy.experimental=true to make BytecodeEnhancementIT and mockito-based tests pass -->
+                <surefire.jvm.args.java-version>
+                    -Djdk.attach.allowAttachSelf=true
+                    -Dnet.bytebuddy.experimental=true
+                </surefire.jvm.args.java-version>
+                <!-- Spring isn't ready for JDK20 yet -->
+                <failsafe.spring.skip>true</failsafe.spring.skip>
+            </properties>
+        </profile>
+
         <profile>
             <id>compiler-eclipse</id>
             <build>