[JAVA-49679] Upgraded spring-persistence modules and enabled it for default and integration profile

Author: panos-kakos

persistence-modules/pom.xml

@@ -131,7 +131,7 @@
         <module>spring-jdbc-2</module>
         <!--<module>spring-jooq</module>--><!--disabling the jooq modules, as the default build profile is failing due to bad mv files. Please refer: JAVA-31341-->
         <module>spring-mybatis</module>
-        <!-- <module>spring-persistence</module> --> <!-- failing after upgrade to jdk21 -->
+        <module>spring-persistence</module>
         <module>spring-data-yugabytedb</module>
         <module>fauna</module>
         <module>spring-data-rest</module>

persistence-modules/spring-persistence/pom.xml

@@ -27,8 +27,8 @@
         </dependency>
         <!-- persistence -->
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
             <version>${persistence-api.version}</version>
         </dependency>
         <dependency>
@@ -37,9 +37,8 @@
             <version>${spring-data-jpa.version}</version>
         </dependency>
         <dependency>
-            <!-- JAVA-37421 cannot upgrade to Jakarta namespace -->
-            <groupId>javax.transaction</groupId>
-            <artifactId>javax.transaction-api</artifactId>
+            <groupId>jakarta.transaction</groupId>
+            <artifactId>jakarta.transaction-api</artifactId>
             <version>${transaction-api.version}</version>
         </dependency>
         <dependency>
@@ -52,21 +51,11 @@
             <artifactId>spring-boot-starter</artifactId>
             <version>${spring-boot-starter.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jta-atomikos</artifactId>
-            <version>${spring-boot-starter.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>
             <version>${spring-boot-starter.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <version>${hsqldb.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -95,15 +84,12 @@
     </dependencies>
 
     <properties>
-        <org.springframework.version>5.3.18</org.springframework.version>
-        <spring-boot-starter.version>2.6.6</spring-boot-starter.version>
-        <persistence-api.version>2.2</persistence-api.version>
-        <transaction-api.version>1.3</transaction-api.version>
-        <spring-data-jpa.version>2.2.7.RELEASE</spring-data-jpa.version>
-        <simple-jndi.version>0.23.0</simple-jndi.version>
-        <hsqldb.version>2.5.2</hsqldb.version>
-        <org.slf4j.version>1.7.32</org.slf4j.version>
-        <logback.version>1.2.7</logback.version>
+        <org.springframework.version>6.2.14</org.springframework.version>
+        <spring-boot-starter.version>3.5.7</spring-boot-starter.version>
+        <persistence-api.version>3.1.0</persistence-api.version>
+        <transaction-api.version>2.0.1</transaction-api.version>
+        <spring-data-jpa.version>3.4.1</spring-data-jpa.version>
+        <simple-jndi.version>0.25.0</simple-jndi.version>
     </properties>
 
 </project>

persistence-modules/spring-persistence/src/main/java/com/baeldung/spring/transactional/Car.java

@@ -1,9 +1,9 @@
 package com.baeldung.spring.transactional;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 public class Car {

persistence-modules/spring-persistence/src/main/java/com/baeldung/spring/transactional/CarService.java

@@ -6,7 +6,7 @@
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.persistence.EntityExistsException;
+import jakarta.persistence.EntityExistsException;
 
 @Service
 @Transactional(isolation = Isolation.READ_COMMITTED, propagation = Propagation.SUPPORTS, readOnly = false, timeout = 30)

persistence-modules/spring-persistence/src/main/java/com/baeldung/spring/transactional/RentalService.java

@@ -3,8 +3,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.persistence.EntityExistsException;
-import javax.transaction.Transactional;
+import jakarta.persistence.EntityExistsException;
+import jakarta.transaction.Transactional;
 
 @Service
 @Transactional(Transactional.TxType.SUPPORTS)

persistence-modules/spring-persistence/src/test/java/com/baeldung/spring/jndi/datasource/mock/SimpleNamingContextBuilderManualTest.java

@@ -9,7 +9,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.mock.jndi.SimpleNamingContextBuilder;
+//import org.springframework.mock.jndi.SimpleNamingContextBuilder;
 
 // marked as a manual test as the bindings in this test and
 // SimpleJNDIUnitTest conflict depending on the order they are run in
@@ -21,7 +21,8 @@ public class SimpleNamingContextBuilderManualTest {
 
     @BeforeEach
     public void init() throws Exception {
-        SimpleNamingContextBuilder.emptyActivatedContextBuilder();
+// SimpleNamingContextBuilder has been deprecated and removed in recent Spring versions
+//        SimpleNamingContextBuilder.emptyActivatedContextBuilder();
         this.initContext = new InitialContext();
     }
 

persistence-modules/spring-persistence/src/test/java/com/baeldung/transactional/TransactionalDetectionUnitTest.java

@@ -1,19 +1,51 @@
 package com.baeldung.transactional;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@SpringBootApplication
-@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest
 public class TransactionalDetectionUnitTest {
 
+    @TestConfiguration
+    @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class })
+    @EnableTransactionManagement
+    static class TestConfig {
+
+        @Bean
+        public PlatformTransactionManager transactionManager() {
+            return new org.springframework.transaction.support.AbstractPlatformTransactionManager() {
+                @Override
+                protected Object doGetTransaction() {
+                    return new Object();
+                }
+
+                @Override
+                protected void doBegin(Object transaction, org.springframework.transaction.TransactionDefinition definition) {
+                }
+
+                @Override
+                protected void doCommit(org.springframework.transaction.support.DefaultTransactionStatus status) {
+                }
+
+                @Override
+                protected void doRollback(org.springframework.transaction.support.DefaultTransactionStatus status) {
+                }
+            };
+        }
+    }
+
     @Test
     @Transactional
     public void givenTransactional_whenCheckingForActiveTransaction_thenReceiveTrue() {

pom.xml

@@ -567,7 +567,6 @@
                 <module>core-java-modules/core-java-datetime-conversion</module>
                 <module>libraries-data-io</module>
                 <module>persistence-modules/spring-data-neo4j</module>
-                <module>persistence-modules/spring-persistence</module>
                 <module>quarkus-modules/quarkus</module>
                 <module>quarkus-modules/quarkus-vs-springboot/quarkus-project</module>
                 <module>spring-di-2</module>
@@ -1056,7 +1055,6 @@
                 <module>core-java-modules/core-java-datetime-conversion</module>
                 <module>libraries-data-io</module>
                 <module>persistence-modules/spring-data-neo4j</module>
-                <module>persistence-modules/spring-persistence</module>
                 <module>quarkus-modules/quarkus</module>
                 <module>quarkus-modules/quarkus-vs-springboot/quarkus-project</module>
                 <module>spring-di-2</module>