From bd8e3989c01a3eda1b953281a519d1055499e1d7 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Mon, 12 Aug 2024 08:42:49 +0200
Subject: [PATCH] Upgrade Hibernate 6.6 builds to Final release.

Closes #3573
---
 Jenkinsfile                                   | 47 +------------------
 pom.xml                                       | 22 ++-------
 ...ProcedureNullHandlingIntegrationTests.java |  2 +-
 3 files changed, 6 insertions(+), 65 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0406d7f8e..8a62b99f0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -80,7 +80,7 @@ pipeline {
 						}
 					}
 				}
-				stage("test: baseline (hibernate 6.5 snapshots)") {
+				stage("test: baseline (hibernate 6.6)") {
 					agent {
 						label 'data'
 					}
@@ -94,50 +94,7 @@ pipeline {
 						script {
 							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
 								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 preview)") {
-					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 " +
-									"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_ACCESS_KEY = credentials("${p['develocity.access-key']}")
-						TESTCONTAINERS_IMAGE_SUBSTITUTOR = 'org.springframework.data.jpa.support.ProxyImageNameSubstitutor'
-					}
-					steps {
-						script {
-							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
-								docker.image(p['docker.java.next.image']).inside(p['docker.java.inside.docker']) {
-									sh "PROFILE=all-dbs,hibernate-66-snapshots " +
+									sh "PROFILE=all-dbs,hibernate-66 " +
 										"JENKINS_USER_NAME=${p['jenkins.user.name']} " +
 										"ci/test.sh"
 								}
diff --git a/pom.xml b/pom.xml
index 9ec5eb094..0f195adc0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -31,10 +31,9 @@
 		<eclipselink>3.0.4</eclipselink>
 		<eclipselink-next>4.0.2</eclipselink-next>
 		<hibernate>6.5.0.Final</hibernate>
-		<hibernate-62>6.2.28.Final</hibernate-62>
-		<hibernate-65-snapshots>6.5.3-SNAPSHOT</hibernate-65-snapshots>
-		<hibernate-66>6.6.0.CR1</hibernate-66>
-		<hibernate-66-snapshots>6.6.0-SNAPSHOT</hibernate-66-snapshots>
+		<hibernate-62>6.2.30.Final</hibernate-62>
+		<hibernate-66>6.6.0.Final</hibernate-66>
+		<hibernate-66-snapshots>6.6.1-SNAPSHOT</hibernate-66-snapshots>
 		<hibernate-70>7.0.0.Beta1</hibernate-70>
 		<hibernate-70-snapshots>7.0.0-SNAPSHOT</hibernate-70-snapshots>
 		<hsqldb>2.7.1</hsqldb>
@@ -66,21 +65,6 @@
 				<hibernate>${hibernate-62}</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</id>
 			<properties>
diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureNullHandlingIntegrationTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureNullHandlingIntegrationTests.java
index bf52ffc66..565779574 100644
--- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureNullHandlingIntegrationTests.java
+++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureNullHandlingIntegrationTests.java
@@ -132,7 +132,7 @@ class PostgresStoredProcedureNullHandlingIntegrationTests {
 		void countUuid(UUID this_uuid);
 
 		@Procedure("countByLocalDate")
-		void countLocalDate(@Temporal Date localDate);
+		void countLocalDate(@Temporal Date this_local_date);
 	}
 
 	@EnableJpaRepositories(considerNestedRepositories = true,