HSEARCH-3277 Upgrade to Hibernate ORM 6.0.0.Beta3

hibernate · Oct 6, 2022 · 6db7338 · 6db7338
1 parent e9343dd
commit 6db7338
Show file tree

Hide file tree

Showing 35 changed files with 542 additions and 811 deletions.
diff --git a/build/config/pom.xml b/build/config/pom.xml
@@ -68,11 +68,11 @@
                             <skip>${maven.javadoc.skip}</skip>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.hibernate</groupId>
-                                    <artifactId>hibernate-core-jakarta</artifactId>
+                                    <groupId>org.hibernate.orm</groupId>
+                                    <artifactId>hibernate-core</artifactId>
                                     <classifier>javadoc</classifier>
                                     <type>jar</type>
-                                    <version>${version.org.hibernate}</version>
+                                    <version>${version.org.hibernate.orm}</version>
                                     <outputDirectory>${tmpdir.dependencies-javadoc-packagelists}/hibernate-core</outputDirectory>
                                 </artifactItem>
                                 <artifactItem>

diff --git a/documentation/pom.xml b/documentation/pom.xml
@@ -314,8 +314,8 @@
                         <hibernateSearchMigrationGuidesIndexUrl>https://hibernate.org/search/documentation/migrate/</hibernateSearchMigrationGuidesIndexUrl>
                         <hibernateCommunityUrl>https://hibernate.org/community</hibernateCommunityUrl>
                         <hibernateBlogUrl>https://in.relation.to/</hibernateBlogUrl>
-                        <hibernateVersion>${version.org.hibernate}</hibernateVersion>
-                        <hibernateDocUrl>${documentation.org.hibernate.url}</hibernateDocUrl>
+                        <hibernateVersion>${version.org.hibernate.orm}</hibernateVersion>
+                        <hibernateDocUrl>${documentation.org.hibernate.orm.url}</hibernateDocUrl>
                         <javaeeUrl>https://www.oracle.com/java/technologies/java-ee-glance.html</javaeeUrl>
                         <hibernateOrm6DocUrl>${documentation.org.hibernate.orm.url}</hibernateOrm6DocUrl>
                         <hibernateOrm6Version>${version.org.hibernate.orm}</hibernateOrm6Version>

diff --git a/integrationtest/mapper/orm-envers/pom.xml b/integrationtest/mapper/orm-envers/pom.xml
@@ -23,8 +23,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-envers-jakarta</artifactId>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-envers</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...egrationtest/mapper/orm/realbackend/limitations/ConcurrentEmbeddedUpdateLimitationIT.java b/...egrationtest/mapper/orm/realbackend/limitations/ConcurrentEmbeddedUpdateLimitationIT.java
@@ -25,7 +25,7 @@
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
-import org.hibernate.dialect.CockroachDB192Dialect;
+import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.search.integrationtest.mapper.orm.realbackend.testsupport.BackendConfigurations;
 import org.hibernate.search.mapper.orm.Search;
@@ -64,7 +64,7 @@ public void indexingStrategySession() throws Throwable {
 				.skipTestForDialect( SQLServerDialect.class,
 						"The execution could provoke a failure caused by a deadlock on SQLServer, "
 						+ "which will abort our requests and will make the tests fail." )
-				.skipTestForDialect( CockroachDB192Dialect.class,
+				.skipTestForDialect( CockroachDialect.class,
 						"The execution could provoke a 'failed preemptive refresh due to a conflict' on CockroachDB,"
 						+ " which will abort our requests and will make the tests fail." )
 				.setup( Book.class, Author.class, BookEdition.class );

diff --git a/integrationtest/mapper/orm-spring/pom.xml b/integrationtest/mapper/orm-spring/pom.xml
@@ -59,6 +59,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
             <exclusions>
+                <!-- Using a newer version of Hibernate ORM, with a different groupID -->
+                <exclusion>
+                    <groupId>org.hibernate</groupId>
+                    <artifactId>hibernate-core</artifactId>
+                </exclusion>
                 <!-- Using JBoss Logging -->
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>