Skip to content

Commit

Permalink
Cast JtaTransactionManager to org.springframework.transaction.Transac…
Browse files Browse the repository at this point in the history
…tionManager while calling TransactionManagerCustomizers.customize because method to be removed in Spring Boot 3.4.0
  • Loading branch information
graben committed Nov 24, 2024
1 parent 9604b46 commit 36985d8
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion narayana-spring-boot-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion narayana-spring-boot-samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion narayana-spring-boot-starter-it/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion narayana-spring-boot-starter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
2 changes: 1 addition & 1 deletion openshift/recovery-controller/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 36985d8

Please sign in to comment.