Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cast JtaTransactionManager to org.springframework.transaction.TransactionManager while calling TransactionManagerCustomizers.customize because method to be removed in Spring Boot 3.4.0 #172

Merged
merged 1 commit into from
Nov 25, 2024
+10 −10
Merged

Cast JtaTransactionManager to org.springframework.transaction.TransactionManager while calling TransactionManagerCustomizers.customize because method to be removed in Spring Boot 3.4.0 #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion narayana-spring-boot-core/pom.xml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion narayana-spring-boot-samples/narayana-spring-boot-sample-2ds/pom.xml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion narayana-spring-boot-samples/narayana-spring-boot-sample-2pc/pom.xml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...ter/src/main/java/dev/snowdrop/boot/narayana/autoconfigure/NarayanaAutoConfiguration.java
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ...src/test/java/dev/snowdrop/boot/narayana/autoconfigure/NarayanaAutoConfigurationTest.java
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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