From 0ff06d1cf4020cfed729c1e0dc51e42c9705720f Mon Sep 17 00:00:00 2001
From: sam-gardner <53271849+sam-gardner@users.noreply.github.com>
Date: Wed, 6 Mar 2024 21:13:40 +0000
Subject: [PATCH] [JAVA-28930] Upgrade blaze-persistence to Spring Boot 3
 (#16051)

---
 persistence-modules/blaze-persistence/pom.xml | 30 +++++++++++--------
 .../config/BlazePersistenceConfiguration.java |  2 +-
 .../main/java/com/baeldung/model/Person.java  |  8 ++---
 .../main/java/com/baeldung/model/Post.java    |  2 +-
 .../baeldung/repository/PersonRepository.java |  4 +--
 .../baeldung/repository/PostRepository.java   |  4 +--
 6 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/persistence-modules/blaze-persistence/pom.xml b/persistence-modules/blaze-persistence/pom.xml
index 55b9831c26..55ce3e02d9 100644
--- a/persistence-modules/blaze-persistence/pom.xml
+++ b/persistence-modules/blaze-persistence/pom.xml
@@ -9,9 +9,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-3</relativePath>
     </parent>
 
     <dependencyManagement>
@@ -34,37 +34,41 @@
         <!-- Core dependencies -->
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-core-api</artifactId>
+            <artifactId>blaze-persistence-core-api-jakarta</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-core-impl</artifactId>
+            <artifactId>blaze-persistence-core-impl-jakarta</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-integration-hibernate-5.6</artifactId>
+            <artifactId>blaze-persistence-integration-hibernate-6.2</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <!-- Entity View dependencies -->
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-entity-view-api</artifactId>
+            <artifactId>blaze-persistence-entity-view-api-jakarta</artifactId>
         </dependency>
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-entity-view-impl</artifactId>
+            <artifactId>blaze-persistence-entity-view-impl-jakarta</artifactId>
         </dependency>
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-entity-view-processor</artifactId>
+            <artifactId>blaze-persistence-entity-view-processor-jakarta</artifactId>
         </dependency>
         <!-- Spring integration dependencies -->
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-integration-entity-view-spring</artifactId>
+            <artifactId>blaze-persistence-integration-entity-view-spring-6.0</artifactId>
         </dependency>
         <dependency>
             <groupId>com.blazebit</groupId>
-            <artifactId>blaze-persistence-integration-spring-data-2.7</artifactId>
+            <artifactId>blaze-persistence-integration-spring-data-3.1</artifactId>
+            <scope>compile</scope>
         </dependency>
         <!-- Spring dependencies -->
         <dependency>
@@ -108,9 +112,9 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <blaze-persistence.version>1.6.8</blaze-persistence.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <blaze-persistence.version>1.6.11</blaze-persistence.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/blaze-persistence/src/main/java/com/baeldung/config/BlazePersistenceConfiguration.java b/persistence-modules/blaze-persistence/src/main/java/com/baeldung/config/BlazePersistenceConfiguration.java
index 0ec2e881ed..ebf3db8a81 100644
--- a/persistence-modules/blaze-persistence/src/main/java/com/baeldung/config/BlazePersistenceConfiguration.java
+++ b/persistence-modules/blaze-persistence/src/main/java/com/baeldung/config/BlazePersistenceConfiguration.java
@@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 
 @Configuration
 @EnableEntityViews(basePackages = {"com.baeldung.view"})
diff --git a/persistence-modules/blaze-persistence/src/main/java/com/baeldung/model/Person.java b/persistence-modules/blaze-persistence/src/main/java/com/baeldung/model/Person.java
index a6daade80d..8af0c88e97 100644
--- a/persistence-modules/blaze-persistence/src/main/java/com/baeldung/model/Person.java
+++ b/persistence-modules/blaze-persistence/src/main/java/com/baeldung/model/Person.java
@@ -1,9 +1,9 @@
 package com.baeldung.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/persistence-modules/blaze-persistence/src/main/java/com/baeldung/model/Post.java b/persistence-modules/blaze-persistence/src/main/java/com/baeldung/model/Post.java
index 6fc10dc730..6f5763b7de 100644
--- a/persistence-modules/blaze-persistence/src/main/java/com/baeldung/model/Post.java
+++ b/persistence-modules/blaze-persistence/src/main/java/com/baeldung/model/Post.java
@@ -1,6 +1,6 @@
 package com.baeldung.model;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 public class Post {
diff --git a/persistence-modules/blaze-persistence/src/main/java/com/baeldung/repository/PersonRepository.java b/persistence-modules/blaze-persistence/src/main/java/com/baeldung/repository/PersonRepository.java
index 12b197e8be..50d41b8694 100644
--- a/persistence-modules/blaze-persistence/src/main/java/com/baeldung/repository/PersonRepository.java
+++ b/persistence-modules/blaze-persistence/src/main/java/com/baeldung/repository/PersonRepository.java
@@ -6,8 +6,8 @@ import com.blazebit.persistence.CriteriaBuilder;
 import com.blazebit.persistence.CriteriaBuilderFactory;
 import org.springframework.stereotype.Repository;
 
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
+import jakarta.persistence.EntityManager;
+import jakarta.transaction.Transactional;
 
 @Repository
 @Transactional
diff --git a/persistence-modules/blaze-persistence/src/main/java/com/baeldung/repository/PostRepository.java b/persistence-modules/blaze-persistence/src/main/java/com/baeldung/repository/PostRepository.java
index cf7edffe62..dc3b5fc640 100644
--- a/persistence-modules/blaze-persistence/src/main/java/com/baeldung/repository/PostRepository.java
+++ b/persistence-modules/blaze-persistence/src/main/java/com/baeldung/repository/PostRepository.java
@@ -8,8 +8,8 @@ import com.blazebit.persistence.view.EntityViewManager;
 import com.blazebit.persistence.view.EntityViewSetting;
 import org.springframework.stereotype.Repository;
 
-import javax.persistence.EntityManager;
-import javax.transaction.Transactional;
+import jakarta.persistence.EntityManager;
+import jakarta.transaction.Transactional;
 
 @Repository
 @Transactional