This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 7672f3f78 Upgrade to Camel 4.10.4 (#620)
7672f3f78 is described below
commit 7672f3f78add93dae674cda27214e8249301f174
Author: JB Onofré <jbono...@apache.org>
AuthorDate: Wed May 28 17:42:28 2025 +0200
Upgrade to Camel 4.10.4 (#620)
---
.../camel/karaf/component/directvm/direct-vm.json | 2 +-
.../org/apache/camel/karaf/component/vm/vm.json | 2 +-
pom.xml | 30 ++++++++---------
.../examples/test/CamelExampleRouteSupplier.java | 39 +++++++++++-----------
4 files changed, 37 insertions(+), 36 deletions(-)
diff --git
a/components/camel-directvm/src/generated/resources/META-INF/org/apache/camel/karaf/component/directvm/direct-vm.json
b/components/camel-directvm/src/generated/resources/META-INF/org/apache/camel/karaf/component/directvm/direct-vm.json
index 89f4df4c2..9b12c0a15 100644
---
a/components/camel-directvm/src/generated/resources/META-INF/org/apache/camel/karaf/component/directvm/direct-vm.json
+++
b/components/camel-directvm/src/generated/resources/META-INF/org/apache/camel/karaf/component/directvm/direct-vm.json
@@ -11,7 +11,7 @@
"supportLevel": "Stable",
"groupId": "org.apache.camel.karaf",
"artifactId": "camel-directvm",
- "version": "4.10.3-SNAPSHOT",
+ "version": "4.10.4-SNAPSHOT",
"scheme": "direct-vm",
"extendsScheme": "",
"syntax": "direct-vm:name",
diff --git
a/components/camel-vm/src/generated/resources/META-INF/org/apache/camel/karaf/component/vm/vm.json
b/components/camel-vm/src/generated/resources/META-INF/org/apache/camel/karaf/component/vm/vm.json
index c95429873..a690d1826 100644
---
a/components/camel-vm/src/generated/resources/META-INF/org/apache/camel/karaf/component/vm/vm.json
+++
b/components/camel-vm/src/generated/resources/META-INF/org/apache/camel/karaf/component/vm/vm.json
@@ -11,7 +11,7 @@
"supportLevel": "Stable",
"groupId": "org.apache.camel.karaf",
"artifactId": "camel-vm",
- "version": "4.10.3-SNAPSHOT",
+ "version": "4.10.4-SNAPSHOT",
"scheme": "vm",
"extendsScheme": "",
"syntax": "vm:name",
diff --git a/pom.xml b/pom.xml
index e17feaea1..2ad8b74d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
<maven.compiler.source>${jdk-version}</maven.compiler.source>
<maven.compiler.target>${jdk-version}</maven.compiler.target>
- <camel-version>4.10.3</camel-version>
+ <camel-version>4.10.4</camel-version>
<!-- START: Maven Properties defining the version of 3rd party
libraries used in Camel -->
<activemq-version>5.18.6</activemq-version>
@@ -232,7 +232,7 @@
<graphql-java-version>22.3</graphql-java-version>
<greenmail-version>2.1.3</greenmail-version>
<grizzly-websockets-version>2.4.4</grizzly-websockets-version>
- <groovy-version>4.0.25</groovy-version>
+ <groovy-version>4.0.26</groovy-version>
<grpc-version>1.70.0</grpc-version>
<grpc-google-auth-library-version>1.32.0</grpc-google-auth-library-version>
<grpc-java-jwt-version>4.5.0</grpc-java-jwt-version>
@@ -253,8 +253,8 @@
<hk2-version>2.6.1</hk2-version>
<hsqldb-version>2.7.4</hsqldb-version>
<httpunit-version>1.7</httpunit-version>
- <httpcore-version>5.3.3</httpcore-version>
- <httpclient-version>5.4.2</httpclient-version>
+ <httpcore-version>5.3.4</httpcore-version>
+ <httpclient-version>5.4.3</httpclient-version>
<httpcore4-version>4.4.16</httpcore4-version>
<httpclient4-version>4.5.14</httpclient4-version>
<httpasyncclient-version>4.1.5</httpasyncclient-version>
@@ -307,7 +307,7 @@
<jcr-version>2.0</jcr-version>
<jedis-client-version>5.2.0</jedis-client-version>
<jetcd-version>0.8.4</jetcd-version>
- <jetty-version>12.0.18</jetty-version>
+ <jetty-version>12.0.19</jetty-version>
<jetty-for-solr-version>10.0.20</jetty-for-solr-version>
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
@@ -324,7 +324,7 @@
<jolokia-version>2.2.5</jolokia-version>
<jolt-version>0.1.8</jolt-version>
<jool-version>0.9.15</jool-version>
- <jooq-version>3.19.19</jooq-version>
+ <jooq-version>3.19.22</jooq-version>
<joor-version>0.9.15</joor-version>
<jose4j-version>0.9.3</jose4j-version>
<johnzon-version>2.0.1</johnzon-version>
@@ -363,8 +363,8 @@
<littleproxy-version>2.4.0</littleproxy-version>
<mapstruct-version>1.6.3</mapstruct-version>
<metrics-version>4.2.30</metrics-version>
- <micrometer-version>1.14.4</micrometer-version>
- <micrometer-tracing-version>1.4.3</micrometer-tracing-version>
+ <micrometer-version>1.14.6</micrometer-version>
+ <micrometer-tracing-version>1.4.5</micrometer-tracing-version>
<microprofile-config-version>3.1</microprofile-config-version>
<microprofile-fault-tolerance-version>4.1.1</microprofile-fault-tolerance-version>
<milvus-client-version>2.5.4</milvus-client-version>
@@ -425,7 +425,7 @@
<protostream-version>5.0.12.Final</protostream-version>
<prowide-version>SRU2024-10.2.6</prowide-version>
<pubnub-version>10.4.1</pubnub-version>
- <pulsar-version>3.3.3</pulsar-version>
+ <pulsar-version>3.3.6</pulsar-version>
<qdrant-client-version>1.13.0</qdrant-client-version>
<qpid-broker-version>9.2.0</qpid-broker-version>
<qpid-proton-j-version>0.34.1</qpid-proton-j-version>
@@ -433,7 +433,7 @@
<quartz-version>2.5.0</quartz-version>
<quickfixj-version>2.3.2</quickfixj-version>
<reactive-streams-version>1.0.4</reactive-streams-version>
- <reactor-version>3.7.2</reactor-version>
+ <reactor-version>3.7.5</reactor-version>
<reactor-netty-version>1.2.2</reactor-netty-version>
<redisson-version>3.44.0</redisson-version>
<resilience4j-version>2.3.0</resilience4j-version>
@@ -464,13 +464,13 @@
<splunk-version>1.9.5_1</splunk-version>
<spock-version>2.3-groovy-4.0</spock-version>
<spring-batch-version>5.2.2</spring-batch-version>
- <spring-data-redis-version>3.4.4</spring-data-redis-version>
- <spring-ldap-version>3.2.11</spring-ldap-version>
+ <spring-data-redis-version>3.4.5</spring-data-redis-version>
+ <spring-ldap-version>3.2.12</spring-ldap-version>
<spring-vault-core-version>3.1.2</spring-vault-core-version>
- <spring-version>6.2.5</spring-version>
+ <spring-version>6.2.6</spring-version>
<spring-rabbitmq-version>3.2.4</spring-rabbitmq-version>
- <spring-security-version>6.4.4</spring-security-version>
- <spring-ws-version>4.0.12</spring-ws-version>
+ <spring-security-version>6.4.5</spring-security-version>
+ <spring-ws-version>4.0.13</spring-ws-version>
<squareup-okhttp-version>3.14.9</squareup-okhttp-version>
<squareup-okio-version>1.17.5</squareup-okio-version>
<sshd-version>2.14.0</sshd-version>
diff --git
a/tests/examples/mixed/src/main/java/org/apache/karaf/camel/examples/test/CamelExampleRouteSupplier.java
b/tests/examples/mixed/src/main/java/org/apache/karaf/camel/examples/test/CamelExampleRouteSupplier.java
index 3f36a95e4..a2a001188 100644
---
a/tests/examples/mixed/src/main/java/org/apache/karaf/camel/examples/test/CamelExampleRouteSupplier.java
+++
b/tests/examples/mixed/src/main/java/org/apache/karaf/camel/examples/test/CamelExampleRouteSupplier.java
@@ -34,25 +34,26 @@ public class CamelExampleRouteSupplier implements
CamelRouteSupplier {
.convertBodyTo(String.class)
.log("[EXAMPLE INBOUND] Received: ${body}")
.choice()
- .when().simple("${headers.CamelHttpMethod} == 'POST'")
- .setHeader("type").jsonpath("$.notification.type")
- .choice()
- .when().simple("${header.type} == 'email'")
- .log("[EXAMPLE INBOUND] Received email notification")
- .to("direct:email")
- .setHeader("Exchange.HTTP_RESPONSE_CODE",
builder.constant(200))
- .when().simple("${header.type} == 'http'")
- .log("[EXAMPLE INBOUND] Received http notification")
- .to("direct:http")
- .setHeader("Exchange.HTTP_RESPONSE_CODE",
builder.constant(200))
- .otherwise()
- .log("[EXAMPLE INBOUND] Unknown notification")
- .setBody(builder.constant("{ \"status\": \"reject\", \"type\":
\"unknown\" }"))
- .setHeader("Exchange.HTTP_RESPONSE_CODE",
builder.constant(400))
- .otherwise()
- .log("[EXAMPLE INBOUND] only POST is accepted
(${headers.CamelHttpMethod})")
- .setBody(builder.constant("{ \"error\": \"only POST is
accepted\" }"))
- .setHeader("Exchange.HTTP_RESPONSE_CODE",
builder.constant(500));
+ .when().simple("${headers.CamelHttpMethod} == 'POST'")
+ .setHeader("type").jsonpath("$.notification.type")
+ .choice()
+ .when().simple("${header.type} == 'email'")
+ .log("[EXAMPLE INBOUND] Received email notification")
+ .to("direct:email")
+ .setHeader("Exchange.HTTP_RESPONSE_CODE",
builder.constant(200))
+ .when().simple("${header.type} == 'http'")
+ .log("[EXAMPLE INBOUND] Received http notification")
+ .to("direct:http")
+ .setHeader("Exchange.HTTP_RESPONSE_CODE",
builder.constant(200))
+ .otherwise()
+ .log("[EXAMPLE INBOUND] Unknown notification")
+ .setBody(builder.constant("{ \"status\": \"reject\",
\"type\": \"unknown\" }"))
+ .setHeader("Exchange.HTTP_RESPONSE_CODE",
builder.constant(400))
+ .end().endChoice()
+ .otherwise()
+ .log("[EXAMPLE INBOUND] only POST is accepted
(${headers.CamelHttpMethod})")
+ .setBody(builder.constant("{ \"error\": \"only POST is
accepted\" }"))
+ .setHeader("Exchange.HTTP_RESPONSE_CODE",
builder.constant(500));
builder.from("direct:email")
.id("example-email")
