JAVA-20168 Migrating spring-jpa (eugenp#14257)

* JAVA-20168 Migrating spring-jpa

* JAVA-20168 Migrate spring-jpa-2

* JAVA-20168 Remove unneeded annotation

---------

Co-authored-by: timis1 <[email protected]>

Author: timis1

persistence-modules/pom.xml

@@ -66,7 +66,6 @@
         <module>spring-data-arangodb</module>
         <module>spring-data-cassandra</module>
         <module>spring-data-cassandra-test</module>
-        <!-- <module>spring-data-cassandra-reactive</module> FAILED -->
         <module>spring-data-cosmosdb</module>
         <module>spring-data-couchbase-2</module>
         <module>spring-data-dynamodb</module>
@@ -99,8 +98,8 @@
         <module>spring-data-solr</module>
         <!-- <module>spring-hibernate-3</module> FAILED -->
         <!-- <module>spring-hibernate-5</module> FAILED --> <!-- long running -->
-        <!-- <module>spring-jpa</module>
-        <module>spring-jpa-2</module> FAILED -->
+        <module>spring-jpa</module>
+        <module>spring-jpa-2</module>
         <module>spring-jdbc</module>
         <module>spring-jooq</module>
         <module>spring-mybatis</module>

persistence-modules/spring-jpa-2/pom.xml

@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.4.0</version>
+            <version>${postgresql.version}</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -97,15 +97,26 @@
             <version>${org.springframework.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jakson-databind.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jakson-core.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>5.2.0.RELEASE</org.springframework.version>
-        <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
+        <org.springframework.version>6.0.9</org.springframework.version>
+        <spring-boot.version>3.1.0</spring-boot.version>
         <!-- persistence -->
-        <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
-        <h2.version>2.1.214</h2.version>
+        <tomcat-dbcp.version>10.1.9</tomcat-dbcp.version>
+        <jakson-databind.version>2.15.1</jakson-databind.version>
+        <jakson-core.version>2.14.2</jakson-core.version>
     </properties>
 
 </project>

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/hibernate/bootstrap/HibernateXMLConf.java

@@ -1,21 +1,9 @@
 package com.baeldung.hibernate.bootstrap;
 
-import com.google.common.base.Preconditions;
-import org.apache.tomcat.dbcp.dbcp2.BasicDataSource;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.core.env.Environment;
-import org.springframework.orm.hibernate5.HibernateTransactionManager;
-import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
-import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import javax.sql.DataSource;
-import java.util.Properties;
-
 @Configuration
 @EnableTransactionManagement
 @ImportResource({ "classpath:hibernate5Configuration.xml" })

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/hibernate/bootstrap/model/TestEntity.java

@@ -1,7 +1,7 @@
 package com.baeldung.hibernate.bootstrap.model;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
 
 @Entity
 public class TestEntity {

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomany/model/Course.java

@@ -1,6 +1,6 @@
 package com.baeldung.manytomany.model;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.HashSet;
 import java.util.Set;
 

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomany/model/CourseRating.java

@@ -1,6 +1,6 @@
 package com.baeldung.manytomany.model;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 
 @Entity
 @Table(name = "course_rating")

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomany/model/CourseRatingKey.java

@@ -1,7 +1,7 @@
 package com.baeldung.manytomany.model;
 
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
 import java.io.Serializable;
 
 @Embeddable

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomany/model/CourseRegistration.java

@@ -1,6 +1,6 @@
 package com.baeldung.manytomany.model;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDateTime;
 
 @Entity

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomany/model/Student.java

@@ -1,6 +1,6 @@
 package com.baeldung.manytomany.model;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.HashSet;
 import java.util.Set;
 

persistence-modules/spring-jpa-2/src/main/java/com/baeldung/manytomanyremoval/Author.java

@@ -1,6 +1,6 @@
 package com.baeldung.manytomanyremoval;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.HashSet;
 import java.util.Set;