Skip to content

Commit

Permalink
Upgrade to new LTS Spring-Boot 3.4.x and Camel 4.10.x
Browse files Browse the repository at this point in the history
  • Loading branch information
graben committed Jan 28, 2025
1 parent a7e673c commit 099c683
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 18 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.2-SNAPSHOT</version>
<version>3.4.0-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.2-SNAPSHOT</version>
<version>3.4.0-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.2-SNAPSHOT</version>
<version>3.4.0-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.2-SNAPSHOT</version>
<version>3.4.0-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.2-SNAPSHOT</version>
<version>3.4.0-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.2-SNAPSHOT</version>
<version>3.4.0-SNAPSHOT</version>
</parent>

<artifactId>narayana-spring-boot-starter</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public JtaTransactionManager transactionManager(UserTransaction userTransaction,
JtaTransactionManager jtaTransactionManager = new JtaTransactionManager(userTransaction, transactionManager);
jtaTransactionManager.setTransactionSynchronizationRegistry(transactionSynchronizationRegistry);
if (this.transactionManagerCustomizers != null) {
this.transactionManagerCustomizers.customize((org.springframework.transaction.TransactionManager) jtaTransactionManager);
this.transactionManagerCustomizers.customize(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((org.springframework.transaction.TransactionManager) jtaTransactionManager);
verify(this.mockTransactionManagerCustomizers).customize(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.2-SNAPSHOT</version>
<version>3.4.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
18 changes: 9 additions & 9 deletions 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.2-SNAPSHOT</version>
<version>3.4.0-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Narayana Spring Boot :: parent</name>
Expand Down Expand Up @@ -53,23 +53,23 @@
<agroal.version>2.5</agroal.version>
<awaitility.version>4.2.2</awaitility.version>
<byteman.version>4.0.23</byteman.version>
<camel.version>4.8.1</camel.version>
<camel-spring-boot.version>4.8.1</camel-spring-boot.version>
<camel.version>4.8.3</camel.version>
<camel-spring-boot.version>4.8.3</camel-spring-boot.version>
<narayana.version>7.2.0.Final</narayana.version>
<openshift-client.version>7.0.1</openshift-client.version>
<spring-boot.version>3.3.6</spring-boot.version>
<spring-boot.version>3.4.2</spring-boot.version>

<maven-checkstyle-plugin.version>3.5.0</maven-checkstyle-plugin.version>
<maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
<maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
<maven-failsafe-plugin.version>3.5.2</maven-failsafe-plugin.version>
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
<maven-javadoc-plugin.version>3.10.1</maven-javadoc-plugin.version>
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
</properties>

Expand Down

0 comments on commit 099c683

Please sign in to comment.