(camel) branch main updated: Mark CEQ 3.8.x as LTS
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 478ddd052e9 Mark CEQ 3.8.x as LTS
478ddd052e9 is described below
commit 478ddd052e9f18d077931d6e81a7f996a700f750
Author: Claus Ibsen
AuthorDate: Fri Apr 26 14:22:45 2024 +0200
Mark CEQ 3.8.x as LTS
---
.../org/apache/camel/catalog/releases/camel-quarkus-releases.json | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
index fc927e5941f..dcbfdcbe1f1 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
@@ -230,12 +230,14 @@
"version": "3.8.0",
"date": "2024-02-28",
"eol": "2025-02-12",
+"kind": "lts",
"jdk": "17,21"
},
{
"version": "3.8.1",
"date": "2024-03-19",
"eol": "2025-02-12",
+"kind": "lts",
"jdk": "17,21"
},
{
(camel-website) branch main updated: Mark CEQ 3.8.x as LTS
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-website.git The following commit(s) were added to refs/heads/main by this push: new 7df276a3 Mark CEQ 3.8.x as LTS 7df276a3 is described below commit 7df276a38a032f418f211b7e55d074a24a0ef95f Author: Claus Ibsen AuthorDate: Fri Apr 26 14:09:56 2024 +0200 Mark CEQ 3.8.x as LTS --- content/releases/q/release-3.8.0.md | 1 + content/releases/q/release-3.8.1.md | 1 + 2 files changed, 2 insertions(+) diff --git a/content/releases/q/release-3.8.0.md b/content/releases/q/release-3.8.0.md index a87c4b5e..929c5fe5 100644 --- a/content/releases/q/release-3.8.0.md +++ b/content/releases/q/release-3.8.0.md @@ -9,5 +9,6 @@ preview: "" changelog: "" category: "camel-quarkus" milestone: 54 +kind: lts jdk: [17, 21] --- \ No newline at end of file diff --git a/content/releases/q/release-3.8.1.md b/content/releases/q/release-3.8.1.md index 59311550..3582054a 100644 --- a/content/releases/q/release-3.8.1.md +++ b/content/releases/q/release-3.8.1.md @@ -9,5 +9,6 @@ preview: "" changelog: "" category: "camel-quarkus" milestone: 56 +kind: lts jdk: [17, 21] --- \ No newline at end of file
(camel) branch main updated: Add handshakeHeaders uri param in vertx-websocket component (#13960)
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 da0124046a4 Add handshakeHeaders uri param in vertx-websocket
component (#13960)
da0124046a4 is described below
commit da0124046a4c861e6e02fd2f0711965acca6925e
Author: Alexis SEGURA
AuthorDate: Fri Apr 26 12:43:48 2024 +0200
Add handshakeHeaders uri param in vertx-websocket component (#13960)
Some websocket apis require authentication and various header during the
handshake process in order to upgrade to websocket. It was not supported by the
vertx-component. So I added an uri param to set a map of headers that will be
passed as header in the HTTP handshake request.
It is important to note that it only works when the endpoint is a producer,
or a consumer of a remote host (consumeAsClient true).
Use multiValue mecanism on UriParam.
Co-authored-by: Alexis SEGURA
---
.../camel/catalog/components/vertx-websocket.json | 29 +--
.../VertxWebsocketEndpointConfigurer.java | 15 ++
.../VertxWebsocketEndpointUriFactory.java | 7 +-
.../component/vertx/websocket/vertx-websocket.json | 29 +--
.../vertx/websocket/VertxWebsocketComponent.java | 4 +
.../websocket/VertxWebsocketConfiguration.java | 15 ++
.../vertx/websocket/VertxWebsocketEndpoint.java| 5 +
.../VertxWebsocketEndpointConfigurationTest.java | 18 ++
.../VertxWebsocketHandshakeHeadersTest.java| 226 +
.../kotlin/components/VertxWebsocketUriDsl.kt | 8 +
10 files changed, 326 insertions(+), 30 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-websocket.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-websocket.json
index efe52316058..1841d9b9b2e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-websocket.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-websocket.json
@@ -49,19 +49,20 @@
"allowOriginHeader": { "index": 4, "kind": "parameter", "displayName":
"Allow Origin Header", "group": "consumer", "label": "producer,consumer",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": true,
"configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "Whether the WebSocket
client should add the Origin [...]
"consumeAsClient": { "index": 5, "kind": "parameter", "displayName":
"Consume As Client", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "When set to true, the
consumer acts as a WebSocket client, crea [...]
"fireWebSocketConnectionEvents": { "index": 6, "kind": "parameter",
"displayName": "Fire Web Socket Connection Events", "group": "consumer",
"label": "consumer", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.vertx.websocket.VertxWebsocketConfiguration",
"configurationField": "configuration", "description": "Whether the server
consumer will [...]
-"maxReconnectAttempts": { "index": 7, "kind": "parameter", "displayName":
"Max Reconnect Attempts", "group": "consumer", "label": "consumer", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 0, "co
(camel) branch main updated (efe80d4d73f -> c305cacf4fa)
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 efe80d4d73f Upgrade Milvus container image to version v2.4.0 (#13961) add c305cacf4fa Update releases No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/releases/camel-releases.json | 7 +++ 1 file changed, 7 insertions(+)
(camel) branch yaml-property deleted (was 251257b4730)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch yaml-property in repository https://gitbox.apache.org/repos/asf/camel.git was 251257b4730 CAMEL-20698: YAML and XML DSL - Remove array of property in favour of using properties to make it consistent and only one-way of setting properties on beans. 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-20698: YAML and XML DSL - Remove array of property in favour of using properties to make it consistent and only one-way of setting properties on beans. (#13959)
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 6b33e6e75b1 CAMEL-20698: YAML and XML DSL - Remove array of property
in favour of using properties to make it consistent and only one-way of setting
properties on beans. (#13959)
6b33e6e75b1 is described below
commit 6b33e6e75b1e9939b007060cc0877bc765cd350a
Author: Claus Ibsen
AuthorDate: Fri Apr 26 12:05:20 2024 +0200
CAMEL-20698: YAML and XML DSL - Remove array of property in favour of using
properties to make it consistent and only one-way of setting properties on
beans. (#13959)
---
.../apache/camel/catalog/models/templateBean.json | 5 +--
.../camel/catalog/models/templatedRouteBean.json | 5 +--
.../apache/camel/catalog/schemas/camel-spring.xsd | 1 -
.../SpringRouteTemplateLocalBeanTest.xml | 2 +-
.../routebuilder/SpringTemplatedRouteTest.xml | 4 +-
.../org/apache/camel/model/templateBean.json | 5 +--
.../org/apache/camel/model/templatedRouteBean.json | 5 +--
.../apache/camel/model/BeanFactoryDefinition.java | 2 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 1 -
.../java/org/apache/camel/xml/out/ModelWriter.java | 1 -
.../src/test/resources/barTemplatedRoute.xml | 4 +-
.../singleTemplatedRouteNoNamespace.xml| 4 +-
.../org/apache/camel/yaml/out/ModelWriter.java | 1 -
.../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 29 ++
.../RouteTemplateBeanDefinitionDeserializer.java | 1 -
.../TemplatedRouteBeanDefinitionDeserializer.java | 1 -
.../generated/resources/schema/camelYamlDsl.json | 12 --
.../org/apache/camel/dsl/yaml/KameletTest.groovy | 5 +--
.../apache/camel/dsl/yaml/RouteTemplateTest.groovy | 45 --
19 files changed, 50 insertions(+), 83 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateBean.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateBean.json
index b40f995763d..ef188dacbfe 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateBean.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateBean.json
@@ -15,8 +15,7 @@
"name": { "index": 0, "kind": "attribute", "displayName": "Name", "group":
"common", "required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Bean
name" },
"type": { "index": 1, "kind": "attribute", "displayName": "Type", "group":
"common", "required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "What
type to use for creating the bean (FQN classname). Can be prefixed with: #class
or #type #class or #type then the bean is created via the fully qualified
classname, such as #class:com.foo.MyBean" },
"scriptLanguage": { "index": 2, "kind": "attribute", "displayName":
"Script Language", "group": "advanced", "label": "advanced", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The script language to use
when using inlined script for creating the bean, such as groovy, java,
javascript etc." },
-"property": { "index": 3, "kind": "element", "displayName": "Property",
"group": "common", "required": false, "type": "array", "javaType":
"java.util.List", "deprecated":
false, "autowired": false, "secret": false, "description": "Optional properties
to set on the created local bean" },
-"properties": { "index": 4, "kind": "element", "displayName":
"Properties", "group": "common", "required": false, "type": "object",
"javaType": "java.util.Map", "deprecated":
false, "autowired": false, "secret": false, "description": &
(camel) branch main updated: CAMEL-20719: Exclude Milvus bulk writer related dependencies (#13958)
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 b90d09b3214 CAMEL-20719: Exclude Milvus bulk writer related
dependencies (#13958)
b90d09b3214 is described below
commit b90d09b321449fd995d976b06893a214aaecb686
Author: James Netherton
AuthorDate: Fri Apr 26 10:29:49 2024 +0100
CAMEL-20719: Exclude Milvus bulk writer related dependencies (#13958)
* CAMEL-20719: Exclude Milvus bulk writer related dependencies
* camel-milvus: Tidy dependencies
---
components/camel-milvus/pom.xml | 54 +++--
1 file changed, 31 insertions(+), 23 deletions(-)
diff --git a/components/camel-milvus/pom.xml b/components/camel-milvus/pom.xml
index 800f7f8a855..d7ac9a4850a 100644
--- a/components/camel-milvus/pom.xml
+++ b/components/camel-milvus/pom.xml
@@ -58,8 +58,38 @@
io.milvus
milvus-sdk-java
- ${milvus-client-version}
+${milvus-client-version}
+
+
+com.amazonaws
+*
+
+
+com.azure
+*
+
+
+com.konghq
+unirest-java
+
+
+io.minio
+*
+
+
+org.apache.hadoop
+*
+
+
+org.apache.parquet
+parquet-avro
+
+
+org.apache.parquet
+parquet-hadoop
+
+
org.apache.logging.log4j
log4j-api
@@ -76,22 +106,6 @@
-
-org.apache.camel
-camel-direct
-test
-
-
-org.apache.camel
-camel-mock
-test
-
-
-org.apache.camel
-camel-jackson
-test
-
-
org.apache.camel
camel-test-junit5
@@ -103,12 +117,6 @@
test
-
-io.rest-assured
-rest-assured
-${rest-assured-version}
-
-
org.assertj
assertj-core
(camel) branch main updated: Revert "Bump org.apache.camel.k:camel-k-crds from 2.2.0 to 2.3.0 (#13955)"
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 815acf2ccc7 Revert "Bump org.apache.camel.k:camel-k-crds from 2.2.0 to 2.3.0 (#13955)" 815acf2ccc7 is described below commit 815acf2ccc77f088e7453aceb22a65548d7c58f5 Author: Claus Ibsen AuthorDate: Fri Apr 26 11:28:14 2024 +0200 Revert "Bump org.apache.camel.k:camel-k-crds from 2.2.0 to 2.3.0 (#13955)" This reverts commit 250a96281a41dbb6d9f2f88736b2936ff924060d. --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index d5b082e6ffd..d68d1e01636 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -90,7 +90,7 @@ 3.11.0 3.11.0 7.21.0 -2.3.0 +2.2.0 4.17.0 1.2 3.3.0
(camel) branch camel-4.4.x updated: CAMEL-20614: deep-copy enrich and poll-enrich processors during instantiation of a route template
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 7f7672ffd13 CAMEL-20614: deep-copy enrich and poll-enrich processors
during instantiation of a route template
7f7672ffd13 is described below
commit 7f7672ffd13ee0ce61aa1fc31bf354e3ec8224ea
Author: Claus Ibsen
AuthorDate: Fri Apr 26 11:14:54 2024 +0200
CAMEL-20614: deep-copy enrich and poll-enrich processors during
instantiation of a route template
---
.../src/main/java/org/apache/camel/model/EnrichDefinition.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
index ba904e06f27..547feb22766 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
@@ -81,6 +81,7 @@ public class EnrichDefinition extends ExpressionNode
}
protected EnrichDefinition(EnrichDefinition source) {
+super(source);
this.aggregationStrategyBean = source.aggregationStrategyBean;
this.variableSend = source.variableSend;
this.variableReceive = source.variableReceive;
(camel) branch main updated: CAMEL-20614: deep-copy enrich and poll-enrich processors during instantiation of a route template
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 b8b297494a2 CAMEL-20614: deep-copy enrich and poll-enrich processors
during instantiation of a route template
b8b297494a2 is described below
commit b8b297494a2c5d4a3d8a4bb565e024b21ee1ce6b
Author: Claus Ibsen
AuthorDate: Fri Apr 26 11:14:54 2024 +0200
CAMEL-20614: deep-copy enrich and poll-enrich processors during
instantiation of a route template
---
.../src/main/java/org/apache/camel/model/EnrichDefinition.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
index ba904e06f27..547feb22766 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
@@ -81,6 +81,7 @@ public class EnrichDefinition extends ExpressionNode
}
protected EnrichDefinition(EnrichDefinition source) {
+super(source);
this.aggregationStrategyBean = source.aggregationStrategyBean;
this.variableSend = source.variableSend;
this.variableReceive = source.variableReceive;
(camel) 01/01: CAMEL-20698: YAML and XML DSL - Remove array of property in favour of using properties to make it consistent and only one-way of setting properties on beans.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch yaml-property
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 251257b4730678e991d545ed17f8267dc736adc0
Author: Claus Ibsen
AuthorDate: Fri Apr 26 11:14:06 2024 +0200
CAMEL-20698: YAML and XML DSL - Remove array of property in favour of using
properties to make it consistent and only one-way of setting properties on
beans.
---
.../apache/camel/catalog/models/templateBean.json | 5 +--
.../camel/catalog/models/templatedRouteBean.json | 5 +--
.../apache/camel/catalog/schemas/camel-spring.xsd | 1 -
.../SpringRouteTemplateLocalBeanTest.xml | 2 +-
.../routebuilder/SpringTemplatedRouteTest.xml | 4 +-
.../org/apache/camel/model/templateBean.json | 5 +--
.../org/apache/camel/model/templatedRouteBean.json | 5 +--
.../apache/camel/model/BeanFactoryDefinition.java | 2 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 1 -
.../java/org/apache/camel/xml/out/ModelWriter.java | 1 -
.../src/test/resources/barTemplatedRoute.xml | 4 +-
.../singleTemplatedRouteNoNamespace.xml| 4 +-
.../org/apache/camel/yaml/out/ModelWriter.java | 1 -
.../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 29 ++
.../RouteTemplateBeanDefinitionDeserializer.java | 1 -
.../TemplatedRouteBeanDefinitionDeserializer.java | 1 -
.../generated/resources/schema/camelYamlDsl.json | 12 --
.../org/apache/camel/dsl/yaml/KameletTest.groovy | 5 +--
.../apache/camel/dsl/yaml/RouteTemplateTest.groovy | 45 --
19 files changed, 50 insertions(+), 83 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateBean.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateBean.json
index b40f995763d..ef188dacbfe 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateBean.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateBean.json
@@ -15,8 +15,7 @@
"name": { "index": 0, "kind": "attribute", "displayName": "Name", "group":
"common", "required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Bean
name" },
"type": { "index": 1, "kind": "attribute", "displayName": "Type", "group":
"common", "required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "What
type to use for creating the bean (FQN classname). Can be prefixed with: #class
or #type #class or #type then the bean is created via the fully qualified
classname, such as #class:com.foo.MyBean" },
"scriptLanguage": { "index": 2, "kind": "attribute", "displayName":
"Script Language", "group": "advanced", "label": "advanced", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The script language to use
when using inlined script for creating the bean, such as groovy, java,
javascript etc." },
-"property": { "index": 3, "kind": "element", "displayName": "Property",
"group": "common", "required": false, "type": "array", "javaType":
"java.util.List", "deprecated":
false, "autowired": false, "secret": false, "description": "Optional properties
to set on the created local bean" },
-"properties": { "index": 4, "kind": "element", "displayName":
"Properties", "group": "common", "required": false, "type": "object",
"javaType": "java.util.Map", "deprecated":
false, "autowired": false, "secret": false, "description": "Optional properties
to set on the created local bean" },
-"script": { "index": 5, "kind": "element", "displayName": "Script",
"group": "advanced", "label": "advanced", "r
(camel) branch yaml-property created (now 251257b4730)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch yaml-property in repository https://gitbox.apache.org/repos/asf/camel.git at 251257b4730 CAMEL-20698: YAML and XML DSL - Remove array of property in favour of using properties to make it consistent and only one-way of setting properties on beans. This branch includes the following new commits: new 251257b4730 CAMEL-20698: YAML and XML DSL - Remove array of property in favour of using properties to make it consistent and only one-way of setting properties on beans. 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 (301d0dfc68e -> 6d7e3bf93f6)
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 301d0dfc68e Bump logback-version from 1.5.5 to 1.5.6 (#13953) add 6d7e3bf93f6 Bump com.couchbase.client:java-client from 3.6.0 to 3.6.1 (#13954) 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 (d55f8623bed -> 301d0dfc68e)
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 d55f8623bed Bump org.springframework.data:spring-data-redis from 3.2.3 to 3.2.5 (#13952) add 301d0dfc68e Bump logback-version from 1.5.5 to 1.5.6 (#13953) 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 (9e5c3d8f92f -> 74952b906ad)
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 9e5c3d8f92f Bump aws-java-sdk2-version from 2.25.38 to 2.25.39 (#13948) add 74952b906ad Bump huaweicloud-sdk-version from 3.1.92 to 3.1.93 (#13949) 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-20718: Fixes JMSRedelivered and JMSCorrelationID conversion (#13947)
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 0323d41984a CAMEL-20718: Fixes JMSRedelivered and JMSCorrelationID
conversion (#13947)
0323d41984a is described below
commit 0323d41984a3b30701646b503c7ea859ef223473
Author: Marco Carletti
AuthorDate: Fri Apr 26 09:50:46 2024 +0200
CAMEL-20718: Fixes JMSRedelivered and JMSCorrelationID conversion (#13947)
---
.../component/kafka/consumer/support/interop/JMSDeserializer.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/interop/JMSDeserializer.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/interop/JMSDeserializer.java
index 61a489d81af..8573854ec9b 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/interop/JMSDeserializer.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/consumer/support/interop/JMSDeserializer.java
@@ -55,11 +55,11 @@ public class JMSDeserializer implements
KafkaHeaderDeserializer {
case "JMSTimestamp":
return bytesToLong(value);
case "JMSCorrelationID":
-return value;
+return new String(value);
case "JMSReplyTo":
return new String(value);
case "JMSRedelivered":
-return bytesToInt(value);
+return Boolean.parseBoolean(new String(value));
case "JMSType":
return new String(value);
case "JMSExpiration":
(camel) branch main updated: Bump org.apache.camel.k:camel-k-crds from 2.2.0 to 2.3.0 (#13955)
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 250a96281a4 Bump org.apache.camel.k:camel-k-crds from 2.2.0 to 2.3.0 (#13955) 250a96281a4 is described below commit 250a96281a41dbb6d9f2f88736b2936ff924060d Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Apr 26 09:52:23 2024 +0200 Bump org.apache.camel.k:camel-k-crds from 2.2.0 to 2.3.0 (#13955) Bumps [org.apache.camel.k:camel-k-crds](https://github.com/apache/camel-k) from 2.2.0 to 2.3.0. - [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.2.0...v2.3.0) --- updated-dependencies: - dependency-name: org.apache.camel.k:camel-k-crds 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 d68d1e01636..d5b082e6ffd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -90,7 +90,7 @@ 3.11.0 3.11.0 7.21.0 -2.2.0 +2.3.0 4.17.0 1.2 3.3.0
(camel) branch main updated (74952b906ad -> d55f8623bed)
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 74952b906ad Bump huaweicloud-sdk-version from 3.1.92 to 3.1.93 (#13949) add d55f8623bed Bump org.springframework.data:spring-data-redis from 3.2.3 to 3.2.5 (#13952) 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 (0323d41984a -> 9e5c3d8f92f)
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 0323d41984a CAMEL-20718: Fixes JMSRedelivered and JMSCorrelationID conversion (#13947) add 9e5c3d8f92f Bump aws-java-sdk2-version from 2.25.38 to 2.25.39 (#13948) 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 (8497622a3f0 -> b9b41b68ddf)
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 8497622a3f0 Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.2 to 3.5.3 (#13946) add b9b41b68ddf chore(docs): Add Kaoto and HawtIO to Catalog page (#13951) No new revisions were added by this update. Summary of changes: docs/user-manual/modules/ROOT/pages/camel-catalog.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
(camel) branch main updated: Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.2 to 3.5.3 (#13946)
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 8497622a3f0 Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.2 to 3.5.3 (#13946) 8497622a3f0 is described below commit 8497622a3f00ea0c42dd8157dcb5a5213279017c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Apr 26 09:14:57 2024 +0200 Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.2 to 3.5.3 (#13946) Bumps [org.apache.maven.plugins:maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.5.2 to 3.5.3. - [Release notes](https://github.com/apache/maven-shade-plugin/releases) - [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.5.2...maven-shade-plugin-3.5.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-shade-plugin 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 dee2c5534c6..8a860cfc999 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -345,7 +345,7 @@ 3.1.1 3.2.0 1.9.19 -3.5.2 +3.5.3 3.4.2 3.2.5 3.5.2
(camel) branch main updated (68c0436d694 -> dd8212bcf6e)
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 68c0436d694 CAMEL-20712 Throw created exception in MessagePredicate (#13943) add dd8212bcf6e CAMEL-20716 Throw created exception in FixMessageRouter (#13944) No new revisions were added by this update. Summary of changes: .../camel/component/quickfixj/examples/routing/FixMessageRouter.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (a3c9b7ee209 -> 68c0436d694)
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 a3c9b7ee209 CAMEL-20521: disable flaky/unstable test (#13941) add 68c0436d694 CAMEL-20712 Throw created exception in MessagePredicate (#13943) No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/component/quickfixj/MessagePredicate.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-spring-boot) branch main updated: Regen
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 23c747039fe Regen
23c747039fe is described below
commit 23c747039fe49d667de365e7dad1ed552cee6d4b
Author: Claus Ibsen
AuthorDate: Fri Apr 26 06:07:40 2024 +0200
Regen
---
.../catalog/components/azure-servicebus.json | 86 ++
.../camel/springboot/catalog/components/cxfrs.json | 60 +++
.../src/main/docs/azure-servicebus.json| 39 +++---
.../ServiceBusComponentConfiguration.java | 72 --
.../springboot/ServiceBusComponentConverter.java | 4 +-
5 files changed, 97 insertions(+), 164 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-servicebus.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-servicebus.json
index 3d4aedc4388..6d77b442911 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-servicebus.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-servicebus.json
@@ -31,28 +31,25 @@
"proxyOptions": { "index": 5, "kind": "property", "displayName": "Proxy
Options", "group": "common", "label": "common", "required": false, "type":
"object", "javaType": "com.azure.core.amqp.ProxyOptions", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "Sets the proxy
configuration to use for ServiceBusSenderAsyncClient. When a p [...]
"serviceBusType": { "index": 6, "kind": "property", "displayName":
"Service Bus Type", "group": "common", "label": "common", "required": true,
"type": "object", "javaType":
"org.apache.camel.component.azure.servicebus.ServiceBusType", "enum": [
"queue", "topic" ], "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "defaultValue": "queue", "configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "c [...]
"bridgeErrorHandler": { "index": 7, "kind": "property", "displayName":
"Bridge Error Handler", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Allows for bridging the consumer to the Camel routing Error Handler, which
mean any exceptions (if possible) occurred while the Camel consumer is trying
to pickup incoming messages, or the like [...]
-"consumerOperation": { "index": 8, "kind": "property", "displayName":
"Consumer Operation", "group": "consumer", "label": "consumer", "required":
false, "type": "object", "javaType":
"org.apache.camel.component.azure.servicebus.ServiceBusConsumerOperationDefinition",
"enum": [ "receiveMessages", "peekMessages" ], "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "receiveMessages",
"configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusCon [...]
-"disableAutoComplete": { "index": 9, "kind": "property", "displayName":
"Disable Auto Complete", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass":
"org.apache.camel.compon
(camel) branch main updated: CAMEL-20521: disable flaky/unstable test (#13941)
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 a3c9b7ee209 CAMEL-20521: disable flaky/unstable test (#13941)
a3c9b7ee209 is described below
commit a3c9b7ee2098844a1e3add8a4e02aaa4ea636dc5
Author: Otavio Rodolfo Piske
AuthorDate: Fri Apr 26 01:00:15 2024 -0300
CAMEL-20521: disable flaky/unstable test (#13941)
---
.../org/apache/camel/component/jms/RestartBrokerBeforeCommitIT.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/RestartBrokerBeforeCommitIT.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/RestartBrokerBeforeCommitIT.java
index 4ad18c7a881..3194b7c4540 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/RestartBrokerBeforeCommitIT.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/RestartBrokerBeforeCommitIT.java
@@ -38,6 +38,7 @@ import org.apache.camel.spi.Registry;
import
org.apache.camel.test.infra.artemis.services.RestartAwareArtemisContainer;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.apache.camel.util.json.JsonObject;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.messaginghub.pooled.jms.JmsPoolConnectionFactory;
import org.slf4j.Logger;
@@ -61,7 +62,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* This issue will be fixed in spring-jms 6.1.6
*/
-
+@Disabled("The test seems to failing often")
public class RestartBrokerBeforeCommitIT extends CamelTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(RestartBrokerBeforeCommitIT.class);
(camel) branch main updated: Regen for commit e5bb7e995a4d745dfb6164eb04ec443a6642068a (#13942)
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 1c3ac66aa4e Regen for commit e5bb7e995a4d745dfb6164eb04ec443a6642068a
(#13942)
1c3ac66aa4e is described below
commit 1c3ac66aa4e693bc50ccdb6a758f8bb304aa7b11
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Apr 26 05:58:51 2024 +0200
Regen for commit e5bb7e995a4d745dfb6164eb04ec443a6642068a (#13942)
Signed-off-by: GitHub
Co-authored-by: davsclaus
---
.../camel/catalog/components/azure-servicebus.json | 86 ++
1 file changed, 40 insertions(+), 46 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-servicebus.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-servicebus.json
index 81dbd9b326d..a2937fdd266 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-servicebus.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-servicebus.json
@@ -31,28 +31,25 @@
"proxyOptions": { "index": 5, "kind": "property", "displayName": "Proxy
Options", "group": "common", "label": "common", "required": false, "type":
"object", "javaType": "com.azure.core.amqp.ProxyOptions", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "Sets the proxy
configuration to use for ServiceBusSenderAsyncClient. When a p [...]
"serviceBusType": { "index": 6, "kind": "property", "displayName":
"Service Bus Type", "group": "common", "label": "common", "required": true,
"type": "object", "javaType":
"org.apache.camel.component.azure.servicebus.ServiceBusType", "enum": [
"queue", "topic" ], "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "defaultValue": "queue", "configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "c [...]
"bridgeErrorHandler": { "index": 7, "kind": "property", "displayName":
"Bridge Error Handler", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Allows for bridging the consumer to the Camel routing Error Handler, which
mean any exceptions (if possible) occurred while the Camel consumer is trying
to pickup incoming messages, or the like [...]
-"consumerOperation": { "index": 8, "kind": "property", "displayName":
"Consumer Operation", "group": "consumer", "label": "consumer", "required":
false, "type": "object", "javaType":
"org.apache.camel.component.azure.servicebus.ServiceBusConsumerOperationDefinition",
"enum": [ "receiveMessages", "peekMessages" ], "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "receiveMessages",
"configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusCon [...]
-"disableAutoComplete": { "index": 9, "kind": "property", "displayName":
"Disable Auto Complete", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description&quo
(camel) branch camel-4.4.x updated: Fix camel-http doc about keystore should prefix with file to load from file system
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 84a35147deb Fix camel-http doc about keystore should prefix with file
to load from file system
84a35147deb is described below
commit 84a35147deb01ce8ebbaf809cec7b126445c9f70
Author: Claus Ibsen
AuthorDate: Thu Apr 25 19:51:47 2024 +0200
Fix camel-http doc about keystore should prefix with file to load from file
system
---
components/camel-http/src/main/docs/http-component.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-http/src/main/docs/http-component.adoc
b/components/camel-http/src/main/docs/http-component.adoc
index db3d43fe018..022694f43fb 100644
--- a/components/camel-http/src/main/docs/http-component.adoc
+++ b/components/camel-http/src/main/docs/http-component.adoc
@@ -388,7 +388,7 @@ Programmatic configuration of the component
[source,java]
---
KeyStoreParameters ksp = new KeyStoreParameters();
-ksp.setResource("/users/home/server/keystore.jks");
+ksp.setResource("file:/users/home/server/keystore.jks");
ksp.setPassword("keystorePassword");
KeyManagersParameters kmp = new KeyManagersParameters();
@@ -413,7 +413,7 @@ Spring DSL based configuration of endpoint
(camel) branch main updated: Fix camel-http doc about keystore should prefix with file to load from file system
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 e5bb7e995a4 Fix camel-http doc about keystore should prefix with file
to load from file system
e5bb7e995a4 is described below
commit e5bb7e995a4d745dfb6164eb04ec443a6642068a
Author: Claus Ibsen
AuthorDate: Thu Apr 25 19:51:47 2024 +0200
Fix camel-http doc about keystore should prefix with file to load from file
system
---
components/camel-http/src/main/docs/http-component.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-http/src/main/docs/http-component.adoc
b/components/camel-http/src/main/docs/http-component.adoc
index db3d43fe018..022694f43fb 100644
--- a/components/camel-http/src/main/docs/http-component.adoc
+++ b/components/camel-http/src/main/docs/http-component.adoc
@@ -388,7 +388,7 @@ Programmatic configuration of the component
[source,java]
---
KeyStoreParameters ksp = new KeyStoreParameters();
-ksp.setResource("/users/home/server/keystore.jks");
+ksp.setResource("file:/users/home/server/keystore.jks");
ksp.setPassword("keystorePassword");
KeyManagersParameters kmp = new KeyManagersParameters();
@@ -413,7 +413,7 @@ Spring DSL based configuration of endpoint
(camel-spring-boot) branch main updated: Bump peter-evans/create-pull-request from 6.0.3 to 6.0.4 (#1133)
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 33b8df7e2ba Bump peter-evans/create-pull-request from 6.0.3 to 6.0.4
(#1133)
33b8df7e2ba is described below
commit 33b8df7e2ba643553406f21caccf226b782c13fe
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Thu Apr 25 19:44:54 2024 +0200
Bump peter-evans/create-pull-request from 6.0.3 to 6.0.4 (#1133)
Bumps
[peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request)
from 6.0.3 to 6.0.4.
- [Release
notes](https://github.com/peter-evans/create-pull-request/releases)
-
[Commits](https://github.com/peter-evans/create-pull-request/compare/v6.0.3...v6.0.4)
---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
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>
---
.github/workflows/automatic-sync-camel-3.yml | 2 +-
.github/workflows/automatic-sync-main.yml| 2 +-
.github/workflows/generate-sbom-main.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/automatic-sync-camel-3.yml
b/.github/workflows/automatic-sync-camel-3.yml
index 1ca9c7665a2..15261eb8815 100644
--- a/.github/workflows/automatic-sync-camel-3.yml
+++ b/.github/workflows/automatic-sync-camel-3.yml
@@ -52,7 +52,7 @@ jobs:
- name: Build Camel-spring-boot Project
run: ./mvnw -V --no-transfer-progress clean install -DskipTests
- name: Create Pull Request
-uses: peter-evans/create-pull-request@v6.0.3
+uses: peter-evans/create-pull-request@v6.0.4
with:
base: camel-spring-boot-3.x
token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/automatic-sync-main.yml
b/.github/workflows/automatic-sync-main.yml
index 0b63e649cbe..7b169746a04 100644
--- a/.github/workflows/automatic-sync-main.yml
+++ b/.github/workflows/automatic-sync-main.yml
@@ -52,7 +52,7 @@ jobs:
- name: Build Camel-spring-boot Project
run: ./mvnw -V --no-transfer-progress clean install -DskipTests
- name: Create Pull Request
-uses: peter-evans/create-pull-request@v6.0.3
+uses: peter-evans/create-pull-request@v6.0.4
with:
base: main
token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/generate-sbom-main.yml
b/.github/workflows/generate-sbom-main.yml
index 4124f4c9092..030b96b7c6b 100644
--- a/.github/workflows/generate-sbom-main.yml
+++ b/.github/workflows/generate-sbom-main.yml
@@ -54,7 +54,7 @@ jobs:
- name: Build Camel-spring-boot Project for generating SBOM
run: ./mvnw -V --no-transfer-progress clean install -DskipTests -Psbom
- name: Create Pull Request
-uses: peter-evans/create-pull-request@v6.0.3
+uses: peter-evans/create-pull-request@v6.0.4
with:
base: main
token: ${{ secrets.GITHUB_TOKEN }}
(camel) branch main updated: Regen
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 5629891f579 Regen
5629891f579 is described below
commit 5629891f5796a8fbe1e5c333c33b2f51fe4eaf0d
Author: Claus Ibsen
AuthorDate: Thu Apr 25 19:13:31 2024 +0200
Regen
---
.../camel/catalog/components/azure-servicebus.json | 86 --
1 file changed, 46 insertions(+), 40 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-servicebus.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-servicebus.json
index a2937fdd266..81dbd9b326d 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-servicebus.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-servicebus.json
@@ -31,25 +31,28 @@
"proxyOptions": { "index": 5, "kind": "property", "displayName": "Proxy
Options", "group": "common", "label": "common", "required": false, "type":
"object", "javaType": "com.azure.core.amqp.ProxyOptions", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "Sets the proxy
configuration to use for ServiceBusSenderAsyncClient. When a p [...]
"serviceBusType": { "index": 6, "kind": "property", "displayName":
"Service Bus Type", "group": "common", "label": "common", "required": true,
"type": "object", "javaType":
"org.apache.camel.component.azure.servicebus.ServiceBusType", "enum": [
"queue", "topic" ], "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "defaultValue": "queue", "configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "c [...]
"bridgeErrorHandler": { "index": 7, "kind": "property", "displayName":
"Bridge Error Handler", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Allows for bridging the consumer to the Camel routing Error Handler, which
mean any exceptions (if possible) occurred while the Camel consumer is trying
to pickup incoming messages, or the like [...]
-"enableDeadLettering": { "index": 8, "kind": "property", "displayName":
"Enable Dead Lettering", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "Enable application level
deadlettering to the subscription [...]
-"maxAutoLockRenewDuration": { "index": 9, "kind": "property",
"displayName": "Max Auto Lock Renew Duration", "group": "consumer", "label":
"consumer", "required": false, "type": "object", "javaType":
"java.time.Duration", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "5m", "configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "Sets the amount of time
to continue au [...]
-"maxConcurrentCalls": { "index": 10, "kind": "property", &qu
(camel-website) branch main updated: Move XSD in correct folder
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-website.git The following commit(s) were added to refs/heads/main by this push: new c0ddffb9 Move XSD in correct folder c0ddffb9 is described below commit c0ddffb9071c89acd850bbbf25a35dc04ea5957f Author: Claus Ibsen AuthorDate: Thu Apr 25 19:12:04 2024 +0200 Move XSD in correct folder --- .../camel-spring-xml-4.4.2.xsd => spring/camel-spring-4.4.2.xsd} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/static/schema/spring-xml/camel-spring-xml-4.4.2.xsd b/static/schema/spring/camel-spring-4.4.2.xsd similarity index 100% rename from static/schema/spring-xml/camel-spring-xml-4.4.2.xsd rename to static/schema/spring/camel-spring-4.4.2.xsd
(camel) branch camel-4.4.x updated: CAMEL-20700: camel-core: ReflectionHelper.setField may fail for numeric type fields
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 ba73184f979 CAMEL-20700: camel-core: ReflectionHelper.setField may
fail for numeric type fields
ba73184f979 is described below
commit ba73184f979dc51f455c14a6ce041c607d5595cb
Author: Claus Ibsen
AuthorDate: Thu Apr 25 16:25:24 2024 +0200
CAMEL-20700: camel-core: ReflectionHelper.setField may fail for numeric
type fields
---
.../DefaultCamelBeanPostProcessorFieldFirstTest.java | 6 +-
.../java/org/apache/camel/util/ReflectionHelper.java | 16 +++-
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelBeanPostProcessorFieldFirstTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelBeanPostProcessorFieldFirstTest.java
index 8e7b5df9d44..809bfd4c544 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelBeanPostProcessorFieldFirstTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelBeanPostProcessorFieldFirstTest.java
@@ -67,10 +67,14 @@ public class DefaultCamelBeanPostProcessorFieldFirstTest
extends ContextTestSupp
@PropertyInject("foo")
private String foo;
+// should inject simple types first such as this property
+@PropertyInject(value = "number", defaultValue = "123")
+private Integer number;
+
@BindToRegistry("myCoolBean")
public MySerialBean myBean() {
MySerialBean myBean = new MySerialBean();
-myBean.setId(123);
+myBean.setId(number);
myBean.setName(foo);
return myBean;
}
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/ReflectionHelper.java
b/core/camel-util/src/main/java/org/apache/camel/util/ReflectionHelper.java
index 649fca93bf2..1f89bf6845d 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/ReflectionHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/ReflectionHelper.java
@@ -21,8 +21,6 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Arrays;
-import javax.swing.text.Document;
-
/**
* Helper for working with reflection on classes.
*
@@ -186,7 +184,7 @@ public final class ReflectionHelper {
}
// must use fine-grained for the correct type when setting a field
value via reflection
Class type = f.getType();
-if (boolean.class == type || Boolean.class == type) {
+if (boolean.class == type) {
boolean val;
if (value instanceof Boolean) {
val = (boolean) value;
@@ -194,7 +192,7 @@ public final class ReflectionHelper {
val = Boolean.parseBoolean(value.toString());
}
f.setBoolean(instance, val);
-} else if (byte.class == type || Byte.class == type) {
+} else if (byte.class == type) {
byte val;
if (value instanceof Byte) {
val = (byte) value;
@@ -202,7 +200,7 @@ public final class ReflectionHelper {
val = Byte.parseByte(value.toString());
}
f.setByte(instance, val);
-} else if (int.class == type || Integer.class == type) {
+} else if (int.class == type) {
int val;
if (value instanceof Integer) {
val = (int) value;
@@ -210,7 +208,7 @@ public final class ReflectionHelper {
val = Integer.parseInt(value.toString());
}
f.setInt(instance, val);
-} else if (long.class == type || Long.class == type) {
+} else if (long.class == type) {
long val;
if (value instanceof Long) {
val = (long) value;
@@ -218,7 +216,7 @@ public final class ReflectionHelper {
val = Long.parseLong(value.toString());
}
f.setLong(instance, val);
-} else if (float.class == type || Float.class == type) {
+} else if (float.class == type) {
float val;
if (value instanceof Float) {
val = (float) value;
@@ -226,9 +224,9 @@ public final class ReflectionHelper {
val = Float.parseFloat(value.toString());
}
f.setFloat(instance, val);
-} else if (double.class == type || Double.class == type) {
+} else if (double.class == type) {
double val;
-if (value instanceof Document) {
+
(camel) branch main updated: CAMEL-20700: camel-core: ReflectionHelper.setField may fail for numeric type fields
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 760658259b8 CAMEL-20700: camel-core: ReflectionHelper.setField may
fail for numeric type fields
760658259b8 is described below
commit 760658259b8e15984308fb5240b71bb342b39524
Author: Claus Ibsen
AuthorDate: Thu Apr 25 16:25:24 2024 +0200
CAMEL-20700: camel-core: ReflectionHelper.setField may fail for numeric
type fields
---
.../DefaultCamelBeanPostProcessorFieldFirstTest.java | 6 +-
.../java/org/apache/camel/util/ReflectionHelper.java | 16 +++-
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelBeanPostProcessorFieldFirstTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelBeanPostProcessorFieldFirstTest.java
index 8e7b5df9d44..809bfd4c544 100644
---
a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelBeanPostProcessorFieldFirstTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelBeanPostProcessorFieldFirstTest.java
@@ -67,10 +67,14 @@ public class DefaultCamelBeanPostProcessorFieldFirstTest
extends ContextTestSupp
@PropertyInject("foo")
private String foo;
+// should inject simple types first such as this property
+@PropertyInject(value = "number", defaultValue = "123")
+private Integer number;
+
@BindToRegistry("myCoolBean")
public MySerialBean myBean() {
MySerialBean myBean = new MySerialBean();
-myBean.setId(123);
+myBean.setId(number);
myBean.setName(foo);
return myBean;
}
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/ReflectionHelper.java
b/core/camel-util/src/main/java/org/apache/camel/util/ReflectionHelper.java
index 649fca93bf2..1f89bf6845d 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/ReflectionHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/ReflectionHelper.java
@@ -21,8 +21,6 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Arrays;
-import javax.swing.text.Document;
-
/**
* Helper for working with reflection on classes.
*
@@ -186,7 +184,7 @@ public final class ReflectionHelper {
}
// must use fine-grained for the correct type when setting a field
value via reflection
Class type = f.getType();
-if (boolean.class == type || Boolean.class == type) {
+if (boolean.class == type) {
boolean val;
if (value instanceof Boolean) {
val = (boolean) value;
@@ -194,7 +192,7 @@ public final class ReflectionHelper {
val = Boolean.parseBoolean(value.toString());
}
f.setBoolean(instance, val);
-} else if (byte.class == type || Byte.class == type) {
+} else if (byte.class == type) {
byte val;
if (value instanceof Byte) {
val = (byte) value;
@@ -202,7 +200,7 @@ public final class ReflectionHelper {
val = Byte.parseByte(value.toString());
}
f.setByte(instance, val);
-} else if (int.class == type || Integer.class == type) {
+} else if (int.class == type) {
int val;
if (value instanceof Integer) {
val = (int) value;
@@ -210,7 +208,7 @@ public final class ReflectionHelper {
val = Integer.parseInt(value.toString());
}
f.setInt(instance, val);
-} else if (long.class == type || Long.class == type) {
+} else if (long.class == type) {
long val;
if (value instanceof Long) {
val = (long) value;
@@ -218,7 +216,7 @@ public final class ReflectionHelper {
val = Long.parseLong(value.toString());
}
f.setLong(instance, val);
-} else if (float.class == type || Float.class == type) {
+} else if (float.class == type) {
float val;
if (value instanceof Float) {
val = (float) value;
@@ -226,9 +224,9 @@ public final class ReflectionHelper {
val = Float.parseFloat(value.toString());
}
f.setFloat(instance, val);
-} else if (double.class == type || Double.class == type) {
+} else if (double.class == type) {
double val;
-if (value instanceof Document) {
+if (value insta
(camel) branch main updated (a1519eecd4c -> ee9ad4566d8)
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 a1519eecd4c (chores) camel-google-pub-sub-lite: do cast to avoid a potential overflow add ee9ad4566d8 CAMEL-20266: Use high-level Azure Service Bus client (#13862) No new revisions were added by this update. Summary of changes: .../camel/catalog/components/azure-servicebus.json | 86 ++-- .../camel-azure/camel-azure-servicebus/pom.xml | 13 + .../servicebus/ServiceBusComponentConfigurer.java | 44 +- .../servicebus/ServiceBusEndpointConfigurer.java | 44 +- .../servicebus/ServiceBusEndpointUriFactory.java | 9 +- .../azure/servicebus/azure-servicebus.json | 86 ++-- .../azure/servicebus/ServiceBusComponent.java | 2 +- .../azure/servicebus/ServiceBusConfiguration.java | 82 +--- .../azure/servicebus/ServiceBusConsumer.java | 167 ++-- .../ServiceBusConsumerOperationDefinition.java | 22 - .../azure/servicebus/ServiceBusEndpoint.java | 13 + .../azure/servicebus/ServiceBusProducer.java | 20 +- .../servicebus/client/ServiceBusClientFactory.java | 64 +-- .../ServiceBusReceiverAsyncClientWrapper.java | 158 --- .../operations/ServiceBusReceiverOperations.java | 46 -- .../azure/servicebus/ServiceBusConsumerTest.java | 466 + .../azure/servicebus/ServiceBusTestUtils.java | 98 - .../BaseCamelServiceBusTestSupport.java| 63 --- .../integration/BaseServiceBusTestSupport.java | 129 ++ .../integration/ServiceBusConsumerIT.java | 153 +++ .../integration/ServiceBusConsumerTest.java| 117 -- .../integration/ServiceBusProducerIT.java | 215 ++ .../integration/ServiceBusProducerTest.java| 272 .../operations/ServiceBusSenderOperationsTest.java | 294 +++-- .../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 11 + .../AzureServicebusComponentBuilderFactory.java| 85 +--- .../dsl/ServiceBusEndpointBuilderFactory.java | 145 ++- .../kotlin/components/AzureServicebusUriDsl.kt | 57 +-- 28 files changed, 1400 insertions(+), 1561 deletions(-) delete mode 100644 components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumerOperationDefinition.java delete mode 100644 components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/client/ServiceBusReceiverAsyncClientWrapper.java delete mode 100644 components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/operations/ServiceBusReceiverOperations.java create mode 100644 components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumerTest.java delete mode 100644 components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/ServiceBusTestUtils.java delete mode 100644 components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/integration/BaseCamelServiceBusTestSupport.java create mode 100644 components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/integration/BaseServiceBusTestSupport.java create mode 100644 components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/integration/ServiceBusConsumerIT.java delete mode 100644 components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/integration/ServiceBusConsumerTest.java create mode 100644 components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/integration/ServiceBusProducerIT.java delete mode 100644 components/camel-azure/camel-azure-servicebus/src/test/java/org/apache/camel/component/azure/servicebus/integration/ServiceBusProducerTest.java
(camel-spring-boot) branch main updated: Regen
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 88fd87bed05 Regen 88fd87bed05 is described below commit 88fd87bed059c850359fab237c32963c43408814 Author: Claus Ibsen AuthorDate: Thu Apr 25 14:35:27 2024 +0200 Regen --- tooling/camel-spring-boot-dependencies/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index b13402f75dd..fcc9aa5b3d8 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -235,12 +235,12 @@ net.bytebuddy byte-buddy -1.14.13 +1.14.14 net.bytebuddy byte-buddy-agent -1.14.13 +1.14.14 org.apache.avro
(camel-karaf) branch camel-karaf-3.22.x updated: Fix karaf features
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-karaf-3.22.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/camel-karaf-3.22.x by this
push:
new e9b082f8 Fix karaf features
e9b082f8 is described below
commit e9b082f8a7aae843db060549483023e7f9f74235
Author: Claus Ibsen
AuthorDate: Thu Apr 25 14:26:16 2024 +0200
Fix karaf features
---
platforms/karaf/features/src/main/resources/features.xml | 3 +++
pom.xml | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index c1b5a3d2..a0715844 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1601,6 +1601,7 @@
camel-core
wrap:mvn:io.minio/minio/${minio-version}
mvn:commons-codec/commons-codec/${commons-codec-version}
+mvn:commons-io/commons-io/${commons-io-version}
mvn:org.apache.commons/commons-compress/${minio-commons-compress-version}
wrap:mvn:com.squareup.okhttp3/okhttp/${okclient-version}
mvn:org.apache.camel/camel-minio/${project.version}
@@ -2223,6 +2224,7 @@
camel-core
mvn:org.apache.camel/camel-tarfile/${project.version}
mvn:commons-codec/commons-codec/${commons-codec-version}
+mvn:commons-io/commons-io/${commons-io-version}
mvn:org.apache.commons/commons-compress/${commons-compress-version}
@@ -2482,6 +2484,7 @@
camel-core
mvn:commons-codec/commons-codec/${commons-codec-version}
+mvn:commons-io/commons-io/${commons-io-version}
mvn:org.apache.commons/commons-compress/${commons-compress-version}
mvn:org.apache.camel/camel-zip-deflater/${project.version}
diff --git a/pom.xml b/pom.xml
index 7e69bd28..a9d96198 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,7 +251,7 @@
5.3.1
3.0.0-M4
1.9.15
-1.21
+1.26.1
0.1.7
20.0
0.9.10_1
(camel-spring-boot) branch camel-spring-boot-3.22.x updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-spring-boot-3.22.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/camel-spring-boot-3.22.x by
this push:
new e92b93dfdd1 Regen
e92b93dfdd1 is described below
commit e92b93dfdd157c9ff3f97a5ef74a90400652e273
Author: Claus Ibsen
AuthorDate: Thu Apr 25 13:02:05 2024 +0200
Regen
---
.../org/apache/camel/springboot/catalog/components/cxfrs.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxfrs.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxfrs.json
index d1fb1587e43..cc6ba2e499b 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxfrs.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxfrs.json
@@ -50,8 +50,6 @@
"beanId": { "kind": "path", "displayName": "Bean Id", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To lookup an existing configured CxfRsEndpoint. Must used bean:
as prefix." },
"address": { "kind": "path", "displayName": "Address", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The service publish address." },
"features": { "kind": "parameter", "displayName": "Features", "group":
"common", "label": "", "required": false, "type": "array", "javaType":
"java.util.List", "deprecated": false,
"autowired": false, "secret": false, "description": "Set the feature list to
the CxfRs endpoint." },
-"loggingFeatureEnabled": { "kind": "parameter", "displayName": "Logging
Feature Enabled", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "This option enables CXF
Logging Feature which writes inbound and outbound REST messages to log." },
-"loggingSizeLimit": { "kind": "parameter", "displayName": "Logging Size
Limit", "group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"description": "To limit the total size of number of bytes the logger will
output when logging feature has been enabled." },
"modelRef": { "kind": "parameter", "displayName": "Model Ref", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "This option is used to specify the model file which is useful
for the resource class without annotation. When using this option, then the
service class can be omitted, to emulate document-only endpoints" },
"providers": { "kind": "parameter", "displayName": "Providers", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Set custom JAX-RS provider(s) list to the CxfRs endpoint. You
can specify a string with a list of providers to lookup in the registy
separated by comma.
(camel) branch camel-3.22.x updated: Fix CS
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 5cdcc8af6e4 Fix CS
5cdcc8af6e4 is described below
commit 5cdcc8af6e482259e12eeae0f4056e87f0f5b8c8
Author: Claus Ibsen
AuthorDate: Thu Apr 25 13:00:14 2024 +0200
Fix CS
---
.../apache/camel/jsonpath/JsonPathSplitSingleListOptionTest.java| 6 +++---
.../apache/camel/processor/idempotent/kafka/KafkaConsumerUtil.java | 5 -
.../kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java | 6 +++---
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListOptionTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListOptionTest.java
index 822560d23ee..04945084c5c 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListOptionTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSplitSingleListOptionTest.java
@@ -16,15 +16,15 @@
*/
package org.apache.camel.jsonpath;
+import java.io.File;
+import java.util.Map;
+
import com.jayway.jsonpath.Option;
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.Test;
-import java.io.File;
-import java.util.Map;
-
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/processor/idempotent/kafka/KafkaConsumerUtil.java
b/components/camel-kafka/src/main/java/org/apache/camel/processor/idempotent/kafka/KafkaConsumerUtil.java
index fdcef5e4d13..90caa8e4168 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/processor/idempotent/kafka/KafkaConsumerUtil.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/processor/idempotent/kafka/KafkaConsumerUtil.java
@@ -24,7 +24,10 @@ import org.apache.camel.util.ObjectHelper;
import org.apache.kafka.clients.consumer.Consumer;
import org.apache.kafka.common.TopicPartition;
-public class KafkaConsumerUtil {
+public final class KafkaConsumerUtil {
+
+private KafkaConsumerUtil() {
+}
/**
* Tests whether the Kafka consumer reached the target offsets for all
specified topic partitions.
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java
index 5c0df557f0f..a7ee5029d1f 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java
@@ -16,6 +16,9 @@
*/
package org.apache.camel.component.kafka.integration;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
@@ -36,9 +39,6 @@ import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
(camel) branch camel-3.22.x updated: Regen
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 0d14ab9919c Regen
0d14ab9919c is described below
commit 0d14ab9919c5e411723e54373cb05b93f1132066
Author: Claus Ibsen
AuthorDate: Thu Apr 25 12:56:12 2024 +0200
Regen
---
camel-dependencies/pom.xml | 4 +-
.../org/apache/camel/catalog/components/cxfrs.json | 6 +-
.../endpoint/dsl/CxfRsEndpointBuilderFactory.java | 404 +++--
3 files changed, 210 insertions(+), 204 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 7b386db96e3..2d787eb4a2a 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -523,12 +523,12 @@
5.5.19
2.4.1
2.4.8
-5.8.8
+5.8.11
2.3.3
${spring5-version}
[5,6)
3.1.8
-5.3.31
+5.3.34
1.5
3.14.9
1.17.2
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxfrs.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxfrs.json
index 06e5bb01cce..167b1b46756 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxfrs.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/cxfrs.json
@@ -50,8 +50,6 @@
"beanId": { "kind": "path", "displayName": "Bean Id", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To lookup an existing configured CxfRsEndpoint. Must used bean:
as prefix." },
"address": { "kind": "path", "displayName": "Address", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The service publish address." },
"features": { "kind": "parameter", "displayName": "Features", "group":
"common", "label": "", "required": false, "type": "array", "javaType":
"java.util.List", "deprecated": false,
"autowired": false, "secret": false, "description": "Set the feature list to
the CxfRs endpoint." },
-"loggingFeatureEnabled": { "kind": "parameter", "displayName": "Logging
Feature Enabled", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "This option enables CXF
Logging Feature which writes inbound and outbound REST messages to log." },
-"loggingSizeLimit": { "kind": "parameter", "displayName": "Logging Size
Limit", "group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"description": "To limit the total size of number of bytes the logger will
output when logging feature has been enabled." },
"modelRef": { "kind": "parameter", "displayName": "Model Ref", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "This option is used to specify the model file which is useful
for the resource class without annotation. When using this option, then the
service class can be omitted, to emulate document-only endpoints" },
"providers": { "kind": "parameter", "displayName": "Providers", "group":
"common", "label": "", "required": false, "type&qu
(camel) branch main updated: Bump jakarta.annotation:jakarta.annotation-api from 2.1.1 to 3.0.0 (#13754)
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 3c846829cd9 Bump jakarta.annotation:jakarta.annotation-api from 2.1.1 to 3.0.0 (#13754) 3c846829cd9 is described below commit 3c846829cd992ec7c3feef85bc249af25966ae46 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Apr 25 11:54:55 2024 +0200 Bump jakarta.annotation:jakarta.annotation-api from 2.1.1 to 3.0.0 (#13754) Bumps [jakarta.annotation:jakarta.annotation-api](https://github.com/jakartaee/common-annotations-api) from 2.1.1 to 3.0.0. - [Commits](https://github.com/jakartaee/common-annotations-api/compare/2.1.1...3.0.0) --- updated-dependencies: - dependency-name: jakarta.annotation:jakarta.annotation-api dependency-type: direct:production update-type: version-update:semver-major ... 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 a308abf5eaf..dee2c5534c6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -252,7 +252,7 @@ 6.0.0 5.0.0 2.1.3 -2.1.1 +3.0.0 6.0.0 4.1.0 2.0.1
(camel) branch main updated: Fix olingo tests
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 e404dc0e6c2 Fix olingo tests
e404dc0e6c2 is described below
commit e404dc0e6c2b1da754e82551d835e53f0fcc8f6b
Author: Claus Ibsen
AuthorDate: Thu Apr 25 09:59:24 2024 +0200
Fix olingo tests
---
.../java/org/apache/camel/component/olingo2/Olingo2Endpoint.java| 6 +++---
.../java/org/apache/camel/component/olingo4/Olingo4Endpoint.java| 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java
b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java
index b3add8464fd..a3241a0669d 100644
---
a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java
+++
b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Endpoint.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.olingo2;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
@@ -40,6 +39,7 @@ import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.support.component.AbstractApiEndpoint;
import org.apache.camel.support.component.ApiMethod;
import org.apache.camel.support.component.ApiMethodPropertiesHelper;
+import org.apache.camel.util.CaseInsensitiveMap;
/**
* Communicate with OData 2.0 services using Apache Olingo.
@@ -114,8 +114,8 @@ public class Olingo2Endpoint extends
AbstractApiEndpoint options) {
// filter out options that are with $ as they are for query
-Map query = new LinkedHashMap<>();
-Map known = new LinkedHashMap<>();
+Map query = new CaseInsensitiveMap();
+Map known = new CaseInsensitiveMap();
options.forEach((k, v) -> {
if (k.startsWith("$")) {
query.put(k, v);
diff --git
a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java
b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java
index cb153e7010e..10a41d682dd 100644
---
a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java
+++
b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Endpoint.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.olingo4;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
@@ -40,6 +39,7 @@ import org.apache.camel.support.PropertyBindingSupport;
import org.apache.camel.support.component.AbstractApiEndpoint;
import org.apache.camel.support.component.ApiMethod;
import org.apache.camel.support.component.ApiMethodPropertiesHelper;
+import org.apache.camel.util.CaseInsensitiveMap;
/**
* Communicate with OData 4.0 services using Apache Olingo OData API.
@@ -114,8 +114,8 @@ public class Olingo4Endpoint extends
AbstractApiEndpoint options) {
// filter out options that are with $ as they are for query
-Map query = new LinkedHashMap<>();
-Map known = new LinkedHashMap<>();
+Map query = new CaseInsensitiveMap();
+Map known = new CaseInsensitiveMap();
options.forEach((k, v) -> {
if (k.startsWith("$")) {
query.put(k, v);
(camel) branch main updated: Bump jakarta.el:jakarta.el-api from 5.0.1 to 6.0.0 (#13912)
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 313f810c03e Bump jakarta.el:jakarta.el-api from 5.0.1 to 6.0.0 (#13912) 313f810c03e is described below commit 313f810c03ec0d0e857fd014cc595c3c2c03ac55 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Apr 25 09:34:03 2024 +0200 Bump jakarta.el:jakarta.el-api from 5.0.1 to 6.0.0 (#13912) Bumps [jakarta.el:jakarta.el-api](https://github.com/eclipse-ee4j/el-ri) from 5.0.1 to 6.0.0. - [Release notes](https://github.com/eclipse-ee4j/el-ri/releases) - [Commits](https://github.com/eclipse-ee4j/el-ri/commits) --- updated-dependencies: - dependency-name: jakarta.el:jakarta.el-api dependency-type: direct:production update-type: version-update:semver-major ... 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 0c2c595f9fc..a308abf5eaf 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -249,7 +249,7 @@ 3.13.10 1.13.0 3.30.2-GA -5.0.1 +6.0.0 5.0.0 2.1.3 2.1.1
(camel) branch camel-4.4.x updated: CAMEL-20715: camel-olingo - Should handle DEFAULT as ApiName if created via tooling (#13920)
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 ae25d0bf1f5 CAMEL-20715: camel-olingo - Should handle DEFAULT as
ApiName if created via tooling (#13920)
ae25d0bf1f5 is described below
commit ae25d0bf1f50dbfcca41d298e8d87d4f43ac16c3
Author: Claus Ibsen
AuthorDate: Thu Apr 25 09:24:35 2024 +0200
CAMEL-20715: camel-olingo - Should handle DEFAULT as ApiName if created via
tooling (#13920)
---
.../main/java/org/apache/camel/component/olingo2/Olingo2Component.java | 3 +++
.../main/java/org/apache/camel/component/olingo4/Olingo4Component.java | 3 +++
2 files changed, 6 insertions(+)
diff --git
a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
index f3043ef6620..908cc19f591 100644
---
a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
+++
b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
@@ -68,6 +68,9 @@ public class Olingo2Component extends
AbstractApiComponent parameters) throws Exception {
// parse remaining to extract resourcePath and queryParams
+if (remaining.startsWith("DEFAULT/")) {
+remaining = remaining.substring(8);
+}
final String[] pathSegments = remaining.split("/", -1);
final String methodName = pathSegments[0];
diff --git
a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java
b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java
index 86448a9f40b..5263ee7522a 100644
---
a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java
+++
b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java
@@ -68,6 +68,9 @@ public class Olingo4Component extends
AbstractApiComponent parameters) throws Exception {
// parse remaining to extract resourcePath and queryParams
+if (remaining.startsWith("DEFAULT/")) {
+remaining = remaining.substring(8);
+}
final String[] pathSegments = remaining.split("/", -1);
final String methodName = pathSegments[0];
(camel) branch main updated (9ad4fce20fe -> 65511a26575)
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 9ad4fce20fe Bump bytebuddy-version from 1.14.13 to 1.14.14 (#13930) add 65511a26575 CAMEL-20715: camel-olingo - Should handle DEFAULT as ApiName if created via tooling (#13920) No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/component/olingo2/Olingo2Component.java | 3 +++ .../main/java/org/apache/camel/component/olingo4/Olingo4Component.java | 3 +++ 2 files changed, 6 insertions(+)
(camel) branch main updated (15be3c28aa1 -> 9ad4fce20fe)
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 15be3c28aa1 Bump com.twilio.sdk:twilio from 10.1.2 to 10.1.5 (#13929) add 9ad4fce20fe Bump bytebuddy-version from 1.14.13 to 1.14.14 (#13930) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch olingo deleted (was 3ffc4efd8b1)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch olingo in repository https://gitbox.apache.org/repos/asf/camel.git was 3ffc4efd8b1 CAMEL-20715: camel-olingo - Should handle DEFAULT as ApiName if created via tooling 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: Bump com.twilio.sdk:twilio from 10.1.2 to 10.1.5 (#13929)
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 15be3c28aa1 Bump com.twilio.sdk:twilio from 10.1.2 to 10.1.5 (#13929) 15be3c28aa1 is described below commit 15be3c28aa1602db6a6ddeb5a8c22a26ad2249db Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Apr 25 09:24:08 2024 +0200 Bump com.twilio.sdk:twilio from 10.1.2 to 10.1.5 (#13929) Bumps [com.twilio.sdk:twilio](https://github.com/twilio/twilio-java) from 10.1.2 to 10.1.5. - [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.1.2...10.1.5) --- 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 b3447e88a83..4cb9c82a859 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -464,7 +464,7 @@ 1.19.7 3.1.2.RELEASE 2.9.2 -10.1.2 +10.1.5 4.1.2 2.3.12.Final 2.9.1
(camel) branch CAMEL-20692/set-default-value-for-loggingSizeLimit deleted (was 583330f6fd7)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-20692/set-default-value-for-loggingSizeLimit in repository https://gitbox.apache.org/repos/asf/camel.git was 583330f6fd7 CAMEL-20692: camel-cxf - Set a default value for loggingSizeLimit 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-3.22.x updated: CAMEL-20692: camel-cxf - Set a default value for loggingSizeLimit (#13865)
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 2437d3fc839 CAMEL-20692: camel-cxf - Set a default value for
loggingSizeLimit (#13865)
2437d3fc839 is described below
commit 2437d3fc8394010414bc6bfdae0d2e226dd9ee67
Author: Nicolas Filotto
AuthorDate: Thu Apr 25 09:14:23 2024 +0200
CAMEL-20692: camel-cxf - Set a default value for loggingSizeLimit (#13865)
---
.../org/apache/camel/component/cxf/jaxrs/cxfrs.json | 6 +++---
.../apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java | 15 ++-
.../org/apache/camel/component/cxf/jaxws/CxfEndpoint.java | 2 +-
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git
a/components/camel-cxf/camel-cxf-rest/src/generated/resources/org/apache/camel/component/cxf/jaxrs/cxfrs.json
b/components/camel-cxf/camel-cxf-rest/src/generated/resources/org/apache/camel/component/cxf/jaxrs/cxfrs.json
index 06e5bb01cce..167b1b46756 100644
---
a/components/camel-cxf/camel-cxf-rest/src/generated/resources/org/apache/camel/component/cxf/jaxrs/cxfrs.json
+++
b/components/camel-cxf/camel-cxf-rest/src/generated/resources/org/apache/camel/component/cxf/jaxrs/cxfrs.json
@@ -50,8 +50,6 @@
"beanId": { "kind": "path", "displayName": "Bean Id", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To lookup an existing configured CxfRsEndpoint. Must used bean:
as prefix." },
"address": { "kind": "path", "displayName": "Address", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The service publish address." },
"features": { "kind": "parameter", "displayName": "Features", "group":
"common", "label": "", "required": false, "type": "array", "javaType":
"java.util.List", "deprecated": false,
"autowired": false, "secret": false, "description": "Set the feature list to
the CxfRs endpoint." },
-"loggingFeatureEnabled": { "kind": "parameter", "displayName": "Logging
Feature Enabled", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "This option enables CXF
Logging Feature which writes inbound and outbound REST messages to log." },
-"loggingSizeLimit": { "kind": "parameter", "displayName": "Logging Size
Limit", "group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"description": "To limit the total size of number of bytes the logger will
output when logging feature has been enabled." },
"modelRef": { "kind": "parameter", "displayName": "Model Ref", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "This option is used to specify the model file which is useful
for the resource class without annotation. When using this option, then the
service class can be omitted, to emulate document-only endpoints" },
"providers": { "kind": "parameter", "displayName": "Providers", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, &quo
(camel) branch main updated (b949f79246b -> c6b186a0b1c)
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 b949f79246b Bump org.mnode.ical4j:ical4j from 3.2.17 to 3.2.18 (#13927) add c6b186a0b1c Bump com.google.apis:google-api-services-sheets (#13928) 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 (8a7b070dfe3 -> b949f79246b)
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 8a7b070dfe3 Bump io.fabric8:mockwebserver from 6.11.0 to 6.12.1 (#13926) add b949f79246b Bump org.mnode.ical4j:ical4j from 3.2.17 to 3.2.18 (#13927) 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 (79080fb83d3 -> 8a7b070dfe3)
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 79080fb83d3 Bump io.smallrye.config:smallrye-config from 3.6.0 to 3.8.1 (#13925) add 8a7b070dfe3 Bump io.fabric8:mockwebserver from 6.11.0 to 6.12.1 (#13926) 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 (e7322465c93 -> 79080fb83d3)
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 e7322465c93 Bump org.apache.maven:maven-archiver from 3.6.1 to 3.6.2 (#13924) add 79080fb83d3 Bump io.smallrye.config:smallrye-config from 3.6.0 to 3.8.1 (#13925) 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 (febefc07353 -> e7322465c93)
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 febefc07353 Bump aws-java-sdk2-version from 2.25.37 to 2.25.38 (#13923) add e7322465c93 Bump org.apache.maven:maven-archiver from 3.6.1 to 3.6.2 (#13924) No new revisions were added by this update. Summary of changes: tooling/parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (ec5f10dc1ed -> febefc07353)
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 ec5f10dc1ed Bump com.sun.xml.bind:jaxb-impl from 4.0.4 to 4.0.5 (#13922) add febefc07353 Bump aws-java-sdk2-version from 2.25.37 to 2.25.38 (#13923) 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 (6f5469a7014 -> ec5f10dc1ed)
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 6f5469a7014 [CAMEL-20546] Regen add ec5f10dc1ed Bump com.sun.xml.bind:jaxb-impl from 4.0.4 to 4.0.5 (#13922) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch olingo created (now 3ffc4efd8b1)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch olingo in repository https://gitbox.apache.org/repos/asf/camel.git at 3ffc4efd8b1 CAMEL-20715: camel-olingo - Should handle DEFAULT as ApiName if created via tooling This branch includes the following new commits: new 3ffc4efd8b1 CAMEL-20715: camel-olingo - Should handle DEFAULT as ApiName if created via tooling 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-20715: camel-olingo - Should handle DEFAULT as ApiName if created via tooling
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch olingo
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3ffc4efd8b1ff9501c9ae7c74ea89efe09c34173
Author: Claus Ibsen
AuthorDate: Wed Apr 24 21:45:19 2024 +0200
CAMEL-20715: camel-olingo - Should handle DEFAULT as ApiName if created via
tooling
---
.../main/java/org/apache/camel/component/olingo2/Olingo2Component.java | 3 +++
.../main/java/org/apache/camel/component/olingo4/Olingo4Component.java | 3 +++
2 files changed, 6 insertions(+)
diff --git
a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
index f3043ef6620..908cc19f591 100644
---
a/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
+++
b/components/camel-olingo2/camel-olingo2-component/src/main/java/org/apache/camel/component/olingo2/Olingo2Component.java
@@ -68,6 +68,9 @@ public class Olingo2Component extends
AbstractApiComponent parameters) throws Exception {
// parse remaining to extract resourcePath and queryParams
+if (remaining.startsWith("DEFAULT/")) {
+remaining = remaining.substring(8);
+}
final String[] pathSegments = remaining.split("/", -1);
final String methodName = pathSegments[0];
diff --git
a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java
b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java
index 86448a9f40b..5263ee7522a 100644
---
a/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java
+++
b/components/camel-olingo4/camel-olingo4-component/src/main/java/org/apache/camel/component/olingo4/Olingo4Component.java
@@ -68,6 +68,9 @@ public class Olingo4Component extends
AbstractApiComponent parameters) throws Exception {
// parse remaining to extract resourcePath and queryParams
+if (remaining.startsWith("DEFAULT/")) {
+remaining = remaining.substring(8);
+}
final String[] pathSegments = remaining.split("/", -1);
final String methodName = pathSegments[0];
(camel-spring-boot) branch main updated: Regen
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 619e191b8d3 Regen
619e191b8d3 is described below
commit 619e191b8d35d3142eecb45dc9c3c19e0acd299b
Author: Claus Ibsen
AuthorDate: Wed Apr 24 21:30:09 2024 +0200
Regen
---
.../org/apache/camel/springboot/catalog/components/google-drive.json| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-drive.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-drive.json
index 4190191ab62..258d90cefbe 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-drive.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-drive.json
@@ -76,7 +76,7 @@
"drive-changes": { "consumerOnly": false, "producerOnly": false,
"description": "The changes collection of methods", "methods": { "list": {
"description": "Lists the changes for a user or shared drive", "signatures": [
"com.google.api.services.drive.Drive$Changes$List list(String pageToken)" ] },
"watch": { "description": "Subscribes to changes for a user", "signatures": [
"com.google.api.services.drive.Drive$Changes$Watch watch(String pageToken,
com.google.api.services.drive.model.C [...]
"drive-channels": { "consumerOnly": false, "producerOnly": false,
"description": "The channels collection of methods", "methods": { "stop": {
"description": "Stops watching resources through this channel", "signatures": [
"com.google.api.services.drive.Drive$Channels$Stop
stop(com.google.api.services.drive.model.Channel content)" ] } } },
"drive-comments": { "consumerOnly": false, "producerOnly": false,
"description": "The comments collection of methods", "methods": { "create": {
"description": "Creates a comment on a file", "signatures": [
"com.google.api.services.drive.Drive$Comments$Create create(String fileId,
com.google.api.services.drive.model.Comment content)" ] }, "delete": {
"description": "Deletes a comment", "signatures": [
"com.google.api.services.drive.Drive$Comments$Delete delete(String fileId,
String co [...]
-"drive-drives": { "consumerOnly": false, "producerOnly": false,
"description": "The drives collection of methods", "methods": { "create": {
"description": "Creates a shared drive", "signatures": [
"com.google.api.services.drive.Drive$Drives$Create create(String requestId,
com.google.api.services.drive.model.Drive content)" ] }, "delete": {
"description": "Permanently deletes a shared drive for which the user is an
organizer", "signatures": [ "com.google.api.services.drive.Drive$Drive [...]
+"drive-drives": { "consumerOnly": false, "producerOnly": false,
"description": "The drives collection of methods", "methods": { "create": {
"description": "Creates a shared drive", "signatures": [
"com.google.api.services.drive.Drive$Drives$Create create(String requestId,
com.google.api.services.drive.model.Drive content)" ] }, "delete": {
"description": "Permanently deletes a shared drive for which the user is an
organizer", "signatures": [ "com.google.api.services.drive.Drive$Drive [...]
"drive-files": { "consumerOnly": false, "producerOnly": false,
"description": "The files collection of methods", "methods": { "copy": {
"description": "Creates a copy of a file and applies any requested updates with
patch semantics", "signatures": [
"com.google.api.services.drive.Drive$Files$Copy copy(String fileId,
com.google.api.services.drive.model.File content)" ] }, "create": {
"description": "Creates a new file", "signatures": [
"com.google.api.services.drive.Drive$Files$Create [...]
"drive-permissions": { &quo
(camel) branch main updated (c5812460c62 -> af400399ad3)
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 c5812460c62 CAMEL-20614: deep-copy enrich and poll-enrich processors during instantiation of a route template (#13869) add af400399ad3 Bump jakarta.json.bind:jakarta.json.bind-api from 3.0.0 to 3.0.1 (#13913) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch camel-4.4.x updated: CAMEL-20614: deep-copy enrich and poll-enrich processors during instantiation of a route template (#13870)
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 cc57bf2353f CAMEL-20614: deep-copy enrich and poll-enrich processors
during instantiation of a route template (#13870)
cc57bf2353f is described below
commit cc57bf2353ff541f379124c24da6ec64849d985c
Author: Bartosz Popiela
AuthorDate: Wed Apr 24 21:19:45 2024 +0200
CAMEL-20614: deep-copy enrich and poll-enrich processors during
instantiation of a route template (#13870)
* CAMEL-20614: deep-copy enrich and poll-enrich processors during
instantiation of a route template
* CAMEL-20614: rename CopyableProcessDefinition to Copyable
* CAMEL-20614: fix formatting
* CAMEL-20614: fix failing unit test
---
...yableProcessorDefinition.java => Copyable.java} | 2 +-
.../org/apache/camel/model/EnrichDefinition.java | 25 ++-
.../org/apache/camel/model/ExpressionNode.java | 5 +++
.../apache/camel/model/PollEnrichDefinition.java | 22 -
.../camel/model/RouteTemplateDefinition.java | 4 +-
.../java/org/apache/camel/model/ToDefinition.java | 2 +-
.../apache/camel/model/ToDynamicDefinition.java| 2 +-
.../camel/model/RouteTemplateDefinitionTest.java | 52 +++---
8 files changed, 99 insertions(+), 15 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/CopyableProcessorDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/Copyable.java
similarity index 96%
rename from
core/camel-core-model/src/main/java/org/apache/camel/model/CopyableProcessorDefinition.java
rename to
core/camel-core-model/src/main/java/org/apache/camel/model/Copyable.java
index cf770d7515c..98ea9d58fc8 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/CopyableProcessorDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/Copyable.java
@@ -20,6 +20,6 @@ package org.apache.camel.model;
* This interface is used to copy {@link ProcessorDefinition
ProcessorDefinitions} during instantiation of a route
* template.
*/
-interface CopyableProcessorDefinition {
+interface Copyable {
ProcessorDefinition copy();
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
index 7b94d4e0bf2..ba904e06f27 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
@@ -34,7 +34,8 @@ import org.apache.camel.spi.Metadata;
@Metadata(label = "eip,transformation")
@XmlRootElement(name = "enrich")
@XmlAccessorType(XmlAccessType.FIELD)
-public class EnrichDefinition extends ExpressionNode implements
AggregationStrategyAwareDefinition {
+public class EnrichDefinition extends ExpressionNode
+implements AggregationStrategyAwareDefinition,
Copyable {
@XmlTransient
private AggregationStrategy aggregationStrategyBean;
@@ -72,13 +73,28 @@ public class EnrichDefinition extends ExpressionNode
implements AggregationStrat
private String autoStartComponents;
public EnrichDefinition() {
-this(null);
+this((AggregationStrategy) null);
}
public EnrichDefinition(AggregationStrategy aggregationStrategy) {
this.aggregationStrategyBean = aggregationStrategy;
}
+protected EnrichDefinition(EnrichDefinition source) {
+this.aggregationStrategyBean = source.aggregationStrategyBean;
+this.variableSend = source.variableSend;
+this.variableReceive = source.variableReceive;
+this.aggregationStrategy = source.aggregationStrategy;
+this.aggregationStrategyMethodName =
source.aggregationStrategyMethodName;
+this.aggregationStrategyMethodAllowNull =
source.aggregationStrategyMethodAllowNull;
+this.aggregateOnException = source.aggregateOnException;
+this.shareUnitOfWork = source.shareUnitOfWork;
+this.cacheSize = source.cacheSize;
+this.ignoreInvalidEndpoint = source.ignoreInvalidEndpoint;
+this.allowOptimisedComponents = source.allowOptimisedComponents;
+this.autoStartComponents = source.autoStartComponents;
+}
+
@Override
public String toString() {
return "Enrich[" + getExpression() + "]";
@@ -379,4 +395,9 @@ public class EnrichDefinition extends ExpressionNode
implements AggregationStrat
public void setAutoStartComponents(String autoStartComponents) {
this.autoStartComponents = autoStartComponents;
}
+
+@Override
+public EnrichDefinition copy() {
+return new EnrichDefinition(this);
+}
}
diff --git
(camel) branch main updated: CAMEL-20614: deep-copy enrich and poll-enrich processors during instantiation of a route template (#13869)
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 c5812460c62 CAMEL-20614: deep-copy enrich and poll-enrich processors
during instantiation of a route template (#13869)
c5812460c62 is described below
commit c5812460c62a0b131becda6426bad72dc3a333e0
Author: Bartosz Popiela
AuthorDate: Wed Apr 24 21:19:32 2024 +0200
CAMEL-20614: deep-copy enrich and poll-enrich processors during
instantiation of a route template (#13869)
* CAMEL-20614: deep-copy enrich and poll-enrich processors during
instantiation of a route template
* CAMEL-20614: rename CopyableProcessDefinition to Copyable
* CAMEL-20614: fix formatting
* CAMEL-20614: fix failing unit test
---
...yableProcessorDefinition.java => Copyable.java} | 2 +-
.../org/apache/camel/model/EnrichDefinition.java | 25 ++-
.../org/apache/camel/model/ExpressionNode.java | 5 +++
.../apache/camel/model/PollEnrichDefinition.java | 22 -
.../camel/model/RouteTemplateDefinition.java | 4 +-
.../java/org/apache/camel/model/ToDefinition.java | 2 +-
.../apache/camel/model/ToDynamicDefinition.java| 2 +-
.../camel/model/RouteTemplateDefinitionTest.java | 52 +++---
8 files changed, 99 insertions(+), 15 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/CopyableProcessorDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/Copyable.java
similarity index 96%
rename from
core/camel-core-model/src/main/java/org/apache/camel/model/CopyableProcessorDefinition.java
rename to
core/camel-core-model/src/main/java/org/apache/camel/model/Copyable.java
index cf770d7515c..98ea9d58fc8 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/CopyableProcessorDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/Copyable.java
@@ -20,6 +20,6 @@ package org.apache.camel.model;
* This interface is used to copy {@link ProcessorDefinition
ProcessorDefinitions} during instantiation of a route
* template.
*/
-interface CopyableProcessorDefinition {
+interface Copyable {
ProcessorDefinition copy();
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
index 7b94d4e0bf2..ba904e06f27 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/EnrichDefinition.java
@@ -34,7 +34,8 @@ import org.apache.camel.spi.Metadata;
@Metadata(label = "eip,transformation")
@XmlRootElement(name = "enrich")
@XmlAccessorType(XmlAccessType.FIELD)
-public class EnrichDefinition extends ExpressionNode implements
AggregationStrategyAwareDefinition {
+public class EnrichDefinition extends ExpressionNode
+implements AggregationStrategyAwareDefinition,
Copyable {
@XmlTransient
private AggregationStrategy aggregationStrategyBean;
@@ -72,13 +73,28 @@ public class EnrichDefinition extends ExpressionNode
implements AggregationStrat
private String autoStartComponents;
public EnrichDefinition() {
-this(null);
+this((AggregationStrategy) null);
}
public EnrichDefinition(AggregationStrategy aggregationStrategy) {
this.aggregationStrategyBean = aggregationStrategy;
}
+protected EnrichDefinition(EnrichDefinition source) {
+this.aggregationStrategyBean = source.aggregationStrategyBean;
+this.variableSend = source.variableSend;
+this.variableReceive = source.variableReceive;
+this.aggregationStrategy = source.aggregationStrategy;
+this.aggregationStrategyMethodName =
source.aggregationStrategyMethodName;
+this.aggregationStrategyMethodAllowNull =
source.aggregationStrategyMethodAllowNull;
+this.aggregateOnException = source.aggregateOnException;
+this.shareUnitOfWork = source.shareUnitOfWork;
+this.cacheSize = source.cacheSize;
+this.ignoreInvalidEndpoint = source.ignoreInvalidEndpoint;
+this.allowOptimisedComponents = source.allowOptimisedComponents;
+this.autoStartComponents = source.autoStartComponents;
+}
+
@Override
public String toString() {
return "Enrich[" + getExpression() + "]";
@@ -379,4 +395,9 @@ public class EnrichDefinition extends ExpressionNode
implements AggregationStrat
public void setAutoStartComponents(String autoStartComponents) {
this.autoStartComponents = autoStartComponents;
}
+
+@Override
+public EnrichDefinition copy() {
+return new EnrichDefinition(this);
+}
}
diff --git
a/core/came
(camel) branch camel-4.4.x updated: CAMEL-20699, CAMEL-20691: Fix Azure ServiceBus header propagation (#13879)
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 b90a5db8f10 CAMEL-20699, CAMEL-20691: Fix Azure ServiceBus header
propagation (#13879)
b90a5db8f10 is described below
commit b90a5db8f1065d90b44335ef35c1f94874adf5b2
Author: Dylan Piergies
AuthorDate: Wed Apr 24 20:16:34 2024 +0100
CAMEL-20699, CAMEL-20691: Fix Azure ServiceBus header propagation (#13879)
* CAMEL-20699: Fix Azure ServiceBus consumer broker property propagation
* CAMEL-20691: Fix propagation of application properties
---
.../azure/servicebus/ServiceBusConfiguration.java | 3 +--
.../azure/servicebus/ServiceBusConsumer.java | 2 +-
.../servicebus/ServiceBusHeaderFilterStrategy.java | 31 ++
3 files changed, 33 insertions(+), 3 deletions(-)
diff --git
a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java
index eeb5ff76dea..b8e9873a64e 100644
---
a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java
+++
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java
@@ -31,7 +31,6 @@ import
com.azure.messaging.servicebus.models.ServiceBusReceiveMode;
import com.azure.messaging.servicebus.models.SubQueue;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.*;
-import org.apache.camel.support.DefaultHeaderFilterStrategy;
import static
org.apache.camel.component.azure.servicebus.CredentialType.CONNECTION_STRING;
@@ -59,7 +58,7 @@ public class ServiceBusConfiguration implements Cloneable,
HeaderFilterStrategyA
private AmqpTransportType amqpTransportType = AmqpTransportType.AMQP;
@UriParam(label = "common",
description = "To use a custom HeaderFilterStrategy to filter
Service Bus application properties to and from Camel message headers.")
-private HeaderFilterStrategy headerFilterStrategy = new
DefaultHeaderFilterStrategy();
+private HeaderFilterStrategy headerFilterStrategy = new
ServiceBusHeaderFilterStrategy();
@UriParam(label = "consumer", defaultValue = "receiveMessages")
private ServiceBusConsumerOperationDefinition consumerOperation =
ServiceBusConsumerOperationDefinition.receiveMessages;
@UriParam(label = "consumer")
diff --git
a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java
index f3394150162..3727f35869b 100644
---
a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java
+++
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java
@@ -186,7 +186,7 @@ public class ServiceBusConsumer extends DefaultConsumer {
// propagate headers
final HeaderFilterStrategy headerFilterStrategy =
getConfiguration().getHeaderFilterStrategy();
-
message.setHeaders(receivedMessage.getApplicationProperties().entrySet().stream()
+
message.getHeaders().putAll(receivedMessage.getApplicationProperties().entrySet().stream()
.filter(entry ->
!headerFilterStrategy.applyFilterToExternalHeaders(entry.getKey(),
entry.getValue(), exchange))
.collect(Collectors.toMap(Map.Entry::getKey,
Map.Entry::getValue)));
diff --git
a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusHeaderFilterStrategy.java
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusHeaderFilterStrategy.java
new file mode 100644
index 000..5ab2a97e08a
--- /dev/null
+++
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusHeaderFilterStrategy.java
@@ -0,0 +1,31 @@
+/*
+ * 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
+ *
+ * htt
(camel) branch main updated: CAMEL-20699, CAMEL-20691: Fix Azure ServiceBus header propagation (#13872)
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 e15819a7ffa CAMEL-20699, CAMEL-20691: Fix Azure ServiceBus header
propagation (#13872)
e15819a7ffa is described below
commit e15819a7ffa0ff0cbd36eef15b4978cd0ac563ce
Author: Dylan Piergies
AuthorDate: Wed Apr 24 20:16:18 2024 +0100
CAMEL-20699, CAMEL-20691: Fix Azure ServiceBus header propagation (#13872)
* CAMEL-20699: Fix Azure ServiceBus consumer broker property propagation
* CAMEL-20691: Fix propagation of application properties
---
.../azure/servicebus/ServiceBusConfiguration.java | 3 +--
.../azure/servicebus/ServiceBusConsumer.java | 2 +-
.../servicebus/ServiceBusHeaderFilterStrategy.java | 31 ++
3 files changed, 33 insertions(+), 3 deletions(-)
diff --git
a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java
index 4bc10e16f2f..55f2840134b 100644
---
a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java
+++
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java
@@ -31,7 +31,6 @@ import
com.azure.messaging.servicebus.models.ServiceBusReceiveMode;
import com.azure.messaging.servicebus.models.SubQueue;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.spi.*;
-import org.apache.camel.support.DefaultHeaderFilterStrategy;
import static
org.apache.camel.component.azure.servicebus.CredentialType.CONNECTION_STRING;
@@ -59,7 +58,7 @@ public class ServiceBusConfiguration implements Cloneable,
HeaderFilterStrategyA
private AmqpTransportType amqpTransportType = AmqpTransportType.AMQP;
@UriParam(label = "common",
description = "To use a custom HeaderFilterStrategy to filter
Service Bus application properties to and from Camel message headers.")
-private HeaderFilterStrategy headerFilterStrategy = new
DefaultHeaderFilterStrategy();
+private HeaderFilterStrategy headerFilterStrategy = new
ServiceBusHeaderFilterStrategy();
@UriParam(label = "consumer", defaultValue = "receiveMessages")
private ServiceBusConsumerOperationDefinition consumerOperation =
ServiceBusConsumerOperationDefinition.receiveMessages;
@UriParam(label = "consumer")
diff --git
a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java
index 14f8297ff25..17551243b18 100644
---
a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java
+++
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConsumer.java
@@ -189,7 +189,7 @@ public class ServiceBusConsumer extends DefaultConsumer {
// propagate headers
final HeaderFilterStrategy headerFilterStrategy =
getConfiguration().getHeaderFilterStrategy();
-
message.setHeaders(receivedMessage.getApplicationProperties().entrySet().stream()
+
message.getHeaders().putAll(receivedMessage.getApplicationProperties().entrySet().stream()
.filter(entry ->
!headerFilterStrategy.applyFilterToExternalHeaders(entry.getKey(),
entry.getValue(), exchange))
.collect(Collectors.toMap(Map.Entry::getKey,
Map.Entry::getValue)));
diff --git
a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusHeaderFilterStrategy.java
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusHeaderFilterStrategy.java
new file mode 100644
index 000..5ab2a97e08a
--- /dev/null
+++
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusHeaderFilterStrategy.java
@@ -0,0 +1,31 @@
+/*
+ * 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
(camel) branch main updated: CAMEL-20714 Added public no-arg constructor for SourceCache (#13903)
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 6ff60e3b0c4 CAMEL-20714 Added public no-arg constructor for
SourceCache (#13903)
6ff60e3b0c4 is described below
commit 6ff60e3b0c451426b778ee0bae3b11acf71622dd
Author: Dmitry Kryukov
AuthorDate: Wed Apr 24 22:15:31 2024 +0300
CAMEL-20714 Added public no-arg constructor for SourceCache (#13903)
---
.../src/main/java/org/apache/camel/util/xml/SourceCache.java | 4
1 file changed, 4 insertions(+)
diff --git
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/SourceCache.java
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/SourceCache.java
index 67a67a1b2eb..c32f4fc4938 100644
---
a/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/SourceCache.java
+++
b/core/camel-xml-jaxp/src/main/java/org/apache/camel/util/xml/SourceCache.java
@@ -40,6 +40,10 @@ public final class SourceCache extends StringSource
implements StreamCache {
this.length = data.length();
}
+public SourceCache() {
+throw new IllegalStateException();
+}
+
@Override
public void reset() {
// do nothing here
(camel) branch runq deleted (was 83ad46150ac)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch runq in repository https://gitbox.apache.org/repos/asf/camel.git was 83ad46150ac CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus 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-jbang - run with spring-boot or quarkus (#13919)
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 25bedbb34f2 camel-jbang - run with spring-boot or quarkus (#13919)
25bedbb34f2 is described below
commit 25bedbb34f2adbfed0a215d954e3caec10207098
Author: Claus Ibsen
AuthorDate: Wed Apr 24 21:12:49 2024 +0200
camel-jbang - run with spring-boot or quarkus (#13919)
CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
---
.../apache/camel/impl/console/RouteDevConsole.java | 4 +-
.../org/apache/camel/main/BaseMainSupport.java | 2 +-
.../modules/ROOT/pages/camel-jbang.adoc| 48 ++
.../dsl/jbang/core/commands/ExportBaseCommand.java | 42 --
.../apache/camel/dsl/jbang/core/commands/Run.java | 164 +
.../src/main/resources/spring-boot-logback.xml | 29
6 files changed, 274 insertions(+), 15 deletions(-)
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
index 087357f1cb9..a6cb3354b04 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
@@ -317,7 +317,9 @@ public class RouteDevConsole extends AbstractDevConsole {
arr.add(jo);
jo.put("id", mp.getProcessorId());
-jo.put("nodePrefixId", mp.getNodePrefixId());
+if (mp.getNodePrefixId() != null) {
+jo.put("nodePrefixId", mp.getNodePrefixId());
+}
if (mp.getSourceLocation() != null) {
String loc = mp.getSourceLocation();
if (mp.getSourceLineNumber() != null) {
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index 74b4ca1a78b..645cd0d2638 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -1691,7 +1691,7 @@ public abstract class BaseMainSupport extends BaseService
{
throws Exception {
TracerConfigurationProperties config =
mainConfigurationProperties.tracerConfig();
-setPropertiesOnTarget(camelContext, config, properties,
"camel.tracer.",
+setPropertiesOnTarget(camelContext, config, properties, "camel.trace.",
failIfNotSet, true, autoConfiguredProperties);
if (!config.isEnabled() && !config.isStandby()) {
diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
index 1a36c8d9ae2..ff04e5be63a 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
@@ -2399,6 +2399,54 @@ which is due to invalid configuration: `Invalid url in
bootstrap.servers: value`
TIP: Use `camel get health --help` to see all the various options.
+
+== Running with Spring Boot or Quarkus
+
+Camel JBang is __primary__ intended to be Camel standalone only. In *Camel
4.6* onwards we added limited
+support for running with Spring Boot or Quarkus, but there are some
limitations.
+
+You use the `--runtime` option to specify which platform to use, as shown
below:
+
+[source,bash]
+
+camel run foo.camel.yaml --runtime=spring-boot
+
+
+And for Quarkus:
+
+[source,bash]
+
+camel run foo.camel.yaml --runtime=quarkus
+
+
+When running this way, then Camel JBang is _essentially_ doing an _export_ to
a temporary folder,
+and then running Spring Boot or Quarkus using Maven.
+
+You can do changes to the source file and have Quarkus and Spring Boot reload
the routes, just as `camel run --dev` can do,
+but uses the natural Spring Boot _dev-tools_ and Quarkus _dev mode_
functionality.
+
+There are several limitations, one would be that Spring Boot and Quarkus
cannot automatically detect new components and download JARs.
+(you can stop and run again to update dependencies).
+
+When using Quarkus then you can only select the Quarkus version to run, that
are locked to a specific Camel version.
+You can see the versions by `camel version list --runtime=quarkus`. On the
other hand Spring Boot is more flexible
+where you can choose different Spring Boot and Camel versions (within
reasonable range).
+
+For example:
+
+[source,bash]
+
+camel run foo.camel.yaml --runtime=spring-boot --spring-boot-version=3.2.3
--camel-version=4.4.1
+
+
+And for Quarkus:
+
+[source,bash]
+
+camel run foo.camel.yaml --runtime=quarkus --quarkus-version=3.9.4
+
+
+
== Transforming m
(camel) branch runq updated (5d3cdf4682c -> 83ad46150ac)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch runq in repository https://gitbox.apache.org/repos/asf/camel.git from 5d3cdf4682c CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus add 83ad46150ac CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus No new revisions were added by this update. Summary of changes: .../src/main/resources/spring-boot-logback.xml | 18 ++ 1 file changed, 18 insertions(+)
(camel) 10/11: CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch runq
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5abbf4decdacdf6d147057a52e708324276b5771
Author: Claus Ibsen
AuthorDate: Wed Apr 24 15:39:37 2024 +0200
CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java| 3 ---
1 file changed, 3 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 1a3ea36fa9b..e713975b98d 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -952,9 +952,6 @@ public class Run extends CamelCommand {
eq.loggingLevel = "off";
System.out.println("Running using Spring Boot v" +
eq.springBootVersion + " (preparing and downloading files)");
-// TODO: camel log from spring-boot/quarkus is not possible
-// TODO: spring-boot dev-tools reloading could update camel reload
counter
-// TODO: docs
// run export
int exit = eq.export();
(camel) 01/11: CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch runq
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5ab046674e150ff63969dba2215bd62fdc3d6972
Author: Claus Ibsen
AuthorDate: Sat Apr 20 09:18:23 2024 +0200
CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
---
.../dsl/jbang/core/commands/ExportBaseCommand.java | 24 ++--
.../apache/camel/dsl/jbang/core/commands/Run.java | 123 +
2 files changed, 135 insertions(+), 12 deletions(-)
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 edb9da8c354..33dedbed9e3 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
@@ -64,6 +64,7 @@ import picocli.CommandLine;
abstract class ExportBaseCommand extends CamelCommand {
protected static final String BUILD_DIR =
CommandLineHelper.CAMEL_JBANG_WORK_DIR + "/work";
+protected static final String RUN_DIR =
CommandLineHelper.CAMEL_JBANG_WORK_DIR + "/run";
protected static final String[] SETTINGS_PROP_SOURCE_KEYS = new String[] {
"camel.main.routesIncludePattern",
@@ -126,10 +127,10 @@ abstract class ExportBaseCommand extends CamelCommand {
@CommandLine.Option(names = { "--main-classname" },
description = "The class name of the Camel Main
application class",
defaultValue = "CamelApplication")
-protected String mainClassname;
+protected String mainClassname = "CamelApplication";
@CommandLine.Option(names = { "--java-version" }, description = "Java
version", defaultValue = "17")
-protected String javaVersion;
+protected String javaVersion = "17";
@CommandLine.Option(names = { "--camel-version" },
description = "To export using a different Camel
version than the default version.")
@@ -149,34 +150,34 @@ abstract class ExportBaseCommand extends CamelCommand {
@CommandLine.Option(names = { "--spring-boot-version" }, description =
"Spring Boot version",
defaultValue = "3.2.5")
-protected String springBootVersion;
+protected String springBootVersion = "3.2.5";
@CommandLine.Option(names = { "--camel-spring-boot-version" }, description
= "Camel version to use with Spring Boot")
protected String camelSpringBootVersion;
@CommandLine.Option(names = { "--quarkus-group-id" }, description =
"Quarkus Platform Maven groupId",
defaultValue = "io.quarkus.platform")
-protected String quarkusGroupId;
+protected String quarkusGroupId = "io.quarkus.platform";
@CommandLine.Option(names = { "--quarkus-artifact-id" }, description =
"Quarkus Platform Maven artifactId",
defaultValue = "quarkus-bom")
-protected String quarkusArtifactId;
+protected String quarkusArtifactId = "quarkus-bom";
@CommandLine.Option(names = { "--quarkus-version" }, description =
"Quarkus Platform version",
defaultValue = "3.9.4")
-protected String quarkusVersion;
+protected String quarkusVersion = "3.9.4";
@CommandLine.Option(names = { "--maven-wrapper" }, defaultValue = "true",
description = "Include Maven Wrapper files in exported
project")
-protected boolean mavenWrapper;
+protected boolean mavenWrapper = true;
@CommandLine.Option(names = { "--gradle-wrapper" }, defaultValue = "true",
description = "Include Gradle Wrapper files in
exported project")
-protected boolean gradleWrapper;
+protected boolean gradleWrapper = true;
@CommandLine.Option(names = { "--build-tool" }, defaultValue = "maven",
description = "Build tool to use (maven or gradle)")
-protected String buildTool;
+protected String buildTool = "maven";
@CommandLine.Option(names = { "--open-api" }, description = "Adds an
OpenAPI spec from the given file (json or yaml file)")
protected String openapi;
@@ -187,12 +188,11 @@ abstract class ExportBaseCommand extends CamelCommand {
protected St
(camel) 08/11: CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch runq
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ebcf5395272512edb2b4b7d5889a0bf994dc7c75
Author: Claus Ibsen
AuthorDate: Wed Apr 24 12:36:12 2024 +0200
CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
---
.../org/apache/camel/dsl/jbang/core/commands/Run.java | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 67ea4f0bf91..fa275f68527 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -889,15 +889,19 @@ public class Run extends CamelCommand {
return exit;
}
// run quarkus via maven
+String mvnw = "/mvnw";
+if (FileUtil.isWindows()) {
+mvnw = "/mvnw.cmd";
+}
ProcessBuilder pb = new ProcessBuilder();
-pb.command(runDir + "/mvnw", "--quiet", "--file", runDir.toString(),
"quarkus:dev");
+pb.command(runDir + mvnw, "--quiet", "--file", runDir.toString(),
"quarkus:dev");
if (background) {
Process p = pb.start();
this.spawnPid = p.pid();
if (!silentRun && !transformRun && !transformMessageRun) {
printer().println("Running Camel Quarkus integration: " + name
+ " (version: " + eq.quarkusVersion
- + ") in background with PID: " + p.pid());
+ + ") in background");
}
return 0;
} else {
@@ -953,6 +957,7 @@ public class Run extends CamelCommand {
// TODO: camel stop does not stop quarkus correctly (spring boot does
that)
// TODO: camel get does not show Quarkus as platform (spring boot does
that)
// TODO: spring-boot dev-tools reloading could update camel reload
counter
+// TODO: docs
// run export
int exit = eq.export();
@@ -961,14 +966,18 @@ public class Run extends CamelCommand {
}
// run spring-boot via maven
ProcessBuilder pb = new ProcessBuilder();
-pb.command(runDir + "/mvnw", "--quiet", "--file", runDir.toString(),
"spring-boot:run");
+String mvnw = "/mvnw";
+if (FileUtil.isWindows()) {
+mvnw = "/mvnw.cmd";
+}
+pb.command(runDir + mvnw, "--quiet", "--file", runDir.toString(),
"spring-boot:run");
if (background) {
Process p = pb.start();
this.spawnPid = p.pid();
if (!silentRun && !transformRun && !transformMessageRun) {
printer().println("Running Camel Spring Boot integration: " +
name + " (version: " + camelVersion
- + ") in background with PID: " + p.pid());
+ + ") in background");
}
return 0;
} else {
(camel) 06/11: CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch runq
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9266b0a525938485bf3b939195fc335b43b7aa00
Author: Claus Ibsen
AuthorDate: Sat Apr 20 11:09:10 2024 +0200
CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
---
.../src/main/java/org/apache/camel/impl/console/RouteDevConsole.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
index a593926d4b4..f3d97561736 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/RouteDevConsole.java
@@ -317,7 +317,9 @@ public class RouteDevConsole extends AbstractDevConsole {
arr.add(jo);
jo.put("id", mp.getProcessorId());
-jo.put("nodePrefixId", mp.getNodePrefixId());
+if (mp.getNodePrefixId() != null) {
+jo.put("nodePrefixId", mp.getNodePrefixId());
+}
if (mp.getSourceLocation() != null) {
String loc = mp.getSourceLocation();
if (mp.getSourceLineNumber() != null) {
(camel) 09/11: CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch runq
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 519635a56a4fe248fa52959576fbfb8e91c0d624
Author: Claus Ibsen
AuthorDate: Wed Apr 24 15:31:22 2024 +0200
CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
---
.../src/main/java/org/apache/camel/main/BaseMainSupport.java | 2 +-
.../java/org/apache/camel/dsl/jbang/core/commands/Run.java| 7 ---
.../src/main/resources/spring-boot-logback.xml| 11 +++
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index 74b4ca1a78b..645cd0d2638 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -1691,7 +1691,7 @@ public abstract class BaseMainSupport extends BaseService
{
throws Exception {
TracerConfigurationProperties config =
mainConfigurationProperties.tracerConfig();
-setPropertiesOnTarget(camelContext, config, properties,
"camel.tracer.",
+setPropertiesOnTarget(camelContext, config, properties, "camel.trace.",
failIfNotSet, true, autoConfiguredProperties);
if (!config.isEnabled() && !config.isStandby()) {
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index fa275f68527..1a3ea36fa9b 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -953,9 +953,6 @@ public class Run extends CamelCommand {
System.out.println("Running using Spring Boot v" +
eq.springBootVersion + " (preparing and downloading files)");
// TODO: camel log from spring-boot/quarkus is not possible
-// TODO: copy files using symbolic link so you can edit the file
(TODO: application.properties)
-// TODO: camel stop does not stop quarkus correctly (spring boot does
that)
-// TODO: camel get does not show Quarkus as platform (spring boot does
that)
// TODO: spring-boot dev-tools reloading could update camel reload
counter
// TODO: docs
@@ -964,6 +961,10 @@ public class Run extends CamelCommand {
if (exit != 0) {
return exit;
}
+// prepare spring-boot for logging to file
+InputStream is =
Run.class.getClassLoader().getResourceAsStream("spring-boot-logback.xml");
+eq.safeCopy(is, new File(eq.exportDir +
"/src/main/resources/logback.xml"));
+
// run spring-boot via maven
ProcessBuilder pb = new ProcessBuilder();
String mvnw = "/mvnw";
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/spring-boot-logback.xml
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/spring-boot-logback.xml
new file mode 100644
index 000..0cd45fcd609
--- /dev/null
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/spring-boot-logback.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
(camel) 11/11: CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch runq in repository https://gitbox.apache.org/repos/asf/camel.git commit 5d3cdf4682c5cb5cd733b3d61eed097ac8587663 Author: Claus Ibsen AuthorDate: Wed Apr 24 18:40:20 2024 +0200 CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus --- .../modules/ROOT/pages/camel-jbang.adoc| 48 ++ 1 file changed, 48 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index 1a36c8d9ae2..ff04e5be63a 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -2399,6 +2399,54 @@ which is due to invalid configuration: `Invalid url in bootstrap.servers: value` TIP: Use `camel get health --help` to see all the various options. + +== Running with Spring Boot or Quarkus + +Camel JBang is __primary__ intended to be Camel standalone only. In *Camel 4.6* onwards we added limited +support for running with Spring Boot or Quarkus, but there are some limitations. + +You use the `--runtime` option to specify which platform to use, as shown below: + +[source,bash] + +camel run foo.camel.yaml --runtime=spring-boot + + +And for Quarkus: + +[source,bash] + +camel run foo.camel.yaml --runtime=quarkus + + +When running this way, then Camel JBang is _essentially_ doing an _export_ to a temporary folder, +and then running Spring Boot or Quarkus using Maven. + +You can do changes to the source file and have Quarkus and Spring Boot reload the routes, just as `camel run --dev` can do, +but uses the natural Spring Boot _dev-tools_ and Quarkus _dev mode_ functionality. + +There are several limitations, one would be that Spring Boot and Quarkus cannot automatically detect new components and download JARs. +(you can stop and run again to update dependencies). + +When using Quarkus then you can only select the Quarkus version to run, that are locked to a specific Camel version. +You can see the versions by `camel version list --runtime=quarkus`. On the other hand Spring Boot is more flexible +where you can choose different Spring Boot and Camel versions (within reasonable range). + +For example: + +[source,bash] + +camel run foo.camel.yaml --runtime=spring-boot --spring-boot-version=3.2.3 --camel-version=4.4.1 + + +And for Quarkus: + +[source,bash] + +camel run foo.camel.yaml --runtime=quarkus --quarkus-version=3.9.4 + + + == Transforming message (data mapping) When integrating system you often need to transform messages from one system to another. Camel has rich set
(camel) branch runq created (now 5d3cdf4682c)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch runq in repository https://gitbox.apache.org/repos/asf/camel.git at 5d3cdf4682c CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus This branch includes the following new commits: new 5ab046674e1 CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus new 6fe9ea5f6bc CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus new 5769db93325 CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus new 93b315e1c63 CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus new e80f94340b5 CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus new 9266b0a5259 CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus new b72b33f3600 CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus new ebcf5395272 CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus new 519635a56a4 CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus new 5abbf4decda CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus new 5d3cdf4682c CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus The 11 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) 05/11: CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch runq
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e80f94340b5759287928e5c47ef31f781ed94cc6
Author: Claus Ibsen
AuthorDate: Sat Apr 20 11:03:53 2024 +0200
CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index c1ae2853bb7..0128045d609 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -942,6 +942,7 @@ public class Run extends CamelCommand {
// TODO: copy files using symbolic link so you can edit the file
(TODO: application.properties)
// TODO: camel stop does not stop quarkus correctly (spring boot do
that)
// TODO: camel get does not show Quarkus as platform (spring boot do
that)
+// TODO: spring-boot dev-tools reloading could update camel reload
counter
// run export
int exit = eq.export();
(camel) 07/11: CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch runq
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b72b33f3600f93c130148c4afbc2b3853788
Author: Claus Ibsen
AuthorDate: Wed Apr 24 12:28:47 2024 +0200
CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
---
.../dsl/jbang/core/commands/ExportBaseCommand.java | 1 -
.../apache/camel/dsl/jbang/core/commands/Run.java | 28 +++---
2 files changed, 19 insertions(+), 10 deletions(-)
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 c741b4e4db1..24f0803d95c 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
@@ -64,7 +64,6 @@ import picocli.CommandLine;
abstract class ExportBaseCommand extends CamelCommand {
protected static final String BUILD_DIR =
CommandLineHelper.CAMEL_JBANG_WORK_DIR + "/work";
-protected static final String RUN_DIR =
CommandLineHelper.CAMEL_JBANG_WORK_DIR + "/run";
protected static final String[] SETTINGS_PROP_SOURCE_KEYS = new String[] {
"camel.main.routesIncludePattern",
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 0128045d609..67ea4f0bf91 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -87,6 +87,7 @@ import static
org.apache.camel.dsl.jbang.core.common.GitHubHelper.fetchGithubUrl
public class Run extends CamelCommand {
public static final String RUN_SETTINGS_FILE =
"camel-jbang-run.properties";
+private static final String RUN_PLATFORM_DIR = ".camel-jbang-run";
private static final String[] ACCEPTED_FILE_EXT
= new String[] { "java", "groovy", "js", "jsh", "kts", "xml",
"yaml" };
@@ -848,13 +849,19 @@ public class Run extends CamelCommand {
}
protected int runQuarkus() throws Exception {
+// create temp run dir
+File runDir = new File(RUN_PLATFORM_DIR, "" +
System.currentTimeMillis());
+if (!this.background) {
+runDir.deleteOnExit();
+}
+
// export to hidden folder
ExportQuarkus eq = new ExportQuarkus(getMain());
eq.symbolicLink = true;
eq.quarkusVersion = this.quarkusVersion;
eq.camelVersion = this.camelVersion;
eq.kameletsVersion = this.kameletsVersion;
-eq.exportDir = ExportBaseCommand.RUN_DIR;
+eq.exportDir = runDir.toString();
eq.exclude = this.exclude;
eq.filePaths = this.filePaths;
eq.files = this.files;
@@ -883,7 +890,7 @@ public class Run extends CamelCommand {
}
// run quarkus via maven
ProcessBuilder pb = new ProcessBuilder();
-pb.command(ExportBaseCommand.RUN_DIR + "/mvnw", "--quiet", "--file",
ExportBaseCommand.RUN_DIR, "quarkus:dev");
+pb.command(runDir + "/mvnw", "--quiet", "--file", runDir.toString(),
"quarkus:dev");
if (background) {
Process p = pb.start();
@@ -903,6 +910,12 @@ public class Run extends CamelCommand {
}
protected int runSpringBoot() throws Exception {
+// create temp run dir
+File runDir = new File(RUN_PLATFORM_DIR, "" +
System.currentTimeMillis());
+if (!this.background) {
+runDir.deleteOnExit();
+}
+
// export to hidden folder
ExportSpringBoot eq = new ExportSpringBoot(getMain());
eq.symbolicLink = true;
@@ -910,7 +923,7 @@ public class Run extends CamelCommand {
eq.camelVersion = this.camelVersion;
eq.camelSpringBootVersion = this.camelVersion;
eq.kameletsVersion = this.kameletsVersion;
-eq.exportDir = ExportBaseCommand.RUN_DIR;
+eq.exportDir = runDir.toString();
eq.exclude = this.exclude;
eq.filePaths = this.filePaths;
eq.files = this.files;
@@ -935,13 +948,10 @@ public class Run extends CamelCommand {
eq.loggingLevel = "off";
System.out.println("Running using Spring Boot v" +
eq.springBootVersion + " (preparing and downloading files)");
-// TODO: if e
(camel) 04/11: CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch runq
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 93b315e1c63d25d58f1186b4670ad6175693ef2e
Author: Claus Ibsen
AuthorDate: Sat Apr 20 11:00:05 2024 +0200
CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
---
.../dsl/jbang/core/commands/ExportBaseCommand.java| 19 ++-
.../org/apache/camel/dsl/jbang/core/commands/Run.java | 10 --
2 files changed, 26 insertions(+), 3 deletions(-)
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 33dedbed9e3..c741b4e4db1 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
@@ -218,6 +218,8 @@ abstract class ExportBaseCommand extends CamelCommand {
description = "Whether to ignore route loading and
compilation errors (use this with care!)")
protected boolean ignoreLoadingError;
+protected boolean symbolicLink; // copy source files using symbolic link
+
public ExportBaseCommand(CamelJBangMain main) {
super(main);
}
@@ -710,7 +712,7 @@ abstract class ExportBaseCommand extends CamelCommand {
return "3.4.0";
}
-protected static void safeCopy(File source, File target, boolean override)
throws Exception {
+protected void safeCopy(File source, File target, boolean override) throws
Exception {
if (!source.exists()) {
return;
}
@@ -728,6 +730,21 @@ abstract class ExportBaseCommand extends CamelCommand {
return;
}
+if (symbolicLink) {
+try {
+// must use absolute paths
+Path link = target.toPath().toAbsolutePath();
+Path src = source.toPath().toAbsolutePath();
+if (Files.exists(link)) {
+Files.delete(link);
+}
+Files.createSymbolicLink(link, src);
+return; // success
+} catch (IOException e) {
+// ignore
+}
+}
+
if (!target.exists()) {
Files.copy(source.toPath(), target.toPath());
} else if (override) {
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index e435f3c3f82..c1ae2853bb7 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -850,6 +850,7 @@ public class Run extends CamelCommand {
protected int runQuarkus() throws Exception {
// export to hidden folder
ExportQuarkus eq = new ExportQuarkus(getMain());
+eq.symbolicLink = true;
eq.quarkusVersion = this.quarkusVersion;
eq.camelVersion = this.camelVersion;
eq.kameletsVersion = this.kameletsVersion;
@@ -904,6 +905,7 @@ public class Run extends CamelCommand {
protected int runSpringBoot() throws Exception {
// export to hidden folder
ExportSpringBoot eq = new ExportSpringBoot(getMain());
+eq.symbolicLink = true;
eq.springBootVersion = this.springBootVersion;
eq.camelVersion = this.camelVersion;
eq.camelSpringBootVersion = this.camelVersion;
@@ -922,6 +924,10 @@ public class Run extends CamelCommand {
} else {
eq.dependencies += ",camel:cli-connector";
}
+if (this.dev) {
+// hot-reload of spring-boot
+eq.dependencies +=
",mvn:org.springframework.boot:spring-boot-devtools";
+}
eq.fresh = this.fresh;
eq.download = this.download;
eq.quiet = true;
@@ -933,7 +939,7 @@ public class Run extends CamelCommand {
// TODO: run in unique sub folder
// TODO: delete sub folder on exit
// TODO: camel log from spring-boot/quarkus is not possible
-// TODO: copy files using symbolic link so you can edit the file
+// TODO: copy files using symbolic link so you can edit the file
(TODO: application.properties)
// TODO: camel stop does not stop quarkus correctly (spring boot do
that)
// TODO: camel get does not show Quarkus as platform (spring boot do
that)
@@ -942,7 +948,7 @@ public class Run extends CamelCommand {
if (exit != 0) {
return exit;
}
-// run quark
(camel) 02/11: CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch runq
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6fe9ea5f6bc28cb562c17381d02e038fc494b9bc
Author: Claus Ibsen
AuthorDate: Sat Apr 20 09:22:08 2024 +0200
CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.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/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 3d80643e35a..7fcd92c9450 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -919,6 +919,8 @@ public class Run extends CamelCommand {
// TODO: delete sub folder on exit
// TODO: camel log from spring-boot/quarkus is not possible
// TODO: copy files using symbolic link so you can edit the file
+// TODO: camel stop does not stop quarkus correctly (spring boot do
that)
+// TODO: camel get does not show Quarkus as platform (spring boot do
that)
// run export
int exit = eq.export();
(camel) 03/11: CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch runq
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5769db93325e08f72300f1f121999f2d8085e815
Author: Claus Ibsen
AuthorDate: Sat Apr 20 09:58:26 2024 +0200
CAMEL-19041: camel-jbang - Run with runtime for spring-boot and quarkus
---
.../apache/camel/dsl/jbang/core/commands/Run.java | 23 ++
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 7fcd92c9450..e435f3c3f82 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -147,6 +147,14 @@ public class Run extends CamelCommand {
@Option(names = { "--kamelets-version" }, description = "Apache Camel
Kamelets version")
String kameletsVersion;
+@Option(names = { "--quarkus-version" }, description = "Quarkus Platform
version",
+defaultValue = "3.9.4")
+String quarkusVersion = "3.9.4";
+
+@Option(names = { "--spring-boot-version" }, description = "Spring Boot
version",
+defaultValue = "3.2.5")
+String springBootVersion = "3.2.5";
+
@Option(names = { "--profile" }, scope = CommandLine.ScopeType.INHERIT,
defaultValue = "dev",
description = "Profile to run (dev, test, or prod).")
String profile = "dev";
@@ -842,13 +850,16 @@ public class Run extends CamelCommand {
protected int runQuarkus() throws Exception {
// export to hidden folder
ExportQuarkus eq = new ExportQuarkus(getMain());
+eq.quarkusVersion = this.quarkusVersion;
+eq.camelVersion = this.camelVersion;
+eq.kameletsVersion = this.kameletsVersion;
eq.exportDir = ExportBaseCommand.RUN_DIR;
eq.exclude = this.exclude;
eq.filePaths = this.filePaths;
eq.files = this.files;
eq.gav = this.gav;
if (eq.gav == null) {
-eq.gav = "org.dummy:dummy:1.0-SNAPSHOT";
+eq.gav = "org.apache.camel:jbang-run-dummy:1.0-SNAPSHOT";
}
eq.dependencies = this.dependencies;
if (eq.dependencies == null) {
@@ -862,7 +873,7 @@ public class Run extends CamelCommand {
eq.logging = false;
eq.loggingLevel = "off";
-System.out.println("Running using Quarkus v" + eq.quarkusVersion + "
(have a little patience)");
+System.out.println("Running using Quarkus v" + eq.quarkusVersion + "
(preparing and downloading files)");
// run export
int exit = eq.export();
@@ -893,13 +904,17 @@ public class Run extends CamelCommand {
protected int runSpringBoot() throws Exception {
// export to hidden folder
ExportSpringBoot eq = new ExportSpringBoot(getMain());
+eq.springBootVersion = this.springBootVersion;
+eq.camelVersion = this.camelVersion;
+eq.camelSpringBootVersion = this.camelVersion;
+eq.kameletsVersion = this.kameletsVersion;
eq.exportDir = ExportBaseCommand.RUN_DIR;
eq.exclude = this.exclude;
eq.filePaths = this.filePaths;
eq.files = this.files;
eq.gav = this.gav;
if (eq.gav == null) {
-eq.gav = "org.dummy:dummy:1.0-SNAPSHOT";
+eq.gav = "org.apache.camel:jbang-run-dummy:1.0-SNAPSHOT";
}
eq.dependencies = this.dependencies;
if (eq.dependencies == null) {
@@ -913,7 +928,7 @@ public class Run extends CamelCommand {
eq.logging = false;
eq.loggingLevel = "off";
-System.out.println("Running using Spring Boot v" +
eq.springBootVersion + " (have a little patience)");
+System.out.println("Running using Spring Boot v" +
eq.springBootVersion + " (preparing and downloading files)");
// TODO: if error exporting we should report error (log output)
// TODO: run in unique sub folder
// TODO: delete sub folder on exit
(camel) branch main updated (9e85b65615a -> bb95a945d73)
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 9e85b65615a camel-jbang - Upgrade SB add bb95a945d73 Fix potential NPE No new revisions were added by this update. Summary of changes: .../camel/tooling/maven/MavenDownloaderImpl.java | 34 -- 1 file changed, 18 insertions(+), 16 deletions(-)
(camel) branch main updated: camel-jbang - Upgrade SB
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 9e85b65615a camel-jbang - Upgrade SB
9e85b65615a is described below
commit 9e85b65615aed5e41cb4f3006fa506c3d913bccd
Author: Claus Ibsen
AuthorDate: Fri Apr 19 16:34:03 2024 +0200
camel-jbang - Upgrade SB
---
.../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 87a32f50b04..edb9da8c354 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
@@ -148,7 +148,7 @@ abstract class ExportBaseCommand extends CamelCommand {
protected String localKameletDir;
@CommandLine.Option(names = { "--spring-boot-version" }, description =
"Spring Boot version",
-defaultValue = "3.2.2")
+defaultValue = "3.2.5")
protected String springBootVersion;
@CommandLine.Option(names = { "--camel-spring-boot-version" }, description
= "Camel version to use with Spring Boot")
(camel) branch sql-var deleted (was 3a98d33a59b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch sql-var in repository https://gitbox.apache.org/repos/asf/camel.git was 3a98d33a59b CAMEL-20696: camel-sql - Add support for using variables with named query parameters 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 (2489fa0e846 -> 271dc0f640f)
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 2489fa0e846 Add test for restConfiguration parsed in xml-io
add 271dc0f640f CAMEL-20696: camel-sql - Add support for using variables
with named query parameters (#13864)
No new revisions were added by this update.
Summary of changes:
components/camel-sql/src/main/docs/sql-component.adoc | 6 --
.../component/sql/DefaultSqlPrepareStatementStrategy.java | 6 ++
.../org/apache/camel/component/sql/SqlProducerInTest.java | 4 +---
...lProducerInTest.java => SqlProducerInVariablesTest.java} | 13 ++---
4 files changed, 17 insertions(+), 12 deletions(-)
copy
components/camel-sql/src/test/java/org/apache/camel/component/sql/{SqlProducerInTest.java
=> SqlProducerInVariablesTest.java} (90%)
(camel) 01/01: CAMEL-20696: camel-sql - Add support for using variables with named query parameters
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch sql-var
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3a98d33a59b2966b6278fd7dc86475f0354fe13e
Author: Claus Ibsen
AuthorDate: Fri Apr 19 15:33:15 2024 +0200
CAMEL-20696: camel-sql - Add support for using variables with named query
parameters
---
components/camel-sql/src/main/docs/sql-component.adoc | 6 --
.../component/sql/DefaultSqlPrepareStatementStrategy.java | 6 ++
.../org/apache/camel/component/sql/SqlProducerInTest.java | 4 +---
...lProducerInTest.java => SqlProducerInVariablesTest.java} | 13 ++---
4 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/components/camel-sql/src/main/docs/sql-component.adoc
b/components/camel-sql/src/main/docs/sql-component.adoc
index 81b408f34b3..d2016b0d357 100644
--- a/components/camel-sql/src/main/docs/sql-component.adoc
+++ b/components/camel-sql/src/main/docs/sql-component.adoc
@@ -65,6 +65,7 @@ When using named parameters, Camel will look up the names in
the given precedenc
1. from a xref:languages:simple-language.adoc[Simple] expressions
2. from message body if its a `java.util.Map`
3. from message headers
+4. from exchange variables
If a named parameter cannot be resolved, then an exception is thrown.
@@ -225,8 +226,9 @@ In the given route below, we want to get all the projects
from the
`projects` table.
Notice the SQL query has two named parameters, `:#lic` and
`:#min`.
-Camel will then look up for these parameters from the message body or
-message headers.
+Camel will then look up for these parameters from the message body,
+message headers and exchange variables.
+
Notice in the example above we set two headers with
constant value for the named parameters:
diff --git
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
index 143ad54e3b4..b555af13b8f 100644
---
a/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
+++
b/components/camel-sql/src/main/java/org/apache/camel/component/sql/DefaultSqlPrepareStatementStrategy.java
@@ -262,6 +262,7 @@ public class DefaultSqlPrepareStatementStrategy implements
SqlPrepareStatementSt
protected static Object lookupParameter(String nextParam, Exchange
exchange, Object body) {
Map bodyMap =
safeMap(exchange.getContext().getTypeConverter().tryConvertTo(Map.class, body));
Map headersMap = safeMap(exchange.getIn().getHeaders());
+Map variablesMap = safeMap(exchange.getVariables());
Object answer = null;
if ((nextParam.startsWith("$simple{") || nextParam.startsWith("${"))
&& nextParam.endsWith("}")) {
@@ -271,6 +272,8 @@ public class DefaultSqlPrepareStatementStrategy implements
SqlPrepareStatementSt
answer = bodyMap.get(nextParam);
} else if (headersMap.containsKey(nextParam)) {
answer = headersMap.get(nextParam);
+} else if (variablesMap.containsKey(nextParam)) {
+answer = variablesMap.get(nextParam);
}
return answer;
@@ -279,6 +282,7 @@ public class DefaultSqlPrepareStatementStrategy implements
SqlPrepareStatementSt
protected static boolean hasParameter(String nextParam, Exchange exchange,
Object body) {
Map bodyMap =
safeMap(exchange.getContext().getTypeConverter().tryConvertTo(Map.class, body));
Map headersMap = safeMap(exchange.getIn().getHeaders());
+Map variablesMap = safeMap(exchange.getVariables());
if ((nextParam.startsWith("$simple{") || nextParam.startsWith("${"))
&& nextParam.endsWith("}")) {
return true;
@@ -286,6 +290,8 @@ public class DefaultSqlPrepareStatementStrategy implements
SqlPrepareStatementSt
return true;
} else if (headersMap.containsKey(nextParam)) {
return true;
+} else if (variablesMap.containsKey(nextParam)) {
+return true;
}
return false;
diff --git
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
index 76a1c0910fe..c860cf36d02 100644
---
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
+++
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerInTest.java
@@ -53,9 +53,7 @@ public class SqlProducerInTest extends CamelTestSupport {
super.tearDown();
if (db != null) {
-if (db != null) {
-db.shutdown();
-}
+db.shutdown();
}
}
diff --git
a/components/ca
(camel) branch sql-var created (now 3a98d33a59b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch sql-var in repository https://gitbox.apache.org/repos/asf/camel.git at 3a98d33a59b CAMEL-20696: camel-sql - Add support for using variables with named query parameters This branch includes the following new commits: new 3a98d33a59b CAMEL-20696: camel-sql - Add support for using variables with named query parameters 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 (1982baef033 -> 98376eb9bbe)
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 1982baef033 CAMEL-20695: camel-kotlin-api - Add setHeaders/setVariables EIP add 98376eb9bbe CAMEL-20492: Rest DSL with clientRequestValidation can support allowe… (#13863) No new revisions were added by this update. Summary of changes: .../rest/RestJettyRequiredQueryParameterTest.java | 19 ++-- .../rest/openapi/RestOpenApiProcessor.java | 25 ++ .../apache/camel/model/rest/ParamDefinition.java | 4 .../camel/model/rest/RestBindingDefinition.java| 22 +++ .../apache/camel/model/rest/RestDefinition.java| 5 + .../camel/reifier/rest/RestBindingReifier.java | 1 + .../camel/support/processor/RestBindingAdvice.java | 23 .../processor/RestBindingAdviceFactory.java| 5 +++-- .../processor/RestBindingConfiguration.java| 9 docs/user-manual/modules/ROOT/pages/rest-dsl.adoc | 1 + 10 files changed, 110 insertions(+), 4 deletions(-)
(camel) branch main updated (98376eb9bbe -> 2489fa0e846)
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 98376eb9bbe CAMEL-20492: Rest DSL with clientRequestValidation can support allowe… (#13863) add 2489fa0e846 Add test for restConfiguration parsed in xml-io No new revisions were added by this update. Summary of changes: .../src/test/java/org/apache/camel/xml/in/ModelParserTest.java | 5 + .../camel-xml-io/src/test/resources/barRestConfiguration.xml | 7 +++ 2 files changed, 8 insertions(+), 4 deletions(-) copy buildingtools/src/main/resources/camel-eclipse-pmd => core/camel-xml-io/src/test/resources/barRestConfiguration.xml (88%)
(camel) branch allowed deleted (was 68de55d0c2a)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch allowed in repository https://gitbox.apache.org/repos/asf/camel.git was 68de55d0c2a CAMEL-20492: Rest DSL with clientRequestValidation can support allowed values 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 allowed updated (53dbb949d2d -> 68de55d0c2a)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch allowed in repository https://gitbox.apache.org/repos/asf/camel.git from 53dbb949d2d CAMEL-20492: Rest DSL with clientRequestValidation can support allowed values add 68de55d0c2a CAMEL-20492: Rest DSL with clientRequestValidation can support allowed values No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/model/rest/ParamDefinition.java | 1 - .../src/main/java/org/apache/camel/model/rest/RestDefinition.java | 2 +- .../java/org/apache/camel/support/processor/RestBindingAdvice.java | 3 ++- .../org/apache/camel/support/processor/RestBindingAdviceFactory.java | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-)
(camel) 01/01: CAMEL-20492: Rest DSL with clientRequestValidation can support allowed values
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch allowed
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 53dbb949d2dce345b021282e9a065822a0db4eb2
Author: Claus Ibsen
AuthorDate: Fri Apr 19 14:26:22 2024 +0200
CAMEL-20492: Rest DSL with clientRequestValidation can support allowed
values
---
.../rest/RestJettyRequiredQueryParameterTest.java | 19 ++--
.../rest/openapi/RestOpenApiProcessor.java | 25 ++
.../apache/camel/model/rest/ParamDefinition.java | 5 +
.../camel/model/rest/RestBindingDefinition.java| 22 +++
.../apache/camel/model/rest/RestDefinition.java| 5 +
.../camel/reifier/rest/RestBindingReifier.java | 1 +
.../camel/support/processor/RestBindingAdvice.java | 22 +++
.../processor/RestBindingAdviceFactory.java| 4 ++--
.../processor/RestBindingConfiguration.java| 9
docs/user-manual/modules/ROOT/pages/rest-dsl.adoc | 1 +
10 files changed, 109 insertions(+), 4 deletions(-)
diff --git
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredQueryParameterTest.java
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredQueryParameterTest.java
index 1c744a81ae4..4c5aaece713 100644
---
a/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredQueryParameterTest.java
+++
b/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/rest/RestJettyRequiredQueryParameterTest.java
@@ -41,7 +41,7 @@ public class RestJettyRequiredQueryParameterTest extends
BaseJettyTest {
}
@Test
-public void testJettyInvalid() {
+public void testJettyMissing() {
fluentTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE,
"application/json")
.withHeader("Accept", "application/json")
.withHeader(Exchange.HTTP_METHOD, "post")
@@ -55,6 +55,21 @@ public class RestJettyRequiredQueryParameterTest extends
BaseJettyTest {
assertEquals("Some of the required query parameters are missing.",
cause.getResponseBody());
}
+@Test
+public void testJettyNotAllowed() {
+fluentTemplate = fluentTemplate.withHeader(Exchange.CONTENT_TYPE,
"application/json")
+.withHeader("Accept", "application/json")
+.withHeader(Exchange.HTTP_METHOD, "post")
+.withBody("{ \"name\": \"Donald Duck\" }")
+.to("http://localhost:; + getPort() +
"/users/123/update?country=se");
+
+Exception ex = assertThrows(CamelExecutionException.class, () ->
fluentTemplate.request(String.class));
+
+HttpOperationFailedException cause =
assertIsInstanceOf(HttpOperationFailedException.class, ex.getCause());
+assertEquals(400, cause.getStatusCode());
+assertEquals("Some of the query parameters or HTTP headers has a
not-allowed value.", cause.getResponseBody());
+}
+
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
@@ -67,7 +82,7 @@ public class RestJettyRequiredQueryParameterTest extends
BaseJettyTest {
// use the rest DSL to define the rest services
rest("/users/").post("{id}/update").consumes("application/json").produces("application/json").param()
-
.name("country").required(true).type(RestParamType.query)
+
.name("country").required(true).allowableValues("uk,dk").type(RestParamType.query)
.endParam().to("direct:update");
from("direct:update").setBody(constant("{ \"status\": \"ok\"
}"));
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
index 0ef2524a53d..8b556c0beb0 100644
---
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
+++
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
@@ -337,6 +337,31 @@ public class RestOpenApiProcessor extends
DelegateAsyncProcessor implements Came
callback.done(true);
return true;
}
+Map allowedValues = null;
+if (o.getParameters() != null) {
+allowedValues = o.getParameters().stream()
+.filter(p -> "query".equals(p.getIn()))
+
(camel) branch allowed created (now 53dbb949d2d)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch allowed in repository https://gitbox.apache.org/repos/asf/camel.git at 53dbb949d2d CAMEL-20492: Rest DSL with clientRequestValidation can support allowed values This branch includes the following new commits: new 53dbb949d2d CAMEL-20492: Rest DSL with clientRequestValidation can support allowed values 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-20695: camel-kotlin-api - Add setHeaders/setVariables EIP
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 1982baef033 CAMEL-20695: camel-kotlin-api - Add
setHeaders/setVariables EIP
1982baef033 is described below
commit 1982baef0334dc22035bbed8a86eb3bcf19f887f
Author: Claus Ibsen
AuthorDate: Fri Apr 19 13:53:24 2024 +0200
CAMEL-20695: camel-kotlin-api - Add setHeaders/setVariables EIP
---
.../src/main/kotlin/org/apache/camel/kotlin/StepsDsl.kt | 8
1 file changed, 8 insertions(+)
diff --git
a/dsl/camel-kotlin-api/src/main/kotlin/org/apache/camel/kotlin/StepsDsl.kt
b/dsl/camel-kotlin-api/src/main/kotlin/org/apache/camel/kotlin/StepsDsl.kt
index ec943cc9bdd..501c28a2cc2 100644
--- a/dsl/camel-kotlin-api/src/main/kotlin/org/apache/camel/kotlin/StepsDsl.kt
+++ b/dsl/camel-kotlin-api/src/main/kotlin/org/apache/camel/kotlin/StepsDsl.kt
@@ -305,6 +305,10 @@ class StepsDsl(
def.setHeader(setHeader, expression)
}
+fun setHeaders(setHeader: String, vararg variableNamesAndValues: Any) {
+def.setHeaders(setHeader, variableNamesAndValues)
+}
+
fun setHeader(setHeader: String, function: () -> Any) {
def.setHeader(setHeader, function)
}
@@ -325,6 +329,10 @@ class StepsDsl(
def.setVariable(setVariable, expression)
}
+fun setVariables(setHeader: String, vararg variableNamesAndValues: Any) {
+def.setVariables(setHeader, variableNamesAndValues)
+}
+
fun setVariable(setVariable: String, function: () -> Any) {
def.setVariable(setVariable, function)
}
(camel) branch vars deleted (was 6cd49612b7c)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch vars in repository https://gitbox.apache.org/repos/asf/camel.git was 6cd49612b7c CAMEL-20694: camel-core - Add serVariables EIP to set multiple at once 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 vars updated (96b414e03e0 -> 6cd49612b7c)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch vars in repository https://gitbox.apache.org/repos/asf/camel.git from 96b414e03e0 CAMEL-20694: camel-core - Add serVariables EIP to set multiple at once add 6cd49612b7c CAMEL-20694: camel-core - Add serVariables EIP to set multiple at once No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/processor/SetVariablesProcessorTest.java| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(camel) branch vars created (now 96b414e03e0)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch vars in repository https://gitbox.apache.org/repos/asf/camel.git at 96b414e03e0 CAMEL-20694: camel-core - Add serVariables EIP to set multiple at once This branch includes the following new commits: new 96b414e03e0 CAMEL-20694: camel-core - Add serVariables EIP to set multiple at once 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: Bump elasticsearch-java-client-version from 8.13.0 to 8.13.2 (#13858)
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 1e7b750981f Bump elasticsearch-java-client-version from 8.13.0 to 8.13.2 (#13858) 1e7b750981f is described below commit 1e7b750981f63fa56c8db91c4a0bac447516d280 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Apr 19 11:07:05 2024 +0200 Bump elasticsearch-java-client-version from 8.13.0 to 8.13.2 (#13858) Bumps `elasticsearch-java-client-version` from 8.13.0 to 8.13.2. Updates `co.elastic.clients:elasticsearch-java` from 8.13.0 to 8.13.2 - [Release notes](https://github.com/elastic/elasticsearch-java/releases) - [Changelog](https://github.com/elastic/elasticsearch-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch-java/compare/v8.13.0...v8.13.2) Updates `org.elasticsearch.client:elasticsearch-rest-client` from 8.13.0 to 8.13.2 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v8.13.0...v8.13.2) --- updated-dependencies: - dependency-name: co.elastic.clients:elasticsearch-java dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-client 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 20e67c0bb1a..fe0cdecad0b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -145,7 +145,7 @@ 0.3.0 2.1.5 3.10.8 - 8.13.0 + 8.13.2 8.13.2 4.1.0.Final 3.2.0
(camel) 01/02: Regen
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
commit b282e6eafb81716b3f20110ff5cd7c088d9a1362
Author: Claus Ibsen
AuthorDate: Fri Apr 19 10:06:38 2024 +0200
Regen
---
.../org/apache/camel/dataformat/bindy/csv/bindyCsv.json | 12 ++--
.../org/apache/camel/dataformat/bindy/fixed/bindyFixed.json | 12 ++--
.../org/apache/camel/dataformat/bindy/kvp/bindyKvp.json | 12 ++--
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/csv/bindyCsv.json
b/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/csv/bindyCsv.json
index e857ad421d2..c85337a8eea 100644
---
a/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/csv/bindyCsv.json
+++
b/components/camel-bindy/src/generated/resources/org/apache/camel/dataformat/bindy/csv/bindyCsv.json
@@ -16,11 +16,11 @@
"modelJavaType": "org.apache.camel.model.dataformat.BindyDataFormat"
},
"properties": {
-"id": { "index": 0, "kind": "attribute", "displayName": "Id", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" },
-"type": { "index": 1, "kind": "attribute", "displayName": "Type",
"required": true, "type": "enum", "javaType":
"org.apache.camel.model.dataformat.BindyType", "enum": [ "Csv", "Fixed",
"KeyValue" ], "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "Csv", "description": "Whether to use Csv, Fixed, or KeyValue."
},
-"classType": { "index": 2, "kind": "attribute", "displayName": "Class
Type", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "Name
of model class to use." },
-"allowEmptyStream": { "index": 3, "kind": "attribute", "displayName":
"Allow Empty Stream", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether to allow empty streams in the
unmarshal process. If true, no exception will be thrown when a body without
records is provided." },
-"unwrapSingleInstance": { "index": 4, "kind": "attribute", "displayName":
"Unwrap Single Instance", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "When
unmarshalling should a single instance be unwrapped and returned instead of
wrapped in a java.util.List." },
-"locale": { "index": 5, "kind": "attribute", "displayName": "Locale",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To configure a default locale to use, such as us for united
states. To use the JVM platform default locale then use the name default" }
+"id": { "index": 0, "kind": "attribute", "displayName": "Id", "group":
"common", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
id of this node" },
+"type": { "index": 1, "kind": "attribute", "displayName": "Type", "group":
"common", "required": true, "type&quo
(camel) branch main updated (6e6cd09b989 -> ec871bfddf4)
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 6e6cd09b989 Bump org.elasticsearch.client:elasticsearch-rest-client-sniffer (#13853) new b282e6eafb8 Regen new ec871bfddf4 Regen The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/camel/catalog/dataformats/asn1.json | 6 +- .../org/apache/camel/catalog/dataformats/avro.json | 4 +- .../camel/catalog/dataformats/avroJackson.json | 38 +++--- .../apache/camel/catalog/dataformats/barcode.json | 10 +- .../apache/camel/catalog/dataformats/base64.json | 8 +- .../apache/camel/catalog/dataformats/beanio.json | 18 +-- .../apache/camel/catalog/dataformats/bindyCsv.json | 12 +- .../camel/catalog/dataformats/bindyFixed.json | 12 +- .../apache/camel/catalog/dataformats/bindyKvp.json | 12 +- .../org/apache/camel/catalog/dataformats/cbor.json | 22 +-- .../apache/camel/catalog/dataformats/crypto.json | 20 +-- .../org/apache/camel/catalog/dataformats/csv.json | 60 .../apache/camel/catalog/dataformats/fastjson.json | 4 +- .../apache/camel/catalog/dataformats/fhirJson.json | 38 +++--- .../apache/camel/catalog/dataformats/fhirXml.json | 38 +++--- .../apache/camel/catalog/dataformats/flatpack.json | 18 +-- .../org/apache/camel/catalog/dataformats/grok.json | 10 +- .../org/apache/camel/catalog/dataformats/gson.json | 8 +- .../camel/catalog/dataformats/gzipDeflater.json| 2 +- .../org/apache/camel/catalog/dataformats/hl7.json | 4 +- .../org/apache/camel/catalog/dataformats/ical.json | 4 +- .../apache/camel/catalog/dataformats/jackson.json | 42 +++--- .../camel/catalog/dataformats/jacksonXml.json | 34 ++--- .../org/apache/camel/catalog/dataformats/jaxb.json | 42 +++--- .../apache/camel/catalog/dataformats/jsonApi.json | 6 +- .../apache/camel/catalog/dataformats/jsonb.json| 6 +- .../org/apache/camel/catalog/dataformats/lzf.json | 4 +- .../camel/catalog/dataformats/mimeMultipart.json | 12 +- .../camel/catalog/dataformats/parquetAvro.json | 8 +- .../org/apache/camel/catalog/dataformats/pgp.json | 30 ++-- .../apache/camel/catalog/dataformats/protobuf.json | 8 +- .../camel/catalog/dataformats/protobufJackson.json | 38 +++--- .../org/apache/camel/catalog/dataformats/rss.json | 2 +- .../camel/catalog/dataformats/snakeYaml.json | 26 ++-- .../org/apache/camel/catalog/dataformats/soap.json | 14 +- .../apache/camel/catalog/dataformats/swiftMt.json | 4 +- .../apache/camel/catalog/dataformats/swiftMx.json | 10 +- .../apache/camel/catalog/dataformats/syslog.json | 2 +- .../apache/camel/catalog/dataformats/tarFile.json | 10 +- .../apache/camel/catalog/dataformats/thrift.json | 8 +- .../camel/catalog/dataformats/univocityCsv.json| 36 ++--- .../camel/catalog/dataformats/univocityFixed.json | 34 ++--- .../camel/catalog/dataformats/univocityTsv.json| 30 ++-- .../camel/catalog/dataformats/xmlSecurity.json | 26 ++-- .../camel/catalog/dataformats/zipDeflater.json | 4 +- .../apache/camel/catalog/dataformats/zipFile.json | 10 +- .../org/apache/camel/catalog/languages/bean.json | 16 +-- .../apache/camel/catalog/languages/datasonnet.json | 14 +- .../org/apache/camel/catalog/languages/groovy.json | 8 +- .../apache/camel/catalog/languages/hl7terser.json | 10 +- .../org/apache/camel/catalog/languages/java.json | 12 +- .../org/apache/camel/catalog/languages/joor.json | 12 +- .../org/apache/camel/catalog/languages/jq.json | 10 +- .../org/apache/camel/catalog/languages/js.json | 8 +- .../apache/camel/catalog/languages/jsonpath.json | 22 +-- .../org/apache/camel/catalog/languages/mvel.json | 8 +- .../org/apache/camel/catalog/languages/ognl.json | 8 +- .../org/apache/camel/catalog/languages/python.json | 8 +- .../org/apache/camel/catalog/languages/spel.json | 8 +- .../org/apache/camel/catalog/languages/wasm.json | 10 +- .../org/apache/camel/catalog/languages/xpath.json | 28 ++-- .../org/apache/camel/catalog/languages/xquery.json | 14 +- .../apache/camel/catalog/languages/xtokenize.json | 16 +-- .../org/apache/camel/dataformat/asn1/asn1.json | 6 +- .../org/apache/camel/dataformat/avro/avro.json | 4 +- .../apache/camel/dataformat/barcode/barcode.json | 10 +- .../org/apache/camel/dataformat/base64/base64.json | 8 +- .../org/apache/camel/language/bean/bean.json | 16 +-- .../org/apache/camel/dataformat/beanio/beanio.json | 18 +-- .../camel/dataformat/bindy/csv/bindyCsv.json | 12 +- .../camel/dataformat/bindy/fixed/bindyFixed.json | 12 +- .../camel/
(camel) branch main updated (004b456ea98 -> 6e6cd09b989)
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 004b456ea98 Bump aws-java-sdk2-version from 2.25.32 to 2.25.34 (#13851) add 6e6cd09b989 Bump org.elasticsearch.client:elasticsearch-rest-client-sniffer (#13853) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
