(camel) branch main updated: CAMEL-19228 - Remove leftover comment (#14494)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new e98831a1f8e CAMEL-19228 - Remove leftover comment (#14494)
e98831a1f8e is described below

commit e98831a1f8e86a6207e53175c3e52cf316f2eacc
Author: Aurélien Pupier 
AuthorDate: Wed Jun 12 19:36:55 2024 +0200

CAMEL-19228 - Remove leftover comment (#14494)

it was to point to an issue mentioning to take care when upgrading the
container version; The container version has already been upgraded and
is now specified in another file (container.properties)

Signed-off-by: Aurélien Pupier 
---
 .../test/infra/couchbase/services/CouchbaseLocalContainerService.java| 1 -
 1 file changed, 1 deletion(-)

diff --git 
a/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerService.java
 
b/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerService.java
index cf91d5fc378..1e09073c514 100644
--- 
a/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerService.java
+++ 
b/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerService.java
@@ -25,7 +25,6 @@ import org.slf4j.LoggerFactory;
 import org.testcontainers.couchbase.CouchbaseContainer;
 
 public class CouchbaseLocalContainerService implements CouchbaseService, 
ContainerService {
-// Please check CAMEL-19228 before upgrading
 
 /*
  * Couchbase container uses a dynamic port for the KV service. The 
configuration

(camel) branch camel-3.21.x updated: CAMEL-20864: camel-kafka - Add option to producer for useIterator so you can force send message as a single kafka record. (#14492)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-3.21.x by this push:
 new 5e5de7afc90 CAMEL-20864: camel-kafka - Add option to producer for 
useIterator so you can force send message as a single kafka record. (#14492)
5e5de7afc90 is described below

commit 5e5de7afc900fdd027271f68218a3839674c1226
Author: Claus Ibsen 
AuthorDate: Wed Jun 12 14:21:53 2024 +0200

CAMEL-20864: camel-kafka - Add option to producer for useIterator so you 
can force send message as a single kafka record. (#14492)
---
 .../org/apache/camel/catalog/components/kafka.json |  2 +
 .../component/kafka/KafkaComponentConfigurer.java  |  6 ++
 .../component/kafka/KafkaEndpointConfigurer.java   |  6 ++
 .../component/kafka/KafkaEndpointUriFactory.java   |  3 +-
 .../org/apache/camel/component/kafka/kafka.json|  2 +
 .../camel/component/kafka/KafkaConfiguration.java  | 14 
 .../camel/component/kafka/KafkaProducer.java   |  5 +-
 .../KafkaProducerUseIteratorFalseIT.java   | 83 ++
 .../integration/KafkaProducerUseIteratorIT.java| 83 ++
 .../dsl/KafkaComponentBuilderFactory.java  | 18 +
 .../endpoint/dsl/KafkaEndpointBuilderFactory.java  | 35 +
 11 files changed, 253 insertions(+), 4 deletions(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kafka.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kafka.json
index 1b6ac7fce5b..d1b764b5713 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kafka.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kafka.json
@@ -96,6 +96,7 @@
 "retries": { "kind": "property", "displayName": "Retries", "group": 
"producer", "label": "producer", "required": false, "type": "integer", 
"javaType": "java.lang.Integer", "deprecated": false, "autowired": false, 
"secret": false, "configurationClass": 
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": 
"configuration", "description": "Setting a value greater than zero will cause 
the client to resend any record whose send fails with a potentially transient 
err [...]
 "retryBackoffMs": { "kind": "property", "displayName": "Retry Backoff Ms", 
"group": "producer", "label": "producer", "required": false, "type": "integer", 
"javaType": "java.lang.Integer", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": "100", "configurationClass": 
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": 
"configuration", "description": "Before each retry, the producer refreshes the 
metadata of relevant topics to see if a n [...]
 "sendBufferBytes": { "kind": "property", "displayName": "Send Buffer 
Bytes", "group": "producer", "label": "producer", "required": false, "type": 
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": "131072", "configurationClass": 
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": 
"configuration", "description": "Socket write buffer size" },
+"useIterator": { "kind": "property", "displayName": "Use Iterator", 
"group": "producer", "label": "producer", "required": false, "type": "boolean", 
"javaType": "boolean", "deprecated": false, "autowired": false, "secret": 
false, "defaultValue": true, "configurationClass": 
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": 
"configuration", "description": "Sets whether sending to kafka should send the 
message body as a single record, or use a java.util.Iterato [...]
 "valueSerializer": { "kind": "property", "displayName": "Value 
Serializer", "group": "pro

(camel) branch camel-3.22.x updated: CAMEL-20864: camel-kafka - Add option to producer for useIterator so you can force send message as a single kafka record. (#14492)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch camel-3.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/camel-3.22.x by this push:
 new 0b691204ac9 CAMEL-20864: camel-kafka - Add option to producer for 
useIterator so you can force send message as a single kafka record. (#14492)
0b691204ac9 is described below

commit 0b691204ac9882b391427c6a6d02f0c5fccc0dae
Author: Claus Ibsen 
AuthorDate: Wed Jun 12 14:21:53 2024 +0200

CAMEL-20864: camel-kafka - Add option to producer for useIterator so you 
can force send message as a single kafka record. (#14492)
---
 .../org/apache/camel/catalog/components/kafka.json |  2 +
 .../component/kafka/KafkaComponentConfigurer.java  |  6 ++
 .../component/kafka/KafkaEndpointConfigurer.java   |  6 ++
 .../component/kafka/KafkaEndpointUriFactory.java   |  3 +-
 .../org/apache/camel/component/kafka/kafka.json|  2 +
 .../camel/component/kafka/KafkaConfiguration.java  | 14 
 .../camel/component/kafka/KafkaProducer.java   |  5 +-
 .../KafkaProducerUseIteratorFalseIT.java   | 83 ++
 .../integration/KafkaProducerUseIteratorIT.java| 83 ++
 .../dsl/KafkaComponentBuilderFactory.java  | 18 +
 .../endpoint/dsl/KafkaEndpointBuilderFactory.java  | 35 +
 11 files changed, 253 insertions(+), 4 deletions(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kafka.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kafka.json
index 2fe0c8eaba7..560f2710cdd 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kafka.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/kafka.json
@@ -96,6 +96,7 @@
 "retries": { "kind": "property", "displayName": "Retries", "group": 
"producer", "label": "producer", "required": false, "type": "integer", 
"javaType": "java.lang.Integer", "deprecated": false, "autowired": false, 
"secret": false, "configurationClass": 
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": 
"configuration", "description": "Setting a value greater than zero will cause 
the client to resend any record whose send fails with a potentially transient 
err [...]
 "retryBackoffMs": { "kind": "property", "displayName": "Retry Backoff Ms", 
"group": "producer", "label": "producer", "required": false, "type": "integer", 
"javaType": "java.lang.Integer", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": "100", "configurationClass": 
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": 
"configuration", "description": "Before each retry, the producer refreshes the 
metadata of relevant topics to see if a n [...]
 "sendBufferBytes": { "kind": "property", "displayName": "Send Buffer 
Bytes", "group": "producer", "label": "producer", "required": false, "type": 
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": "131072", "configurationClass": 
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": 
"configuration", "description": "Socket write buffer size" },
+"useIterator": { "kind": "property", "displayName": "Use Iterator", 
"group": "producer", "label": "producer", "required": false, "type": "boolean", 
"javaType": "boolean", "deprecated": false, "autowired": false, "secret": 
false, "defaultValue": true, "configurationClass": 
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": 
"configuration", "description": "Sets whether sending to kafka should send the 
message body as a single record, or use a java.util.Iterato [...]
 "valueSerializer": { "kind": "property", "displayName": "Value 
Serializer", "group": "pro

(camel) branch camel-4.4.x updated (f176095ca24 -> 1e4279e27bd)

[davsclaus]

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 f176095ca24 CAMEL-20823 Filter out folders when listing files (#14493)
 new c1506d0ddca Regen
 new 9ed04c516aa Upgrade jbang to 4.4.2
 new 2723364ee07 CAMEL-20864: camel-kafka - Add option to producer for 
useIterator so you can force send message as a single kafka record. (#14492)
 new 1e4279e27bd Regen

The 4 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:
 .../org/apache/camel/catalog/components/kafka.json | 144 
 .../component/kafka/KafkaComponentConfigurer.java  |   6 +
 .../component/kafka/KafkaEndpointConfigurer.java   |   6 +
 .../component/kafka/KafkaEndpointUriFactory.java   |   3 +-
 .../org/apache/camel/component/kafka/kafka.json| 144 
 .../camel/component/kafka/KafkaConfiguration.java  |  14 +
 .../camel/component/kafka/KafkaProducer.java   |   5 +-
 .../KafkaProducerUseIteratorFalseIT.java   |  83 +
 .../integration/KafkaProducerUseIteratorIT.java|  83 +
 .../AzureServicebusComponentBuilderFactory.java|  19 +
 .../dsl/KafkaComponentBuilderFactory.java  |  18 +
 .../dsl/NettyComponentBuilderFactory.java  |  34 +-
 .../dsl/NettyHttpComponentBuilderFactory.java  |  34 +-
 .../endpoint/dsl/CxfRsEndpointBuilderFactory.java  | 404 +++--
 .../endpoint/dsl/KafkaEndpointBuilderFactory.java  |  35 ++
 .../endpoint/dsl/NettyEndpointBuilderFactory.java  | 198 +-
 .../dsl/NettyHttpEndpointBuilderFactory.java   | 198 +-
 .../dsl/ServiceBusEndpointBuilderFactory.java  | 108 ++
 dsl/camel-jbang/camel-jbang-container/Dockerfile   |   2 +-
 .../jbang/core/commands/catalog/CatalogDoc.java|   2 +-
 .../camel-jbang-main/dist/CamelJBang.java  |   6 +-
 .../src/main/jbang/main/CamelJBang.java|   6 +-
 .../apache/camel/kotlin/components/KafkaUriDsl.kt  |   8 +
 23 files changed, 975 insertions(+), 585 deletions(-)
 create mode 100644 
components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerUseIteratorFalseIT.java
 create mode 100644 
components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaProducerUseIteratorIT.java

(camel) 02/04: Upgrade jbang to 4.4.2

[davsclaus]

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 9ed04c516aaf424ffb5fdf4605e273000fa57aba
Author: Claus Ibsen 
AuthorDate: Wed Jun 12 14:29:09 2024 +0200

Upgrade jbang to 4.4.2
---
 dsl/camel-jbang/camel-jbang-container/Dockerfile| 2 +-
 .../apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java| 2 +-
 dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java   | 6 +++---
 .../camel-jbang-main/src/main/jbang/main/CamelJBang.java| 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dsl/camel-jbang/camel-jbang-container/Dockerfile 
b/dsl/camel-jbang/camel-jbang-container/Dockerfile
index a2b6106db8a..c4ca5ba4073 100644
--- a/dsl/camel-jbang/camel-jbang-container/Dockerfile
+++ b/dsl/camel-jbang/camel-jbang-container/Dockerfile
@@ -19,5 +19,5 @@ FROM docker.io/jbangdev/jbang-action
 
 RUN jbang trust add https://github.com/apache/camel
 
-ENTRYPOINT [ "jbang",  "-Dcamel.jbang.version=4.4.1", "camel@apache/camel"]
+ENTRYPOINT [ "jbang",  "-Dcamel.jbang.version=4.4.2", "camel@apache/camel"]
 
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
index c4857497806..47e061d64a3 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
@@ -86,7 +86,7 @@ public class CatalogDoc extends CamelCommand {
 boolean headers;
 
 @CommandLine.Option(names = {
-"--kamelets-version" }, description = "Apache Camel Kamelets 
version", defaultValue = "4.4.1")
+"--kamelets-version" }, description = "Apache Camel Kamelets 
version", defaultValue = "4.4.2")
 String kameletsVersion;
 
 CamelCatalog catalog;
diff --git a/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java 
b/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
index 7d2787f085c..6277b630c7b 100755
--- a/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
+++ b/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
@@ -19,9 +19,9 @@
 
 //JAVA 17+
 //REPOS 
central=https://repo1.maven.org/maven2,apache-snapshot=https://repository.apache.org/content/groups/snapshots/
-//DEPS org.apache.camel:camel-bom:${camel.jbang.version:4.4.1}@pom
-//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version:4.4.1}
-//DEPS org.apache.camel.kamelets:camel-kamelets:${camel-kamelets.version:4.4.1}
+//DEPS org.apache.camel:camel-bom:${camel.jbang.version:4.4.2}@pom
+//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version:4.4.2}
+//DEPS org.apache.camel.kamelets:camel-kamelets:${camel-kamelets.version:4.4.2}
 
 package main;
 
diff --git 
a/dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java 
b/dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java
index 7d2787f085c..6277b630c7b 100755
--- a/dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java
+++ b/dsl/camel-jbang/camel-jbang-main/src/main/jbang/main/CamelJBang.java
@@ -19,9 +19,9 @@
 
 //JAVA 17+
 //REPOS 
central=https://repo1.maven.org/maven2,apache-snapshot=https://repository.apache.org/content/groups/snapshots/
-//DEPS org.apache.camel:camel-bom:${camel.jbang.version:4.4.1}@pom
-//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version:4.4.1}
-//DEPS org.apache.camel.kamelets:camel-kamelets:${camel-kamelets.version:4.4.1}
+//DEPS org.apache.camel:camel-bom:${camel.jbang.version:4.4.2}@pom
+//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version:4.4.2}
+//DEPS org.apache.camel.kamelets:camel-kamelets:${camel-kamelets.version:4.4.2}
 
 package main;
 

(camel) 04/04: Regen

[davsclaus]

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 1e4279e27bd0783a250280dce3c03f5170d4a5ca
Author: Claus Ibsen 
AuthorDate: Wed Jun 12 14:33:10 2024 +0200

Regen
---
 .../AzureServicebusComponentBuilderFactory.java|  19 +
 .../dsl/NettyComponentBuilderFactory.java  |  34 +-
 .../dsl/NettyHttpComponentBuilderFactory.java  |  34 +-
 .../endpoint/dsl/CxfRsEndpointBuilderFactory.java  | 404 +++--
 .../endpoint/dsl/NettyEndpointBuilderFactory.java  | 198 +-
 .../dsl/NettyHttpEndpointBuilderFactory.java   | 198 +-
 .../dsl/ServiceBusEndpointBuilderFactory.java  | 108 ++
 7 files changed, 564 insertions(+), 431 deletions(-)

diff --git 
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureServicebusComponentBuilderFactory.java
 
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureServicebusComponentBuilderFactory.java
index 4146ed9bc09..8429c48b233 100644
--- 
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureServicebusComponentBuilderFactory.java
+++ 
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AzureServicebusComponentBuilderFactory.java
@@ -119,6 +119,24 @@ public interface AzureServicebusComponentBuilderFactory {
 doSetProperty("configuration", configuration);
 return this;
 }
+/**
+ * To use a custom HeaderFilterStrategy to filter Service Bus
+ * application properties to and from Camel message headers.
+ * 
+ * The option is a:
+ * codeorg.apache.camel.spi.HeaderFilterStrategy/code
+ * type.
+ * 
+ * Group: common
+ * 
+ * @param headerFilterStrategy the value to set
+ * @return the dsl builder
+ */
+default AzureServicebusComponentBuilder headerFilterStrategy(
+org.apache.camel.spi.HeaderFilterStrategy 
headerFilterStrategy) {
+doSetProperty("headerFilterStrategy", headerFilterStrategy);
+return this;
+}
 /**
  * Sets the proxy configuration to use for ServiceBusSenderAsyncClient.
  * When a proxy is configured, AMQP_WEB_SOCKETS must be used for the
@@ -577,6 +595,7 @@ public interface AzureServicebusComponentBuilderFactory {
 case "amqpTransportType": 
getOrCreateConfiguration((ServiceBusComponent) 
component).setAmqpTransportType((com.azure.core.amqp.AmqpTransportType) value); 
return true;
 case "clientOptions": 
getOrCreateConfiguration((ServiceBusComponent) 
component).setClientOptions((com.azure.core.util.ClientOptions) value); return 
true;
 case "configuration": ((ServiceBusComponent) 
component).setConfiguration((org.apache.camel.component.azure.servicebus.ServiceBusConfiguration)
 value); return true;
+case "headerFilterStrategy": 
getOrCreateConfiguration((ServiceBusComponent) 
component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) 
value); return true;
 case "proxyOptions": 
getOrCreateConfiguration((ServiceBusComponent) 
component).setProxyOptions((com.azure.core.amqp.ProxyOptions) value); return 
true;
 case "serviceBusType": 
getOrCreateConfiguration((ServiceBusComponent) 
component).setServiceBusType((org.apache.camel.component.azure.servicebus.ServiceBusType)
 value); return true;
 case "bridgeErrorHandler": ((ServiceBusComponent) 
component).setBridgeErrorHandler((boolean) value); return true;
diff --git 
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java
 
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java
index c15e830d416..7c7d0390916 100644
--- 
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java
+++ 
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java
@@ -768,22 +768,6 @@ public interface NettyComponentBuilderFactory {
 doSetProperty("useByteBuf", useByteBuf);
 return this;
 }
-/**
- * To enable/disable hostname verification on SSLEngine.
- * 
- * The option is a: codeboolean/code type.
- * 
- * Default: false
- * Group:  security
- * 
- * @param hostnameVerification the value to set
- * @return the dsl builder
- */
-default NettyComponentBuilder hostnameVerification(
-boolean hostnameVerificat

(camel) 01/04: Regen

[davsclaus]

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 c1506d0ddca63938aee36b8fda41be96377e
Author: Claus Ibsen 
AuthorDate: Wed Jun 12 14:28:31 2024 +0200

Regen
---
 dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java 
b/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
index 7dd45d2dfd2..7d2787f085c 100755
--- a/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
+++ b/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
@@ -19,9 +19,9 @@
 
 //JAVA 17+
 //REPOS 
central=https://repo1.maven.org/maven2,apache-snapshot=https://repository.apache.org/content/groups/snapshots/
-//DEPS org.apache.camel:camel-bom:${camel.jbang.version:4.4.0}@pom
-//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version:4.4.0}
-//DEPS org.apache.camel.kamelets:camel-kamelets:${camel-kamelets.version:4.4.0}
+//DEPS org.apache.camel:camel-bom:${camel.jbang.version:4.4.1}@pom
+//DEPS org.apache.camel:camel-jbang-core:${camel.jbang.version:4.4.1}
+//DEPS org.apache.camel.kamelets:camel-kamelets:${camel-kamelets.version:4.4.1}
 
 package main;
 

(camel) branch kafka-split deleted (was 63ea04df01c)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch kafka-split
in repository https://gitbox.apache.org/repos/asf/camel.git


 was 63ea04df01c CAMEL-20864: camel-kafka - Add option to producer for 
useIterator so you can force send message as a single kafka record.

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

(camel-spring-boot) branch CAMEL-20868 deleted (was d63e21810cd)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch CAMEL-20868
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git


 was d63e21810cd CAMEL-20868: camel-aws-xray configure AWS XRay tracing out 
of the box

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

(camel-spring-boot) branch main updated: CAMEL-20868: camel-aws-xray configure AWS XRay tracing out of the box (#1162)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git


The following commit(s) were added to refs/heads/main by this push:
 new 72c015ccb2d CAMEL-20868: camel-aws-xray configure AWS XRay tracing out 
of the box (#1162)
72c015ccb2d is described below

commit 72c015ccb2de17eb0cc4084132e438a0f20167e7
Author: John Poth 
AuthorDate: Wed Jun 12 14:02:11 2024 +0200

CAMEL-20868: camel-aws-xray configure AWS XRay tracing out of the box 
(#1162)
---
 components-starter/camel-aws-xray-starter/pom.xml  | 12 
 .../src/main/docs/aws-xray.json| 30 +-
 .../aws/xray/starter/AwsXRayAutoConfiguration.java | 59 ++
 .../starter/AwsXRayConfigurationProperties.java| 69 ++
 .../xray/starter/CamelAwsXRayTracingStrategy.java  | 35 +++
 ...rk.boot.autoconfigure.AutoConfiguration.imports | 17 ++
 .../aws/xray/starter/CamelAwsXRayCustomTest.java   | 58 ++
 .../aws/xray/starter/CamelAwsXRayDisabledTest.java | 62 +++
 .../aws/xray/starter/CamelAwsXRayNoopTest.java | 61 +++
 .../camel/aws/xray/starter/CamelAwsXRayTest.java   | 67 +
 .../xray/starter/CustomAwsXRayTracingStrategy.java | 36 +++
 .../src/test/resources/default.properties  |  1 +
 .../src/test/resources/disabled.properties |  1 +
 .../src/test/resources/noop.properties |  1 +
 14 files changed, 508 insertions(+), 1 deletion(-)

diff --git a/components-starter/camel-aws-xray-starter/pom.xml 
b/components-starter/camel-aws-xray-starter/pom.xml
index bd8575f786e..aa6d19a2862 100644
--- a/components-starter/camel-aws-xray-starter/pom.xml
+++ b/components-starter/camel-aws-xray-starter/pom.xml
@@ -47,6 +47,18 @@
   
   
 
+
+  org.apache.camel
+  camel-test-spring-junit5
+  ${camel-version}
+  test
+
+
+  org.apache.camel.springboot
+  camel-spring-boot
+  ${project.version}
+  test
+
 
 
   org.apache.camel.springboot
diff --git 
a/components-starter/camel-aws-xray-starter/src/main/docs/aws-xray.json 
b/components-starter/camel-aws-xray-starter/src/main/docs/aws-xray.json
index da5f5f24116..3a1f2089d95 100644
--- a/components-starter/camel-aws-xray-starter/src/main/docs/aws-xray.json
+++ b/components-starter/camel-aws-xray-starter/src/main/docs/aws-xray.json
@@ -1,3 +1,31 @@
 {
-  "properties": []
+  "groups": [
+{
+  "name": "camel.aws-xray",
+  "type": 
"org.apache.camel.aws.xray.starter.AwsXRayConfigurationProperties",
+  "sourceType": 
"org.apache.camel.aws.xray.starter.AwsXRayConfigurationProperties"
+}
+  ],
+  "properties": [
+{
+  "name": "camel.aws-xray.enabled",
+  "type": "java.lang.Boolean",
+  "description": "Global option to enable\/disable AWS XRay integration, 
default is true.",
+  "sourceType": 
"org.apache.camel.aws.xray.starter.AwsXRayConfigurationProperties",
+  "defaultValue": true
+},
+{
+  "name": "camel.aws-xray.exclude-patterns",
+  "type": "java.util.Set",
+  "description": "Sets exclude pattern(s) that will disable tracing for 
Camel messages that matches the pattern. Multiple patterns can be separated by 
comma.",
+  "sourceType": 
"org.apache.camel.aws.xray.starter.AwsXRayConfigurationProperties"
+},
+{
+  "name": "camel.aws-xray.tracing-strategy",
+  "type": 
"org.apache.camel.aws.xray.starter.AwsXRayConfigurationProperties$TracingStrategy",
+  "description": "Tracing strategy used. Defaults to {@link 
org.apache.camel.component.aws.xray.TraceAnnotatedTracingStrategy}",
+  "sourceType": 
"org.apache.camel.aws.xray.starter.AwsXRayConfigurationProperties"
+}
+  ],
+  "hints": []
 }
\ No newline at end of file
diff --git 
a/components-starter/camel-aws-xray-starter/src/main/java/org/apache/camel/aws/xray/starter/AwsXRayAutoConfiguration.java
 
b/components-starter/camel-aws-xray-starter/src/main/java/org/apache/camel/aws/xray/starter/AwsXRayAutoConfiguration.java
new file mode 100644
index 000..b03d0225484
--- /dev/null
+++ 
b/components-starter/camel-aws-xray-starter/src/main/java/org/apache/camel/aws/xray/starter/AwsXRayAutoConfiguration.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses t

(camel) branch camel-4.4.x updated: CAMEL-20823 Filter out folders when listing files (#14493)

[davsclaus]

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


The following commit(s) were added to refs/heads/camel-4.4.x by this push:
 new f176095ca24 CAMEL-20823 Filter out folders when listing files (#14493)
f176095ca24 is described below

commit f176095ca24572dcffb7b7d556b644a3ae250bf6
Author: Tom Cunningham 
AuthorDate: Wed Jun 12 08:01:36 2024 -0400

CAMEL-20823 Filter out folders when listing files (#14493)
---
 .../src/main/java/org/apache/camel/component/smb/SmbConsumer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbConsumer.java
 
b/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbConsumer.java
index d9bb35aba00..58484c2e293 100644
--- 
a/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbConsumer.java
+++ 
b/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbConsumer.java
@@ -58,7 +58,7 @@ public class SmbConsumer extends ScheduledPollConsumer {
 IdempotentRepository repository = 
configuration.getIdempotentRepository();
 
 for (FileIdBothDirectoryInformation f : 
share.list(configuration.getPath(), configuration.getSearchPattern())) {
-if (f.getFileName().equals(".") || 
f.getFileName().equals("..")) {
+if (f.getFileName().equals(".") || 
f.getFileName().equals("..") || share.folderExists(f.getFileName())) {
 continue;
 }
 

(camel) branch kafka-split created (now 63ea04df01c)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch kafka-split
in repository https://gitbox.apache.org/repos/asf/camel.git


  at 63ea04df01c CAMEL-20864: camel-kafka - Add option to producer for 
useIterator so you can force send message as a single kafka record.

This branch includes the following new commits:

 new 63ea04df01c CAMEL-20864: camel-kafka - Add option to producer for 
useIterator so you can force send message as a single kafka record.

The 1 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.

(camel) branch main updated: CAMEL-20860: camel-core - Endpoint should have isRemote method

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new a27eab7e8ba CAMEL-20860: camel-core - Endpoint should have isRemote 
method
a27eab7e8ba is described below

commit a27eab7e8bad9207c5a3a1cafb7e82e810c01533
Author: Claus Ibsen 
AuthorDate: Wed Jun 12 10:56:08 2024 +0200

CAMEL-20860: camel-core - Endpoint should have isRemote method
---
 .../org/apache/camel/dsl/jbang/core/commands/Debug.java   |  9 ++---
 .../dsl/jbang/core/commands/action/CamelTraceAction.java  | 15 ++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
index f20d7c80735..dbe70c24e01 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
@@ -749,12 +749,14 @@ public class Debug extends Run {
 }
 
 private String getStatus(SuspendedRow r) {
+boolean remote = r.endpoint != null && 
r.endpoint.getBooleanOrDefault("remote", false);
+
 if (r.first) {
 String s = "Created";
 if (loggingColor) {
 return 
Ansi.ansi().fg(Ansi.Color.GREEN).a(s).reset().toString();
 } else {
-return "Input";
+return s;
 }
 } else if (r.last) {
 String done = r.exception != null ? "Completed (exception)" : 
"Completed (success)";
@@ -778,10 +780,11 @@ public class Debug extends Run {
 return fail;
 }
 } else {
+String s = remote ? "Sent" : "Processed";
 if (loggingColor) {
-return 
Ansi.ansi().fg(Ansi.Color.GREEN).a("Processed").reset().toString();
+return 
Ansi.ansi().fg(Ansi.Color.GREEN).a(s).reset().toString();
 } else {
-return "Processed";
+return s;
 }
 }
 }
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
index e15cba05773..28e5b962b10 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
@@ -439,6 +439,7 @@ public class CamelTraceAction extends ActionBaseCommand {
 uri = URISupport.sanitizeUri(uri);
 }
 row.endpoint.put("endpoint", uri);
+row.endpoint.put("remote", 
jo.getBooleanOrDefault("remoteEndpoint", true));
 }
 JsonObject es = jo.getMap("endpointService");
 if (es != null) {
@@ -736,12 +737,14 @@ public class CamelTraceAction extends ActionBaseCommand {
 }
 
 private String getStatus(Row r) {
+boolean remote = r.endpoint != null && 
r.endpoint.getBooleanOrDefault("remote", false);
+
 if (r.first) {
 String s = r.parent.depth == 1 ? "Created" : "Routing to " + 
r.routeId;
 if (loggingColor) {
 return 
Ansi.ansi().fg(Ansi.Color.GREEN).a(s).reset().toString();
 } else {
-return "Input";
+return s;
 }
 } else if (r.last) {
 String done = r.exception != null ? "Completed (exception)" : 
"Completed (success)";
@@ -753,10 +756,11 @@ public class CamelTraceAction extends ActionBaseCommand {
 }
 }
 if (!r.done) {
+String s = remote ? "Sending" : "Processing";
 if (loggingColor) {
-return 
Ansi.ansi().fg(Ansi.Color.BLUE).a("Processing").reset().toString();
+return Ansi.ansi().fg(Ansi.Color.BLUE).a(s).reset().toString();
 } else {
-return "Processing";
+return s;
 }
 } else if (r.failed) {
 String fail = r.exception != null ? "Exception" : "Failed";
@@ -766,10 +770,11 @@ public class CamelTraceAction extends ActionBaseCommand {
 return fail;
 

(camel) branch main updated: chore(deps): Bump org.apache.maven.plugins:maven-dependency-plugin (#14488)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new c15bae74b40 chore(deps): Bump 
org.apache.maven.plugins:maven-dependency-plugin (#14488)
c15bae74b40 is described below

commit c15bae74b401cba24e94a1ae3306bd993a2a3916
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Wed Jun 12 09:55:03 2024 +0200

chore(deps): Bump org.apache.maven.plugins:maven-dependency-plugin (#14488)

Bumps 
[org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin)
 from 3.6.1 to 3.7.0.
- [Release 
notes](https://github.com/apache/maven-dependency-plugin/releases)
- 
[Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.6.1...maven-dependency-plugin-3.7.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b3175e177c8..c9573cce6c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
 4.3
 3.7.1
 3.13.0
-
3.6.1
+
3.7.0
 3.5.0
 3.7.0
 3.7.0

(camel) branch main updated: chore(deps): Bump aws-java-sdk2-version from 2.25.70 to 2.26.0 (#14486)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 0d720ccfb16 chore(deps): Bump aws-java-sdk2-version from 2.25.70 to 
2.26.0 (#14486)
0d720ccfb16 is described below

commit 0d720ccfb163521ced39de1f6dd3efb6363f78ca
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Wed Jun 12 09:31:14 2024 +0200

chore(deps): Bump aws-java-sdk2-version from 2.25.70 to 2.26.0 (#14486)

Bumps `aws-java-sdk2-version` from 2.25.70 to 2.26.0.

Updates `software.amazon.awssdk:sqs` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:kinesis` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:s3` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:sns` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:cloudwatch` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:ec2` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:eventbridge` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:iam` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:kms` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:lambda` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:secretsmanager` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:sts` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:dynamodb` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:config` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:apache-client` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:athena` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:bedrock` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:bedrockruntime` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:bedrockagent` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:bedrockagentruntime` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:cloudtrail` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:ecs` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:eks` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:netty-nio-client` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:firehose` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:kafka` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:mq` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:redshiftdata` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:ses` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:sfn` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:timestreamquery` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:timestreamwrite` from 2.25.70 to 2.26.0

Updates `software.amazon.awssdk:translate` from 2.25.70 to 2.26.0

---
updated-dependencies:
- dependency-name: software.amazon.awssdk:sqs
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: software.amazon.awssdk:kinesis
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: software.amazon.awssdk:s3
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: software.amazon.awssdk:sns
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: software.amazon.awssdk:cloudwatch
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: software.amazon.awssdk:ec2
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: software.amazon.awssdk:eventbridge
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: software.amazon.awssdk:iam
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: software.amazon.awssdk:kms
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: software.amazon.awssdk:lambda
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: software.amazon.awssdk:secretsmanager
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: software.amazon.awssdk:sts
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: software.amazon.awssdk:dynamodb
  dependency-type: direct:production
  update-type: version-update:semver-minor
- depe

(camel) branch main updated: CAMEL-20860: camel-core - Endpoint should have isRemote method

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 3b0fe617d14 CAMEL-20860: camel-core - Endpoint should have isRemote 
method
3b0fe617d14 is described below

commit 3b0fe617d145bc3f0e19e1c40fcac305aa41a337
Author: Claus Ibsen 
AuthorDate: Wed Jun 12 09:27:36 2024 +0200

CAMEL-20860: camel-core - Endpoint should have isRemote method
---
 .../org/apache/camel/spi/BacklogTracerEventMessage.java |  9 +
 .../impl/debugger/DefaultBacklogTracerEventMessage.java | 12 
 .../apache/camel/impl/engine/CamelInternalProcessor.java|  4 
 .../java/org/apache/camel/impl/engine/DefaultTracer.java| 13 ++---
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git 
a/core/camel-api/src/main/java/org/apache/camel/spi/BacklogTracerEventMessage.java
 
b/core/camel-api/src/main/java/org/apache/camel/spi/BacklogTracerEventMessage.java
index bf2e88adee9..4966baca42d 100644
--- 
a/core/camel-api/src/main/java/org/apache/camel/spi/BacklogTracerEventMessage.java
+++ 
b/core/camel-api/src/main/java/org/apache/camel/spi/BacklogTracerEventMessage.java
@@ -18,6 +18,8 @@ package org.apache.camel.spi;
 
 import java.util.Map;
 
+import org.apache.camel.Endpoint;
+
 /**
  * Represents a traced message by the BacklogTracer.
  */
@@ -137,6 +139,13 @@ public interface BacklogTracerEventMessage {
  */
 String getEndpointUri();
 
+/**
+ * Whether the endpoint is remote.
+ *
+ * @see Endpoint#isRemote()
+ */
+boolean isRemoteEndpoint();
+
 /**
  * Gets the endpoint remote address such as URL, hostname, 
connection-string, or cloud region, that are component
  * specific.
diff --git 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DefaultBacklogTracerEventMessage.java
 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DefaultBacklogTracerEventMessage.java
index 5db7cc4a226..b57668d2a8b 100644
--- 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DefaultBacklogTracerEventMessage.java
+++ 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DefaultBacklogTracerEventMessage.java
@@ -41,6 +41,7 @@ public final class DefaultBacklogTracerEventMessage 
implements BacklogTracerEven
 private final String exchangeId;
 private final String threadName;
 private String endpointUri;
+private boolean remoteEndpoint;
 private String endpointServiceUrl;
 private String endpointServiceProtocol;
 private Map endpointServiceMetadata;
@@ -193,6 +194,15 @@ public final class DefaultBacklogTracerEventMessage 
implements BacklogTracerEven
 return endpointUri;
 }
 
+@Override
+public boolean isRemoteEndpoint() {
+return remoteEndpoint;
+}
+
+public void setRemoteEndpoint(boolean remoteEndpoint) {
+this.remoteEndpoint = remoteEndpoint;
+}
+
 public void setEndpointUri(String endpointUri) {
 this.endpointUri = endpointUri;
 }
@@ -258,6 +268,7 @@ public final class DefaultBacklogTracerEventMessage 
implements BacklogTracerEven
 sb.append(prefix).append("  ").append(routeId != null ? 
routeId : "").append("\n");
 if (endpointUri != null) {
 sb.append(prefix).append("  
").append(endpointUri).append("\n");
+sb.append(prefix).append("  
").append(remoteEndpoint).append("\n");
 }
 if (toNode != null) {
 sb.append(prefix).append("  
").append(toNode).append("\n");
@@ -313,6 +324,7 @@ public final class DefaultBacklogTracerEventMessage 
implements BacklogTracerEven
 }
 if (endpointUri != null) {
 jo.put("endpointUri", endpointUri);
+jo.put("remoteEndpoint", remoteEndpoint);
 }
 if (routeId != null) {
 jo.put("routeId", routeId);
diff --git 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
index 2e57acf3554..1e49cd39a6d 100644
--- 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
+++ 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
@@ -710,15 +710,18 @@ public class CamelInternalProcessor extends 
DelegateAsyncProcessor implements In
 data.doneProcessing();
 
 String uri = null;
+boolean remote = true;
 Endpoint endpoint = notifier.after(exchange);
 if (endpoint != null) {
 uri = endpoint.getEndpointUri();
+remote = endpoint.isRem

(camel) branch er deleted (was 3342a351a70)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch er
in repository https://gitbox.apache.org/repos/asf/camel.git


 was 3342a351a70 CAMEL-20860: camel-core - Endpoint should have isRemote 
method

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

(camel) branch main updated: CAMEL-20860: camel-core - Endpoint should have isRemote method (#14484)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 114dcd0a279 CAMEL-20860: camel-core - Endpoint should have isRemote 
method (#14484)
114dcd0a279 is described below

commit 114dcd0a2795a49b6f1faeec4ba5fbb13d4bfa1c
Author: Claus Ibsen 
AuthorDate: Wed Jun 12 08:54:29 2024 +0200

CAMEL-20860: camel-core - Endpoint should have isRemote method (#14484)
---
 .../apache/camel/component/djl/DJLEndpoint.java|  5 +
 .../bean/validator/BeanValidatorEndpoint.java  |  5 +
 .../apache/camel/component/bean/BeanEndpoint.java  |  5 +
 .../camel/component/browse/BrowseEndpoint.java |  5 +
 .../caffeine/cache/CaffeineCacheEndpoint.java  |  7 +-
 .../caffeine/load/CaffeineLoadCacheEndpoint.java   |  7 +-
 .../camel/component/chunk/ChunkEndpoint.java   | 10 -
 .../component/controlbus/ControlBusEndpoint.java   |  5 +
 .../apache/camel/component/cron/CronEndpoint.java  |  5 +
 .../component/crypto/DigitalSignatureEndpoint.java |  5 +
 .../component/dataformat/DataFormatEndpoint.java   |  5 +
 .../camel/component/dataset/DataSetEndpoint.java   |  5 +
 .../component/dataset/DataSetTestEndpoint.java |  5 +
 .../camel/component/direct/DirectEndpoint.java |  5 +
 .../component/disruptor/DisruptorEndpoint.java |  5 +
 .../control/DynamicRouterControlEndpoint.java  |  5 +
 .../routing/DynamicRouterEndpoint.java |  5 +
 .../apache/camel/component/exec/ExecEndpoint.java  |  5 +
 .../camel/component/flatpack/FlatpackEndpoint.java |  5 +
 .../apache/camel/component/fop/FopEndpoint.java|  5 +
 .../component/freemarker/FreemarkerEndpoint.java   |  5 +
 .../camel/component/grape/GrapeEndpoint.java   |  5 +
 .../guava/eventbus/GuavaEventBusEndpoint.java  |  5 +
 .../apache/camel/component/jmx/JMXEndpoint.java|  5 +
 .../apache/camel/component/jolt/JoltEndpoint.java  |  5 +
 .../apache/camel/component/jslt/JsltEndpoint.java  |  5 +
 .../component/jsonpatch/JsonPatchEndpoint.java |  5 +
 .../jsonvalidator/JsonValidatorEndpoint.java   |  5 +
 .../camel/component/jsonata/JsonataEndpoint.java   |  5 +
 .../apache/camel/component/jte/JteEndpoint.java|  5 +
 .../camel/component/language/LanguageEndpoint.java |  5 +
 .../apache/camel/component/log/LogEndpoint.java|  5 +
 .../component/lumberjack/LumberjackEndpoint.java   |  7 +-
 .../component/mapstruct/MapstructEndpoint.java |  5 +
 .../camel/component/metrics/MetricsEndpoint.java   |  5 +
 .../component/micrometer/MicrometerEndpoint.java   |  5 +
 .../apache/camel/component/mock/MockEndpoint.java  |  5 +
 .../camel/component/mustache/MustacheEndpoint.java |  5 +
 .../apache/camel/component/mvel/MvelEndpoint.java  |  5 +
 .../apache/camel/component/pdf/PdfEndpoint.java|  5 +
 .../camel/component/quartz/QuartzEndpoint.java |  5 +
 .../reactive/streams/ReactiveStreamsEndpoint.java  | 11 +
 .../apache/camel/component/ref/RefEndpoint.java|  5 +
 .../camel/component/rest/RestApiEndpoint.java  |  5 +
 .../robotframework/RobotFrameworkEndpoint.java |  5 +
 .../camel/component/xquery/XQueryEndpoint.java |  5 +
 .../component/scheduler/SchedulerEndpoint.java |  5 +
 .../component/schematron/SchematronEndpoint.java   |  5 +
 .../apache/camel/component/seda/SedaEndpoint.java  |  5 +
 .../spring/batch/SpringBatchEndpoint.java  |  5 +
 .../camel/component/event/EventEndpoint.java   |  5 +
 .../apache/camel/component/stax/StAXEndpoint.java  |  5 +
 .../stringtemplate/StringTemplateEndpoint.java |  5 +
 .../apache/camel/component/stub/StubEndpoint.java  |  5 +
 .../component/thymeleaf/ThymeleafEndpoint.java |  5 +
 .../apache/camel/component/tika/TikaEndpoint.java  |  5 +
 .../camel/component/timer/TimerEndpoint.java   |  5 +
 .../component/validator/ValidatorEndpoint.java |  5 +
 .../camel/component/velocity/VelocityEndpoint.java |  5 +
 .../apache/camel/component/wasm/WasmEndpoint.java  | 26 +++---
 .../org/apache/camel/component/xj/XJEndpoint.java  |  5 +
 .../component/xmlsecurity/XmlSignerEndpoint.java   |  5 +
 .../component/xmlsecurity/XmlVerifierEndpoint.java |  5 +
 .../component/xslt/saxon/XsltSaxonEndpoint.java|  5 +
 .../apache/camel/component/xslt/XsltEndpoint.java  |  5 +
 .../src/main/java/org/apache/camel/Endpoint.java   | 10 -
 .../camel/impl/console/EndpointDevConsole.java |  1 +
 .../api/management/mbean/ManagedEndpointMBean.java |  3 +++
 .../camel/management/mbean/ManagedEndpoint.java|  5 +
 .../camel/management/ManagedEndpointTest.java  |  5

(camel) 01/01: CAMEL-20860: camel-core - Endpoint should have isRemote method

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch er
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 3342a351a70fe6168b1a44a43bdb1e217f25a222
Author: Claus Ibsen 
AuthorDate: Wed Jun 12 08:26:53 2024 +0200

CAMEL-20860: camel-core - Endpoint should have isRemote method
---
 .../apache/camel/component/djl/DJLEndpoint.java|  5 +
 .../bean/validator/BeanValidatorEndpoint.java  |  5 +
 .../apache/camel/component/bean/BeanEndpoint.java  |  5 +
 .../camel/component/browse/BrowseEndpoint.java |  5 +
 .../caffeine/cache/CaffeineCacheEndpoint.java  |  7 +-
 .../caffeine/load/CaffeineLoadCacheEndpoint.java   |  7 +-
 .../camel/component/chunk/ChunkEndpoint.java   | 10 -
 .../component/controlbus/ControlBusEndpoint.java   |  5 +
 .../apache/camel/component/cron/CronEndpoint.java  |  5 +
 .../component/crypto/DigitalSignatureEndpoint.java |  5 +
 .../component/dataformat/DataFormatEndpoint.java   |  5 +
 .../camel/component/dataset/DataSetEndpoint.java   |  5 +
 .../component/dataset/DataSetTestEndpoint.java |  5 +
 .../camel/component/direct/DirectEndpoint.java |  5 +
 .../component/disruptor/DisruptorEndpoint.java |  5 +
 .../control/DynamicRouterControlEndpoint.java  |  5 +
 .../routing/DynamicRouterEndpoint.java |  5 +
 .../apache/camel/component/exec/ExecEndpoint.java  |  5 +
 .../camel/component/flatpack/FlatpackEndpoint.java |  5 +
 .../apache/camel/component/fop/FopEndpoint.java|  5 +
 .../component/freemarker/FreemarkerEndpoint.java   |  5 +
 .../camel/component/grape/GrapeEndpoint.java   |  5 +
 .../guava/eventbus/GuavaEventBusEndpoint.java  |  5 +
 .../apache/camel/component/jmx/JMXEndpoint.java|  5 +
 .../apache/camel/component/jolt/JoltEndpoint.java  |  5 +
 .../apache/camel/component/jslt/JsltEndpoint.java  |  5 +
 .../component/jsonpatch/JsonPatchEndpoint.java |  5 +
 .../jsonvalidator/JsonValidatorEndpoint.java   |  5 +
 .../camel/component/jsonata/JsonataEndpoint.java   |  5 +
 .../apache/camel/component/jte/JteEndpoint.java|  5 +
 .../camel/component/language/LanguageEndpoint.java |  5 +
 .../apache/camel/component/log/LogEndpoint.java|  5 +
 .../component/lumberjack/LumberjackEndpoint.java   |  7 +-
 .../component/mapstruct/MapstructEndpoint.java |  5 +
 .../camel/component/metrics/MetricsEndpoint.java   |  5 +
 .../component/micrometer/MicrometerEndpoint.java   |  5 +
 .../apache/camel/component/mock/MockEndpoint.java  |  5 +
 .../camel/component/mustache/MustacheEndpoint.java |  5 +
 .../apache/camel/component/mvel/MvelEndpoint.java  |  5 +
 .../apache/camel/component/pdf/PdfEndpoint.java|  5 +
 .../camel/component/quartz/QuartzEndpoint.java |  5 +
 .../reactive/streams/ReactiveStreamsEndpoint.java  | 11 +
 .../apache/camel/component/ref/RefEndpoint.java|  5 +
 .../camel/component/rest/RestApiEndpoint.java  |  5 +
 .../robotframework/RobotFrameworkEndpoint.java |  5 +
 .../camel/component/xquery/XQueryEndpoint.java |  5 +
 .../component/scheduler/SchedulerEndpoint.java |  5 +
 .../component/schematron/SchematronEndpoint.java   |  5 +
 .../apache/camel/component/seda/SedaEndpoint.java  |  5 +
 .../spring/batch/SpringBatchEndpoint.java  |  5 +
 .../camel/component/event/EventEndpoint.java   |  5 +
 .../apache/camel/component/stax/StAXEndpoint.java  |  5 +
 .../stringtemplate/StringTemplateEndpoint.java |  5 +
 .../apache/camel/component/stub/StubEndpoint.java  |  5 +
 .../component/thymeleaf/ThymeleafEndpoint.java |  5 +
 .../apache/camel/component/tika/TikaEndpoint.java  |  5 +
 .../camel/component/timer/TimerEndpoint.java   |  5 +
 .../component/validator/ValidatorEndpoint.java |  5 +
 .../camel/component/velocity/VelocityEndpoint.java |  5 +
 .../apache/camel/component/wasm/WasmEndpoint.java  | 26 +++---
 .../org/apache/camel/component/xj/XJEndpoint.java  |  5 +
 .../component/xmlsecurity/XmlSignerEndpoint.java   |  5 +
 .../component/xmlsecurity/XmlVerifierEndpoint.java |  5 +
 .../component/xslt/saxon/XsltSaxonEndpoint.java|  5 +
 .../apache/camel/component/xslt/XsltEndpoint.java  |  5 +
 .../src/main/java/org/apache/camel/Endpoint.java   | 10 -
 .../camel/impl/console/EndpointDevConsole.java |  1 +
 .../api/management/mbean/ManagedEndpointMBean.java |  3 +++
 .../camel/management/mbean/ManagedEndpoint.java|  5 +
 .../camel/management/ManagedEndpointTest.java  |  5 +
 .../jbang/core/commands/process/ListEndpoint.java  |  3 +++
 71 files changed, 357 insertions(+), 33 deletions(-)

diff --git 
a/components/camel-ai/camel-djl/src/main/java/org/apache/camel/component/djl

(camel) branch er created (now 3342a351a70)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch er
in repository https://gitbox.apache.org/repos/asf/camel.git


  at 3342a351a70 CAMEL-20860: camel-core - Endpoint should have isRemote 
method

This branch includes the following new commits:

 new 3342a351a70 CAMEL-20860: camel-core - Endpoint should have isRemote 
method

The 1 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.

(camel) branch main updated: fix(sql-component): Fix sql component adoc (#14480)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 6ce1c8e2887 fix(sql-component): Fix sql component adoc (#14480)
6ce1c8e2887 is described below

commit 6ce1c8e288754d1220be337f7e827ddc6fe3f3d3
Author: Ricardo M 
AuthorDate: Tue Jun 11 11:47:24 2024 -0400

fix(sql-component): Fix sql component adoc (#14480)
---
 components/camel-sql/src/main/docs/sql-component.adoc | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/camel-sql/src/main/docs/sql-component.adoc 
b/components/camel-sql/src/main/docs/sql-component.adoc
index 9ba92b2f717..f9bb3b9c37b 100644
--- a/components/camel-sql/src/main/docs/sql-component.adoc
+++ b/components/camel-sql/src/main/docs/sql-component.adoc
@@ -357,7 +357,7 @@ from("direct:query")
 .to("mock:query");
 
 
-If the dynamic list of values is stored in the message body, you can use 
`(:#in:$+{body}+)` to
+If the dynamic list of values is stored in the message body, you can use 
`(:#in:$\{body\})` to
 refer to the message body, such as:
 
 [source,sql]
@@ -444,18 +444,18 @@ the second one is the message id (`String`).
 The option `tableName` can be used to use the default SQL queries but with a 
different table name.
 However, if you want to customize the SQL queries, then you can configure each 
of them individually.
 
-=== Orphan Lock aware Jdbc IdempotentRepository 
+=== Orphan Lock aware Jdbc IdempotentRepository
 
 One of the limitations of 
`org.apache.camel.processor.idempotent.jdbc.JdbcMessageIdRepository` is that it 
does not handle orphan locks resulting from JVM crash or non-graceful shutdown. 
This can result in unprocessed files/messages if this is implementation is used 
with camel-file, camel-ftp etc. if you need to address orphan locks processing 
then use
 
`org.apache.camel.processor.idempotent.jdbc.JdbcOrphanLockAwareIdempotentRepository`.
  This repository keeps track of the locks held by an instance of the 
application. For each lock held, the application will send keep-alive signals 
to the lock repository resulting in updating the createdAt column with the 
current Timestamp. When an application instance tries to acquire a lock, then 
there are three possibilities:
 
-* lock entry does not exist then the lock is provided using the base 
implementation of `JdbcMessageIdRepository`. 
+* lock entry does not exist then the lock is provided using the base 
implementation of `JdbcMessageIdRepository`.
 
 * lock already exists and the `createdAt` < `System.currentTimeMillis() - 
lockMaxAgeMillis`. In this case, it is assumed that an active instance has the 
lock and the lock is not provided to the new instance requesting the lock
 
 * lock already exists and the `createdAt` > = `System.currentTimeMillis() - 
lockMaxAgeMillis`. In this case, it is assumed that there is no active instance 
which has the lock and the lock is provided to the requesting instance. The 
reason behind is that if the original instance which had the lock, if it was 
still running, it would have updated the Timestamp on createdAt using its 
keepAlive mechanism
 
-This repository has two additional configuration parameters 
+This repository has two additional configuration parameters
 
 [cols="1,1"]
 |===
@@ -464,13 +464,13 @@ This repository has two additional configuration 
parameters
 |lockKeepAliveIntervalMillis | The frequency at which keep-alive updates are 
done to createdAt Timestamp column.
 |===
 
-=== Caching Jdbc IdempotentRepository 
+=== Caching Jdbc IdempotentRepository
 
 Some SQL implementations are not fast on a per-query basis.  The
 `JdbcMessageIdRepository` implementation does its idempotent checks
-individually within SQL transactions.  Checking a mere 100 keys can 
-take minutes.  The `JdbcCachedMessageIdRepository` preloads an in-memory 
-cache on start with the entire list of keys.  This cache is then 
+individually within SQL transactions.  Checking a mere 100 keys can
+take minutes.  The `JdbcCachedMessageIdRepository` preloads an in-memory
+cache on start with the entire list of keys.  This cache is then
 checked first before passing through to the original implementation.
 
 As with all cache implementations, there are considerations that should

(camel) branch main updated: CAMEL-20861: Default tracer now include details of when an exchange was sent to an endpoint including service location.

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 5c50ab7390b CAMEL-20861: Default tracer now include details of when an 
exchange was sent to an endpoint including service location.
5c50ab7390b is described below

commit 5c50ab7390bb1b70481f14aa90a6e23141eb8672
Author: Claus Ibsen 
AuthorDate: Tue Jun 11 16:14:47 2024 +0200

CAMEL-20861: Default tracer now include details of when an exchange was 
sent to an endpoint including service location.
---
 .../java/org/apache/camel/impl/engine/DefaultTracer.java | 16 +---
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java
 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java
index 70a44e5ac65..aa23da6ebeb 100644
--- 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java
+++ 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultTracer.java
@@ -134,12 +134,9 @@ public class DefaultTracer extends ServiceSupport 
implements CamelContextAware,
 
 StringJoiner sj = new StringJoiner(", ");
 sj.add("url=" + endpoint.toString());
-if (endpoint instanceof EndpointServiceLocation esl) {
+if (endpoint instanceof EndpointServiceLocation esl && 
esl.getServiceUrl() != null) {
 // enrich with service location
-String url = esl.getServiceUrl();
-if (url != null) {
-sj.add("service=" + url);
-}
+sj.add("service=" + esl.getServiceUrl());
 String protocol = esl.getServiceProtocol();
 if (protocol != null) {
 sj.add("protocol=" + protocol);
@@ -186,14 +183,11 @@ public class DefaultTracer extends ServiceSupport 
implements CamelContextAware,
 // enrich with endpoint service location on incoming request
 if (original) {
 Endpoint endpoint = exchange.getFromEndpoint();
-if (endpoint instanceof EndpointServiceLocation esl) {
+if (endpoint instanceof EndpointServiceLocation esl && 
esl.getServiceUrl() != null) {
+// enrich with service location
 StringJoiner sj = new StringJoiner(", ");
 sj.add("url=" + endpoint);
-// enrich with service location
-String url = esl.getServiceUrl();
-if (url != null) {
-sj.add("service=" + url);
-}
+sj.add("service=" + esl.getServiceUrl());
 String protocol = esl.getServiceProtocol();
 if (protocol != null) {
 sj.add("protocol=" + protocol);

(camel) branch main updated (2b088d37475 -> 3423a74322e)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from 2b088d37475 doc: Improve CoAP component description (#14420)
 add 3423a74322e camel-langchain4j-chat -  NPE if only producer is used 
(#14475)

No new revisions were added by this update.

Summary of changes:
 .../langchain4j/chat/LangChain4jChatProducer.java   | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

(camel-spring-boot) branch main updated: Regen

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git


The following commit(s) were added to refs/heads/main by this push:
 new 417b49297e3 Regen
417b49297e3 is described below

commit 417b49297e3800ed50b7754452147e5fa2a26eef
Author: Claus Ibsen 
AuthorDate: Tue Jun 11 13:29:00 2024 +0200

Regen
---
 .../org/apache/camel/springboot/catalog/components/coap+tcp.json  | 2 +-
 .../org/apache/camel/springboot/catalog/components/coap.json  | 2 +-
 .../org/apache/camel/springboot/catalog/components/coaps+tcp.json | 2 +-
 .../org/apache/camel/springboot/catalog/components/coaps.json | 2 +-
 .../springboot/catalog/components/elasticsearch-rest-client.json  | 6 ++
 .../apache/camel/coap/springboot/CoAPComponentConfiguration.java  | 3 ++-
 tooling/camel-spring-boot-dependencies/pom.xml| 8 
 7 files changed, 16 insertions(+), 9 deletions(-)

diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coap+tcp.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coap+tcp.json
index 584d9907309..9883f83955c 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coap+tcp.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coap+tcp.json
@@ -3,7 +3,7 @@
 "kind": "component",
 "name": "coap+tcp",
 "title": "CoAP",
-"description": "Send and receive messages to\/from COAP capable devices.",
+"description": "Send and receive messages to\/from CoAP (Constrained 
Application Protocol) capable devices.",
 "deprecated": false,
 "firstVersion": "2.16.0",
 "label": "iot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coap.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coap.json
index 231f4fa4db9..02e6404c91e 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coap.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coap.json
@@ -3,7 +3,7 @@
 "kind": "component",
 "name": "coap",
 "title": "CoAP",
-"description": "Send and receive messages to\/from COAP capable devices.",
+"description": "Send and receive messages to\/from CoAP (Constrained 
Application Protocol) capable devices.",
 "deprecated": false,
 "firstVersion": "2.16.0",
 "label": "iot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coaps+tcp.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coaps+tcp.json
index 96178603fe1..c5f6f046344 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coaps+tcp.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coaps+tcp.json
@@ -3,7 +3,7 @@
 "kind": "component",
 "name": "coaps+tcp",
 "title": "CoAP",
-"description": "Send and receive messages to\/from COAP capable devices.",
+"description": "Send and receive messages to\/from CoAP (Constrained 
Application Protocol) capable devices.",
 "deprecated": false,
 "firstVersion": "2.16.0",
 "label": "iot",
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coaps.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coaps.json
index 0e2eac0caa9..4d5e07bbfac 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coaps.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coaps.json
@@ -3,7 +3,7 @@
 "kind": "component",
 "name": "coaps",
 "title": "CoAP (Secure)",
-"description": "Send and receive messages to\/from COAP c

(camel) branch main updated: doc: Improve CoAP component description (#14420)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 2b088d37475 doc: Improve CoAP component description (#14420)
2b088d37475 is described below

commit 2b088d37475c9af9223806da203eaab3f1e6f586
Author: Aurélien Pupier 
AuthorDate: Tue Jun 11 13:21:41 2024 +0200

doc: Improve CoAP component description (#14420)

Signed-off-by: Aurélien Pupier 
---
 .../apache/camel/catalog/components/coap+tcp.json   |  2 +-
 .../org/apache/camel/catalog/components/coap.json   |  2 +-
 .../apache/camel/catalog/components/coaps+tcp.json  |  2 +-
 .../org/apache/camel/catalog/components/coaps.json  |  2 +-
 .../META-INF/org/apache/camel/coap/coap+tcp.json|  2 +-
 .../META-INF/org/apache/camel/coap/coap.json|  2 +-
 .../META-INF/org/apache/camel/coap/coaps+tcp.json   |  2 +-
 .../META-INF/org/apache/camel/coap/coaps.json   |  2 +-
 .../camel-coap/src/main/docs/coap-component.adoc|  2 +-
 .../java/org/apache/camel/coap/CoAPEndpoint.java|  2 +-
 .../builder/component/ComponentsBuilderFactory.java | 12 
 .../component/dsl/CoapComponentBuilderFactory.java  |  6 --
 .../dsl/CoapTcpComponentBuilderFactory.java |  6 --
 .../component/dsl/CoapsComponentBuilderFactory.java |  6 --
 .../dsl/CoapsTcpComponentBuilderFactory.java|  6 --
 .../builder/endpoint/StaticEndpointBuilders.java| 15 ++-
 .../endpoint/dsl/CoAPEndpointBuilderFactory.java| 21 ++---
 .../apache/camel/kotlin/components/CoapUriDsl.kt|  2 +-
 18 files changed, 59 insertions(+), 35 deletions(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coap+tcp.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coap+tcp.json
index d31065b6fd9..d8c62342a45 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coap+tcp.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coap+tcp.json
@@ -3,7 +3,7 @@
 "kind": "component",
 "name": "coap+tcp",
 "title": "CoAP",
-"description": "Send and receive messages to\/from COAP capable devices.",
+"description": "Send and receive messages to\/from CoAP (Constrained 
Application Protocol) capable devices.",
 "deprecated": false,
 "firstVersion": "2.16.0",
 "label": "iot",
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coap.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coap.json
index b047b5b9578..43519f789bf 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coap.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coap.json
@@ -3,7 +3,7 @@
 "kind": "component",
 "name": "coap",
 "title": "CoAP",
-"description": "Send and receive messages to\/from COAP capable devices.",
+"description": "Send and receive messages to\/from CoAP (Constrained 
Application Protocol) capable devices.",
 "deprecated": false,
 "firstVersion": "2.16.0",
 "label": "iot",
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coaps+tcp.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coaps+tcp.json
index 7694aff1e7f..a3f18c78073 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coaps+tcp.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coaps+tcp.json
@@ -3,7 +3,7 @@
 "kind": "component",
 "name": "coaps+tcp",
 "title": "CoAP",
-"description": "Send and receive messages to\/from COAP capable devices.",
+"description": "Send and receive messages to\/from CoAP (Constrained 
Application Protocol) capable devices.",
 "deprecated": false,
 "firstVersion": "2.16.0",
 "label": "iot",
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coaps.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coaps.json
index 9d81d63d579..27019fe41f9 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/coaps.

(camel) branch main updated (2392950a8e0 -> 68c96770673)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from 2392950a8e0 chore(deps): Bump io.nats:jnats from 2.18.1 to 2.19.0 
(#14473)
 add 68c96770673 chore(deps-dev): Bump com.nimbusds:nimbus-jose-jwt from 
9.39.3 to 9.40 (#14472)

No new revisions were added by this update.

Summary of changes:
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(camel) branch main updated: chore(deps): Bump io.nats:jnats from 2.18.1 to 2.19.0 (#14473)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 2392950a8e0 chore(deps): Bump io.nats:jnats from 2.18.1 to 2.19.0 
(#14473)
2392950a8e0 is described below

commit 2392950a8e001f623429f506dff6f4aa94930a27
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Jun 11 13:21:09 2024 +0200

chore(deps): Bump io.nats:jnats from 2.18.1 to 2.19.0 (#14473)

Bumps [io.nats:jnats](https://github.com/nats-io/nats.java) from 2.18.1 to 
2.19.0.
- [Release notes](https://github.com/nats-io/nats.java/releases)
- [Changelog](https://github.com/nats-io/nats.java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nats-io/nats.java/compare/2.18.1...2.19.0)

---
updated-dependencies:
- dependency-name: io.nats:jnats
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index eddcba66eba..f545803c291 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -244,7 +244,7 @@
 1.9.3
 0.1.9
 2.9.0
-2.18.1
+2.19.0
 3.1.0
 0.22
 3.13.10

(camel) branch CAMEL-20798-AWS-full deleted (was 5f8e413a3b4)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch CAMEL-20798-AWS-full
in repository https://gitbox.apache.org/repos/asf/camel.git


 was 5f8e413a3b4 CAMEL-20798: EndpointServiceLocation on components to make 
it possible to know which remote system Camel connects to to assist for 
monitoring and observability - AWS Athena

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

(camel) branch main updated: CAMEL-20798: EndpointServiceLocation on components to make it possible to know which remote system Camel connects to to assist for monitoring and observability - Athena an

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new dedeb656fb2 CAMEL-20798: EndpointServiceLocation on components to make 
it possible to know which remote system Camel connects to to assist for 
monitoring and observability - Athena and Secrets Manager (#14474)
dedeb656fb2 is described below

commit dedeb656fb26c5baef631053cc8883502f1bd258
Author: Andrea Cosentino 
AuthorDate: Tue Jun 11 13:20:47 2024 +0200

CAMEL-20798: EndpointServiceLocation on components to make it possible to 
know which remote system Camel connects to to assist for monitoring and 
observability - Athena and Secrets Manager (#14474)

* CAMEL-20798: EndpointServiceLocation on components to make it possible to 
know which remote system Camel connects to to assist for monitoring and 
observability - AWS Secrets Manager

Signed-off-by: Andrea Cosentino 

* CAMEL-20798: EndpointServiceLocation on components to make it possible to 
know which remote system Camel connects to to assist for monitoring and 
observability - AWS Athena

Signed-off-by: Andrea Cosentino 

* CAMEL-20798: EndpointServiceLocation on components to make it possible to 
know which remote system Camel connects to to assist for monitoring and 
observability - AWS Athena

Signed-off-by: Andrea Cosentino 

-

Signed-off-by: Andrea Cosentino 
---
 .../aws/secretsmanager/SecretsManagerEndpoint.java | 20 -
 .../component/aws2/athena/Athena2Endpoint.java | 26 +-
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git 
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpoint.java
 
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpoint.java
index 126712b1456..36305267539 100644
--- 
a/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpoint.java
+++ 
b/components/camel-aws/camel-aws-secrets-manager/src/main/java/org/apache/camel/component/aws/secretsmanager/SecretsManagerEndpoint.java
@@ -22,6 +22,7 @@ import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import 
org.apache.camel.component.aws.secretsmanager.client.SecretsManagerClientFactory;
+import org.apache.camel.spi.EndpointServiceLocation;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
@@ -38,7 +39,7 @@ import 
software.amazon.awssdk.services.secretsmanager.SecretsManagerClient;
 @Metadata(annotations = {
 "vault=aws-secrets-manager",
 })
-public class SecretsManagerEndpoint extends ScheduledPollEndpoint {
+public class SecretsManagerEndpoint extends ScheduledPollEndpoint implements 
EndpointServiceLocation {
 
 private SecretsManagerClient secretsManagerClient;
 
@@ -91,4 +92,21 @@ public class SecretsManagerEndpoint extends 
ScheduledPollEndpoint {
 public SecretsManagerClient getSecretsManagerClient() {
 return secretsManagerClient;
 }
+
+@Override
+public String getServiceUrl() {
+if (!configuration.isOverrideEndpoint()) {
+if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
+return configuration.getRegion();
+}
+} else if 
(ObjectHelper.isNotEmpty(configuration.getUriEndpointOverride())) {
+return configuration.getUriEndpointOverride();
+}
+return null;
+}
+
+@Override
+public String getServiceProtocol() {
+return "secrets-manager";
+}
 }
diff --git 
a/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Endpoint.java
 
b/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Endpoint.java
index 2e5a3dedc4a..7eaa695946f 100644
--- 
a/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Endpoint.java
+++ 
b/components/camel-aws/camel-aws2-athena/src/main/java/org/apache/camel/component/aws2/athena/Athena2Endpoint.java
@@ -16,12 +16,15 @@
  */
 package org.apache.camel.component.aws2.athena;
 
+import java.util.Map;
+
 import org.apache.camel.Category;
 import org.apache.camel.Component;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.component.aws2.athena.client.Athena2ClientFactory;
+import org.apache.camel.spi.EndpointServiceLocation;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.support.DefaultEndpoint;
@@ -

(camel) branch main updated (0806e757a7d -> 744418a49f1)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from 0806e757a7d chore(deps): Bump californium-version from 3.11.0 to 
3.12.0 (#14470)
 add 744418a49f1 chore(deps): Bump com.github.beanio:beanio from 3.0.1 to 
3.0.2 (#14471)

No new revisions were added by this update.

Summary of changes:
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(camel) branch main updated (f08d4f1c727 -> 0806e757a7d)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from f08d4f1c727 chore(deps-dev): Bump io.projectreactor:reactor-core from 
3.6.6 to 3.6.7 (#14469)
 add 0806e757a7d chore(deps): Bump californium-version from 3.11.0 to 
3.12.0 (#14470)

No new revisions were added by this update.

Summary of changes:
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(camel) branch main updated (e0691d5bdfa -> f08d4f1c727)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from e0691d5bdfa chore(deps): Bump 
com.google.cloud:google-cloud-secretmanager-bom (#14468)
 add f08d4f1c727 chore(deps-dev): Bump io.projectreactor:reactor-core from 
3.6.6 to 3.6.7 (#14469)

No new revisions were added by this update.

Summary of changes:
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(camel) branch main updated: chore(deps): Bump com.google.cloud:google-cloud-secretmanager-bom (#14468)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new e0691d5bdfa chore(deps): Bump 
com.google.cloud:google-cloud-secretmanager-bom (#14468)
e0691d5bdfa is described below

commit e0691d5bdfa18cd1f9d9bd3a1c82579731e454f6
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Jun 11 12:13:57 2024 +0200

chore(deps): Bump com.google.cloud:google-cloud-secretmanager-bom (#14468)

Bumps com.google.cloud:google-cloud-secretmanager-bom from 2.44.0 to 2.45.0.

---
updated-dependencies:
- dependency-name: com.google.cloud:google-cloud-secretmanager-bom
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 3f02c4b69b5..1202817c314 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -192,7 +192,7 @@
 26.40.0
 
2.47.0
 
1.44.2
-
2.44.0
+
2.45.0
 24.0.1
 22.1
 2.0.1

(camel) branch main updated (e5814076263 -> a9ffbc1e997)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from e5814076263 chore(deps): Bump com.box:box-java-sdk from 4.9.1 to 4.10.0
 add a9ffbc1e997 CAMEL-20861: Default tracer now include details of when an 
exchange was sent to an endpoint including service location.

No new revisions were added by this update.

Summary of changes:
 .../apache/camel/impl/engine/DefaultTracer.java| 35 --
 1 file changed, 32 insertions(+), 3 deletions(-)

(camel) branch sl2 deleted (was 808dfd78b8d)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch sl2
in repository https://gitbox.apache.org/repos/asf/camel.git


 was 808dfd78b8d CAMEL-20861: Default tracer now include details of when an 
exchange was sent to an endpoint including service location.

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

(camel) branch main updated (53d9e995d67 -> c4d201b9502)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from 53d9e995d67 chore(deps): Bump com.github.mwiede:jsch from 0.2.17 to 
0.2.18
 add c4d201b9502 CAMEL-20861: Default tracer now include details of when an 
exchange was sent to an endpoint including service location. (#14465)

No new revisions were added by this update.

Summary of changes:
 .../src/main/java/org/apache/camel/spi/Tracer.java | 11 +
 .../camel/impl/engine/CamelInternalProcessor.java  | 57 +++---
 .../apache/camel/impl/engine/DefaultChannel.java   |  2 +-
 .../apache/camel/impl/engine/DefaultTracer.java| 51 +++
 4 files changed, 102 insertions(+), 19 deletions(-)

(camel) branch main updated: chore(deps): Bump org.apache.camel.k:camel-k-crds from 2.3.2 to 2.3.3 (#14454)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 47217bef88c chore(deps): Bump org.apache.camel.k:camel-k-crds from 
2.3.2 to 2.3.3 (#14454)
47217bef88c is described below

commit 47217bef88cc944d6057389d9bfdcc0c3fbf2f7f
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Jun 11 11:47:45 2024 +0200

chore(deps): Bump org.apache.camel.k:camel-k-crds from 2.3.2 to 2.3.3 
(#14454)

Bumps [org.apache.camel.k:camel-k-crds](https://github.com/apache/camel-k) 
from 2.3.2 to 2.3.3.
- [Release notes](https://github.com/apache/camel-k/releases)
- [Changelog](https://github.com/apache/camel-k/blob/main/CHANGELOG.md)
- [Commits](https://github.com/apache/camel-k/compare/v2.3.2...v2.3.3)

---
updated-dependencies:
- dependency-name: org.apache.camel.k:camel-k-crds
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index c095e164e0e..47912d11367 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -91,7 +91,7 @@
 3.11.0
 3.11.0
 7.21.0
-2.3.2
+2.3.3
 4.17.0
 1.2
 3.3.0

(camel) branch sl2 created (now 808dfd78b8d)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch sl2
in repository https://gitbox.apache.org/repos/asf/camel.git


  at 808dfd78b8d CAMEL-20861: Default tracer now include details of when an 
exchange was sent to an endpoint including service location.

This branch includes the following new commits:

 new 808dfd78b8d CAMEL-20861: Default tracer now include details of when an 
exchange was sent to an endpoint including service location.

The 1 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.

(camel) 01/01: CAMEL-20861: Default tracer now include details of when an exchange was sent to an endpoint including service location.

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch sl2
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 808dfd78b8d3fa44ad09aca438f050386bb7ca8c
Author: Claus Ibsen 
AuthorDate: Tue Jun 11 11:34:24 2024 +0200

CAMEL-20861: Default tracer now include details of when an exchange was 
sent to an endpoint including service location.
---
 .../src/main/java/org/apache/camel/spi/Tracer.java | 11 +
 .../camel/impl/engine/CamelInternalProcessor.java  | 57 +++---
 .../apache/camel/impl/engine/DefaultChannel.java   |  2 +-
 .../apache/camel/impl/engine/DefaultTracer.java| 51 +++
 4 files changed, 102 insertions(+), 19 deletions(-)

diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/Tracer.java 
b/core/camel-api/src/main/java/org/apache/camel/spi/Tracer.java
index fa168a65389..b96558832ae 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/Tracer.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/Tracer.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.spi;
 
+import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.NamedNode;
 import org.apache.camel.NamedRoute;
@@ -58,6 +59,16 @@ public interface Tracer extends StaticService {
  */
 void traceAfterNode(NamedNode node, Exchange exchange);
 
+/**
+ * Trace when an Exchange was sent to a given endpoint
+ *
+ * @param node the node EIP
+ * @param exchange the exchange
+ * @param endpoint the endpoint the exchange was sent to
+ * @param elapsed  time in millis for sending the exchange
+ */
+void traceSentNode(NamedNode node, Exchange exchange, Endpoint endpoint, 
long elapsed);
+
 /**
  * Trace after the route (eg output from route)
  *
diff --git 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
index 235fd733b83..2e57acf3554 100644
--- 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
+++ 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
@@ -569,7 +569,7 @@ public class CamelInternalProcessor extends 
DelegateAsyncProcessor implements In
 public static final class BacklogTracerAdvice
 implements 
CamelInternalProcessorAdvice {
 
-private final BacklogTraceAdviceEventNotifier notifier;
+private final TraceAdviceEventNotifier notifier;
 private final CamelContext camelContext;
 private final BacklogTracer backlogTracer;
 private final NamedNode processorDefinition;
@@ -605,14 +605,14 @@ public class CamelInternalProcessor extends 
DelegateAsyncProcessor implements In
 this.notifier = getOrCreateEventNotifier(camelContext);
 }
 
-private BacklogTraceAdviceEventNotifier 
getOrCreateEventNotifier(CamelContext camelContext) {
+private TraceAdviceEventNotifier getOrCreateEventNotifier(CamelContext 
camelContext) {
 // use a single instance of this event notifier
 for (EventNotifier en : 
camelContext.getManagementStrategy().getEventNotifiers()) {
-if (en instanceof BacklogTraceAdviceEventNotifier) {
-return (BacklogTraceAdviceEventNotifier) en;
+if (en instanceof TraceAdviceEventNotifier) {
+return (TraceAdviceEventNotifier) en;
 }
 }
-BacklogTraceAdviceEventNotifier answer = new 
BacklogTraceAdviceEventNotifier();
+TraceAdviceEventNotifier answer = new TraceAdviceEventNotifier();
 camelContext.getManagementStrategy().addEventNotifier(answer);
 return answer;
 }
@@ -1066,15 +1066,17 @@ public class CamelInternalProcessor extends 
DelegateAsyncProcessor implements In
 /**
  * Advice for tracing
  */
-public static class TracingAdvice implements 
CamelInternalProcessorAdvice {
+public static class TracingAdvice implements 
CamelInternalProcessorAdvice {
 
+private final TraceAdviceEventNotifier notifier;
 private final Tracer tracer;
 private final NamedNode processorDefinition;
 private final NamedRoute routeDefinition;
 private final Synchronization tracingAfterRoute;
 private final boolean skip;
 
-public TracingAdvice(Tracer tracer, NamedNode processorDefinition, 
NamedRoute routeDefinition, boolean first) {
+public TracingAdvice(CamelContext camelContext, Tracer tracer, 
NamedNode processorDefinition,
+ NamedRoute routeDefinition, boolean first) {
 this.tracer = tracer;
 this.processorDefinition = processorDefinition;
 this.routeDefinition = routeDefinition;
@@ -1099,11 +1101,28

(camel) branch main updated (3c943f40e64 -> d2e9f3a35ea)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from 3c943f40e64 chore(deps): Bump io.github.classgraph:classgraph (#14455)
 add d2e9f3a35ea chore(deps): Bump org.opensearch.client:opensearch-java 
(#14456)

No new revisions were added by this update.

Summary of changes:
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(camel) branch main updated (20457c625a7 -> 3c943f40e64)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from 20457c625a7 chore(deps): Bump com.arangodb:arangodb-java-driver from 
7.6.0 to 7.7.0 (#14457)
 add 3c943f40e64 chore(deps): Bump io.github.classgraph:classgraph (#14455)

No new revisions were added by this update.

Summary of changes:
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(camel) branch main updated (a940fb14d10 -> 20457c625a7)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from a940fb14d10 chore(deps): Bump lucene-version from 9.10.0 to 9.11.0 
(#14452)
 add 20457c625a7 chore(deps): Bump com.arangodb:arangodb-java-driver from 
7.6.0 to 7.7.0 (#14457)

No new revisions were added by this update.

Summary of changes:
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(camel) branch main updated (7b96964c8a3 -> a940fb14d10)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from 7b96964c8a3 chore(deps): Bump commons-net:commons-net from 3.11.0 to 
3.11.1 (#14450)
 add a940fb14d10 chore(deps): Bump lucene-version from 9.10.0 to 9.11.0 
(#14452)

No new revisions were added by this update.

Summary of changes:
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(camel) branch main updated (0a74d63ca4e -> 7b96964c8a3)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from 0a74d63ca4e chore(deps): Bump micrometer-version from 1.13.0 to 1.13.1 
(#14453)
 add 7b96964c8a3 chore(deps): Bump commons-net:commons-net from 3.11.0 to 
3.11.1 (#14450)

No new revisions were added by this update.

Summary of changes:
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(camel) branch main updated (195246eb066 -> 0a74d63ca4e)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from 195246eb066 chore(deps): Bump aws-java-sdk2-version from 2.25.69 to 
2.25.70 (#14451)
 add 0a74d63ca4e chore(deps): Bump micrometer-version from 1.13.0 to 1.13.1 
(#14453)

No new revisions were added by this update.

Summary of changes:
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(camel) branch main updated (4f66f20e63f -> 195246eb066)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from 4f66f20e63f CAMEL-20859: dump routes should keep middle name
 add 195246eb066 chore(deps): Bump aws-java-sdk2-version from 2.25.69 to 
2.25.70 (#14451)

No new revisions were added by this update.

Summary of changes:
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(camel) branch main updated: CAMEL-20859: dump routes should keep middle name

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 4f66f20e63f CAMEL-20859: dump routes should keep middle name
4f66f20e63f is described below

commit 4f66f20e63f9b4e4fe7208fc74f70c02d3bf715a
Author: Claus Ibsen 
AuthorDate: Tue Jun 11 08:00:32 2024 +0200

CAMEL-20859: dump routes should keep middle name
---
 .../src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
 
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
index 81da7ca1925..2e87a16060d 100644
--- 
a/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
+++ 
b/core/camel-core-engine/src/main/java/org/apache/camel/impl/DefaultDumpRoutesStrategy.java
@@ -648,7 +648,7 @@ public class DefaultDumpRoutesStrategy extends 
ServiceSupport implements DumpRou
 if (name.contains(":")) {
 name = StringHelper.after(name, ":");
 }
-return FileUtil.onlyName(name) + "." + ext;
+return FileUtil.onlyName(name, true) + "." + ext;
 }
 
 }

(camel-spring-boot) branch main updated: Regen

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git


The following commit(s) were added to refs/heads/main by this push:
 new 00373971e93 Regen
00373971e93 is described below

commit 00373971e93cbd404d523d0363536cedd4454ba6
Author: Claus Ibsen 
AuthorDate: Tue Jun 11 07:13:00 2024 +0200

Regen
---
 .../components/elasticsearch-rest-client.json  |  14 ++-
 .../src/main/docs/elasticsearch-rest-client.json   |  65 +++
 ...searchRestClientComponentAutoConfiguration.java |   2 +-
 ...sticsearchRestClientComponentConfiguration.java | 122 +
 .../ElasticsearchRestClientComponentConverter.java |  65 +++
 ...rk.boot.autoconfigure.AutoConfiguration.imports |   3 +-
 6 files changed, 267 insertions(+), 4 deletions(-)

diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch-rest-client.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch-rest-client.json
index dd1dbda3bd0..fe3151ddda5 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch-rest-client.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch-rest-client.json
@@ -23,8 +23,18 @@
 "remote": true
   },
   "componentProperties": {
-"lazyStartProducer": { "index": 0, "kind": "property", "displayName": 
"Lazy Start Producer", "group": "producer", "label": "producer", "required": 
false, "type": "boolean", "javaType": "boolean", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": false, "description": 
"Whether the producer should be started lazy (on the first message). By 
starting lazy you can use this to allow CamelContext and routes to startup in 
situations where a producer may otherwise fail [...]
-"autowiredEnabled": { "index": 1, "kind": "property", "displayName": 
"Autowired Enabled", "group": "advanced", "label": "advanced", "required": 
false, "type": "boolean", "javaType": "boolean", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": true, "description": 
"Whether autowiring is enabled. This is used for automatic autowiring options 
(the option must be marked as autowired) by looking up in the registry to find 
if there is a single instance of matching t [...]
+"connectionTimeout": { "index": 0, "kind": "property", "displayName": 
"Connection Timeout", "group": "producer", "label": "", "required": false, 
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": 3, "description": "Connection timeout" },
+"hostAddressesList": { "index": 1, "kind": "property", "displayName": 
"Host Addresses List", "group": "producer", "label": "", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "List of host Addresses, 
multiple hosts can be separated by comma." },
+"lazyStartProducer": { "index": 2, "kind": "property", "displayName": 
"Lazy Start Producer", "group": "producer", "label": "producer", "required": 
false, "type": "boolean", "javaType": "boolean", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": false, "description": 
"Whether the producer should be started lazy (on the first message). By 
starting lazy you can use this to allow CamelContext and routes to startup in 
situations where a producer may otherwise fail [...]
+"socketTimeout": { "index": 3, "kind": "property", "displayName": "Socket 
Timeout", "group": "

(camel) branch main updated: CAMEL-20722 - change base class + enable on more CI archs (#14438)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 60377bbae7e CAMEL-20722 - change base class + enable on more CI archs 
(#14438)
60377bbae7e is described below

commit 60377bbae7e9bf62edb1522851a9cf6bf5ea9a4c
Author: Jang-Vijay Singh 
AuthorDate: Mon Jun 10 17:34:41 2024 +0100

CAMEL-20722 - change base class + enable on more CI archs (#14438)

- the base class change for test
KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT is to get rid
of symptom NoSuchElementException
- Same reason as PR: https://github.com/apache/camel/pull/14376
---
 .../integration/KafkaBreakOnFirstErrorSeekIssueIT.java |  2 +-
 ...reakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java | 14 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git 
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java
 
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java
index 93fb7c4e26f..33db5d1e3c7 100644
--- 
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java
+++ 
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java
@@ -54,7 +54,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  */
 @Tags({ @Tag("breakOnFirstError") })
 @EnabledOnOs(value = { OS.LINUX, OS.MAC, OS.FREEBSD, OS.OPENBSD, OS.WINDOWS },
- architectures = { "amd64", "aarch64" },
+ architectures = { "amd64", "aarch64", "ppc64le" },
  disabledReason = "This test does not run reliably on some 
platforms")
 
 class KafkaBreakOnFirstErrorSeekIssueIT extends BaseKafkaTestSupport {
diff --git 
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java
 
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java
index 10b96fad61f..045968b41a4 100644
--- 
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java
+++ 
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.java
@@ -29,13 +29,13 @@ import 
org.apache.camel.component.kafka.MockConsumerInterceptor;
 import org.apache.camel.component.kafka.testutil.CamelKafkaUtil;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.Uuid;
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Tags;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
 import org.junit.jupiter.api.condition.EnabledOnOs;
 import org.junit.jupiter.api.condition.OS;
 import org.slf4j.Logger;
@@ -49,13 +49,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
  */
 @Tags({ @Tag("breakOnFirstError") })
 @EnabledOnOs(value = { OS.LINUX, OS.MAC, OS.FREEBSD, OS.OPENBSD, OS.WINDOWS },
- architectures = { "amd64", "aarch64" },
+ architectures = { "amd64", "aarch64", "ppc64le" },
  disabledReason = "This test does not run reliably on some 
platforms")
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*",
-  disabledReason = "CAMEL-20722: Too unreliable on 
most of the CI environments")
-class KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT extends 
BaseExclusiveKafkaTestSupport {
+
+class KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT extends 
BaseKafkaTestSupport {
 public static final String ROUTE_ID = "breakOnFirstErrorBatchIT";
-public static final String TOPIC = "breakOnFirstErrorBatchIT";
+public static final String TOPIC = "breakOnFirstErrorBatchIT" + 
Uuid.randomUuid();
 
 private static final Logger LOG = 
LoggerFactory.getLogger(KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT.class);
 
@@ -101,7 +100,8 @@ class 
KafkaBreakOnFirstErrorWithBatchUsingAsyncCommitManagerIT extends BaseExclu
 
contextExtension.getContext().getRouteController().startRoute(ROUTE_ID);
 
 Awaitility.await()
-.atMost(10, TimeUnit.SECONDS) // changed to 10 sec

(camel) branch main updated: camel-sql - Add test based on user forum issue

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 47fc4aec108 camel-sql - Add test based on user forum issue
47fc4aec108 is described below

commit 47fc4aec108eedd1ec1d715effc4a42eb8321d2d
Author: Claus Ibsen 
AuthorDate: Mon Jun 10 17:28:08 2024 +0200

camel-sql - Add test based on user forum issue
---
 .../camel-sql/src/main/docs/sql-component.adoc |  12 ++
 .../camel/component/sql/SqlProducerInBodyTest.java | 130 +
 .../test/resources/sql/selectProjectsInBody.sql|  22 
 3 files changed, 164 insertions(+)

diff --git a/components/camel-sql/src/main/docs/sql-component.adoc 
b/components/camel-sql/src/main/docs/sql-component.adoc
index d2016b0d357..9ba92b2f717 100644
--- a/components/camel-sql/src/main/docs/sql-component.adoc
+++ b/components/camel-sql/src/main/docs/sql-component.adoc
@@ -357,6 +357,18 @@ from("direct:query")
 .to("mock:query");
 
 
+If the dynamic list of values is stored in the message body, you can use 
`(:#in:$+{body}+)` to
+refer to the message body, such as:
+
+[source,sql]
+
+-- this is a comment
+select *
+from projects
+where project in (:#in:${body})
+order by id
+
+
 == Using the JDBC-based idempotent repository
 
 In this section, we will use the JDBC-based idempotent repository.
diff --git 
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInBodyTest.java
 
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInBodyTest.java
new file mode 100644
index 000..899aedaf8a2
--- /dev/null
+++ 
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInBodyTest.java
@@ -0,0 +1,130 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.sql;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class SqlProducerInBodyTest extends CamelTestSupport {
+
+EmbeddedDatabase db;
+
+@Override
+@BeforeEach
+public void setUp() throws Exception {
+db = new EmbeddedDatabaseBuilder()
+.setName(getClass().getSimpleName())
+.setType(EmbeddedDatabaseType.H2)
+.addScript("sql/createAndPopulateDatabase.sql").build();
+
+super.setUp();
+}
+
+@Override
+@AfterEach
+public void tearDown() throws Exception {
+super.tearDown();
+
+if (db != null) {
+db.shutdown();
+}
+}
+
+@Test
+public void testQueryInArray() throws InterruptedException {
+MockEndpoint mock = getMockEndpoint("mock:query");
+mock.expectedMessageCount(1);
+
+template.requestBody("direct:query", new String[] { "Camel", "AMQ" });
+
+MockEndpoint.assertIsSatisfied(context);
+
+List list = 
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+assertEquals(2, list.size());
+Map row = (Map) list.get(0);
+assertEquals("Camel", row.get("PROJECT"));
+row = (Map) list.get(1);
+assertEquals("AMQ", row.get("PROJECT"));
+}
+
+@Test
+public void testQueryInList() throws InterruptedException {
+MockEndpoint mock = getMockEndpoint("mock:query");
+mock.expectedMessageCount(1);
+
+List names = new ArrayList<>();
+names.add("Camel&qu

(camel) branch main updated: CAMEL-20846: Add capability to configure elasticsearch-rest-client with component options (#14446)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 251aa272bf1 CAMEL-20846: Add capability to configure 
elasticsearch-rest-client with component options (#14446)
251aa272bf1 is described below

commit 251aa272bf1584121fdb0e21b6d67b686a51f1f6
Author: James Netherton 
AuthorDate: Mon Jun 10 16:02:17 2024 +0100

CAMEL-20846: Add capability to configure elasticsearch-rest-client with 
component options (#14446)
---
 .../components/elasticsearch-rest-client.json  |  14 +-
 ...ElasticsearchRestClientComponentConfigurer.java |  59 +++
 .../rest/client/elasticsearch-rest-client.json |  14 +-
 .../client/ElasticsearchRestClientComponent.java   | 146 -
 ...SearchRestClientComponentConfigurationTest.java |  66 
 ...ticsearchRestClientComponentBuilderFactory.java | 175 +
 6 files changed, 469 insertions(+), 5 deletions(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch-rest-client.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch-rest-client.json
index 6edf65e32ae..a36af6dc55d 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch-rest-client.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/elasticsearch-rest-client.json
@@ -23,8 +23,18 @@
 "remote": true
   },
   "componentProperties": {
-"lazyStartProducer": { "index": 0, "kind": "property", "displayName": 
"Lazy Start Producer", "group": "producer", "label": "producer", "required": 
false, "type": "boolean", "javaType": "boolean", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": false, "description": 
"Whether the producer should be started lazy (on the first message). By 
starting lazy you can use this to allow CamelContext and routes to startup in 
situations where a producer may otherwise fail [...]
-"autowiredEnabled": { "index": 1, "kind": "property", "displayName": 
"Autowired Enabled", "group": "advanced", "label": "advanced", "required": 
false, "type": "boolean", "javaType": "boolean", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": true, "description": 
"Whether autowiring is enabled. This is used for automatic autowiring options 
(the option must be marked as autowired) by looking up in the registry to find 
if there is a single instance of matching t [...]
+"connectionTimeout": { "index": 0, "kind": "property", "displayName": 
"Connection Timeout", "group": "producer", "label": "", "required": false, 
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false, 
"secret": false, "defaultValue": 3, "description": "Connection timeout" },
+"hostAddressesList": { "index": 1, "kind": "property", "displayName": 
"Host Addresses List", "group": "producer", "label": "", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "List of host Addresses, 
multiple hosts can be separated by comma." },
+"lazyStartProducer": { "index": 2, "kind": "property", "displayName": 
"Lazy Start Producer", "group": "producer", "label": "producer", "required": 
false, "type": "boolean", "javaType": "boolean", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": false, "description": 
"Whether the producer should be started lazy (on the first message). By 
starting lazy you can use this to allow CamelContext and routes to startup in 
situations where a producer may otherwise fail [...]
+"socketTimeout": { "index": 3, "kind": "property&

(camel) branch main updated: Use the correct camel spring boot starter for camel export (#14448)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new a4d7f6563c2 Use the correct camel spring boot starter for camel export 
(#14448)
a4d7f6563c2 is described below

commit a4d7f6563c2edccc3b09d4053c7cfc5bc4b8b05d
Author: Federico Mariani <34543311+cro...@users.noreply.github.com>
AuthorDate: Mon Jun 10 17:01:49 2024 +0200

Use the correct camel spring boot starter for camel export (#14448)
---
 .../camel-jbang-core/src/main/resources/templates/spring-boot-pom.tmpl  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-pom.tmpl
 
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-pom.tmpl
index ebd8c6f2995..15281778d47 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-pom.tmpl
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/spring-boot-pom.tmpl
@@ -54,7 +54,7 @@
 
 
 org.apache.camel.springboot
-camel-spring-boot-engine-starter
+camel-spring-boot-starter
 
 {{ .CamelDependencies }}
 

(camel) branch main updated (b295b5134ee -> 0debc6298b0)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from b295b5134ee Add endpoint service location to backlog tracing (#14447)
 add 0debc6298b0 Regen

No new revisions were added by this update.

Summary of changes:
 .../src/generated/resources/org/apache/camel/catalog/others.properties   | 1 +
 .../resources/org/apache/camel/catalog/others}/openapi-validator.json| 0
 2 files changed, 1 insertion(+)
 copy {components/camel-openapi-validator/src/generated/resources => 
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/openapi-validator.json
 (100%)

(camel) branch sl deleted (was 148870d655f)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch sl
in repository https://gitbox.apache.org/repos/asf/camel.git


 was 148870d655f CAMEL-20842: Add endpoint service location to backlog 
tracing

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

(camel) branch main updated: Add endpoint service location to backlog tracing (#14447)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new b295b5134ee Add endpoint service location to backlog tracing (#14447)
b295b5134ee is described below

commit b295b5134eea65995dffb4f7ddc9c905c06d0ac1
Author: Claus Ibsen 
AuthorDate: Mon Jun 10 16:20:16 2024 +0200

Add endpoint service location to backlog tracing (#14447)

CAMEL-20842: Add endpoint service location to backlog tracing
---
 .../camel/spi/BacklogTracerEventMessage.java   | 26 ++
 .../apache/camel/spi/EndpointServiceLocation.java  |  2 +-
 .../debugger/DefaultBacklogTracerEventMessage.java | 57 ++
 .../camel/impl/engine/CamelInternalProcessor.java  | 11 +
 .../camel/dsl/jbang/core/commands/Debug.java   |  8 ++-
 .../core/commands/action/CamelSendAction.java  |  2 +-
 .../core/commands/action/CamelStubAction.java  |  2 +-
 .../core/commands/action/CamelTraceAction.java |  8 ++-
 .../core/commands/action/MessageTableHelper.java   | 32 +++-
 .../commands/action/TransformMessageAction.java|  2 +-
 10 files changed, 143 insertions(+), 7 deletions(-)

diff --git 
a/core/camel-api/src/main/java/org/apache/camel/spi/BacklogTracerEventMessage.java
 
b/core/camel-api/src/main/java/org/apache/camel/spi/BacklogTracerEventMessage.java
index d8ef6204bee..bf2e88adee9 100644
--- 
a/core/camel-api/src/main/java/org/apache/camel/spi/BacklogTracerEventMessage.java
+++ 
b/core/camel-api/src/main/java/org/apache/camel/spi/BacklogTracerEventMessage.java
@@ -137,6 +137,32 @@ public interface BacklogTracerEventMessage {
  */
 String getEndpointUri();
 
+/**
+ * Gets the endpoint remote address such as URL, hostname, 
connection-string, or cloud region, that are component
+ * specific.
+ *
+ * @return the address or null if no address can be determined.
+ * @seeEndpointServiceLocation
+ */
+String getEndpointServiceUrl();
+
+/**
+ * Get the endpoint protocol the service is using such as http, amqp, tcp.
+ *
+ * @see EndpointServiceLocation
+ */
+String getEndpointServiceProtocol();
+
+/**
+ * Optional endpoint metadata that is relevant to the service as key value 
pairs. Notice that the metadata is not
+ * supposed to contain sensitive security details such as access token, 
api keys, or passwords. Only share
+ * information that can be safely accessed and written to logs.
+ *
+ * @return optional metadata or null if no data
+ * @seeEndpointServiceLocation
+ */
+Map getEndpointServiceMetadata();
+
 /**
  * Dumps the event message as XML using the {@link #ROOT_TAG} as root tag.
  * 
diff --git 
a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointServiceLocation.java
 
b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointServiceLocation.java
index 403d652c95c..1a32da721f9 100644
--- 
a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointServiceLocation.java
+++ 
b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointServiceLocation.java
@@ -32,7 +32,7 @@ import java.util.Map;
 public interface EndpointServiceLocation {
 
 /**
- * Gets the remote address such as URL, hostname, or connection-string 
that are component specific
+ * Gets the remote address such as URL, hostname, connection-string, or 
cloud region, that are component specific.
  *
  * @return the address or null if no address can be determined.
  */
diff --git 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DefaultBacklogTracerEventMessage.java
 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DefaultBacklogTracerEventMessage.java
index 9fec3c74143..5db7cc4a226 100644
--- 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DefaultBacklogTracerEventMessage.java
+++ 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DefaultBacklogTracerEventMessage.java
@@ -41,6 +41,9 @@ public final class DefaultBacklogTracerEventMessage 
implements BacklogTracerEven
 private final String exchangeId;
 private final String threadName;
 private String endpointUri;
+private String endpointServiceUrl;
+private String endpointServiceProtocol;
+private Map endpointServiceMetadata;
 private final boolean rest;
 private final boolean template;
 private final String messageAsXml;
@@ -194,6 +197,30 @@ public final class DefaultBacklogTracerEventMessage 
implements BacklogTracerEven
 this.endpointUri = endpointUri;
 }
 
+public String getEndpointServiceUrl() {
+return endpointServiceUrl;
+}
+
+public void setEndpointServiceUrl(String endpointServiceUrl) {
+this.endpointServiceUrl = endpointServiceUrl;
+}
+
+public String

(camel) 03/04: CAMEL-20842: Add endpoint service location to backlog tracing

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch sl
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 7f552a5db1afd6ec30f0d39b4b4e9d619828b6ae
Author: Claus Ibsen 
AuthorDate: Mon Jun 10 15:56:37 2024 +0200

CAMEL-20842: Add endpoint service location to backlog tracing
---
 .../camel/dsl/jbang/core/commands/Debug.java   |  7 -
 .../core/commands/action/CamelSendAction.java  |  2 +-
 .../core/commands/action/CamelStubAction.java  |  2 +-
 .../core/commands/action/CamelTraceAction.java |  7 -
 .../core/commands/action/MessageTableHelper.java   | 30 +-
 .../commands/action/TransformMessageAction.java|  2 +-
 6 files changed, 44 insertions(+), 6 deletions(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
index 49367ed2fd2..11e3e1cfc62 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
@@ -369,6 +369,10 @@ public class Debug extends Run {
 }
 row.endpoint.put("endpoint", uri);
 }
+JsonObject es = jo.getMap("endpointService");
+if (es != null) {
+row.endpointService = es;
+}
 Long ts = jo.getLong("timestamp");
 if (ts != null) {
 row.timestamp = ts;
@@ -740,7 +744,7 @@ public class Debug extends Run {
 }
 
 private String getDataAsTable(SuspendedRow r) {
-return tableHelper.getDataAsTable(r.exchangeId, r.exchangePattern, 
r.endpoint, r.message, r.exception);
+return tableHelper.getDataAsTable(r.exchangeId, r.exchangePattern, 
r.endpoint, r.endpointService, r.message, r.exception);
 }
 
 private String getStatus(SuspendedRow r) {
@@ -815,6 +819,7 @@ public class Debug extends Run {
 boolean done;
 boolean failed;
 JsonObject endpoint;
+JsonObject endpointService;
 JsonObject message;
 JsonObject exception;
 List code = new ArrayList<>();
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java
index c5f786e4d52..266b576a11c 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java
@@ -173,7 +173,7 @@ public class CamelSendAction extends ActionBaseCommand {
 tableHelper.setPretty(pretty);
 tableHelper.setLoggingColor(loggingColor);
 
tableHelper.setShowExchangeProperties(showExchangeProperties);
-String table = tableHelper.getDataAsTable(exchangeId, mep, 
jo, message, cause);
+String table = tableHelper.getDataAsTable(exchangeId, mep, 
jo, null, message, cause);
 printer().println(table);
 }
 }
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelStubAction.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelStubAction.java
index 1375fb53343..32880c2d5d3 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelStubAction.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelStubAction.java
@@ -294,7 +294,7 @@ public class CamelStubAction extends ActionWatchCommand {
 }
 String data
 = 
tableHelper.getDataAsTable(root.getString("exchangeId"), 
root.getString("exchangePattern"),
-row.endpoint, root, null);
+row.endpoint, null, root, null);
 if (data != null) {
 String[] lines = 
data.split(System.lineSeparator());
 if (lines.length > 0) {
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceA

(camel) 02/04: CAMEL-20842: Add endpoint service location to backlog tracing

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch sl
in repository https://gitbox.apache.org/repos/asf/camel.git

commit bdfea5bc8c64fcf3cf4c0642006601838ce2a259
Author: Claus Ibsen 
AuthorDate: Mon Jun 10 15:18:25 2024 +0200

CAMEL-20842: Add endpoint service location to backlog tracing
---
 .../camel/spi/BacklogTracerEventMessage.java   | 26 ++
 .../apache/camel/spi/EndpointServiceLocation.java  |  3 +-
 .../debugger/DefaultBacklogTracerEventMessage.java | 57 ++
 .../camel/impl/engine/CamelInternalProcessor.java  | 11 +
 4 files changed, 95 insertions(+), 2 deletions(-)

diff --git 
a/core/camel-api/src/main/java/org/apache/camel/spi/BacklogTracerEventMessage.java
 
b/core/camel-api/src/main/java/org/apache/camel/spi/BacklogTracerEventMessage.java
index d8ef6204bee..bf2e88adee9 100644
--- 
a/core/camel-api/src/main/java/org/apache/camel/spi/BacklogTracerEventMessage.java
+++ 
b/core/camel-api/src/main/java/org/apache/camel/spi/BacklogTracerEventMessage.java
@@ -137,6 +137,32 @@ public interface BacklogTracerEventMessage {
  */
 String getEndpointUri();
 
+/**
+ * Gets the endpoint remote address such as URL, hostname, 
connection-string, or cloud region, that are component
+ * specific.
+ *
+ * @return the address or null if no address can be determined.
+ * @seeEndpointServiceLocation
+ */
+String getEndpointServiceUrl();
+
+/**
+ * Get the endpoint protocol the service is using such as http, amqp, tcp.
+ *
+ * @see EndpointServiceLocation
+ */
+String getEndpointServiceProtocol();
+
+/**
+ * Optional endpoint metadata that is relevant to the service as key value 
pairs. Notice that the metadata is not
+ * supposed to contain sensitive security details such as access token, 
api keys, or passwords. Only share
+ * information that can be safely accessed and written to logs.
+ *
+ * @return optional metadata or null if no data
+ * @seeEndpointServiceLocation
+ */
+Map getEndpointServiceMetadata();
+
 /**
  * Dumps the event message as XML using the {@link #ROOT_TAG} as root tag.
  * 
diff --git 
a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointServiceLocation.java
 
b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointServiceLocation.java
index 3dfb0c9efde..1a32da721f9 100644
--- 
a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointServiceLocation.java
+++ 
b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointServiceLocation.java
@@ -32,8 +32,7 @@ import java.util.Map;
 public interface EndpointServiceLocation {
 
 /**
- * Gets the remote address such as URL, hostname, connection-string,
- * or cloud region, that are component specific.
+ * Gets the remote address such as URL, hostname, connection-string, or 
cloud region, that are component specific.
  *
  * @return the address or null if no address can be determined.
  */
diff --git 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DefaultBacklogTracerEventMessage.java
 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DefaultBacklogTracerEventMessage.java
index 9fec3c74143..5db7cc4a226 100644
--- 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DefaultBacklogTracerEventMessage.java
+++ 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DefaultBacklogTracerEventMessage.java
@@ -41,6 +41,9 @@ public final class DefaultBacklogTracerEventMessage 
implements BacklogTracerEven
 private final String exchangeId;
 private final String threadName;
 private String endpointUri;
+private String endpointServiceUrl;
+private String endpointServiceProtocol;
+private Map endpointServiceMetadata;
 private final boolean rest;
 private final boolean template;
 private final String messageAsXml;
@@ -194,6 +197,30 @@ public final class DefaultBacklogTracerEventMessage 
implements BacklogTracerEven
 this.endpointUri = endpointUri;
 }
 
+public String getEndpointServiceUrl() {
+return endpointServiceUrl;
+}
+
+public void setEndpointServiceUrl(String endpointServiceUrl) {
+this.endpointServiceUrl = endpointServiceUrl;
+}
+
+public String getEndpointServiceProtocol() {
+return endpointServiceProtocol;
+}
+
+public void setEndpointServiceProtocol(String endpointServiceProtocol) {
+this.endpointServiceProtocol = endpointServiceProtocol;
+}
+
+public Map getEndpointServiceMetadata() {
+return endpointServiceMetadata;
+}
+
+public void setEndpointServiceMetadata(Map 
endpointServiceMetadata) {
+this.endpointServiceMetadata = endpointServiceMetadata;
+}
+
 @Override
 public String toString() {
 return "DefaultBacklogTracerEventMessage[" + exchangeId + "

(camel) 04/04: CAMEL-20842: Add endpoint service location to backlog tracing

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch sl
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 148870d655fa142a145b781264628341078884e6
Author: Claus Ibsen 
AuthorDate: Mon Jun 10 16:00:20 2024 +0200

CAMEL-20842: Add endpoint service location to backlog tracing
---
 .../java/org/apache/camel/dsl/jbang/core/commands/Debug.java   |  3 ++-
 .../camel/dsl/jbang/core/commands/action/CamelTraceAction.java |  3 ++-
 .../dsl/jbang/core/commands/action/MessageTableHelper.java | 10 ++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
index 11e3e1cfc62..f20d7c80735 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
@@ -744,7 +744,8 @@ public class Debug extends Run {
 }
 
 private String getDataAsTable(SuspendedRow r) {
-return tableHelper.getDataAsTable(r.exchangeId, r.exchangePattern, 
r.endpoint, r.endpointService, r.message, r.exception);
+return tableHelper.getDataAsTable(r.exchangeId, r.exchangePattern, 
r.endpoint, r.endpointService, r.message,
+r.exception);
 }
 
 private String getStatus(SuspendedRow r) {
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
index 49a26e6f9eb..e15cba05773 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
@@ -724,7 +724,8 @@ public class CamelTraceAction extends ActionBaseCommand {
 }
 
 private String getDataAsTable(Row r) {
-return tableHelper.getDataAsTable(r.exchangeId, r.exchangePattern, 
r.endpoint, r.endpointService, r.message, r.exception);
+return tableHelper.getDataAsTable(r.exchangeId, r.exchangePattern, 
r.endpoint, r.endpointService, r.message,
+r.exception);
 }
 
 private String getElapsed(Row r) {
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/MessageTableHelper.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/MessageTableHelper.java
index 070e771e857..b7fdc7cadeb 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/MessageTableHelper.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/MessageTableHelper.java
@@ -128,10 +128,12 @@ public class MessageTableHelper {
 String data = "(" + sj + ")";
 eRow2 = new TableRow(null, null, null, data);
 }
-tab0b = AsciiTable.getTable(AsciiTable.NO_BORDERS, eRow2 != null ? 
List.of(eRow, eRow2) : List.of(eRow), Arrays.asList(
-new Column().dataAlign(HorizontalAlign.LEFT)
-.minWidth(showExchangeProperties || 
showExchangeVariables ? 12 : 10).with(TableRow::kindAsString),
-new 
Column().dataAlign(HorizontalAlign.LEFT).with(TableRow::valueAsString)));
+tab0b = AsciiTable.getTable(AsciiTable.NO_BORDERS, eRow2 != null ? 
List.of(eRow, eRow2) : List.of(eRow),
+Arrays.asList(
+new Column().dataAlign(HorizontalAlign.LEFT)
+.minWidth(showExchangeProperties || 
showExchangeVariables ? 12 : 10)
+.with(TableRow::kindAsString),
+new 
Column().dataAlign(HorizontalAlign.LEFT).with(TableRow::valueAsString)));
 }
 
 if (root != null) {

(camel) 01/04: CAMEL-20842: Add endpoint service location to backlog tracing

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch sl
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 68f4297524bdc006489f69c545aa95ef4eb5c73a
Author: Claus Ibsen 
AuthorDate: Mon Jun 10 14:41:55 2024 +0200

CAMEL-20842: Add endpoint service location to backlog tracing
---
 .../src/main/java/org/apache/camel/spi/EndpointServiceLocation.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointServiceLocation.java
 
b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointServiceLocation.java
index 403d652c95c..3dfb0c9efde 100644
--- 
a/core/camel-api/src/main/java/org/apache/camel/spi/EndpointServiceLocation.java
+++ 
b/core/camel-api/src/main/java/org/apache/camel/spi/EndpointServiceLocation.java
@@ -32,7 +32,8 @@ import java.util.Map;
 public interface EndpointServiceLocation {
 
 /**
- * Gets the remote address such as URL, hostname, or connection-string 
that are component specific
+ * Gets the remote address such as URL, hostname, connection-string,
+ * or cloud region, that are component specific.
  *
  * @return the address or null if no address can be determined.
  */

(camel) branch sl created (now 148870d655f)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch sl
in repository https://gitbox.apache.org/repos/asf/camel.git


  at 148870d655f CAMEL-20842: Add endpoint service location to backlog 
tracing

This branch includes the following new commits:

 new 68f4297524b CAMEL-20842: Add endpoint service location to backlog 
tracing
 new bdfea5bc8c6 CAMEL-20842: Add endpoint service location to backlog 
tracing
 new 7f552a5db1a CAMEL-20842: Add endpoint service location to backlog 
tracing
 new 148870d655f CAMEL-20842: Add endpoint service location to backlog 
tracing

The 4 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.

(camel) branch camel-4.4.x updated: CAMEL-20851: Shut down ElasticSearch client sniffer on producer stop (#14440)

[davsclaus]

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


The following commit(s) were added to refs/heads/camel-4.4.x by this push:
 new fd24ac0819d CAMEL-20851: Shut down ElasticSearch client sniffer on 
producer stop (#14440)
fd24ac0819d is described below

commit fd24ac0819db438a99271bfdd172dc3169803db6
Author: James Netherton 
AuthorDate: Mon Jun 10 13:00:06 2024 +0100

CAMEL-20851: Shut down ElasticSearch client sniffer on producer stop 
(#14440)
---
 .../rest/client/ElasticsearchRestClientProducer.java  | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git 
a/components/camel-elasticsearch-rest-client/src/main/java/org/apache/camel/component/elasticsearch/rest/client/ElasticsearchRestClientProducer.java
 
b/components/camel-elasticsearch-rest-client/src/main/java/org/apache/camel/component/elasticsearch/rest/client/ElasticsearchRestClientProducer.java
index 053e734df32..bb7781a12c2 100644
--- 
a/components/camel-elasticsearch-rest-client/src/main/java/org/apache/camel/component/elasticsearch/rest/client/ElasticsearchRestClientProducer.java
+++ 
b/components/camel-elasticsearch-rest-client/src/main/java/org/apache/camel/component/elasticsearch/rest/client/ElasticsearchRestClientProducer.java
@@ -66,6 +66,7 @@ public class ElasticsearchRestClientProducer extends 
DefaultAsyncProducer {
 private ElasticsearchRestClientEndpoint endpoint;
 private RestClient restClient;
 private boolean createdRestClient;
+private Sniffer sniffer;
 
 public ElasticsearchRestClientProducer(ElasticsearchRestClientEndpoint 
endpoint) {
 super(endpoint);
@@ -114,6 +115,11 @@ public class ElasticsearchRestClientProducer extends 
DefaultAsyncProducer {
 super.doStop();
 
 if (createdRestClient && restClient != null) {
+if (sniffer != null) {
+IOHelper.close(sniffer);
+sniffer = null;
+}
+
 IOHelper.close(restClient);
 restClient = null;
 }
@@ -385,7 +391,7 @@ public class ElasticsearchRestClientProducer extends 
DefaultAsyncProducer {
 
 // initiate Sniffer
 if (this.endpoint.isEnableSniffer()) {
-Sniffer.builder(restClient)
+sniffer = Sniffer.builder(restClient)
 .setSniffIntervalMillis(this.endpoint.getSnifferInterval())
 
.setSniffAfterFailureDelayMillis(this.endpoint.getSniffAfterFailureDelay())
 .build();

(camel) branch main updated: CAMEL-20851: Shut down ElasticSearch client sniffer on producer stop (#14440)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 0a0d607402e CAMEL-20851: Shut down ElasticSearch client sniffer on 
producer stop (#14440)
0a0d607402e is described below

commit 0a0d607402ef418a435a99d5287d9af2a477276f
Author: James Netherton 
AuthorDate: Mon Jun 10 13:00:06 2024 +0100

CAMEL-20851: Shut down ElasticSearch client sniffer on producer stop 
(#14440)
---
 .../rest/client/ElasticsearchRestClientProducer.java  | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git 
a/components/camel-elasticsearch-rest-client/src/main/java/org/apache/camel/component/elasticsearch/rest/client/ElasticsearchRestClientProducer.java
 
b/components/camel-elasticsearch-rest-client/src/main/java/org/apache/camel/component/elasticsearch/rest/client/ElasticsearchRestClientProducer.java
index 053e734df32..bb7781a12c2 100644
--- 
a/components/camel-elasticsearch-rest-client/src/main/java/org/apache/camel/component/elasticsearch/rest/client/ElasticsearchRestClientProducer.java
+++ 
b/components/camel-elasticsearch-rest-client/src/main/java/org/apache/camel/component/elasticsearch/rest/client/ElasticsearchRestClientProducer.java
@@ -66,6 +66,7 @@ public class ElasticsearchRestClientProducer extends 
DefaultAsyncProducer {
 private ElasticsearchRestClientEndpoint endpoint;
 private RestClient restClient;
 private boolean createdRestClient;
+private Sniffer sniffer;
 
 public ElasticsearchRestClientProducer(ElasticsearchRestClientEndpoint 
endpoint) {
 super(endpoint);
@@ -114,6 +115,11 @@ public class ElasticsearchRestClientProducer extends 
DefaultAsyncProducer {
 super.doStop();
 
 if (createdRestClient && restClient != null) {
+if (sniffer != null) {
+IOHelper.close(sniffer);
+sniffer = null;
+}
+
 IOHelper.close(restClient);
 restClient = null;
 }
@@ -385,7 +391,7 @@ public class ElasticsearchRestClientProducer extends 
DefaultAsyncProducer {
 
 // initiate Sniffer
 if (this.endpoint.isEnableSniffer()) {
-Sniffer.builder(restClient)
+sniffer = Sniffer.builder(restClient)
 .setSniffIntervalMillis(this.endpoint.getSnifferInterval())
 
.setSniffAfterFailureDelayMillis(this.endpoint.getSniffAfterFailureDelay())
 .build();

(camel) branch main updated: Handle missing additional properties for custom templates (#14443)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 147eaa57183 Handle missing additional properties for custom templates 
(#14443)
147eaa57183 is described below

commit 147eaa5718333737084c2152820a5046a553d526
Author: Federico Mariani <34543311+cro...@users.noreply.github.com>
AuthorDate: Mon Jun 10 13:27:23 2024 +0200

Handle missing additional properties for custom templates (#14443)
---
 .../java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index 4af9f7f14f6..2a598c9c566 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -195,6 +195,8 @@ class ExportSpringBoot extends Export {
 .map(property -> property + System.lineSeparator())
 .collect(Collectors.joining());
 context = context.replaceFirst("\\{\\{ \\.AdditionalProperties 
}}", properties);
+} else {
+context = context.replaceFirst("\\{\\{ \\.AdditionalProperties 
}}", "");
 }
 
 // Convert jkube properties to maven properties

(camel) branch main updated: Add package updates for CXF split happened in 3.18 (#14441)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 58e3fbb1dd5 Add package updates for CXF split happened in 3.18 (#14441)
58e3fbb1dd5 is described below

commit 58e3fbb1dd5b33d5c71952883d8dbee558871fde
Author: Federico Mariani <34543311+cro...@users.noreply.github.com>
AuthorDate: Mon Jun 10 13:27:02 2024 +0200

Add package updates for CXF split happened in 3.18 (#14441)
---
 .../ROOT/pages/camel-3x-upgrade-guide-3_18.adoc| 39 ++
 1 file changed, 39 insertions(+)

diff --git 
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_18.adoc 
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_18.adoc
index 69ddb403fe5..f734ff66eca 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_18.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_18.adoc
@@ -70,6 +70,45 @@ i.e. `org.apache.camel.component.cxf` is now 
`org.apache.camel.component.cxf.jaw
 This means, for example, the `CxfComponent` class is now located
 in `org.apache.camel.component.cxf.jaxws`.
 
+Some classes in the following packages were refactored, and the package was 
updated, 
+if you were using one of those packages and, after the migration, a 
ClassNotFoundException is thrown, 
+an update should be considered
+
+|===
+|Old Package | New Package
+
+| `org.apache.camel.component.cxf`
+| `org.apache.camel.component.cxf.common`
+
+| `org.apache.camel.component.cxf.interceptors`
+| `org.apache.camel.component.cxf.util`
+
+| `org.apache.camel.component.cxf.converter`
+| `org.apache.camel.component.cxf.jaxrs`
+
+| `org.apache.camel.component.cxf`
+| `org.apache.camel.component.cxf.jaxws`
+
+| `org.apache.camel.component.cxf.spring`
+| `org.apache.camel.component.cxf.spring.jaxrs`
+
+| `org.apache.camel.component.cxf.spring`
+| `org.apache.camel.component.cxf.spring.jaxws`
+
+| `org.apache.camel.component.cxf`
+| `org.apache.camel.component.cxf.spring.jaxws`
+
+| `org.apache.camel.component.cxf.transport.spring`
+| `org.apache.camel.component.cxf.spring.transport`
+
+| `org.apache.camel.component.cxf.common.header`
+| `org.apache.camel.component.cxf.transport.header`
+
+| `org.apache.camel.component.cxf.common.message`
+| `org.apache.camel.component.cxf.transport.message`
+
+|===
+
 === camel-endpointdsl
 
 The options for `lazyStartProducer` and `bridgeErrorHandler` has moved into 
the _advanced_ group.

(camel) branch openapi-validator-fix deleted (was 2992dc22f9f)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch openapi-validator-fix
in repository https://gitbox.apache.org/repos/asf/camel.git


 was 2992dc22f9f Regen

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

(camel) branch CAMEL-20832/add-camel-openapi-validator-to-parent-pom deleted (was b4d90f5f570)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch 
CAMEL-20832/add-camel-openapi-validator-to-parent-pom
in repository https://gitbox.apache.org/repos/asf/camel.git


 was b4d90f5f570 CAMEL-20832: Add camel-openapi-validator to parent pom

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

(camel) branch main updated (818bee60827 -> ff1af498740)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from 818bee60827 doc: Improve PLC4X documentation by adding most common 
supported protocols
 add ff1af498740 CAMEL-20832: Add camel-openapi-validator to parent pom 
(#1)

No new revisions were added by this update.

Summary of changes:
 components/pom.xml | 1 +
 1 file changed, 1 insertion(+)

(camel) branch main updated: Added Camel-Openapi-validator to kit (#14442)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 11bcf8acd8f Added Camel-Openapi-validator to kit (#14442)
11bcf8acd8f is described below

commit 11bcf8acd8f969873c78447bcd649d325c5bd1ba
Author: Andrea Cosentino 
AuthorDate: Mon Jun 10 13:26:42 2024 +0200

Added Camel-Openapi-validator to kit (#14442)

* Added Camel-Openapi-validator to kit

Signed-off-by: Andrea Cosentino 

* Regen

Signed-off-by: Andrea Cosentino 

-

Signed-off-by: Andrea Cosentino 
---
 .../validator/client/OpenApiRestClientRequestValidatorTest.java  | 5 +++--
 .../component/rest/openapi/DefaultRestOpenapiProcessorStrategy.java  | 3 ++-
 .../camel/component/rest/openapi/RestOpenapiProcessorStrategy.java   | 3 ++-
 .../main/java/org/apache/camel/component/smb/SmbConfiguration.java   | 3 ++-
 .../src/main/java/org/apache/camel/component/smb/SmbConsumer.java| 1 -
 .../java/org/apache/camel/support/processor/RestBindingAdvice.java   | 2 --
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git 
a/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidatorTest.java
 
b/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidatorTest.java
index 62b2cb883b7..4a70e0b2649 100644
--- 
a/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidatorTest.java
+++ 
b/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidatorTest.java
@@ -44,8 +44,9 @@ public class OpenApiRestClientRequestValidatorTest extends 
ExchangeTestSupport {
 
 OpenApiRestClientRequestValidator validator = new 
OpenApiRestClientRequestValidator();
 
-RestClientRequestValidator.ValidationError error = 
validator.validate(exchange, new RestClientRequestValidator.ValidationContext(
-"application/json", "application/json", true, null, null, 
null, null));
+RestClientRequestValidator.ValidationError error
+= validator.validate(exchange, new 
RestClientRequestValidator.ValidationContext(
+"application/json", "application/json", true, null, 
null, null, null));
 
 Assertions.assertNotNull(error);
 Assertions.assertTrue(error.body().contains("A request body is 
required but none found"));
diff --git 
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/DefaultRestOpenapiProcessorStrategy.java
 
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/DefaultRestOpenapiProcessorStrategy.java
index 8539d865dac..5021ca826b0 100644
--- 
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/DefaultRestOpenapiProcessorStrategy.java
+++ 
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/DefaultRestOpenapiProcessorStrategy.java
@@ -168,7 +168,8 @@ public class DefaultRestOpenapiProcessorStrategy extends 
ServiceSupport
 }
 
 @Override
-public boolean process(OpenAPI openAPI,
+public boolean process(
+OpenAPI openAPI,
 Operation operation, String verb, String path,
 RestBindingAdvice binding,
 Exchange exchange, AsyncCallback callback) {
diff --git 
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenapiProcessorStrategy.java
 
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenapiProcessorStrategy.java
index d93d0a79557..7c639071633 100644
--- 
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenapiProcessorStrategy.java
+++ 
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenapiProcessorStrategy.java
@@ -78,7 +78,8 @@ public interface RestOpenapiProcessorStrategy {
  * @return   (doneSync) true to continue execute synchronously, 
false to continue being executed
  *   asynchronously
  */
-boolean process(OpenAPI openAPI,
+boolean process(
+OpenAPI openAPI,
 Operation operation, String verb, String path,
 RestBindingAdvice binding,
 Exchange exchange, AsyncCallback callback);
diff --git 
a/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbConfiguration.java
 
b/components/camel-smb/src/main/java/org/apache/camel/component/smb/SmbConfiguration.java
index 3fbffa5d1a9..eb239b21fe3 100644
--- 
a/c

(camel-spring-boot) branch main updated: CAMEL-20832: camel-openapi-validator to use Atlassian openapi validator for rest-dsl

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git


The following commit(s) were added to refs/heads/main by this push:
 new 9a8d2fc962f CAMEL-20832: camel-openapi-validator to use Atlassian 
openapi validator for rest-dsl
9a8d2fc962f is described below

commit 9a8d2fc962f656e65b9b01acb86198e28c47febc
Author: Claus Ibsen 
AuthorDate: Mon Jun 10 10:06:20 2024 +0200

CAMEL-20832: camel-openapi-validator to use Atlassian openapi validator for 
rest-dsl
---
 .../camel/springboot/catalog/others.properties |   1 +
 .../catalog/others/openapi-validator.json  |  15 ++
 .../camel-openapi-validator-starter/pom.xml|  56 ++
 .../src/main/resources/META-INF/LICENSE.txt| 203 +
 .../src/main/resources/META-INF/NOTICE.txt |  11 ++
 components-starter/pom.xml |   1 +
 tooling/camel-spring-boot-bom/pom.xml  |   5 +
 tooling/camel-spring-boot-dependencies/pom.xml |   5 +
 8 files changed, 297 insertions(+)

diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
index fd7ad79eeea..7e3416226f1 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties
@@ -23,6 +23,7 @@ mail-microsoft-oauth
 management
 observation
 openapi-java
+openapi-validator
 opentelemetry
 reactor
 resilience4j
diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/openapi-validator.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/openapi-validator.json
new file mode 100644
index 000..d4c1f0c9a84
--- /dev/null
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/openapi-validator.json
@@ -0,0 +1,15 @@
+{
+  "other": {
+"kind": "other",
+"name": "openapi-validator",
+"title": "Openapi Validator",
+"description": "OpenAPI validator for Camel Rest DSL",
+"deprecated": false,
+"firstVersion": "4.7.0",
+"label": "rest,api",
+"supportLevel": "Preview",
+"groupId": "org.apache.camel.springboot",
+"artifactId": "camel-openapi-validator-starter",
+"version": "4.7.0-SNAPSHOT"
+  }
+}
diff --git a/components-starter/camel-openapi-validator-starter/pom.xml 
b/components-starter/camel-openapi-validator-starter/pom.xml
new file mode 100644
index 000..899c05f1c15
--- /dev/null
+++ b/components-starter/camel-openapi-validator-starter/pom.xml
@@ -0,0 +1,56 @@
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+  4.0.0
+  
+org.apache.camel.springboot
+components-starter
+4.7.0-SNAPSHOT
+  
+  camel-openapi-validator-starter
+  jar
+  Camel SB Starters :: OpenAPI Validator
+  
+
+  org.springframework.boot
+  spring-boot-starter
+  ${spring-boot-version}
+
+
+  org.apache.camel
+  camel-openapi-validator
+  ${camel-version}
+  
+  
+
+  commons-logging
+  commons-logging
+
+  
+  
+
+
+
+  org.apache.camel.springboot
+  camel-core-starter
+
+
+  
+
diff --git 
a/components-starter/camel-openapi-validator-starter/src/main/resources/META-INF/LICENSE.txt
 
b/components-starter/camel-openapi-validator-starter/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 000..6b0b1270ff0
--- /dev/null
+++ 
b/components-starter/camel-openapi-validator-starter/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the unio

(camel-spring-boot) branch main updated: Regen

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git


The following commit(s) were added to refs/heads/main by this push:
 new aa79b57c916 Regen
aa79b57c916 is described below

commit aa79b57c916437de7879e79eb40864ea508f5a97
Author: Claus Ibsen 
AuthorDate: Mon Jun 10 10:03:08 2024 +0200

Regen
---
 .../org/apache/camel/springboot/catalog/components/rest-openapi.json | 2 +-
 tooling/camel-spring-boot-dependencies/pom.xml   | 5 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-openapi.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-openapi.json
index 190d447aa36..5a1e429823a 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-openapi.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-openapi.json
@@ -48,7 +48,7 @@
 "operationId": { "index": 1, "kind": "path", "displayName": "Operation 
Id", "group": "producer", "label": "producer", "required": false, "type": 
"string", "javaType": "java.lang.String", "deprecated": false, "autowired": 
false, "secret": false, "description": "ID of the operation from the OpenApi 
specification. This is required when using producer" },
 "apiContextPath": { "index": 2, "kind": "parameter", "displayName": "Api 
Context Path", "group": "consumer", "label": "consumer", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the context-path to 
use for servicing the OpenAPI specification" },
 "clientRequestValidation": { "index": 3, "kind": "parameter", 
"displayName": "Client Request Validation", "group": "consumer", "label": 
"consumer", "required": false, "type": "boolean", "javaType": "boolean", 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
false, "description": "Whether to enable validation of the client request to 
check if the incoming request is valid according to the OpenAPI specification" 
},
-"consumes": { "index": 4, "kind": "parameter", "displayName": "Consumes", 
"group": "consumer", "label": "consumer", "required": false, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "autowired": false, 
"secret": false, "description": "What payload type this component capable of 
consuming. Could be one type, like application\/json or multiple types as 
application\/json, application\/xml; q=0.5 according to the RFC7231. This 
equates to the value of Accept HTTP h [...]
+"consumes": { "index": 4, "kind": "parameter", "displayName": "Consumes", 
"group": "consumer", "label": "consumer", "required": false, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "autowired": false, 
"secret": false, "description": "What payload type this component capable of 
consuming. Could be one type, like application\/json or multiple types as 
application\/json, application\/xml; q=0.5 according to the RFC7231. This 
equates or multiple types as applicat [...]
 "missingOperation": { "index": 5, "kind": "parameter", "displayName": 
"Missing Operation", "group": "consumer", "label": "consumer", "required": 
false, "type": "string", "javaType": "java.lang.String", "enum": [ "fail", 
"ignore", "mock" ], "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": "fail", "

(camel) branch main updated (18d86b7e1a5 -> 400f2d5af4c)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from 18d86b7e1a5 chore(deps): Bump 
com.google.cloud:google-cloud-functions-bom (#14434)
 add 400f2d5af4c Regen

No new revisions were added by this update.

Summary of changes:
 .../org/apache/camel/catalog/beans/ZipAggregationStrategy.json  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(camel) branch main updated (8b6c75a6a5d -> ec94ff5083d)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from 8b6c75a6a5d chore(deps): Bump metrics-version from 4.2.25 to 4.2.26 
(#14436)
 add ec94ff5083d chore(deps): Bump opentelemetry-version from 1.38.0 to 
1.39.0 (#14435)

No new revisions were added by this update.

Summary of changes:
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(camel) branch vc4 deleted (was b0d65991dfa)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch vc4
in repository https://gitbox.apache.org/repos/asf/camel.git


 was b0d65991dfa CAMEL-20832: camel-openapi-validator to use Atlassian 
openapi validator for rest-dsl

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

(camel) branch main updated (300a397b314 -> 8b6c75a6a5d)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from 300a397b314 camel-openapi-validator (#14437)
 add 8b6c75a6a5d chore(deps): Bump metrics-version from 4.2.25 to 4.2.26 
(#14436)

No new revisions were added by this update.

Summary of changes:
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(camel) branch main updated (d725aef7a28 -> 18d86b7e1a5)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from d725aef7a28 chore(deps): Bump huaweicloud-sdk-version from 3.1.98 to 
3.1.99 (#14433)
 add 18d86b7e1a5 chore(deps): Bump 
com.google.cloud:google-cloud-functions-bom (#14434)

No new revisions were added by this update.

Summary of changes:
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(camel) branch main updated (ec94ff5083d -> d725aef7a28)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from ec94ff5083d chore(deps): Bump opentelemetry-version from 1.38.0 to 
1.39.0 (#14435)
 add d725aef7a28 chore(deps): Bump huaweicloud-sdk-version from 3.1.98 to 
3.1.99 (#14433)

No new revisions were added by this update.

Summary of changes:
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(camel) branch main updated (e56e14392d2 -> 300a397b314)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from e56e14392d2 chore(deps): Bump aws-java-sdk2-version from 2.25.68 to 
2.25.69 (#14432)
 add 300a397b314 camel-openapi-validator (#14437)

No new revisions were added by this update.

Summary of changes:
 bom/camel-bom/pom.xml  |  5 ++
 catalog/camel-allcomponents/pom.xml|  5 ++
 .../camel/catalog/components/rest-openapi.json |  2 +-
 .../org/apache/camel/catalog/others.properties |  1 +
 .../camel/catalog/others/openapi-validator.json| 15 +
 components/camel-openapi-validator/pom.xml | 70 +
 .../services/org/apache/camel/other.properties |  7 +++
 .../org/apache/camel/rest-client-validator-factory |  2 +
 .../src/generated/resources/openapi-validator.json | 15 +
 .../src/main/docs/openapi-validator.adoc   | 23 +++
 .../client/OpenApiRestClientRequestValidator.java  | 72 ++
 .../OpenApiRestClientRequestValidatorTest.java | 59 ++
 .../src/test/resources/log4j2.properties   | 28 +
 .../src/test/resources/petstore-v3.json|  0
 .../camel/component/rest/openapi/rest-openapi.json |  2 +-
 .../DefaultRestOpenapiProcessorStrategy.java   |  3 +-
 .../rest/openapi/RestOpenApiEndpoint.java  |  1 +
 .../rest/openapi/RestOpenApiProcessor.java |  2 +-
 .../rest/openapi/RestOpenapiProcessorStrategy.java |  3 +-
 .../org/apache/camel/ExchangeConstantProvider.java |  3 +-
 .../src/main/java/org/apache/camel/Exchange.java   |  1 +
 .../camel/support/processor/RestBindingAdvice.java |  2 +
 .../others/examples/json/openapi-validator.json|  1 +
 docs/components/modules/others/nav.adoc|  1 +
 .../modules/others/pages/openapi-validator.adoc|  1 +
 .../dsl/RestOpenApiEndpointBuilderFactory.java |  8 ++-
 .../camel/kotlin/components/RestOpenapiUriDsl.kt   |  3 +-
 parent/pom.xml |  6 ++
 28 files changed, 331 insertions(+), 10 deletions(-)
 create mode 100644 
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/openapi-validator.json
 create mode 100644 components/camel-openapi-validator/pom.xml
 create mode 100644 
components/camel-openapi-validator/src/generated/resources/META-INF/services/org/apache/camel/other.properties
 create mode 100644 
components/camel-openapi-validator/src/generated/resources/META-INF/services/org/apache/camel/rest-client-validator-factory
 create mode 100644 
components/camel-openapi-validator/src/generated/resources/openapi-validator.json
 create mode 100644 
components/camel-openapi-validator/src/main/docs/openapi-validator.adoc
 create mode 100644 
components/camel-openapi-validator/src/main/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidator.java
 create mode 100644 
components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidatorTest.java
 create mode 100644 
components/camel-openapi-validator/src/test/resources/log4j2.properties
 copy components/{camel-openapi-java => 
camel-openapi-validator}/src/test/resources/petstore-v3.json (100%)
 create mode 12 
docs/components/modules/others/examples/json/openapi-validator.json
 create mode 12 docs/components/modules/others/pages/openapi-validator.adoc

(camel) branch vc4 updated (fecab159149 -> b0d65991dfa)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch vc4
in repository https://gitbox.apache.org/repos/asf/camel.git


from fecab159149 CAMEL-20832: camel-openapi-validator to use Atlassian 
openapi validator for rest-dsl
 add b0d65991dfa CAMEL-20832: camel-openapi-validator to use Atlassian 
openapi validator for rest-dsl

No new revisions were added by this update.

Summary of changes:
 .../validator/client/OpenApiRestClientRequestValidator.java  | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(camel) 01/03: CAMEL-20832: Add rest-dsl client validator that can use atlassian validator in a plugin fashion

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch vc4
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 3665b8110abcafa4776c25fdc976313de7e87442
Author: Claus Ibsen 
AuthorDate: Wed Jun 5 16:26:19 2024 +0200

CAMEL-20832: Add rest-dsl client validator that can use atlassian validator 
in a plugin fashion
---
 bom/camel-bom/pom.xml  |  5 ++
 catalog/camel-allcomponents/pom.xml|  5 ++
 .../org/apache/camel/catalog/others.properties |  1 +
 .../camel/catalog/others/openapi-validator.json| 15 +
 components/camel-openapi-validator/pom.xml | 70 ++
 .../services/org/apache/camel/other.properties |  7 +++
 .../org/apache/camel/rest-client-validator-factory |  2 +
 .../src/generated/resources/openapi-validator.json | 15 +
 .../src/main/docs/openapi-validator.adoc   | 19 ++
 .../client/OpenApiRestClientRequestValidator.java  | 30 ++
 .../others/examples/json/openapi-validator.json|  1 +
 docs/components/modules/others/nav.adoc|  1 +
 .../modules/others/pages/openapi-validator.adoc|  1 +
 parent/pom.xml |  6 ++
 14 files changed, 178 insertions(+)

diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 5bfbac4377a..751c5536722 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1532,6 +1532,11 @@
 camel-openapi-rest-dsl-generator
 4.7.0-SNAPSHOT
   
+  
+org.apache.camel
+camel-openapi-validator
+4.7.0-SNAPSHOT
+  
   
 org.apache.camel
 camel-opensearch
diff --git a/catalog/camel-allcomponents/pom.xml 
b/catalog/camel-allcomponents/pom.xml
index 96f648880e9..b6ad183fa43 100644
--- a/catalog/camel-allcomponents/pom.xml
+++ b/catalog/camel-allcomponents/pom.xml
@@ -1322,6 +1322,11 @@
 camel-openapi-java
 ${project.version}
 
+
+org.apache.camel
+camel-openapi-validator
+${project.version}
+
 
 org.apache.camel
 camel-opensearch
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
index 9b64a3dd84a..15e1b4bcb33 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties
@@ -35,6 +35,7 @@ microprofile-fault-tolerance
 microprofile-health
 observation
 openapi-java
+openapi-validator
 opentelemetry
 platform-http-jolokia
 platform-http-main
diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/openapi-validator.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/openapi-validator.json
new file mode 100644
index 000..4439b1cdd95
--- /dev/null
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/openapi-validator.json
@@ -0,0 +1,15 @@
+{
+  "other": {
+"kind": "other",
+"name": "openapi-validator",
+"title": "Openapi Validator",
+"description": "OpenAPI validator for Camel Rest DSL",
+"deprecated": false,
+"firstVersion": "4.7.0",
+"label": "rest,api",
+"supportLevel": "Preview",
+"groupId": "org.apache.camel",
+"artifactId": "camel-openapi-validator",
+"version": "4.7.0-SNAPSHOT"
+  }
+}
diff --git a/components/camel-openapi-validator/pom.xml 
b/components/camel-openapi-validator/pom.xml
new file mode 100644
index 000..da01b0cb916
--- /dev/null
+++ b/components/camel-openapi-validator/pom.xml
@@ -0,0 +1,70 @@
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;>
+4.0.0
+
+
+org.apache.camel
+components
+4.7.0-SNAPSHOT
+
+
+camel-openapi-validator
+jar
+Camel :: OpenAPI :: Validator
+OpenAPI validator for Camel Rest DSL
+
+
+4.7.0
+rest,api
+
+
+
+
+
+org.apache.camel
+camel-support
+
+
+
+com.atlassian.oai
+swagger-request-validator-core
+${swagger-request-validator-version}
+
+
+
+
+org.apache.camel
+camel-test-junit5
+test
+
+
+org.apache.camel
+camel-mock
+test
+
+
+   

(camel) 03/03: CAMEL-20832: camel-openapi-validator to use Atlassian openapi validator for rest-dsl

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch vc4
in repository https://gitbox.apache.org/repos/asf/camel.git

commit fecab159149b78c0c8cd2c9f958c3dc347418b5a
Author: Claus Ibsen 
AuthorDate: Mon Jun 10 09:20:06 2024 +0200

CAMEL-20832: camel-openapi-validator to use Atlassian openapi validator for 
rest-dsl
---
 .../src/main/docs/openapi-validator.adoc   |   10 +-
 .../client/OpenApiRestClientRequestValidator.java  |8 +-
 .../OpenApiRestClientRequestValidatorTest.java |   59 +
 .../src/test/resources/log4j2.properties   |   28 +
 .../src/test/resources/petstore-v3.json| 1225 
 5 files changed, 1322 insertions(+), 8 deletions(-)

diff --git 
a/components/camel-openapi-validator/src/main/docs/openapi-validator.adoc 
b/components/camel-openapi-validator/src/main/docs/openapi-validator.adoc
index cc939abb2ce..0d17cc1aa4f 100644
--- a/components/camel-openapi-validator/src/main/docs/openapi-validator.adoc
+++ b/components/camel-openapi-validator/src/main/docs/openapi-validator.adoc
@@ -9,10 +9,14 @@
 
 *Since Camel {since}*
 
-The OpenAPI Validator component is used for plugin a OpenAPI specific client 
request validator
-for the Camel Rest DSL.
+Camel comes with a default client request validator for the Camel Rest DSL.
 
-This validator uses the 
https://bitbucket.org/atlassian/swagger-request-validator/src/master/[Atlassian 
Swagger Request Validator].
+The `camel-openapi-validator` uses the 3rd-party
+the 
https://bitbucket.org/atlassian/swagger-request-validator/src/master/[Atlassian 
Swagger Request Validator]
+library instead for client request validator. This library is a more extensive 
validator than
+the default validator from `camel-core`.
+
+NOTE: This library does not work with running in `camel-jbang`.
 
 == Auto-detection from classpath
 
diff --git 
a/components/camel-openapi-validator/src/main/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidator.java
 
b/components/camel-openapi-validator/src/main/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidator.java
index 989478c01e0..46532addaf3 100644
--- 
a/components/camel-openapi-validator/src/main/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidator.java
+++ 
b/components/camel-openapi-validator/src/main/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidator.java
@@ -18,6 +18,7 @@ package 
org.apache.camel.component.rest.openapi.validator.client;
 
 import com.atlassian.oai.validator.OpenApiInteractionValidator;
 import com.atlassian.oai.validator.model.SimpleRequest;
+import com.atlassian.oai.validator.report.SimpleValidationReportFormat;
 import com.atlassian.oai.validator.report.ValidationReport;
 import io.swagger.v3.oas.models.OpenAPI;
 import org.apache.camel.Exchange;
@@ -29,8 +30,6 @@ import org.apache.camel.support.MessageHelper;
 @JdkService(RestClientRequestValidator.FACTORY)
 public class OpenApiRestClientRequestValidator implements 
RestClientRequestValidator {
 
-// TODO: use default validator if no OpenAPI
-
 @Override
 public ValidationError validate(Exchange exchange, ValidationContext 
validationContent) {
 OpenAPI openAPI = exchange.getProperty(Exchange.REST_OPENAPI, 
OpenAPI.class);
@@ -59,9 +58,8 @@ public class OpenApiRestClientRequestValidator implements 
RestClientRequestValid
 OpenApiInteractionValidator validator = 
OpenApiInteractionValidator.createFor(openAPI).build();
 ValidationReport report = validator.validateRequest(builder.build());
 if (report.hasErrors()) {
-for (var m : report.getMessages()) {
-System.out.println(m);
-}
+String msg = 
SimpleValidationReportFormat.getInstance().apply(report);
+return new ValidationError(400, msg);
 }
 return null;
 }
diff --git 
a/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidatorTest.java
 
b/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidatorTest.java
new file mode 100644
index 000..62b2cb883b7
--- /dev/null
+++ 
b/components/camel-openapi-validator/src/test/java/org/apache/camel/component/rest/openapi/validator/client/OpenApiRestClientRequestValidatorTest.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obt

(camel) 02/03: CAMEL-20832: camel-openapi-validator to use Atlassian openapi validator for rest-dsl

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch vc4
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 14f1b58af44e8a97fea86aa668129eed8ee143b5
Author: Claus Ibsen 
AuthorDate: Thu Jun 6 07:06:09 2024 +0200

CAMEL-20832: camel-openapi-validator to use Atlassian openapi validator for 
rest-dsl
---
 .../camel/catalog/components/rest-openapi.json |  2 +-
 .../client/OpenApiRestClientRequestValidator.java  | 41 +-
 .../camel/component/rest/openapi/rest-openapi.json |  2 +-
 .../DefaultRestOpenapiProcessorStrategy.java   |  3 +-
 .../rest/openapi/RestOpenApiEndpoint.java  |  1 +
 .../rest/openapi/RestOpenApiProcessor.java |  2 +-
 .../rest/openapi/RestOpenapiProcessorStrategy.java |  3 +-
 .../org/apache/camel/ExchangeConstantProvider.java |  3 +-
 .../src/main/java/org/apache/camel/Exchange.java   |  1 +
 .../camel/support/processor/RestBindingAdvice.java |  2 ++
 .../dsl/RestOpenApiEndpointBuilderFactory.java |  8 +++--
 .../camel/kotlin/components/RestOpenapiUriDsl.kt   |  3 +-
 12 files changed, 60 insertions(+), 11 deletions(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json
index 32f5b67f650..f978b2d54e9 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/rest-openapi.json
@@ -48,7 +48,7 @@
 "operationId": { "index": 1, "kind": "path", "displayName": "Operation 
Id", "group": "producer", "label": "producer", "required": false, "type": 
"string", "javaType": "java.lang.String", "deprecated": false, "autowired": 
false, "secret": false, "description": "ID of the operation from the OpenApi 
specification. This is required when using producer" },
 "apiContextPath": { "index": 2, "kind": "parameter", "displayName": "Api 
Context Path", "group": "consumer", "label": "consumer", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "description": "Sets the context-path to 
use for servicing the OpenAPI specification" },
 "clientRequestValidation": { "index": 3, "kind": "parameter", 
"displayName": "Client Request Validation", "group": "consumer", "label": 
"consumer", "required": false, "type": "boolean", "javaType": "boolean", 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
false, "description": "Whether to enable validation of the client request to 
check if the incoming request is valid according to the OpenAPI specification" 
},
-"consumes": { "index": 4, "kind": "parameter", "displayName": "Consumes", 
"group": "consumer", "label": "consumer", "required": false, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "autowired": false, 
"secret": false, "description": "What payload type this component capable of 
consuming. Could be one type, like application\/json or multiple types as 
application\/json, application\/xml; q=0.5 according to the RFC7231. This 
equates to the value of Accept HTTP h [...]
+"consumes": { "index": 4, "kind": "parameter", "displayName": "Consumes", 
"group": "consumer", "label": "consumer", "required": false, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "autowired": false, 
"secret": false, "description": "What payload type this component capable of 
consuming. Could be one type, like application\/json or multiple types as 
application\/json, application\/xml; q=0.5 according to the RFC7231. This 
equates or multiple types as applicat [...]
 "missingOperation": { "index": 5, "kind": "parameter", "displayName": 
"Missing Operation&quo

(camel) branch vc4 created (now fecab159149)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch vc4
in repository https://gitbox.apache.org/repos/asf/camel.git


  at fecab159149 CAMEL-20832: camel-openapi-validator to use Atlassian 
openapi validator for rest-dsl

This branch includes the following new commits:

 new 3665b8110ab CAMEL-20832: Add rest-dsl client validator that can use 
atlassian validator in a plugin fashion
 new 14f1b58af44 CAMEL-20832: camel-openapi-validator to use Atlassian 
openapi validator for rest-dsl
 new fecab159149 CAMEL-20832: camel-openapi-validator to use Atlassian 
openapi validator for rest-dsl

The 3 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.

(camel-spring-boot) branch main updated: Regen

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git


The following commit(s) were added to refs/heads/main by this push:
 new fa5a568f67d Regen
fa5a568f67d is described below

commit fa5a568f67dedcf8e4b2f1902deb95f19ce2f701
Author: Claus Ibsen 
AuthorDate: Mon Jun 10 07:22:18 2024 +0200

Regen
---
 .../catalog/components/aws2-kinesis.json   | 92 +++---
 .../camel/springboot/catalog/components/smb.json   | 53 +++--
 .../src/main/docs/aws2-kinesis.json|  7 ++
 .../springboot/Kinesis2ComponentConfiguration.java | 12 +++
 4 files changed, 93 insertions(+), 71 deletions(-)

diff --git 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json
 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json
index a160d79a090..f0c00a211e9 100644
--- 
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json
+++ 
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json
@@ -34,23 +34,24 @@
 "sequenceNumber": { "index": 8, "kind": "property", "displayName": 
"Sequence Number", "group": "consumer", "label": "consumer", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "configurationClass": 
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", 
"configurationField": "configuration", "description": "The sequence number to 
start polling from. Required if iteratorType is set to AFTER_SEQUENC [...]
 "shardClosed": { "index": 9, "kind": "property", "displayName": "Shard 
Closed", "group": "consumer", "label": "consumer", "required": false, "type": 
"object", "javaType": 
"org.apache.camel.component.aws2.kinesis.Kinesis2ShardClosedStrategyEnum", 
"enum": [ "ignore", "fail", "silent" ], "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": "ignore", "configurationClass": 
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", 
"configurationField": "configur [...]
 "shardId": { "index": 10, "kind": "property", "displayName": "Shard Id", 
"group": "consumer", "label": "consumer", "required": false, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "autowired": false, 
"secret": false, "configurationClass": 
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", 
"configurationField": "configuration", "description": "Defines which shardId in 
the Kinesis stream to get records from" },
-"lazyStartProducer": { "index": 11, "kind": "property", "displayName": 
"Lazy Start Producer", "group": "producer", "label": "producer", "required": 
false, "type": "boolean", "javaType": "boolean", "deprecated": false, 
"autowired": false, "secret": false, "defaultValue": false, "description": 
"Whether the producer should be started lazy (on the first message). By 
starting lazy you can use this to allow CamelContext and routes to startup in 
situations where a producer may otherwise fai [...]
-"amazonKinesisClient": { "index": 12, "kind": "property", "displayName": 
"Amazon Kinesis Client", "group": "advanced", "label": "advanced", "required": 
false, "type": "object", "javaType": 
"software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false, 
"deprecationNote": "", "autowired": true, "secret": false, 
"configurationClass": 
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", 
"configurationField": "configuratio

(camel) branch main updated: CAMEL-20852: New option to allow adding empty files to a zip (#14426)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new c488231b60f CAMEL-20852: New option to allow adding empty files to a 
zip (#14426)
c488231b60f is described below

commit c488231b60fc37a17c3ec8016f4113cc790521e8
Author: Alexander Friedrichs 
AuthorDate: Mon Jun 10 07:22:52 2024 +0200

CAMEL-20852: New option to allow adding empty files to a zip (#14426)
---
 .../zipfile/ZipAggregationStrategyConfigurer.java  |  6 
 .../apache/camel/bean/ZipAggregationStrategy.json  |  2 +-
 .../aggregate/zipfile/ZipAggregationStrategy.java  | 35 ---
 .../ZipAggregationStrategyEmptyFileTest.java   | 39 +++---
 4 files changed, 73 insertions(+), 9 deletions(-)

diff --git 
a/components/camel-zipfile/src/generated/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyConfigurer.java
 
b/components/camel-zipfile/src/generated/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyConfigurer.java
index 7609bc81e1a..5f20c83f9b7 100644
--- 
a/components/camel-zipfile/src/generated/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyConfigurer.java
+++ 
b/components/camel-zipfile/src/generated/java/org/apache/camel/processor/aggregate/zipfile/ZipAggregationStrategyConfigurer.java
@@ -23,6 +23,8 @@ public class ZipAggregationStrategyConfigurer extends 
org.apache.camel.support.c
 public boolean configure(CamelContext camelContext, Object obj, String 
name, Object value, boolean ignoreCase) {
 org.apache.camel.processor.aggregate.zipfile.ZipAggregationStrategy 
target = (org.apache.camel.processor.aggregate.zipfile.ZipAggregationStrategy) 
obj;
 switch (ignoreCase ? name.toLowerCase() : name) {
+case "allowemptyfiles":
+case "allowEmptyFiles": 
target.setAllowEmptyFiles(property(camelContext, boolean.class, value)); return 
true;
 case "fileprefix":
 case "filePrefix": target.setFilePrefix(property(camelContext, 
java.lang.String.class, value)); return true;
 case "filesuffix":
@@ -42,6 +44,8 @@ public class ZipAggregationStrategyConfigurer extends 
org.apache.camel.support.c
 @Override
 public Class getOptionType(String name, boolean ignoreCase) {
 switch (ignoreCase ? name.toLowerCase() : name) {
+case "allowemptyfiles":
+case "allowEmptyFiles": return boolean.class;
 case "fileprefix":
 case "filePrefix": return java.lang.String.class;
 case "filesuffix":
@@ -62,6 +66,8 @@ public class ZipAggregationStrategyConfigurer extends 
org.apache.camel.support.c
 public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
 org.apache.camel.processor.aggregate.zipfile.ZipAggregationStrategy 
target = (org.apache.camel.processor.aggregate.zipfile.ZipAggregationStrategy) 
obj;
 switch (ignoreCase ? name.toLowerCase() : name) {
+case "allowemptyfiles":
+case "allowEmptyFiles": return target.isAllowEmptyFiles();
 case "fileprefix":
 case "filePrefix": return target.getFilePrefix();
 case "filesuffix":
diff --git 
a/components/camel-zipfile/src/generated/resources/META-INF/services/org/apache/camel/bean/ZipAggregationStrategy.json
 
b/components/camel-zipfile/src/generated/resources/META-INF/services/org/apache/camel/bean/ZipAggregationStrategy.json
index 7f70dc05ba4..479b164f676 100644
--- 
a/components/camel-zipfile/src/generated/resources/META-INF/services/org/apache/camel/bean/ZipAggregationStrategy.json
+++ 
b/components/camel-zipfile/src/generated/resources/META-INF/services/org/apache/camel/bean/ZipAggregationStrategy.json
@@ -10,7 +10,7 @@
 "groupId": "org.apache.camel",
 "artifactId": "camel-zipfile",
 "version": "4.7.0-SNAPSHOT",
-"properties": { "filePrefix": { "index": 0, "kind": "property", 
"displayName": "File Prefix", "required": false, "type": "string", "javaType": 
"java.lang.String", "deprecated": false, "autowired": false, "secret": false, 
"description": "Sets the prefix that will be used when creating the ZIP 
filename." }, "fileSuffix": { "index": 1, "kind": "property", "displayName": 
"File Suffix", "required": false, "type": "string", "javaType": 
"java.lang.String", "deprecated": false, "autowired":  [...]
+"

(camel) branch main updated: Regen

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 97d5b9737b5 Regen
97d5b9737b5 is described below

commit 97d5b9737b5e0940e3a7242542f446282b90df77
Author: Claus Ibsen 
AuthorDate: Mon Jun 10 07:03:44 2024 +0200

Regen
---
 .../apache/camel/catalog/schemas/camel-spring.xsd  | 50 +++---
 1 file changed, 45 insertions(+), 5 deletions(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index ece74309fe5..e92a71aeca2 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -75,7 +75,7 @@ Configures batch-processing resequence eip.
 
   
 
   
 
@@ -3973,10 +3973,50 @@ Enables random backoff. Default value: false
 
   
 
-
-
-
-
+
+  
+
+
+
+  
+
+
+  
+
+
+
+  
+
+
+  
+
+
+
+  
+
+
+  
+
+
+
+  
+
   
 
   

(camel) branch main updated: CAMEL-19358 - changes to address flakiness of KafkaConsumerFullIT test (#14423)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 58966a9af30 CAMEL-19358 - changes to address flakiness of 
KafkaConsumerFullIT test (#14423)
58966a9af30 is described below

commit 58966a9af30239549c702c880ceaa86f5547d0d0
Author: Jang-Vijay Singh 
AuthorDate: Mon Jun 10 05:56:49 2024 +0100

CAMEL-19358 - changes to address flakiness of KafkaConsumerFullIT test 
(#14423)

changes to address flakiness of KafkaConsumerFullIT test:
- unique topic & route names
- ensure topic is actually deleted in @AfterEach
---
 .../kafka/integration/KafkaConsumerFullIT.java | 31 +++---
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git 
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
 
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
index 318ecc59e22..0957733834c 100644
--- 
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
+++ 
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.kafka.integration;
 import java.util.Collections;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.StreamSupport;
 
 import org.apache.camel.BindToRegistry;
@@ -33,7 +34,9 @@ import 
org.apache.camel.component.kafka.integration.common.KafkaTestUtil;
 import org.apache.camel.component.kafka.serde.DefaultKafkaHeaderDeserializer;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.infra.core.annotations.RouteFixture;
+import org.apache.kafka.clients.admin.DeleteTopicsResult;
 import org.apache.kafka.clients.producer.ProducerRecord;
+import org.apache.kafka.common.Uuid;
 import org.apache.kafka.common.header.internals.RecordHeader;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -54,7 +57,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class KafkaConsumerFullIT extends BaseKafkaTestSupport {
-public static final String TOPIC = "test-full-KafkaConsumerFullIT"; 
//CAMEL-20722: try a more unique name to avoid clash
+public static final String TOPIC = "test-full-" + Uuid.randomUuid(); 
//CAMEL-20722: a more unique name to avoid clash
+public static final String ROUTE = "full-it-" + Uuid.randomUuid();   
//CAMEL-20722: a more unique name to avoid clash
 
 private static final Logger LOG = 
LoggerFactory.getLogger(KafkaConsumerFullIT.class);
 
@@ -80,7 +84,14 @@ public class KafkaConsumerFullIT extends 
BaseKafkaTestSupport {
 producer.close();
 }
 // clean all test topics
-kafkaAdminClient.deleteTopics(Collections.singletonList(TOPIC)).all();
+DeleteTopicsResult r = 
kafkaAdminClient.deleteTopics(Collections.singletonList(TOPIC));
+
+// wait necessary to ensure the topic is actually deleted, and avoid 
chance of clash in unrelate tests
+Awaitility.await()
+.timeout(60, TimeUnit.SECONDS)
+.pollDelay(3, TimeUnit.SECONDS)
+.untilAsserted(() -> assertTrue(r.all().isDone()));
+
 }
 
 @RouteFixture
@@ -94,7 +105,7 @@ public class KafkaConsumerFullIT extends 
BaseKafkaTestSupport {
 public void configure() {
 from(FROM_URI)
 .process(exchange -> LOG.trace("Captured on the 
processor: {}", exchange.getMessage().getBody()))
-.routeId("full-it").to(KafkaTestUtil.MOCK_RESULT);
+.routeId(ROUTE).to(KafkaTestUtil.MOCK_RESULT);
 }
 };
 }
@@ -174,12 +185,12 @@ public class KafkaConsumerFullIT extends 
BaseKafkaTestSupport {
 
 // Restart endpoint
 CamelContext context = contextExtension.getContext();
-context.getRouteController().stopRoute("full-it");
+context.getRouteController().stopRoute(ROUTE);
 
 KafkaEndpoint kafkaEndpoint = (KafkaEndpoint) 
context.getEndpoint(FROM_URI);
 kafkaEndpoint.getConfiguration().setSeekTo(SeekPolicy.BEGINNING);
 
-context.getRouteController().startRoute("full-it");
+context.getRouteController().startRoute(ROUTE);
 
 // As wee set seek to beginning we should re-consume all messages
 to.assertIsSatisfied(3000);
@@ -205,12 +216,12 @@ public class KafkaConsumerFullIT extends 
BaseKafkaTestSupport {
 

(camel) branch main updated: CAMEL-20776: Kinesis Consumer uses a separate thread to monitor shard changes (#14406)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 0856951b23b CAMEL-20776: Kinesis Consumer uses a separate thread to 
monitor shard changes (#14406)
0856951b23b is described below

commit 0856951b23b682e324b83b4731b48fa664bfe95a
Author: Fan Yang 
AuthorDate: Mon Jun 10 12:56:22 2024 +0800

CAMEL-20776: Kinesis Consumer uses a separate thread to monitor shard 
changes (#14406)

* Kinesis Consumer uses a separate thread to monitor shard changes

* Use millisecond and ExecutorServiceManager

* Commit generated files

* Commit generated files

* Adjust code format

* fix tests

* format
---
 .../camel/catalog/components/aws2-kinesis.json | 92 +++---
 .../aws2/kinesis/Kinesis2ComponentConfigurer.java  |  6 ++
 .../aws2/kinesis/Kinesis2EndpointConfigurer.java   |  6 ++
 .../aws2/kinesis/Kinesis2EndpointUriFactory.java   |  3 +-
 .../camel/component/aws2/kinesis/aws2-kinesis.json | 92 +++---
 .../aws2/kinesis/Kinesis2Configuration.java| 11 +++
 .../component/aws2/kinesis/Kinesis2Consumer.java   | 92 --
 .../KinesisConsumerClosedShardWithFailTest.java| 36 +
 .../KinesisConsumerClosedShardWithSilentTest.java  | 33 
 .../kinesis/integration/KinesisConsumerIT.java |  4 +-
 .../KinesisConsumerResumeAfterRestartIT.java   |  4 +-
 .../integration/KinesisConsumerResumeIT.java   |  4 +-
 .../dsl/Aws2KinesisComponentBuilderFactory.java| 18 +
 .../dsl/Kinesis2EndpointBuilderFactory.java| 30 +++
 .../camel/kotlin/components/Aws2KinesisUriDsl.kt   | 14 
 15 files changed, 289 insertions(+), 156 deletions(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
index 54b40aa1820..8f1a0065ed7 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
@@ -34,23 +34,24 @@
 "sequenceNumber": { "index": 8, "kind": "property", "displayName": 
"Sequence Number", "group": "consumer", "label": "consumer", "required": false, 
"type": "string", "javaType": "java.lang.String", "deprecated": false, 
"autowired": false, "secret": false, "configurationClass": 
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", 
"configurationField": "configuration", "description": "The sequence number to 
start polling from. Required if iteratorType is set to AFTER_SEQUENC [...]
 "shardClosed": { "index": 9, "kind": "property", "displayName": "Shard 
Closed", "group": "consumer", "label": "consumer", "required": false, "type": 
"object", "javaType": 
"org.apache.camel.component.aws2.kinesis.Kinesis2ShardClosedStrategyEnum", 
"enum": [ "ignore", "fail", "silent" ], "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": "ignore", "configurationClass": 
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", 
"configurationField": "configur [...]
 "shardId": { "index": 10, "kind": "property", "displayName": "Shard Id", 
"group": "consumer", "label": "consumer", "required": false, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "autowired": false, 
"secret": false, "configurationClass": 
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration", 
"configurationField": "configuration", "description": "Defines which shardId in 
the Kinesis stream to get records from" },
-"lazyStartProducer": { "index": 11, "kind": "property", "displayName": 
"Lazy Start Producer", "group": "producer", "label": "producer", "required": 
false, "type": "boolean", "javaType": "boolean", "deprecated": 

(camel) branch main updated: CAMEL-20833 Add a recursive option for polling files and subdirectories (#14374)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new b2232542041 CAMEL-20833 Add a recursive option for polling files and 
subdirectories (#14374)
b2232542041 is described below

commit b223254204155056bc2ab831db39efa972ded135
Author: Tom Cunningham 
AuthorDate: Mon Jun 10 00:55:54 2024 -0400

CAMEL-20833 Add a recursive option for polling files and subdirectories 
(#14374)

* CAMEL-20833 Add a recursive option for polling files and subdirectories

* Remove default "" value for path
---
 .../org/apache/camel/catalog/components/smb.json   | 53 ++---
 .../apache/camel/catalog/schemas/camel-spring.xsd  | 50 ++--
 .../camel/component/smb/SmbEndpointConfigurer.java |  3 +
 .../camel/component/smb/SmbEndpointUriFactory.java |  3 +-
 .../org/apache/camel/component/smb/smb.json| 53 ++---
 .../camel/component/smb/SmbConfiguration.java  | 14 
 .../apache/camel/component/smb/SmbConsumer.java| 88 +-
 .../endpoint/dsl/SmbEndpointBuilderFactory.java| 32 
 .../apache/camel/kotlin/components/SmbUriDsl.kt| 14 
 9 files changed, 178 insertions(+), 132 deletions(-)

diff --git 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smb.json
 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smb.json
index 35a56d6cae8..3f9a64b3769 100644
--- 
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smb.json
+++ 
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smb.json
@@ -31,31 +31,32 @@
 "port": { "index": 1, "kind": "path", "displayName": "Port", "group": 
"consumer", "label": "", "required": false, "type": "integer", "javaType": 
"int", "deprecated": false, "autowired": false, "secret": false, 
"defaultValue": 445, "description": "The share port number" },
 "shareName": { "index": 2, "kind": "path", "displayName": "Share Name", 
"group": "consumer", "label": "", "required": true, "type": "string", 
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", 
"autowired": false, "secret": false, "description": "The name of the share to 
connect to." },
 "path": { "index": 3, "kind": "parameter", "displayName": "Path", "group": 
"consumer", "label": "", "required": true, "type": "string", "javaType": 
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": 
false, "secret": false, "configurationClass": 
"org.apache.camel.component.smb.SmbConfiguration", "configurationField": 
"configuration", "description": "The path, within the share, to consume the 
files from" },
-"searchPattern": { "index": 4, "kind": "parameter", "displayName": "Search 
Pattern", "group": "consumer", "label": "", "required": false, "type": 
"string", "javaType": "java.lang.String", "deprecated": false, "autowired": 
false, "secret": false, "defaultValue": "*.txt", "configurationClass": 
"org.apache.camel.component.smb.SmbConfiguration", "configurationField": 
"configuration", "description": "The search pattern used to list the files" },
-"sendEmptyMessageWhenIdle": { "index": 5, "kind": "parameter", 
"displayName": "Send Empty Message When Idle", "group": "consumer", "label": 
"consumer", "required": false, "type": "boolean", "javaType": "boolean", 
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 
false, "description": "If the polling consumer did not poll any files, you can 
enable this option to send an empty message (no body) instead." },
-"bridgeErrorHandler": { "i

(camel) branch main updated: CAMEL-20845: camel-core - Simple language to make it easy to replace texts (#14412)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 89dc81b7647 CAMEL-20845: camel-core - Simple language to make it easy 
to replace texts (#14412)
89dc81b7647 is described below

commit 89dc81b76478f7da95f01899d017f11107dfdd40
Author: Claus Ibsen 
AuthorDate: Fri Jun 7 17:08:11 2024 +0200

CAMEL-20845: camel-core - Simple language to make it easy to replace texts 
(#14412)
---
 .../main/docs/modules/languages/pages/simple-language.adoc| 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git 
a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
 
b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
index 025a3aafa48..b0061ec90dd 100644
--- 
a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
+++ 
b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
@@ -854,14 +854,17 @@ You can nest functions, such as shown below:
 
 === Replacing double and single quotes
 
-You can use the `replace` function to more easily replace all single or double 
quotes in the message body.
+You can use the `replace` function to more easily replace all single or double 
quotes in the message body,
+using the XML escape syntax. This avoids to fiddle with enclosing a double 
quote or single quotes with outer quotes,
+that can get confusing to be correct as you may need to escape the quotes as 
well. So instead you can use the XML escape
+syntax where double quote is `\` and single quote is `\` (yeah 
that is the name).
 
 For example to replace all double quotes with single quotes:
 
 [source,java]
 
 from("direct:order")
-  .transform().simple("${replace(,)}")
+  .transform().simple("${replace( , )}")
   .to("mock:reply");
 
 
@@ -870,7 +873,7 @@ And to replace all single quotes with double quotes:
 [source,xml]
 
 
-  ${replace(,)}
+  ${replace( , )}
 
 
 
@@ -879,7 +882,7 @@ Or to remove all double quotes:
 [source,xml]
 
 
-  ${replace()}
+  ${replace( , )}
 
 
 

(camel) branch main updated: chore(deps): Bump com.twilio.sdk:twilio from 10.2.0 to 10.2.1 (#14413)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new c2a682d3270 chore(deps): Bump com.twilio.sdk:twilio from 10.2.0 to 
10.2.1 (#14413)
c2a682d3270 is described below

commit c2a682d32706d9c22fc9897334b5db21aa8262d5
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Jun 7 17:00:53 2024 +0200

chore(deps): Bump com.twilio.sdk:twilio from 10.2.0 to 10.2.1 (#14413)

Bumps [com.twilio.sdk:twilio](https://github.com/twilio/twilio-java) from 
10.2.0 to 10.2.1.
- [Release notes](https://github.com/twilio/twilio-java/releases)
- [Changelog](https://github.com/twilio/twilio-java/blob/main/CHANGES.md)
- [Commits](https://github.com/twilio/twilio-java/compare/10.2.0...10.2.1)

---
updated-dependencies:
- dependency-name: com.twilio.sdk:twilio
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 16812da9de9..ecfe73b9649 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -467,7 +467,7 @@
 1.19.8
 3.1.2.RELEASE
 2.9.2
-10.2.0
+10.2.1
 4.1.2
 2.3.13.Final
 2.9.1

(camel) branch main updated: camel-elasticsearch-rest-client: Add header details to component documentation (#14422)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new bf9fa80976f camel-elasticsearch-rest-client: Add header details to 
component documentation (#14422)
bf9fa80976f is described below

commit bf9fa80976f061c34e5ddc478c539dbbc5c85e99
Author: James Netherton 
AuthorDate: Fri Jun 7 15:59:02 2024 +0100

camel-elasticsearch-rest-client: Add header details to component 
documentation (#14422)
---
 .../src/main/docs/elasticsearch-rest-client-component.adoc| 4 
 1 file changed, 4 insertions(+)

diff --git 
a/components/camel-elasticsearch-rest-client/src/main/docs/elasticsearch-rest-client-component.adoc
 
b/components/camel-elasticsearch-rest-client/src/main/docs/elasticsearch-rest-client-component.adoc
index ab1fec9e2d9..53dafe39a63 100644
--- 
a/components/camel-elasticsearch-rest-client/src/main/docs/elasticsearch-rest-client-component.adoc
+++ 
b/components/camel-elasticsearch-rest-client/src/main/docs/elasticsearch-rest-client-component.adoc
@@ -49,6 +49,10 @@ include::partial$component-endpoint-options.adoc[]
 
 // endpoint options: END
 
+// component headers: START
+include::partial$component-endpoint-headers.adoc[]
+// component headers: END
+
 == Async Producer
 
 This component implements the async producer.

(camel) branch sr deleted (was 92e89011aa9)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch sr
in repository https://gitbox.apache.org/repos/asf/camel.git


 was 92e89011aa9 CAMEL-20845: camel-core - Simple language to make it easy 
to replace texts

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

(camel) branch main updated: CAMEL-20845: camel-core - Simple language to make it easy to replace texts (#14412)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 5b55ceb0203 CAMEL-20845: camel-core - Simple language to make it easy 
to replace texts (#14412)
5b55ceb0203 is described below

commit 5b55ceb020374340fbe9275fa646da1a8321e33f
Author: Claus Ibsen 
AuthorDate: Fri Jun 7 09:06:18 2024 +0200

CAMEL-20845: camel-core - Simple language to make it easy to replace texts 
(#14412)
---
 .../modules/languages/pages/simple-language.adoc   | 37 ++
 .../language/simple/SimpleExpressionBuilder.java   | 27 
 .../simple/ast/SimpleFunctionExpression.java   | 27 
 .../apache/camel/language/simple/SimpleTest.java   | 16 ++
 .../camel/support/builder/ExpressionBuilder.java   | 29 +
 .../java/org/apache/camel/util/StringHelper.java   | 19 +++
 6 files changed, 155 insertions(+)

diff --git 
a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
 
b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
index 313a125297d..025a3aafa48 100644
--- 
a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
+++ 
b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
@@ -238,6 +238,12 @@ constant field from Exchange as: 
`org.apache.camel.Exchange.FILE_NAME`
 |random(min,max) |Integer |returns a random Integer between _min_ (included) 
and
 _max_ (excluded)
 
+|replace(from,to) |String |replace all the string values in the message body.
+To make it easier to replace single and double quotes, then you can use XML 
escaped values `\` as double quote, `\` as single quote, and 
`\` as empty value.
+
+|replace(from,to,exp) |String |replace all the string values in the given 
expression.
+To make it easier to replace single and double quotes, then you can use XML 
escaped values `\` as double quote, `\` as single quote, and 
`\` as empty value.
+
 |collate(group) |List |The collate function iterates the message body and 
groups
 the data into sub lists of specified size. This can be used with the
 Splitter EIP to split a message body and group/batch
@@ -846,6 +852,37 @@ You can nest functions, such as shown below:
 
 
 
+=== Replacing double and single quotes
+
+You can use the `replace` function to more easily replace all single or double 
quotes in the message body.
+
+For example to replace all double quotes with single quotes:
+
+[source,java]
+
+from("direct:order")
+  .transform().simple("${replace(,)}")
+  .to("mock:reply");
+
+
+And to replace all single quotes with double quotes:
+
+[source,xml]
+
+
+  ${replace(,)}
+
+
+
+Or to remove all double quotes:
+
+[source,xml]
+
+
+  ${replace()}
+
+
+
 == Setting result type
 
 You can now provide a result type to the xref:simple-language.adoc[Simple]
diff --git 
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
 
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
index 3203ec7deb9..82d0a18b7b0 100644
--- 
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
+++ 
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
@@ -207,6 +207,33 @@ public final class SimpleExpressionBuilder {
 };
 }
 
+/**
+ * Replaces string values from the expression
+ */
+public static Expression replaceExpression(final String expression, final 
String from, final String to) {
+return new ExpressionAdapter() {
+private Expression exp;
+
+@Override
+public void init(CamelContext context) {
+exp = 
context.resolveLanguage("simple").createExpression(expression);
+exp.init(context);
+exp = ExpressionBuilder.replaceAll(exp, from, to);
+exp.init(context);
+}
+
+@Override
+public Object evaluate(Exchange exchange) {
+return exp.evaluate(exchange, Object.class);
+}
+
+@Override
+public String toString() {
+return "replace(" + expression + "," + from + "," + to + ")";
+}
+};
+}
+
 /**
  * Hashes the value using the given algorithm
  */
diff --git 
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
 
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
index 0ba3b65788a..e9c2a41bb00 100644
--- 
a/core/camel-core-languages/

(camel) branch sr created (now 92e89011aa9)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch sr
in repository https://gitbox.apache.org/repos/asf/camel.git


  at 92e89011aa9 CAMEL-20845: camel-core - Simple language to make it easy 
to replace texts

This branch includes the following new commits:

 new 92e89011aa9 CAMEL-20845: camel-core - Simple language to make it easy 
to replace texts

The 1 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.

(camel) 01/01: CAMEL-20845: camel-core - Simple language to make it easy to replace texts

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch sr
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 92e89011aa98e58d2ba52963153b4529b2109d35
Author: Claus Ibsen 
AuthorDate: Fri Jun 7 08:14:08 2024 +0200

CAMEL-20845: camel-core - Simple language to make it easy to replace texts
---
 .../modules/languages/pages/simple-language.adoc   | 37 ++
 .../language/simple/SimpleExpressionBuilder.java   | 27 
 .../simple/ast/SimpleFunctionExpression.java   | 27 
 .../apache/camel/language/simple/SimpleTest.java   | 16 ++
 .../camel/support/builder/ExpressionBuilder.java   | 29 +
 .../java/org/apache/camel/util/StringHelper.java   | 19 +++
 6 files changed, 155 insertions(+)

diff --git 
a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
 
b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
index 313a125297d..025a3aafa48 100644
--- 
a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
+++ 
b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
@@ -238,6 +238,12 @@ constant field from Exchange as: 
`org.apache.camel.Exchange.FILE_NAME`
 |random(min,max) |Integer |returns a random Integer between _min_ (included) 
and
 _max_ (excluded)
 
+|replace(from,to) |String |replace all the string values in the message body.
+To make it easier to replace single and double quotes, then you can use XML 
escaped values `\` as double quote, `\` as single quote, and 
`\` as empty value.
+
+|replace(from,to,exp) |String |replace all the string values in the given 
expression.
+To make it easier to replace single and double quotes, then you can use XML 
escaped values `\` as double quote, `\` as single quote, and 
`\` as empty value.
+
 |collate(group) |List |The collate function iterates the message body and 
groups
 the data into sub lists of specified size. This can be used with the
 Splitter EIP to split a message body and group/batch
@@ -846,6 +852,37 @@ You can nest functions, such as shown below:
 
 
 
+=== Replacing double and single quotes
+
+You can use the `replace` function to more easily replace all single or double 
quotes in the message body.
+
+For example to replace all double quotes with single quotes:
+
+[source,java]
+
+from("direct:order")
+  .transform().simple("${replace(,)}")
+  .to("mock:reply");
+
+
+And to replace all single quotes with double quotes:
+
+[source,xml]
+
+
+  ${replace(,)}
+
+
+
+Or to remove all double quotes:
+
+[source,xml]
+
+
+  ${replace()}
+
+
+
 == Setting result type
 
 You can now provide a result type to the xref:simple-language.adoc[Simple]
diff --git 
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
 
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
index 3203ec7deb9..82d0a18b7b0 100644
--- 
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
+++ 
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
@@ -207,6 +207,33 @@ public final class SimpleExpressionBuilder {
 };
 }
 
+/**
+ * Replaces string values from the expression
+ */
+public static Expression replaceExpression(final String expression, final 
String from, final String to) {
+return new ExpressionAdapter() {
+private Expression exp;
+
+@Override
+public void init(CamelContext context) {
+exp = 
context.resolveLanguage("simple").createExpression(expression);
+exp.init(context);
+exp = ExpressionBuilder.replaceAll(exp, from, to);
+exp.init(context);
+}
+
+@Override
+public Object evaluate(Exchange exchange) {
+return exp.evaluate(exchange, Object.class);
+}
+
+@Override
+public String toString() {
+return "replace(" + expression + "," + from + "," + to + ")";
+}
+};
+}
+
 /**
  * Hashes the value using the given algorithm
  */
diff --git 
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
 
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
index 0ba3b65788a..e9c2a41bb00 100644
--- 
a/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
+++ 
b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
@@ -660,6 +660,33 @@

(camel) branch camel-4.4.x updated: CAMEL-20841 Fixes DS expressions not able to be evalated after being removed from mapperCache (#14411)

[davsclaus]

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


The following commit(s) were added to refs/heads/camel-4.4.x by this push:
 new b41ee31adbf CAMEL-20841 Fixes DS expressions not able to be evalated 
after being removed from mapperCache (#14411)
b41ee31adbf is described below

commit b41ee31adbf6b0bb33b1f328c7d312058b72e5b0
Author: Rob Ratcliffe 
AuthorDate: Fri Jun 7 00:36:19 2024 -0400

CAMEL-20841 Fixes DS expressions not able to be evalated after being 
removed from mapperCache (#14411)

* change to initialize expression if not found

* switch to only use computeIfMiss

* add comment back
---
 .../camel/language/datasonnet/DatasonnetExpression.java | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git 
a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
 
b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
index 86bb0b244ff..3ead8d5574b 100644
--- 
a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
+++ 
b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/DatasonnetExpression.java
@@ -133,9 +133,20 @@ public class DatasonnetExpression extends 
ExpressionAdapter implements Expressio
 }
 }
 
-// the mapper is pre initialized
-Mapper mapper = language.lookup(expression)
-.orElseThrow(() -> new IllegalStateException("Datasonnet 
expression not initialized"));
+// the mapper is pre initialized but can become empty
+Mapper mapper = language.computeIfMiss(expression, () -> {
+MapperBuilder builder = new MapperBuilder(expression)
+.withInputNames("body")
+.withImports(resolveImports(language))
+.withLibrary(CML.getInstance())
+.withDefaultOutput(MediaTypes.APPLICATION_JAVA);
+
+Set additionalLibraries = 
exchange.getContext().getRegistry().findByType(com.datasonnet.spi.Library.class);
+for (Library lib : additionalLibraries) {
+builder = builder.withLibrary(lib);
+}
+return builder.build();
+});
 
 MediaType outMT = outputMediaType;
 if (outMT == null) {

(camel) branch main updated (f0ee72721c6 -> 56b4ab14066)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from f0ee72721c6 CAMEL-20848: camel-jbang - Export should only jib if no 
jkube is in use
 add 56b4ab14066 CAMEL-20841 Fixes DS expressions not able to be evalated 
after being removed from mapperCache (#14411)

No new revisions were added by this update.

Summary of changes:
 .../camel/language/datasonnet/DatasonnetExpression.java | 17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(camel) branch main updated: CAMEL-20848: camel-jbang - Export should only jib if no jkube is in use

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new f0ee72721c6 CAMEL-20848: camel-jbang - Export should only jib if no 
jkube is in use
f0ee72721c6 is described below

commit f0ee72721c669de9dfd5e99c24809f45dd936ed7
Author: Claus Ibsen 
AuthorDate: Thu Jun 6 22:31:22 2024 +0200

CAMEL-20848: camel-jbang - Export should only jib if no jkube is in use
---
 .../modules/ROOT/pages/camel-jbang.adoc|  2 +-
 .../dsl/jbang/core/commands/ExportBaseCommand.java | 16 +--
 .../dsl/jbang/core/commands/ExportCamelMain.java   | 18 +
 ...uth-pom.tmpl => main-docker-from-auth-pom.tmpl} |  0
 .../main/resources/templates/main-docker-pom.tmpl  | 21 
 ...-auth-pom.tmpl => main-docker-to-auth-pom.tmpl} |  0
 .../resources/templates/main-kubernetes-pom.tmpl   | 23 +-
 .../src/main/resources/templates/main-pom.tmpl |  8 
 8 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc 
b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
index be1c7b0b037..6aa1297e9c6 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
@@ -3480,7 +3480,7 @@ For example, the following can be used for a general 
Camel based application to
 
 label.runtime=app.kubernetes.io/runtime
 jib.to.image=demo/myapp:1.0
-jkube.version=1.16.0
+jkube.version=1.16.2
 jkube.build.strategy=jib
 jkube.skip.build=true
 jkube.namespace=my-namespace
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index 04048626157..f366c50f91c 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -704,11 +704,23 @@ abstract class ExportBaseCommand extends CamelCommand {
 try {
 List lines = RuntimeUtil.loadPropertiesLines(settings);
 return lines.stream().filter(l -> 
l.startsWith("camel.jbang.jib-maven-plugin-version="))
-.map(s -> StringHelper.after(s, 
"=")).findFirst().orElse("3.4.0");
+.map(s -> StringHelper.after(s, 
"=")).findFirst().orElse("3.4.3");
 } catch (Exception e) {
 // ignore
 }
-return "3.4.0";
+return "3.4.3";
+}
+
+protected static String jkubeMavenPluginVersion(File settings) {
+try {
+List lines = RuntimeUtil.loadPropertiesLines(settings);
+return lines.stream()
+.filter(l -> 
l.startsWith("camel.jbang.jkube-maven-plugin-version=") || 
l.startsWith("jkube.version="))
+.map(s -> StringHelper.after(s, 
"=")).findFirst().orElse("1.16.2");
+} catch (Exception e) {
+// ignore
+}
+return "1.16.2";
 }
 
 protected void safeCopy(File source, File target, boolean override) throws 
Exception {
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
index d833f666416..fd37cf570c0 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
@@ -243,8 +243,10 @@ class ExportCamelMain extends Export {
 if (profile.exists()) {
 RuntimeUtil.loadProperties(prop, profile);
 }
+boolean jib = prop.stringPropertyNames().stream().anyMatch(s -> 
s.startsWith("jib."));
 boolean jkube = prop.stringPropertyNames().stream().anyMatch(s -> 
s.startsWith("jkube."));
-if (jkube) {
+// jib is used for docker and kubernetes, jkube is only used for 
kubernetes
+if (jib || jkube) {
 // include all jib/jkube/label properties
 String fromImage = null;
 for (String key : prop.stringPropertyNames()) {
@@ -263,7 +265,7 @@ class ExportCamelMain extends Export {
 sb1.append(String.format("<%s>%s%n", 
"jib.from.image", fromImage, "jib.from.image"));
 }
 
-InputStream is = 

(camel) branch main updated (0c3a28572a6 -> 8b46596bf00)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


from 0c3a28572a6 CAMEL-20847: camel-jbang - Run with jolokia enabled does 
not work
 add 8b46596bf00 Add docs

No new revisions were added by this update.

Summary of changes:
 .../camel/catalog/others/platform-http-jolokia.json |  2 +-
 components/camel-platform-http-jolokia/pom.xml  |  1 +
 .../generated/resources/platform-http-jolokia.json  |  2 +-
 .../src/main/docs/platform-http-jolokia.adoc| 21 +
 .../plugin/DefaultJolokiaPlatformHttpPlugin.java|  5 ++---
 docs/components/modules/others/nav.adoc |  1 +
 .../modules/others/pages/platform-http-jolokia.adoc |  1 +
 7 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 
components/camel-platform-http-jolokia/src/main/docs/platform-http-jolokia.adoc
 create mode 12 
docs/components/modules/others/pages/platform-http-jolokia.adoc

(camel) branch main updated: CAMEL-20847: camel-jbang - Run with jolokia enabled does not work

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
 new 0c3a28572a6 CAMEL-20847: camel-jbang - Run with jolokia enabled does 
not work
0c3a28572a6 is described below

commit 0c3a28572a6932ec36a1014debfdcafea582eb4d
Author: Claus Ibsen 
AuthorDate: Thu Jun 6 20:35:33 2024 +0200

CAMEL-20847: camel-jbang - Run with jolokia enabled does not work
---
 components/camel-platform-http-jolokia/pom.xml | 12 +++-
 .../plugin/DefaultJolokiaPlatformHttpPlugin.java   | 72 +++---
 2 files changed, 61 insertions(+), 23 deletions(-)

diff --git a/components/camel-platform-http-jolokia/pom.xml 
b/components/camel-platform-http-jolokia/pom.xml
index 59ad8e17e43..9826eb2d31d 100644
--- a/components/camel-platform-http-jolokia/pom.xml
+++ b/components/camel-platform-http-jolokia/pom.xml
@@ -56,7 +56,17 @@
 
 
 org.jolokia
-jolokia-agent-jvm
+jolokia-server-core
+${jolokia-version}
+
+
+org.jolokia
+jolokia-service-serializer
+${jolokia-version}
+
+
+org.jolokia
+jolokia-service-jmx
 ${jolokia-version}
 
 
diff --git 
a/components/camel-platform-http-jolokia/src/main/java/org/apache/camel/component/platform/http/plugin/DefaultJolokiaPlatformHttpPlugin.java
 
b/components/camel-platform-http-jolokia/src/main/java/org/apache/camel/component/platform/http/plugin/DefaultJolokiaPlatformHttpPlugin.java
index 5275ad7f8c4..7ea95eb8623 100644
--- 
a/components/camel-platform-http-jolokia/src/main/java/org/apache/camel/component/platform/http/plugin/DefaultJolokiaPlatformHttpPlugin.java
+++ 
b/components/camel-platform-http-jolokia/src/main/java/org/apache/camel/component/platform/http/plugin/DefaultJolokiaPlatformHttpPlugin.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.platform.http.plugin;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Method;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
@@ -35,7 +36,9 @@ import io.vertx.ext.web.RoutingContext;
 import io.vertx.ext.web.impl.Utils;
 import org.apache.camel.CamelContext;
 import org.apache.camel.spi.annotations.JdkService;
+import org.apache.camel.support.ObjectHelper;
 import org.apache.camel.support.service.ServiceSupport;
+import org.apache.camel.util.ReflectionHelper;
 import org.jolokia.server.core.config.ConfigKey;
 import org.jolokia.server.core.config.StaticConfiguration;
 import org.jolokia.server.core.http.HttpRequestHandler;
@@ -49,8 +52,6 @@ import org.jolokia.server.core.service.api.Restrictor;
 import org.jolokia.server.core.util.NetworkUtil;
 import org.jolokia.service.jmx.LocalRequestHandler;
 import org.jolokia.service.serializer.JolokiaSerializer;
-import org.json.simple.JSONAware;
-import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -159,34 +160,68 @@ public class DefaultJolokiaPlatformHttpPlugin extends 
ServiceSupport implements
 }
 }
 
+/**
+ * This method uses reflection to invoke the Jolokia HttpRequestHandler 
because its shading
+ * JSon library which at runtime causes NoSuchMethodError due to 
JSONObject has been shaded
+ * into a different package.
+ */
 private Handler createVertxHandler() {
 return routingContext -> {
 HttpServerRequest req = routingContext.request();
 String remainingPath = Utils.pathOffset(req.path(), 
routingContext);
 
-JSONAware json = null;
+Object json = null;
+int status = 200;
 try {
-requestHandler.checkAccess(req.scheme(), 
req.remoteAddress().host(), req.remoteAddress().host(),
-getOriginOrReferer(req));
+ObjectHelper.invokeMethodSafe("checkAccess", requestHandler, 
req.scheme(), req.remoteAddress().host(),
+req.remoteAddress().host(), getOriginOrReferer(req));
 if (req.method() == HttpMethod.GET) {
-json = requestHandler.handleGetRequest(req.uri(), 
remainingPath, getParams(req.params()));
+Method m = 
ReflectionHelper.findMethod(requestHandler.getClass(), "handleGetRequest", 
String.class,
+String.class, Map.class);
+if (m != null) {
+json = ObjectHelper.invokeMethodSafe(m, 
requestHandler, req.uri(), remainingPath,
+getParams(req.params()));
+}
 } else {
 Arguments.require(routingContext.body() != null, "Missing 
body");
 InputStream inpu