From 884a589e220f277ec3815dbe6d5f1f99ec5697cb Mon Sep 17 00:00:00 2001
From: "Greg L. Turnquist" <gturnquist@vmware.com>
Date: Wed, 29 Mar 2023 10:29:42 -0500
Subject: [PATCH] Test against Java 20 in CI.

Resolves #2892.
---
 Jenkinsfile             | 19 ++++++++++++++++++-
 pom.xml                 |  2 --
 spring-data-jpa/pom.xml | 31 +++++++------------------------
 3 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7718e42be..46c74c42d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
 	}
 
 	stages {
-		stage("test: baseline (Java 17)") {
+		stage("test: baseline (main)") {
 			when {
 				beforeAgent(true)
 				anyOf {
@@ -53,6 +53,23 @@ pipeline {
 			}
 
 			parallel {
+				stage("test: baseline (next)") {
+					agent {
+						label 'data'
+					}
+					options { timeout(time: 30, unit: 'MINUTES')}
+					environment {
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+					}
+					steps {
+						script {
+							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
+								sh 'PROFILE=all-dbs ci/test.sh'
+								sh "ci/clean.sh"
+							}
+						}
+					}
+				}
 				stage("test: eclipselink-next") {
 					agent {
 						label 'data'
diff --git a/pom.xml b/pom.xml
index 4813a26ab..aab2d923a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,7 +180,6 @@
 							</excludes>
 							<argLine>
 								-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar
-								-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco}/org.jacoco.agent-${jacoco}-runtime.jar=destfile=${jacoco.destfile}
 							</argLine>
 						</configuration>
 					</execution>
@@ -195,7 +194,6 @@
 								<include>**/EclipseLink*Tests.java</include>
 							</includes>
 							<argLine>
-								-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco}/org.jacoco.agent-${jacoco}-runtime.jar=destfile=${jacoco.destfile}
 								-javaagent:${settings.localRepository}/org/eclipse/persistence/org.eclipse.persistence.jpa/${eclipselink}/org.eclipse.persistence.jpa-${eclipselink}.jar
 								-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar
 							</argLine>
diff --git a/spring-data-jpa/pom.xml b/spring-data-jpa/pom.xml
index 1d74ca88d..b7c886ddd 100644
--- a/spring-data-jpa/pom.xml
+++ b/spring-data-jpa/pom.xml
@@ -149,8 +149,14 @@
 			<artifactId>hibernate-core</artifactId>
 			<version>${hibernate}</version>
 			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<groupId>net.bytebuddy</groupId>
+					<artifactId>byte-buddy</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>${hibernate.groupId}.orm</groupId>
 			<artifactId>hibernate-jpamodelgen</artifactId>
@@ -246,27 +252,6 @@
 	<build>
 		<plugins>
 
-			<!--
-			     Jacoco plugin redeclared to make sure it's downloaded and
-			     the agents can be explicitly added to the test executions.
-			-->
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>${jacoco}</version>
-				<configuration>
-					<destFile>${jacoco.destfile}</destFile>
-				</configuration>
-				<executions>
-					<execution>
-						<id>jacoco-initialize</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -320,7 +305,6 @@
 							</excludes>
 							<argLine>
 								-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar
-								-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco}/org.jacoco.agent-${jacoco}-runtime.jar=destfile=${jacoco.destfile}
 							</argLine>
 						</configuration>
 					</execution>
@@ -335,7 +319,6 @@
 								<include>**/EclipseLink*Tests.java</include>
 							</includes>
 							<argLine>
-								-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco}/org.jacoco.agent-${jacoco}-runtime.jar=destfile=${jacoco.destfile}
 								-javaagent:${settings.localRepository}/org/eclipse/persistence/org.eclipse.persistence.jpa/${eclipselink}/org.eclipse.persistence.jpa-${eclipselink}.jar
 								-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring}/spring-instrument-${spring}.jar
 							</argLine>