You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/04/15 05:02:23 UTC
(camel) branch camel-4.4.x updated (c5aa8e5566f -> 6f9d0cf1691)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from c5aa8e5566f CAMEL-20663: camel-main - Reading properties file should support mixed case and dash vs no-dash style all combinations (#13779)
new 3ee961433c7 CAMEL-20521: Upgrade spring with jms/amqp fixes
new 6f9d0cf1691 Fix compile
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel/main/MainSupervisingRouteControllerTest.java | 1 +
parent/pom.xml | 14 +++++++-------
2 files changed, 8 insertions(+), 7 deletions(-)
(camel) 01/02: CAMEL-20521: Upgrade spring with jms/amqp fixes
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3ee961433c7810d6e07e06ad3deff848a5171313
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Apr 15 06:52:46 2024 +0200
CAMEL-20521: Upgrade spring with jms/amqp fixes
---
parent/pom.xml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 268fb22a310..b5150506faf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -338,8 +338,8 @@
<maven-wagon-version>3.5.2</maven-wagon-version>
<maven-war-plugin-version>3.4.0</maven-war-plugin-version>
<metrics-version>4.2.25</metrics-version>
- <micrometer-version>1.12.3</micrometer-version>
- <micrometer-tracing-version>1.2.3</micrometer-tracing-version>
+ <micrometer-version>1.12.5</micrometer-version>
+ <micrometer-tracing-version>1.2.5</micrometer-tracing-version>
<microprofile-config-version>3.1</microprofile-config-version>
<microprofile-fault-tolerance-version>4.0.2</microprofile-fault-tolerance-version>
<mina-version>2.2.3</mina-version>
@@ -401,8 +401,8 @@
<quartz-version>2.3.2</quartz-version>
<quickfixj-version>2.3.1</quickfixj-version>
<reactive-streams-version>1.0.4</reactive-streams-version>
- <reactor-version>3.6.3</reactor-version>
- <reactor-netty-version>1.1.16</reactor-netty-version>
+ <reactor-version>3.6.5</reactor-version>
+ <reactor-netty-version>1.1.18</reactor-netty-version>
<redisson-version>3.26.0</redisson-version>
<resilience4j-version>2.2.0</resilience4j-version>
<rest-assured-version>5.4.0</rest-assured-version>
@@ -430,11 +430,11 @@
<spock-version>2.3-groovy-4.0</spock-version>
<spring-batch-version>5.1.1</spring-batch-version>
<spring-data-redis-version>3.2.2</spring-data-redis-version>
- <spring-ldap-version>3.2.1</spring-ldap-version>
+ <spring-ldap-version>3.2.3</spring-ldap-version>
<spring-vault-core-version>3.1.1</spring-vault-core-version>
- <spring-version>6.1.4</spring-version>
+ <spring-version>6.1.6</spring-version>
<spring-rabbitmq-version>3.1.1</spring-rabbitmq-version>
- <spring-security-version>6.2.2</spring-security-version>
+ <spring-security-version>6.2.3</spring-security-version>
<spring-ws-version>4.0.10</spring-ws-version>
<sql-maven-plugin-version>1.5</sql-maven-plugin-version>
<squareup-okhttp-version>3.14.9</squareup-okhttp-version>
(camel) 02/02: Fix compile
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6f9d0cf169134b94465608e7882c62cae1e5d4a6
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Apr 15 06:54:26 2024 +0200
Fix compile
---
.../java/org/apache/camel/main/MainSupervisingRouteControllerTest.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java
index d6153769360..2e958980b33 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java
@@ -31,6 +31,7 @@ import org.apache.camel.spi.SupervisingRouteController;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;