From 249991f81a5ad12bea67f0e23f7ce4f42323f0b3 Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <oliver.drotbohm@broadcom.com>
Date: Tue, 2 Apr 2024 15:08:04 +0200
Subject: [PATCH] Broaden integration test builds against Hibernate 6 versions.

Set up build profiles for all supported Hibernate 6 versions. Also trigger them in CI as compatibility builds.

Ticket: GH-3413.
---
 Jenkinsfile | 109 +++++++++++++++++++++++++++++++++++++++++-----------
 pom.xml     |  51 +++++++++++++++++++++---
 2 files changed, 131 insertions(+), 29 deletions(-)
 mode change 100644 => 100755 pom.xml

diff --git a/Jenkinsfile b/Jenkinsfile
index 11bac59f6..793e2e97d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -57,7 +57,7 @@ pipeline {
 			}
 
 			parallel {
-				stage("test: baseline (hibernate 6.4.x snapshots)") {
+				stage("test: hibernate 6.2 (LTS)") {
 					agent {
 						label 'data'
 					}
@@ -71,34 +71,97 @@ pipeline {
 					steps {
 						script {
 							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-								sh "PROFILE=all-dbs,hibernate-64-next " +
+								sh "PROFILE=all-dbs,hibernate-62 " +
+									"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
+									"ci/test.sh"
+							}
+						}
+					}
+				}
+				stage("test: baseline (hibernate 6.4 snapshots)") {
+					agent {
+						label 'data'
+					}
+					options { timeout(time: 30, unit: 'MINUTES')}
+					environment {
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+						DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
+						TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
+					}
+					steps {
+						script {
+							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
+								sh "PROFILE=all-dbs,hibernate-64-snapshots " +
+									"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
+									"ci/test.sh"
+							}
+						}
+					}
+				}
+				stage("test: baseline (hibernate 6.5)") {
+					agent {
+						label 'data'
+					}
+					options { timeout(time: 30, unit: 'MINUTES')}
+					environment {
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+						DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
+						TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
+					}
+					steps {
+						script {
+							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
+								sh "PROFILE=all-dbs,hibernate-65 " +
+									"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
+									"ci/test.sh"
+							}
+						}
+					}
+				}
+				stage("test: baseline (hibernate 6.5 snapshots)") {
+					agent {
+						label 'data'
+					}
+					options { timeout(time: 30, unit: 'MINUTES')}
+					environment {
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+						DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
+						TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
+					}
+					steps {
+						script {
+							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
+								sh "PROFILE=all-dbs,hibernate-65-snapshots " +
+									"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
+									"ci/test.sh"
+							}
+						}
+					}
+				}
+				stage("test: baseline (hibernate 6.6 snapshots)") {
+					agent {
+						label 'data'
+					}
+					options { timeout(time: 30, unit: 'MINUTES')}
+					environment {
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+						DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
+						TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
+					}
+					steps {
+						script {
+							docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
+								sh "PROFILE=all-dbs,hibernate-66-snapshots " +
 									"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
 									"ci/test.sh"
 							}
 						}
 					}
 				}
-				stage("test: hibernate 6.2 (LTS)") {
-                	agent {
-                		label 'data'
-                	}
-                	options { timeout(time: 30, unit: 'MINUTES')}
-                	environment {
-                		ARTIFACTORY = credentials("${p['artifactory.credentials']}")
-                		DEVELOCITY_CACHE = credentials("${p['develocity.cache.credentials']}")
-                		DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
-                		TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
-                	}
-                	steps {
-                		script {
-                			docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-                				sh "PROFILE=all-dbs,hibernate-62 " +
-                					"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
-                					"ci/test.sh"
-                			}
-                		}
-                	}
-                }
 				stage("test: java.next (next)") {
 					agent {
 						label 'data'
diff --git a/pom.xml b/pom.xml
old mode 100644
new mode 100755
index f6494f664..43ae9ea27
--- a/pom.xml
+++ b/pom.xml
@@ -31,8 +31,11 @@
 		<eclipselink>3.0.4</eclipselink>
 		<eclipselink-next>4.0.2</eclipselink-next>
 		<hibernate>6.4.4.Final</hibernate>
-		<hibernate-64-next-snapshots>6.4.5-SNAPSHOT</hibernate-64-next-snapshots>
-		<hibernate-62>6.2.22.Final</hibernate-62>
+		<hibernate-62>6.2.24.Final</hibernate-62>
+		<hibernate-64-snapshots>6.4.5-SNAPSHOT</hibernate-64-snapshots>
+		<hibernate-65>6.5.0.CR1</hibernate-65>
+		<hibernate-65-snapshots>6.5.0-SNAPSHOT</hibernate-65-snapshots>
+		<hibernate-66-snapshots>6.6.0-SNAPSHOT</hibernate-66-snapshots>
 		<hsqldb>2.7.1</hsqldb>
 		<h2>2.2.220</h2>
 		<jakarta-persistence-api>3.1.0</jakarta-persistence-api>
@@ -56,9 +59,15 @@
 
 	<profiles>
 		<profile>
-			<id>hibernate-64-next</id>
+			<id>hibernate-62</id>
 			<properties>
-				<hibernate>${hibernate-64-next-snapshots}</hibernate>
+				<hibernate>${hibernate-62}</hibernate>
+			</properties>
+		</profile>
+		<profile>
+			<id>hibernate-64-snapshots</id>
+			<properties>
+				<hibernate>${hibernate-64-snapshots}</hibernate>
 			</properties>
 			<repositories>
 				<repository>
@@ -71,11 +80,41 @@
 			</repositories>
 		</profile>
 		<profile>
-			<id>hibernate-62</id>
+			<id>hibernate-65</id>
 			<properties>
-				<hibernate>${hibernate-62}</hibernate>
+				<hibernate>${hibernate-65}</hibernate>
 			</properties>
 		</profile>
+		<profile>
+			<id>hibernate-65-snapshots</id>
+			<properties>
+				<hibernate>${hibernate-65-snapshots}</hibernate>
+			</properties>
+			<repositories>
+				<repository>
+					<id>sonatype-oss</id>
+					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+					<releases>
+						<enabled>false</enabled>
+					</releases>
+				</repository>
+			</repositories>
+		</profile>
+		<profile>
+			<id>hibernate-66-snapshots</id>
+			<properties>
+				<hibernate>${hibernate-66-snapshots}</hibernate>
+			</properties>
+			<repositories>
+				<repository>
+					<id>sonatype-oss</id>
+					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+					<releases>
+						<enabled>false</enabled>
+					</releases>
+				</repository>
+			</repositories>
+		</profile>
 		<profile>
 			<id>all-dbs</id>
 			<build>