Merge pull request #172 from graben/sb340fix

Cast JtaTransactionManager to org.springframework.transaction.TransactionManager while calling TransactionManagerCustomizers.customize because method to be removed in Spring Boot 3.4.0
snowdrop · Nov 25, 2024 · faf464d · faf464d
2 parents 9604b46 + 36985d8
commit faf464d
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git a/narayana-spring-boot-core/pom.xml b/narayana-spring-boot-core/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>dev.snowdrop</groupId>
     <artifactId>narayana-spring-boot-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>narayana-spring-boot-core</artifactId>

diff --git a/narayana-spring-boot-samples/narayana-spring-boot-sample-2ds/pom.xml b/narayana-spring-boot-samples/narayana-spring-boot-sample-2ds/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.snowdrop</groupId>
     <artifactId>narayana-spring-boot-samples</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>narayana-spring-boot-sample-2ds</artifactId>

diff --git a/narayana-spring-boot-samples/narayana-spring-boot-sample-2pc/pom.xml b/narayana-spring-boot-samples/narayana-spring-boot-sample-2pc/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.snowdrop</groupId>
     <artifactId>narayana-spring-boot-samples</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>narayana-spring-boot-sample-2pc</artifactId>

diff --git a/narayana-spring-boot-samples/pom.xml b/narayana-spring-boot-samples/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>dev.snowdrop</groupId>
     <artifactId>narayana-spring-boot-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>narayana-spring-boot-samples</artifactId>

diff --git a/narayana-spring-boot-starter-it/pom.xml b/narayana-spring-boot-starter-it/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>dev.snowdrop</groupId>
     <artifactId>narayana-spring-boot-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>narayana-spring-boot-starter-it</artifactId>

diff --git a/narayana-spring-boot-starter/pom.xml b/narayana-spring-boot-starter/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>dev.snowdrop</groupId>
     <artifactId>narayana-spring-boot-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>narayana-spring-boot-starter</artifactId>

diff --git a/...ter/src/main/java/dev/snowdrop/boot/narayana/autoconfigure/NarayanaAutoConfiguration.java b/...ter/src/main/java/dev/snowdrop/boot/narayana/autoconfigure/NarayanaAutoConfiguration.java
@@ -116,7 +116,7 @@ public JtaTransactionManager transactionManager(UserTransaction userTransaction,
         JtaTransactionManager jtaTransactionManager = new JtaTransactionManager(userTransaction, transactionManager);
         jtaTransactionManager.setTransactionSynchronizationRegistry(transactionSynchronizationRegistry);
         if (this.transactionManagerCustomizers != null) {
-            this.transactionManagerCustomizers.customize(jtaTransactionManager);
+            this.transactionManagerCustomizers.customize((org.springframework.transaction.TransactionManager) jtaTransactionManager);
         }
         return jtaTransactionManager;
     }

diff --git a/...src/test/java/dev/snowdrop/boot/narayana/autoconfigure/NarayanaAutoConfigurationTest.java b/...src/test/java/dev/snowdrop/boot/narayana/autoconfigure/NarayanaAutoConfigurationTest.java
@@ -102,6 +102,6 @@ void jtaTransactionManagerShouldBeCustomized() {
         this.configuration = new NarayanaAutoConfiguration(this.mockTransactionManagerCustomizersProvider);
         JtaTransactionManager jtaTransactionManager = this.configuration.transactionManager(
                 this.mockUserTransaction, this.mockTransactionManager, this.mockTransactionSynchronizationRegistry);
-        verify(this.mockTransactionManagerCustomizers).customize(jtaTransactionManager);
+        verify(this.mockTransactionManagerCustomizers).customize((org.springframework.transaction.TransactionManager) jtaTransactionManager);
     }
 }
diff --git a/openshift/recovery-controller/pom.xml b/openshift/recovery-controller/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>dev.snowdrop</groupId>
     <artifactId>narayana-spring-boot-parent</artifactId>
-    <version>3.3.0-SNAPSHOT</version>
+    <version>3.3.1-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>dev.snowdrop</groupId>
   <artifactId>narayana-spring-boot-parent</artifactId>
-  <version>3.3.0-SNAPSHOT</version>
+  <version>3.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Narayana Spring Boot :: parent</name>