From c5b6e9fd696a255ecf7192de160255a346638f7d Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Tue, 6 Aug 2024 13:20:42 +0200 Subject: [PATCH] Add profile for Hibernate 7 stable previews. --- pom.xml | 17 +++++++++++++++++ .../MySqlStoredProcedureIntegrationTests.java | 14 ++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index d0606af39..9fb83c6cd 100755 --- a/pom.xml +++ b/pom.xml @@ -35,6 +35,7 @@ 6.5.3-SNAPSHOT 6.6.0.CR1 6.6.0-SNAPSHOT + 7.0.0.Beta1 7.0.0-SNAPSHOT 2.7.1

2.2.220

@@ -107,6 +108,22 @@ + + hibernate-70 + + ${hibernate-70} + 3.2.0-M2 + + + + sonatype-oss + https://oss.sonatype.org/content/repositories/snapshots + + false + + + + hibernate-70-snapshots diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/procedures/MySqlStoredProcedureIntegrationTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/procedures/MySqlStoredProcedureIntegrationTests.java index 6755dbb88..ec37517f2 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/procedures/MySqlStoredProcedureIntegrationTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/procedures/MySqlStoredProcedureIntegrationTests.java @@ -30,7 +30,7 @@ import java.util.Properties; import javax.sql.DataSource; -import org.hibernate.dialect.MySQL8Dialect; +import org.hibernate.dialect.MySQLDialect; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; @@ -149,8 +149,7 @@ class MySqlStoredProcedureIntegrationTests { resultClasses = Employee.class) public static class Employee { - @Id - @GeneratedValue // + @Id @GeneratedValue // private Integer id; private String name; @@ -181,10 +180,12 @@ class MySqlStoredProcedureIntegrationTests { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } Employee employee = (Employee) o; return Objects.equals(id, employee.id) && Objects.equals(name, employee.name); } @@ -194,6 +195,7 @@ class MySqlStoredProcedureIntegrationTests { return Objects.hash(id, name); } + @Override public String toString() { return "MySqlStoredProcedureIntegrationTests.Employee(id=" + this.getId() + ", name=" + this.getName() + ")"; } @@ -265,7 +267,7 @@ class MySqlStoredProcedureIntegrationTests { Properties properties = new Properties(); properties.setProperty("hibernate.hbm2ddl.auto", "create"); - properties.setProperty("hibernate.dialect", MySQL8Dialect.class.getCanonicalName()); + properties.setProperty("hibernate.dialect", MySQLDialect.class.getCanonicalName()); factoryBean.setJpaProperties(properties); return factoryBean;