From a07556adaf2381d70955c122188fb61bc479869b Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Thu, 24 Dec 2020 12:41:29 +0100
Subject: [PATCH 1/3] JAVA-3710: Use hibernate-core in spring-jpa

---
 persistence-modules/spring-jpa/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/persistence-modules/spring-jpa/pom.xml b/persistence-modules/spring-jpa/pom.xml
index 410ed592b0..e389886d8d 100644
--- a/persistence-modules/spring-jpa/pom.xml
+++ b/persistence-modules/spring-jpa/pom.xml
@@ -41,7 +41,7 @@
 
         <dependency>
             <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
+            <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
         <dependency>

From 95f98baeb33516967e98096a79a330ad13598c42 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Thu, 24 Dec 2020 12:45:51 +0100
Subject: [PATCH 2/3] JAVA-3710: Use hibernate-core in spring-jpa-2

---
 persistence-modules/spring-jpa-2/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/persistence-modules/spring-jpa-2/pom.xml b/persistence-modules/spring-jpa-2/pom.xml
index 8d8dfe3a7b..7770c0e045 100644
--- a/persistence-modules/spring-jpa-2/pom.xml
+++ b/persistence-modules/spring-jpa-2/pom.xml
@@ -46,7 +46,7 @@
         <!-- persistence -->
         <dependency>
             <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
+            <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
         <dependency>

From 6af6f685fd22cbbd63ef6711b725c463638c61f0 Mon Sep 17 00:00:00 2001
From: Krzysztof Woyke <krzysztofwoyke@gmail.com>
Date: Thu, 24 Dec 2020 13:07:07 +0100
Subject: [PATCH 3/3] JAVA-3710: Replace hibernate-entitymanager dependency
 with hibernate-core

---
 atomikos/pom.xml                     | 2 +-
 persistence-modules/querydsl/pom.xml | 2 +-
 spring-jinq/pom.xml                  | 5 -----
 spring-rest-query-language/pom.xml   | 2 +-
 spring-rest-testing/pom.xml          | 2 +-
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/atomikos/pom.xml b/atomikos/pom.xml
index d680a3ca77..8918de7b77 100644
--- a/atomikos/pom.xml
+++ b/atomikos/pom.xml
@@ -51,7 +51,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-entitymanager</artifactId>
+			<artifactId>hibernate-core</artifactId>
 			<version>${hibernate.version}</version>
 			<scope>provided</scope>
 			<exclusions>
diff --git a/persistence-modules/querydsl/pom.xml b/persistence-modules/querydsl/pom.xml
index 9f6802ff77..a611c309b6 100644
--- a/persistence-modules/querydsl/pom.xml
+++ b/persistence-modules/querydsl/pom.xml
@@ -31,7 +31,7 @@
         <!-- JPA Persistence Dependencies -->
         <dependency>
             <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
+            <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
             <scope>compile</scope>
         </dependency>
diff --git a/spring-jinq/pom.xml b/spring-jinq/pom.xml
index 647c0907a7..1f5d8cd915 100644
--- a/spring-jinq/pom.xml
+++ b/spring-jinq/pom.xml
@@ -27,11 +27,6 @@
             <artifactId>h2</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
-        </dependency>
-        
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
diff --git a/spring-rest-query-language/pom.xml b/spring-rest-query-language/pom.xml
index 2423528743..4458aa0580 100644
--- a/spring-rest-query-language/pom.xml
+++ b/spring-rest-query-language/pom.xml
@@ -140,7 +140,7 @@
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
+            <artifactId>hibernate-core</artifactId>
         </dependency>
         <dependency>
             <groupId>xml-apis</groupId>
diff --git a/spring-rest-testing/pom.xml b/spring-rest-testing/pom.xml
index 9bfe9d83a4..0e947260f4 100644
--- a/spring-rest-testing/pom.xml
+++ b/spring-rest-testing/pom.xml
@@ -120,7 +120,7 @@
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-entitymanager</artifactId>
+            <artifactId>hibernate-core</artifactId>
         </dependency>
         <dependency>
             <groupId>xml-apis</groupId>