Merge pull request #19027 from panos-kakos/JAVA-49679-1

ulisseslima · web-flow · commit e3d91cde6ffe · 2025-12-09T16:16:04.000-03:00
[JAVA-49679]
diff --git a/persistence-modules/pom.xml b/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>
diff --git a/persistence-modules/spring-data-jpa-enterprise/pom.xml b/persistence-modules/spring-data-jpa-enterprise/pom.xml
@@ -34,6 +34,15 @@
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jta-atomikos</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>${hsqldb.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-envers</artifactId>
@@ -99,6 +108,7 @@
     <properties>
         <mapstruct.version>1.6.0.Beta1</mapstruct.version>
         <testcontainers.version>1.19.6</testcontainers.version>
+        <hsqldb.version>2.5.2</hsqldb.version>
     </properties>
 
 </project>
diff --git a/persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/boot/Application.java b/persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/boot/Application.java
@@ -3,9 +3,10 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.autoconfigure.transaction.jta.JtaAutoConfiguration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = JtaAutoConfiguration.class)
 @EnableJpaRepositories("com.baeldung.boot")
 @EntityScan("com.baeldung.boot")
 public class Application {
diff --git a/persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/jtademo/JtaDemoApplication.java b/persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/jtademo/JtaDemoApplication.java
@@ -1,5 +1,7 @@
 package com.baeldung.jtademo;
 
+import javax.sql.DataSource;
+
 import org.hsqldb.jdbc.pool.JDBCXADataSource;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -10,8 +12,6 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import javax.sql.DataSource;
-
 @EnableAutoConfiguration
 @EnableTransactionManagement
 @Configuration
diff --git a/persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/jtademo/dto/TransferLog.java b/persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/jtademo/dto/TransferLog.java
diff --git a/persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/jtademo/services/AuditService.java b/persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/jtademo/services/AuditService.java
@@ -1,12 +1,13 @@
 package com.baeldung.jtademo.services;
 
-import com.baeldung.jtademo.dto.TransferLog;
+import java.math.BigDecimal;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
+import com.baeldung.jtademo.dto.TransferLog;
 
 @Service
 public class AuditService {
diff --git a/persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/jtademo/services/BankAccountService.java b/persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/jtademo/services/BankAccountService.java
@@ -1,12 +1,12 @@
 package com.baeldung.jtademo.services;
 
+import java.math.BigDecimal;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-
 @Service
 public class BankAccountService {
 
diff --git a/persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/jtademo/services/TellerService.java b/persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/jtademo/services/TellerService.java
@@ -1,11 +1,12 @@
 package com.baeldung.jtademo.services;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
 
 import javax.transaction.Transactional;
 import javax.transaction.UserTransaction;
-import java.math.BigDecimal;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 @Service
 public class TellerService {
diff --git a/persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/jtademo/services/TestHelper.java b/persistence-modules/spring-data-jpa-enterprise/src/main/java/com/baeldung/jtademo/services/TestHelper.java
@@ -1,5 +1,10 @@
 package com.baeldung.jtademo.services;
 
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import javax.sql.DataSource;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.io.DefaultResourceLoader;
@@ -8,10 +13,6 @@
 import org.springframework.jdbc.datasource.init.ScriptUtils;
 import org.springframework.stereotype.Component;
 
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
-
 @Component
 public class TestHelper {
     final JdbcTemplate jdbcTemplateAccount;
diff --git a/persistence-modules/spring-data-jpa-enterprise/src/main/resources/account.sql b/persistence-modules/spring-data-jpa-enterprise/src/main/resources/account.sql
diff --git a/persistence-modules/spring-data-jpa-enterprise/src/main/resources/application.properties b/persistence-modules/spring-data-jpa-enterprise/src/main/resources/application.properties
@@ -13,4 +13,7 @@ spring.jpa.show-sql=false
 
 #hibernate.dialect=org.hibernate.dialect.H2Dialect
 spring.jpa.hibernate.ddl-auto=create
-spring.jpa.properties.hibernate.id.new_generator_mappings=false
+spring.jpa.properties.hibernate.id.new_generator_mappings=false
+
+spring.jta.atomikos.properties.log-base-name=atomikos-log
+spring.jta.log-dir=target/transaction-logs
diff --git a/persistence-modules/spring-data-jpa-enterprise/src/main/resources/audit.sql b/persistence-modules/spring-data-jpa-enterprise/src/main/resources/audit.sql
diff --git a/persistence-modules/spring-data-jpa-enterprise/src/main/resources/logback.xml b/persistence-modules/spring-data-jpa-enterprise/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
diff --git a/persistence-modules/spring-data-jpa-enterprise/src/test/java/com/baeldung/jtademo/JtaDemoUnitTest.java b/persistence-modules/spring-data-jpa-enterprise/src/test/java/com/baeldung/jtademo/JtaDemoUnitTest.java
@@ -1,24 +1,27 @@
 package com.baeldung.jtademo;
 
-import com.baeldung.jtademo.dto.TransferLog;
-import com.baeldung.jtademo.services.AuditService;
-import com.baeldung.jtademo.services.BankAccountService;
-import com.baeldung.jtademo.services.TellerService;
-import com.baeldung.jtademo.services.TestHelper;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.math.BigDecimal;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import java.math.BigDecimal;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import com.baeldung.jtademo.dto.TransferLog;
+import com.baeldung.jtademo.services.AuditService;
+import com.baeldung.jtademo.services.BankAccountService;
+import com.baeldung.jtademo.services.TellerService;
+import com.baeldung.jtademo.services.TestHelper;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = JtaDemoApplication.class)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
 public class JtaDemoUnitTest {
     @Autowired
     TestHelper testHelper;
diff --git a/persistence-modules/spring-persistence/pom.xml b/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>
diff --git a/persistence-modules/spring-persistence/src/main/java/com/baeldung/spring/transactional/Car.java b/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 {
diff --git a/persistence-modules/spring-persistence/src/main/java/com/baeldung/spring/transactional/CarService.java b/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)
diff --git a/persistence-modules/spring-persistence/src/main/java/com/baeldung/spring/transactional/RentalService.java b/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)
diff --git a/persistence-modules/spring-persistence/src/main/resources/application.properties b/persistence-modules/spring-persistence/src/main/resources/application.properties
diff --git a/persistence-modules/spring-persistence/src/test/java/com/baeldung/spring/jndi/datasource/mock/SimpleNamingContextBuilderManualTest.java b/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();
     }
 
diff --git a/persistence-modules/spring-persistence/src/test/java/com/baeldung/transactional/TransactionalDetectionUnitTest.java b/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() {
diff --git a/pom.xml b/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>
@@ -1057,7 +1056,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>
