Backport support for Hibernate 6.2.

Move off deprecated Hibernate Postgres 9.1 dialect.

Switch order of persistence provider dependencies. Hibernate 6.2 needs to be declared before Eclipselink as the latter pulls in JPA 3.0 but the former now strongly requires 3.1.

Related tickets: #2899.

Author: Eng-Fouad

spring-data-jpa/pom.xml

@@ -137,13 +137,6 @@
 
 		<!-- Persistence providers -->
 
-		<dependency>
-			<groupId>org.eclipse.persistence</groupId>
-			<artifactId>org.eclipse.persistence.jpa</artifactId>
-			<version>${eclipselink}</version>
-			<optional>true</optional>
-		</dependency>
-
 		<dependency>
 			<groupId>${hibernate.groupId}.orm</groupId>
 			<artifactId>hibernate-core</artifactId>
@@ -177,6 +170,13 @@
 			<version>${jakarta-annotation-api}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.eclipse.persistence</groupId>
+			<artifactId>org.eclipse.persistence.jpa</artifactId>
+			<version>${eclipselink}</version>
+			<optional>true</optional>
+		</dependency>
+
 		<!-- QueryDsl -->
 		<dependency>
 			<groupId>com.querydsl</groupId>

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureIntegrationTests.java

@@ -201,7 +201,7 @@ static class Config {
 		@Bean(initMethod = "start", destroyMethod = "stop")
 		public PostgreSQLContainer<?> container() {
 
-			return new PostgreSQLContainer<>("postgres:9.6.12") //
+			return new PostgreSQLContainer<>("postgres:10.21") //
 					.withUsername("postgres");
 		}
 

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/procedures/PostgresStoredProcedureNullHandlingIntegrationTests.java

@@ -31,7 +31,7 @@
 
 import javax.sql.DataSource;
 
-import org.hibernate.dialect.PostgreSQL91Dialect;
+import org.hibernate.dialect.PostgreSQLDialect;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.postgresql.ds.PGSimpleDataSource;
@@ -109,7 +109,7 @@ static class Config {
 		@Bean(initMethod = "start", destroyMethod = "stop")
 		public PostgreSQLContainer<?> container() {
 
-			return new PostgreSQLContainer<>("postgres:9.6.12") //
+			return new PostgreSQLContainer<>("postgres:10.21") //
 					.withUsername("postgres");
 		}
 
@@ -135,7 +135,7 @@ public AbstractEntityManagerFactoryBean entityManagerFactory(DataSource dataSour
 
 			Properties properties = new Properties();
 			properties.setProperty("hibernate.hbm2ddl.auto", "create");
-			properties.setProperty("hibernate.dialect", PostgreSQL91Dialect.class.getCanonicalName());
+			properties.setProperty("hibernate.dialect", PostgreSQLDialect.class.getCanonicalName());
 			properties.setProperty("hibernate.proc.param_null_passing", "true");
 			properties.setProperty("hibernate.globally_quoted_identifiers", "true");
 			properties.setProperty("hibernate.globally_quoted_identifiers_skip_column_definitions", "true");

spring-data-jpa/src/test/resources/META-INF/persistence.xml

@@ -177,7 +177,7 @@
 		<class>org.springframework.data.jpa.repository.support.JpaMetamodelEntityInformationIntegrationTests$ExampleEntityWithUUIDId</class>
 		<exclude-unlisted-classes>true</exclude-unlisted-classes>
 		<properties>
-			<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQL91Dialect" />
+			<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect" />
 		</properties>
 	</persistence-unit>
 	<persistence-unit name="metadata-id-handling-el">
@@ -195,7 +195,7 @@
 		<class>org.springframework.data.jpa.repository.support.JpaMetamodelEntityInformationIntegrationTests$ExampleEntityWithUUIDId</class>
 		<exclude-unlisted-classes>true</exclude-unlisted-classes>
 		<properties>
-			<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQL91Dialect" />
+			<property name="hibernate.dialect" value="org.hibernate.dialect.PostgreSQLDialect" />
 		</properties>
 	</persistence-unit>