(camel) branch main updated: Bump io.nats:jnats from 2.17.6 to 2.18.1 (#14246)
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 4ad055286bf Bump io.nats:jnats from 2.17.6 to 2.18.1 (#14246) 4ad055286bf is described below commit 4ad055286bf2192d4aeefea5ea09a85d047e4df3 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 27 09:43:33 2024 +0200 Bump io.nats:jnats from 2.17.6 to 2.18.1 (#14246) Bumps [io.nats:jnats](https://github.com/nats-io/nats.java) from 2.17.6 to 2.18.1. - [Release notes](https://github.com/nats-io/nats.java/releases) - [Changelog](https://github.com/nats-io/nats.java/blob/main/CHANGELOG.md) - [Commits](https://github.com/nats-io/nats.java/compare/2.17.6...2.18.1) --- updated-dependencies: - dependency-name: io.nats:jnats dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 3d91d23f9c4..ff989fea5c8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -244,7 +244,7 @@ 1.9.3 0.1.9 2.9.0 -2.17.6 +2.18.1 3.1.0 0.22 3.13.10
(camel) branch main updated (f6e28ada941 -> 912744645ed)
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 f6e28ada941 Bump bytebuddy-version from 1.14.15 to 1.14.16 (#14244) add 912744645ed Bump io.qdrant:client from 1.9.0 to 1.9.1 (#14243) 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 (912744645ed -> 6385b6b9cdd)
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 912744645ed Bump io.qdrant:client from 1.9.0 to 1.9.1 (#14243) add 6385b6b9cdd Bump aws-java-sdk2-version from 2.25.59 to 2.25.60 (#14245) 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: Bump bytebuddy-version from 1.14.15 to 1.14.16 (#14244)
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 f6e28ada941 Bump bytebuddy-version from 1.14.15 to 1.14.16 (#14244) f6e28ada941 is described below commit f6e28ada94132b88aa2b160bad62a0d3bc08b778 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 27 09:05:58 2024 +0200 Bump bytebuddy-version from 1.14.15 to 1.14.16 (#14244) Bumps `bytebuddy-version` from 1.14.15 to 1.14.16. Updates `net.bytebuddy:byte-buddy` from 1.14.15 to 1.14.16 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.14.15...byte-buddy-1.14.16) Updates `net.bytebuddy:byte-buddy-agent` from 1.14.15 to 1.14.16 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.14.15...byte-buddy-1.14.16) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: net.bytebuddy:byte-buddy-agent 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 b393dc045a9..2b9318fe603 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -85,7 +85,7 @@ 4.9.0 3.34.0 3.6.0 -1.14.15 +1.14.16 0.9.5.5 3.1.8 3.11.0
(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 0a7ac68541e Regen
0a7ac68541e is described below
commit 0a7ac68541e1c745f438f7f1aa9412d8a795dbbf
Author: Claus Ibsen
AuthorDate: Mon May 27 09:05:32 2024 +0200
Regen
---
.../test/java/org/apache/camel/component/paho/PahoComponentTest.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentTest.java
b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentTest.java
index 75af9a0bbd9..5e6990a9903 100644
---
a/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentTest.java
+++
b/components/camel-paho/src/test/java/org/apache/camel/component/paho/PahoComponentTest.java
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@DisabledOnOs(architectures = { "s390x" },
-disabledReason = "This test does not run reliably on s390x")
+ disabledReason = "This test does not run reliably on s390x")
public class PahoComponentTest extends PahoTestSupport {
@Order(2)
(camel-quarkus) branch main updated: Remove broken link that causes website to fail
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-quarkus.git The following commit(s) were added to refs/heads/main by this push: new c134fe4e46 Remove broken link that causes website to fail c134fe4e46 is described below commit c134fe4e4698e51c0b78876317079b1c8402f2ff Author: Claus Ibsen AuthorDate: Sun May 26 11:44:50 2024 +0200 Remove broken link that causes website to fail --- docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc | 2 -- extensions/rest-openapi/runtime/src/main/doc/usage.adoc| 1 - 2 files changed, 3 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc b/docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc index cc02809c46..ca259535e4 100644 --- a/docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc @@ -126,8 +126,6 @@ When running in the native mode, the contract files must be specified the `quark quarkus.native.resources.includes=contract.json -Please refer to https://camel.apache.org/manual/rest-dsl-openapi.html#_contract_first[Camel Rest DSL Contract First] for more details. - [id="extensions-rest-openapi-additional-camel-quarkus-configuration"] == Additional Camel Quarkus configuration diff --git a/extensions/rest-openapi/runtime/src/main/doc/usage.adoc b/extensions/rest-openapi/runtime/src/main/doc/usage.adoc index 7925e402c3..63e99a7566 100644 --- a/extensions/rest-openapi/runtime/src/main/doc/usage.adoc +++ b/extensions/rest-openapi/runtime/src/main/doc/usage.adoc @@ -75,4 +75,3 @@ When running in the native mode, the contract files must be specified the `quark quarkus.native.resources.includes=contract.json -Please refer to https://camel.apache.org/manual/rest-dsl-openapi.html#_contract_first[Camel Rest DSL Contract First] for more details. \ No newline at end of file
(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 2b215b42706 Regen
2b215b42706 is described below
commit 2b215b42706573d85ceb8616add82e1a9529938b
Author: Claus Ibsen
AuthorDate: Sat May 25 09:32:42 2024 +0200
Regen
---
.../catalog/components/openstack-neutron.json | 2 +-
.../catalog/components/spring-rabbitmq.json| 2 +-
tooling/camel-spring-boot-dependencies/pom.xml | 67 --
3 files changed, 38 insertions(+), 33 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-neutron.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-neutron.json
index 432acd67940..cc5862fee6f 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-neutron.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-neutron.json
@@ -30,7 +30,7 @@
"tenantId": { "index": 0, "kind": "header", "displayName": "", "group":
"network port router", "label": "network port router", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Tenant ID.", "constantName":
"org.apache.camel.component.openstack.neutron.NeutronConstants#TENANT_ID" },
"networkId": { "index": 1, "kind": "header", "displayName": "", "group":
"subnet port", "label": "subnet port", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Network ID.", "constantName":
"org.apache.camel.component.openstack.neutron.NeutronConstants#NETWORK_ID" },
"adminStateUp": { "index": 2, "kind": "header", "displayName": "",
"group": "network", "label": "network", "required": false, "javaType":
"Boolean", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "AdminStateUp header.", "constantName":
"org.apache.camel.component.openstack.neutron.NeutronConstants#ADMIN_STATE_UP"
},
-"networkType": { "index": 3, "kind": "header", "displayName": "", "group":
"network", "label": "network", "required": false, "javaType":
"org.openstack4j.model.network.NetworkType", "enum": [ "LOCAL", "FLAT", "VLAN",
"VXLAN", "GRE" ], "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Network type.", "constantName":
"org.apache.camel.component.openstack.neutron.NeutronConstants#NETWORK_TYPE" },
+"networkType": { "index": 3, "kind": "header", "displayName": "", "group":
"network", "label": "network", "required": false, "javaType":
"org.openstack4j.model.network.NetworkType", "enum": [ "LOCAL", "FLAT", "VLAN",
"VXLAN", "GRE", "GENEVE" ], "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "Network type.",
"constantName":
"org.apache.camel.component.openstack.neutron.NeutronConstants#NETWORK_TYPE" },
"physicalNetwork": { "index": 4, "kind": "header", "displayName": "",
"group": "network", "label": "network", "required": false, "javaType":
"String", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": fals
(camel) branch main updated: CAMEL-20803: camel-spring-rabbitmq - Configuring maximumRetryAttempts should accept 0
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 bc54c4929bd CAMEL-20803: camel-spring-rabbitmq - Configuring
maximumRetryAttempts should accept 0
bc54c4929bd is described below
commit bc54c4929bdb58d5d1c56c6563a620d245d1e3a4
Author: Claus Ibsen
AuthorDate: Sat May 25 09:30:51 2024 +0200
CAMEL-20803: camel-spring-rabbitmq - Configuring maximumRetryAttempts
should accept 0
---
.../org/apache/camel/catalog/components/spring-rabbitmq.json | 2 +-
.../apache/camel/component/springrabbit/spring-rabbitmq.json | 2 +-
.../springrabbit/DefaultListenerContainerFactory.java | 5 -
.../camel/component/springrabbit/SpringRabbitMQEndpoint.java | 2 +-
.../endpoint/dsl/SpringRabbitMQEndpointBuilderFactory.java | 10 ++
.../org/apache/camel/kotlin/components/SpringRabbitmqUriDsl.kt | 8
6 files changed, 17 insertions(+), 12 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json
index 3bd85849ae9..d76ff93530a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/spring-rabbitmq.json
@@ -94,7 +94,7 @@
"autoStartup": { "index": 13, "kind": "parameter", "displayName": "Auto
Startup", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Specifies whether the
consumer container should auto-startup." },
"exchangeType": { "index": 14, "kind": "parameter", "displayName":
"Exchange Type", "group": "consumer", "label": "consumer", "required": false,
"type": "string", "javaType": "java.lang.String", "enum": [ "direct", "fanout",
"headers", "topic" ], "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "direct", "description": "The type of the exchange" },
"exclusive": { "index": 15, "kind": "parameter", "displayName":
"Exclusive", "group": "consumer", "label": "consumer", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "Set to true for
an exclusive consumer" },
-"maximumRetryAttempts": { "index": 16, "kind": "parameter", "displayName":
"Maximum Retry Attempts", "group": "consumer", "label": "consumer", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 5, "description": "How many times a
Rabbitmq consumer will retry the same message if Camel failed to process the
message" },
+"maximumRetryAttempts": { "index": 16, "kind": "parameter", "displayName":
"Maximum Retry Attempts", "group": "consumer", "label": "consumer", "required":
false, "type": "integer", "javaType": "int", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 5, "description": "How many times a
Rabbitmq consumer will try the same message if Camel failed to process the
message (The number of attempts includes the initial try)" },
"noLocal": { "index": 17, "kind": "parameter", "displayName": "No Local",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": fa
(camel) branch main updated: Bump jakarta.persistence:jakarta.persistence-api from 3.1.0 to 3.2.0 (#14236)
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 0624099ad8e Bump jakarta.persistence:jakarta.persistence-api from 3.1.0 to 3.2.0 (#14236) 0624099ad8e is described below commit 0624099ad8e8c9a2e13b8c46886f25cd5a8f20cf Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri May 24 10:11:26 2024 +0200 Bump jakarta.persistence:jakarta.persistence-api from 3.1.0 to 3.2.0 (#14236) Bumps [jakarta.persistence:jakarta.persistence-api](https://github.com/jakartaee/persistence) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/jakartaee/persistence/releases) - [Commits](https://github.com/jakartaee/persistence/commits) --- updated-dependencies: - dependency-name: jakarta.persistence:jakarta.persistence-api 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 5735cda4edd..b393dc045a9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -171,7 +171,7 @@ 1.0 1.0 3.1.0 - 3.1.0 + 3.2.0 2.1.3 3.0.1 2.0.1
(camel) branch main updated (7360f88aeb1 -> 6d55587a391)
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 7360f88aeb1 Bump huaweicloud-sdk-version from 3.1.96 to 3.1.97 (#14235) add 6d55587a391 Bump aws-java-sdk2-version from 2.25.58 to 2.25.59 (#14234) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-kamelets-examples) branch main updated: How to run via docker
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-kamelets-examples.git The following commit(s) were added to refs/heads/main by this push: new fac0ed9 How to run via docker fac0ed9 is described below commit fac0ed9a87daebcf5d350987dcd28143cfb7eaa1 Author: Claus Ibsen AuthorDate: Thu May 23 12:54:18 2024 +0200 How to run via docker --- jbang/artemis/README.adoc| 10 ++ jbang/artemis/application.properties | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/jbang/artemis/README.adoc b/jbang/artemis/README.adoc index d2e5e6b..6824ff9 100644 --- a/jbang/artemis/README.adoc +++ b/jbang/artemis/README.adoc @@ -8,6 +8,16 @@ messaging broker. You first need to have an ActiveMQ Artemis broker up and running. See more at: https://activemq.apache.org/components/artemis/ +You can run Artemis using Docker via + +[source,sh] + +$ docker run --detach --name mycontainer -p 61616:61616 -p 8161:8161 --rm apache/activemq-artemis:latest-alpine + + +This will run the broker locally. To login you need to use `artemis` as username and password, +in the `application.properties` file. + === Install JBang diff --git a/jbang/artemis/application.properties b/jbang/artemis/application.properties index 3d9bb74..73cdd56 100644 --- a/jbang/artemis/application.properties +++ b/jbang/artemis/application.properties @@ -4,8 +4,8 @@ camel.beans.artemisCF = #class:org.apache.activemq.artemis.jms.client.ActiveMQCo camel.beans.artemisCF.brokerURL = tcp://localhost:61616 # if broker requires specific login -#camel.beans.artemisCF.user = admin -#camel.beans.artemisCF.password = admin +camel.beans.artemisCF.user = artemis +camel.beans.artemisCF.password = artemis # pooled connection factory camel.beans.poolCF = #class:org.messaginghub.pooled.jms.JmsPoolConnectionFactory
(camel) branch main updated: camel-catalog - Summary as json should use the loader version. Also include more details added recently to the catalog.
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 35af34ead49 camel-catalog - Summary as json should use the loader
version. Also include more details added recently to the catalog.
35af34ead49 is described below
commit 35af34ead49e58a1a7f22f288456a274a6da4290
Author: Claus Ibsen
AuthorDate: Thu May 23 09:49:33 2024 +0200
camel-catalog - Summary as json should use the loader version. Also include
more details added recently to the catalog.
---
.../src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index e41ed30c2ce..f9bb8954296 100644
---
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -542,12 +542,15 @@ public class DefaultCamelCatalog extends
AbstractCachingCamelCatalog implements
public String summaryAsJson() {
return cache(SUMMARY_AS_JSON, () -> {
Map obj = new JsonObject();
-obj.put("version", getCatalogVersion());
+obj.put("version", getLoadedVersion());
obj.put("models", findModelNames().size());
obj.put("components", findComponentNames().size());
obj.put("dataformats", findDataFormatNames().size());
obj.put("languages", findLanguageNames().size());
obj.put("others", findOtherNames().size());
+obj.put("beans", findBeansNames().size());
+obj.put("dev-consoles", findDevConsoleNames().size());
+obj.put("transformers", findTransformerNames().size());
return JsonMapper.serialize(obj);
});
}
(camel) branch main updated: camel-jbang - Upgrade Q
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 e39f68a10eb camel-jbang - Upgrade Q
e39f68a10eb is described below
commit e39f68a10ebb8980b6847610a31d718429875faf
Author: Claus Ibsen
AuthorDate: Thu May 23 09:02:14 2024 +0200
camel-jbang - Upgrade Q
---
.../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 4 ++--
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 4 ++--
.../camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java | 2 +-
3 files changed, 5 insertions(+), 5 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 3153903cc1e..af629ff7b5c 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
@@ -163,8 +163,8 @@ abstract class ExportBaseCommand extends CamelCommand {
protected String quarkusArtifactId = "quarkus-bom";
@CommandLine.Option(names = { "--quarkus-version" }, description =
"Quarkus Platform version",
-defaultValue = "3.10.1")
-protected String quarkusVersion = "3.10.1";
+defaultValue = "3.10.2")
+protected String quarkusVersion = "3.10.2";
@CommandLine.Option(names = { "--maven-wrapper" }, defaultValue = "true",
description = "Include Maven Wrapper files in exported
project")
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 42ee7b3c775..5478a0bdda7 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
@@ -141,8 +141,8 @@ public class Run extends CamelCommand {
String kameletsVersion;
@Option(names = { "--quarkus-version" }, description = "Quarkus Platform
version",
-defaultValue = "3.10.1")
-String quarkusVersion = "3.10.1";
+defaultValue = "3.10.2")
+String quarkusVersion = "3.10.2";
@Option(names = { "--spring-boot-version" }, description = "Spring Boot
version",
defaultValue = "3.2.5")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
index 050cdd55e49..50368e07fce 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
@@ -49,7 +49,7 @@ public abstract class CatalogBaseCommand extends CamelCommand
{
String runtime;
@CommandLine.Option(names = { "--quarkus-version" }, description =
"Quarkus Platform version",
-defaultValue = "3.10.1")
+defaultValue = "3.10.2")
String quarkusVersion;
@CommandLine.Option(names = { "--repos" },
(camel) branch main updated (fbc46aba98e -> 13cbdb88d37)
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 fbc46aba98e Try to fix website build add 13cbdb88d37 Upgrade spring 6.1.8 No new revisions were added by this update. Summary of changes: parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(camel-quarkus) branch main updated: Remove broken link that causes website to fail
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-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 96a758b666 Remove broken link that causes website to fail 96a758b666 is described below commit 96a758b66640ede0a469e512b0e276cfcb05 Author: Claus Ibsen AuthorDate: Thu May 23 08:36:43 2024 +0200 Remove broken link that causes website to fail --- docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc b/docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc index cc02809c46..3dd3bbc731 100644 --- a/docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/rest-openapi.adoc @@ -126,7 +126,7 @@ When running in the native mode, the contract files must be specified the `quark quarkus.native.resources.includes=contract.json -Please refer to https://camel.apache.org/manual/rest-dsl-openapi.html#_contract_first[Camel Rest DSL Contract First] for more details. +Please refer to Camel Rest DSL Contract First documentation for more details. [id="extensions-rest-openapi-additional-camel-quarkus-configuration"]
(camel) branch main updated: Try to fix website build
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 fbc46aba98e Try to fix website build fbc46aba98e is described below commit fbc46aba98e98ed24e8b3a98c83381af2b2aa78e Author: Claus Ibsen AuthorDate: Thu May 23 06:42:18 2024 +0200 Try to fix website build --- docs/main/modules/contributing/pages/index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/main/modules/contributing/pages/index.adoc b/docs/main/modules/contributing/pages/index.adoc index a865760e82f..67901f8c2ec 100644 --- a/docs/main/modules/contributing/pages/index.adoc +++ b/docs/main/modules/contributing/pages/index.adoc @@ -6,7 +6,7 @@ Thank you for your interest in contributing to Apache Camel. Our community encourages and welcomes everyone to participate. -The link:expectations.adoc[Contributing expectations document] describes how to contribute and what our expectations are. +The xref:contributing:expectations.adoc[Contributing expectations document] describes how to contribute and what our expectations are. == Getting in touch
(camel-website) branch main updated: Update front page
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 bb7e6e24 Update front page
bb7e6e24 is described below
commit bb7e6e245dafd485c4891621bc94ce8506aed05f
Author: Claus Ibsen
AuthorDate: Wed May 22 21:19:35 2024 +0200
Update front page
---
content/_index.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/content/_index.md b/content/_index.md
index a10371b3..7f666113 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -213,7 +213,7 @@ Apache Camel Karaf makes running Camel in the OSGi
container.
{{< div "content" >}}
## Camel Karavan
-Apache Camel Karavan is a mastering tool to facilitate integration and speed
up development through the process visualization.
+Apache Camel Karavan a Low-code Data Integration Platform.
Read More
{{< /div >}}
@@ -232,7 +232,7 @@ Apache Camel Karavan is a mastering tool to facilitate
integration and speed up
## Camel JBang
-The Camel CLI for easily getting started with Apache Camel.
+Camel JBang is CLI tooling to easily get started and for building low-code
integrations with Camel.
Read More
(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 a642c76d4fb Regen
a642c76d4fb is described below
commit a642c76d4fba951a4338e151c81f76120d640fe1
Author: Claus Ibsen
AuthorDate: Wed May 22 13:30:55 2024 +0200
Regen
---
.../org/apache/camel/springboot/catalog/components/nats.json | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nats.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nats.json
index 418c41045ca..e7ad69609a4 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nats.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nats.json
@@ -67,7 +67,8 @@
"connection": { "index": 25, "kind": "parameter", "displayName":
"Connection", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "io.nats.client.Connection", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.nats.NatsConfiguration", "configurationField":
"configuration", "description": "Reference an already instantiated connection
to Nats server" },
"headerFilterStrategy": { "index": 26, "kind": "parameter", "displayName":
"Header Filter Strategy", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType":
"org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.nats.NatsConfiguration", "configurationField":
"configuration", "description": "Define the header filtering strategy" },
"traceConnection": { "index": 27, "kind": "parameter", "displayName":
"Trace Connection", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.nats.NatsConfiguration",
"configurationField": "configuration", "description": "Whether or not
connection trace messages should be printed to standard out for fine [...]
-"secure": { "index": 28, "kind": "parameter", "displayName": "Secure",
"group": "security", "label": "security", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.nats.NatsConfiguration", "configurationField":
"configuration", "description": "Set secure option indicating TLS is required"
},
-"sslContextParameters": { "index": 29, "kind": "parameter", "displayName":
"Ssl Context Parameters", "group": "security", "label": "security", "required":
false, "type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.nats.NatsConfiguration", "configurationField":
"configuration", "description": "To configure security using
SSLContextParameters" }
+"credentialsFilePath": { "index": 28, "kind": "parameter", "displayName":
"Credentials File Path", "group": "security", "label": "security", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.nats.NatsConfiguration", "configurationField":
"configuration", "description": "If we use useCredentialsFile to true we'll
need to set the credentialsFilePath option. It [...]
+"secure": { "index": 29, "kind": "parameter", "displayName": "Secure",
"group": "security", "label": "security", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.nats.NatsConfiguration", "configurationField":
"configuration", "description": "Set secure option indicating TLS is required"
},
+"sslContextParameters": { "index": 30, "kind": "parameter", "displayName":
"Ssl Context Parameters", "group": "security", "label": "security", "required":
false, "type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.nats.NatsConfiguration", "configurationField":
"configuration", "description": "To configure security using
SSLContextParameters" }
}
}
(camel) branch main updated (e7ca2b8fd80 -> 4417f629db5)
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 e7ca2b8fd80 --- (#14216) add 4417f629db5 --- (#14218) 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 (c5b146dc2df -> e7ca2b8fd80)
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 c5b146dc2df CAMEL-20795 - camel-nats - NATS Credential file support (#14223) add e7ca2b8fd80 --- (#14216) 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 (edfc3a285f7 -> a1cdc91d07e)
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 edfc3a285f7 --- (#14217) add a1cdc91d07e --- (#14220) 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 (1284276dc94 -> edfc3a285f7)
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 1284276dc94 --- (#14215) add edfc3a285f7 --- (#14217) 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 (21a93450c02 -> 1284276dc94)
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 21a93450c02 --- (#14214) add 1284276dc94 --- (#14215) 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 (007dc66f6de -> 21a93450c02)
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 007dc66f6de (chores) ci: always clean the workspace after the build is complete add 21a93450c02 --- (#14214) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-spring-boot) branch main updated: Add more GH labels
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 893f04ce3de Add more GH labels 893f04ce3de is described below commit 893f04ce3de83c1f1e265ebae3c6b02c5f9325f7 Author: Claus Ibsen AuthorDate: Wed May 22 07:01:51 2024 +0200 Add more GH labels --- .asf.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index b6e85509428..3111d6a0c4c 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -16,11 +16,13 @@ # github: - description: "Apache Camel Spring Boot support" + description: "Runs Camel on Spring Boot and provides starters for Camel components" homepage: https://camel.apache.org labels: - camel - integration +- eip +- microservices - java - spring-boot notifications:
(camel) branch main updated: --- (#14210)
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 0cd370ea5ee --- (#14210) 0cd370ea5ee is described below commit 0cd370ea5eea5dda7b795ce1b2831f087dc4a374 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 21 10:32:27 2024 +0200 --- (#14210) updated-dependencies: - dependency-name: org.opensearch.client:opensearch-java 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 7b8fe79894c..42447d2fcb2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -383,7 +383,7 @@ 7.5.0 3.2.2 2.13.0 -2.10.2 +2.10.3 2.11.0 2.0.1 3.11
(camel) branch main updated: Add more GH labels
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 06eb358a922 Add more GH labels 06eb358a922 is described below commit 06eb358a922032930c03f61c078d081977f7bd2f Author: Claus Ibsen AuthorDate: Tue May 21 09:58:02 2024 +0200 Add more GH labels --- .asf.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index 26680bbfdc5..97a0e049a24 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -21,6 +21,8 @@ github: labels: - camel - integration +- eip +- microservices - java dependabot_alerts: true dependabot_updates: true
(camel) branch main updated: --- (#14209)
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 e83fe715547 --- (#14209) e83fe715547 is described below commit e83fe71554713244708897a5dd352465c352f0f8 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 21 09:51:04 2024 +0200 --- (#14209) updated-dependencies: - dependency-name: com.huaweicloud.sdk:huaweicloud-sdk-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.huaweicloud.sdk:huaweicloud-sdk-frs dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.huaweicloud.sdk:huaweicloud-sdk-functiongraph dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.huaweicloud.sdk:huaweicloud-sdk-iam dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.huaweicloud.sdk:huaweicloud-sdk-image dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.huaweicloud.sdk:huaweicloud-sdk-smn 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 2b3715e99aa..f7e09835771 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -223,7 +223,7 @@ 4.5.14 4.1.5 3.24.3 -3.1.95 +3.1.96 3.2.18 75.1 2.16.0
(camel) branch main updated (722c427bc02 -> a236b892c8d)
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 722c427bc02 --- (#14207) add a236b892c8d --- (#14208) 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 (08ab433b944 -> 722c427bc02)
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 08ab433b944 --- (#14205) add 722c427bc02 --- (#14207) 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 (1cea34d5a51 -> 08ab433b944)
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 1cea34d5a51 --- (#14202) add 08ab433b944 --- (#14205) 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 (5efbaa0bd38 -> 005cd6cb50f)
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 5efbaa0bd38 CAMEL-20782: re-enable MongoDB tests on ASF CI add 005cd6cb50f Typo No new revisions were added by this update. Summary of changes: components/camel-opentelemetry/src/main/docs/opentelemetry.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated: CAMEL-20217: camel-jbang - You can now camel init a pipe file.
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 ca77c1a11c8 CAMEL-20217: camel-jbang - You can now camel init a pipe
file.
ca77c1a11c8 is described below
commit ca77c1a11c8e1a85d25dfef61bac8dfe8e3d055b
Author: Claus Ibsen
AuthorDate: Mon May 20 10:47:21 2024 +0200
CAMEL-20217: camel-jbang - You can now camel init a pipe file.
---
.../org/apache/camel/dsl/jbang/core/commands/Init.java | 6 ++
.../apache/camel/dsl/jbang/core/commands/bind/Bind.java | 3 ---
.../src/main/resources/templates/init-pipe.yaml.tmpl| 17 +
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
index 42ab2a55335..2c03f571d75 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
@@ -69,6 +69,10 @@ public class Init extends CamelCommand {
description = "When creating a yaml file should it be created as a
Camel K Integration CRD")
private boolean integration;
+@Option(names = { "--pipe" },
+description = "When creating a yaml file should it be created as a
Camel K Pipe CRD")
+private boolean pipe;
+
public Init(CamelJBangMain main) {
super(main);
}
@@ -96,6 +100,8 @@ public class Init extends CamelCommand {
String ext = FileUtil.onlyExt(file, false);
if ("yaml".equals(ext) && integration) {
ext = "integration.yaml";
+} else if ("yaml".equals(ext) && pipe) {
+ext = "init-pipe.yaml";
}
if (fromKamelet != null && !"kamelet.yaml".equals(ext)) {
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/bind/Bind.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/bind/Bind.java
index e1236d39574..c81351c9fa9 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/bind/Bind.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/bind/Bind.java
@@ -245,9 +245,6 @@ public class Bind extends CamelCommand {
/**
* Extracts properties from given property arguments. Filter properties by
given prefix. This way each component in
* pipe (source, sink, errorHandler, step[1-n]) can have its individual
properties.
- *
- * @param keyPrefix
- * @return
*/
private Map getProperties(String keyPrefix) {
Map props = new HashMap<>();
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/init-pipe.yaml.tmpl
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/init-pipe.yaml.tmpl
new file mode 100644
index 000..9e9beffcc07
--- /dev/null
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/resources/templates/init-pipe.yaml.tmpl
@@ -0,0 +1,17 @@
+apiVersion: camel.apache.org/v1
+kind: Pipe
+metadata:
+ name: {{ .Name }}
+spec:
+ source:
+ref:
+ kind: Kamelet
+ apiVersion: camel.apache.org/v1
+ name: timer-source
+properties:
+ message: Hello World
+ sink:
+ref:
+ kind: Kamelet
+ apiVersion: camel.apache.org/v1
+ name: log-sink
\ No newline at end of file
(camel) branch main updated: Bump cometd-java-server-version from 8.0.0.beta3 to 8.0.0 (#14193)
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 7755a2be925 Bump cometd-java-server-version from 8.0.0.beta3 to 8.0.0 (#14193) 7755a2be925 is described below commit 7755a2be925f4b03c3a39eac1adaf4f3b67955c0 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 20 10:26:28 2024 +0200 Bump cometd-java-server-version from 8.0.0.beta3 to 8.0.0 (#14193) Bumps `cometd-java-server-version` from 8.0.0.beta3 to 8.0.0. Updates `org.cometd.java:cometd-java-server-websocket-jetty` from 8.0.0.beta3 to 8.0.0 Updates `org.cometd.java:cometd-java-server-http-jakarta` from 8.0.0.beta3 to 8.0.0 --- updated-dependencies: - dependency-name: org.cometd.java:cometd-java-server-websocket-jetty dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.cometd.java:cometd-java-server-http-jakarta 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 d9522283d2a..3af7dfbd81c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -99,7 +99,7 @@ 3.6.2 4.8.172 8.0.0 -8.0.0.beta3 +8.0.0 1.9.4 1.17.0 3.2.2
(camel) branch main updated: CAMEL-20407: camel-datasonnet - Add support for variables
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 b1495dc845d CAMEL-20407: camel-datasonnet - Add support for variables
b1495dc845d is described below
commit b1495dc845d2f8cfd34f2c9d238a3ad6d8e75931
Author: Claus Ibsen
AuthorDate: Mon May 20 10:25:56 2024 +0200
CAMEL-20407: camel-datasonnet - Add support for variables
---
.../src/main/docs/datasonnet-language.adoc | 2 ++
.../org/apache/camel/language/datasonnet/CML.java | 10 +
.../language/datasonnet/CamelDatasonnetTest.java | 7 ++
.../camel/language.datasonnet/camel-context.xml| 26 ++
4 files changed, 45 insertions(+)
diff --git a/components/camel-datasonnet/src/main/docs/datasonnet-language.adoc
b/components/camel-datasonnet/src/main/docs/datasonnet-language.adoc
index 5020ed32f2a..1011870fae7 100644
--- a/components/camel-datasonnet/src/main/docs/datasonnet-language.adoc
+++ b/components/camel-datasonnet/src/main/docs/datasonnet-language.adoc
@@ -171,6 +171,8 @@ xref:ROOT:properties-component.adoc[Properties] component
(property placeholders
|cml.header |the header name |String |Will return the message header.
|cml.exchangeProperty |key for property |String |Will return the exchange
property.
+
+|cml.variable |the variable name |String |Will return the exchange variable.
|===
Here's an example showing some of these functions in use:
diff --git
a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/CML.java
b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/CML.java
index 756bacfbc3b..e759f5b978c 100644
---
a/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/CML.java
+++
b/components/camel-datasonnet/src/main/java/org/apache/camel/language/datasonnet/CML.java
@@ -66,6 +66,9 @@ public final class CML extends Library {
answer.put("header", makeSimpleFunc(
Collections.singletonList("key"), //parameters list
params -> header(params.get(0), dataFormats)));
+answer.put("variable", makeSimpleFunc(
+Collections.singletonList("key"), //parameters list
+params -> variable(params.get(0), dataFormats)));
answer.put("exchangeProperty", makeSimpleFunc(
Collections.singletonList("key"), //parameters list
params -> exchangeProperty(params.get(0), dataFormats)));
@@ -91,6 +94,13 @@ public final class CML extends Library {
throw new IllegalArgumentException("Expected String got: " +
key.prettyName());
}
+private Val variable(Val key, DataFormatService dataformats) {
+if (key instanceof Val.Str) {
+return valFrom(exchange.get().getVariable(((Val.Str)
key).value()), dataformats);
+}
+throw new IllegalArgumentException("Expected String got: " +
key.prettyName());
+}
+
private Val exchangeProperty(Val key, DataFormatService dataformats) {
if (key instanceof Val.Str) {
return valFrom(exchange.get().getProperty(((Val.Str)
key).value()), dataformats);
diff --git
a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java
b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java
index 22486236499..3b0251cda88 100644
---
a/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java
+++
b/components/camel-datasonnet/src/test/java/org/apache/camel/language/datasonnet/CamelDatasonnetTest.java
@@ -85,6 +85,13 @@ public class CamelDatasonnetTest extends
CamelSpringTestSupport {
"direct:expressionLanguage");
}
+@Test
+public void testVariable() throws Exception {
+runCamelTest("World",
+"{ \"test\":\"Hello, World\"}",
+"direct:variable");
+}
+
@Test
public void testNullInput() throws Exception {
runCamelTest("",
diff --git
a/components/camel-datasonnet/src/test/resources/org/apache/camel/language.datasonnet/camel-context.xml
b/components/camel-datasonnet/src/test/resources/org/apache/camel/language.datasonnet/camel-context.xml
index a7ca6d87cdc..055885542b4 100644
---
a/components/camel-datasonnet/src/test/resources/org/apache/camel/language.datasonnet/camel-context.xml
+++
b/components/camel-datasonnet/src/test/resources/org/apache/camel/language.datasonnet/camel-context.xml
@@ -165,6 +165,32 @@
+
+
+
+
+text/plain
+
+
+"Hello, " + payload
+
+
+
+application/json
+
+
+
+
+
+
+
+
+
+
(camel) branch hib deleted (was f26e2a370d9)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch hib in repository https://gitbox.apache.org/repos/asf/camel.git was f26e2a370d9 Remove hibernate from camel-openjpa as it was not working and they dont have Derby database driver anymore 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-jpa - Cleanup (#14182)
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 e2783234e32 camel-jpa - Cleanup (#14182)
e2783234e32 is described below
commit e2783234e32535d5f06e30c0c48232385e773fe0
Author: Claus Ibsen
AuthorDate: Mon May 20 10:05:12 2024 +0200
camel-jpa - Cleanup (#14182)
* Upgrade openjpa to 4.0
* Remove hibernate from camel-openjpa as it was not working and they dont
have Derby database driver anymore
---
components/camel-jpa/pom.xml | 52 +-
.../camel-jpa/src/main/docs/jpa-component.adoc | 2 +-
parent/pom.xml | 3 +-
3 files changed, 3 insertions(+), 54 deletions(-)
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index daaafe2afa0..73843128fde 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -34,7 +34,7 @@
true
-
-javaagent:${project.basedir}/target/openjpa-${openjpa-version}-jakarta.jar
-Xmx3G
+
-javaagent:${project.basedir}/target/openjpa-${openjpa-version}.jar
-Xmx3G
240
@@ -126,11 +126,6 @@
openjpa
-
-
-!hibernate
-
-
@@ -188,7 +183,6 @@
org.apache.openjpa
openjpa
${openjpa-version}
-jakarta
jakarta.transaction
@@ -209,49 +203,6 @@
org.apache.openjpa
openjpa
${openjpa-version}
-jakarta
-
-
-
-
-hibernate
-
-
-hibernate
-
-
-
-
-
-maven-resources-plugin
-
-
-copy-hibernate-persistence-xml
-
-copy-resources
-
-generate-test-resources
-
-
-
-
-
${project.basedir}/src/test/resources/profiles/hibernate/META-INF
-
-
-
-
${project.build.testOutputDirectory}/META-INF
-
-
-
-
-
-
-
-
-org.hibernate
-hibernate-core-jakarta
-${hibernate-version}
-test
@@ -280,7 +231,6 @@
org.apache.openjpa
openjpa
${openjpa-version}
-jakarta
${project.build.directory}
diff --git a/components/camel-jpa/src/main/docs/jpa-component.adoc
b/components/camel-jpa/src/main/docs/jpa-component.adoc
index 3c9bb8ae64f..5319ca82f03 100644
--- a/components/camel-jpa/src/main/docs/jpa-component.adoc
+++ b/components/camel-jpa/src/main/docs/jpa-component.adoc
@@ -17,7 +17,7 @@
The JPA component enables you to store and retrieve Java objects from
persistent storage using EJB 3's Java Persistence Architecture (JPA).
JPA is a standard interface layer that wraps Object/Relational Mapping
-(ORM) products such as OpenJPA, Hibernate, TopLink, and so on.
+(ORM) products such as OpenJPA, Hibernate, and so on.
Maven users will need to add the following dependency to their `pom.xml`
for this component:
diff --git a/parent/pom.xml b/parent/pom.xml
index 85e9449a3f8..d9522283d2a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -214,7 +214,6 @@
5.3.7
2.2.1
8.0.1.Final
-6.3.2.Final
2.6.1
2.7.2
1.7
@@ -381,7 +380,7 @@
5.0.0
3.4.3
7.5.0
-3.2.2
+4.0.0
2.13.0
2.10.2
2.11.0
(camel) branch main updated (30d17e57ea0 -> e2c19bbdfd3)
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 30d17e57ea0 Bump hapi-fhir-version from 7.0.2 to 7.2.0 (#14187) add e2c19bbdfd3 Bump org.codehaus.mojo:build-helper-maven-plugin from 3.5.0 to 3.6.0 (#14188) 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 (6dee39d8376 -> 30d17e57ea0)
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 6dee39d8376 Bump com.azure:azure-storage-blob-changefeed (#14192) add 30d17e57ea0 Bump hapi-fhir-version from 7.0.2 to 7.2.0 (#14187) 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: Bump com.azure:azure-storage-blob-changefeed (#14192)
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 6dee39d8376 Bump com.azure:azure-storage-blob-changefeed (#14192) 6dee39d8376 is described below commit 6dee39d83764a76610a44bdba66de4bfd5c9afba Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 20 10:03:05 2024 +0200 Bump com.azure:azure-storage-blob-changefeed (#14192) Bumps [com.azure:azure-storage-blob-changefeed](https://github.com/Azure/azure-sdk-for-java) from 12.0.0-beta.19 to 12.0.0-beta.21. - [Release notes](https://github.com/Azure/azure-sdk-for-java/releases) - [Commits](https://github.com/Azure/azure-sdk-for-java/compare/azure-storage-blob-nio_12.0.0-beta.19...azure-storage-blob-nio_12.0.0-beta.21) --- updated-dependencies: - dependency-name: com.azure:azure-storage-blob-changefeed 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 7b8cdceff7f..8709f959203 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -79,7 +79,7 @@ 2.25.55 2.15.3 1.2.23 - 12.0.0-beta.19 + 12.0.0-beta.21 3.0.0 1.78 4.9.0
(camel) branch main updated: Bump org.hdrhistogram:HdrHistogram from 2.1.12 to 2.2.1 (#14189)
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 bc65a535d44 Bump org.hdrhistogram:HdrHistogram from 2.1.12 to 2.2.1 (#14189) bc65a535d44 is described below commit bc65a535d445b049bdfbe4f889c2541aa86fd8b1 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 20 10:02:53 2024 +0200 Bump org.hdrhistogram:HdrHistogram from 2.1.12 to 2.2.1 (#14189) Bumps [org.hdrhistogram:HdrHistogram](https://github.com/HdrHistogram/HdrHistogram) from 2.1.12 to 2.2.1. - [Release notes](https://github.com/HdrHistogram/HdrHistogram/releases) - [Commits](https://github.com/HdrHistogram/HdrHistogram/compare/HdrHistogram-2.1.12...HdrHistogram-2.2.1) --- updated-dependencies: - dependency-name: org.hdrhistogram:HdrHistogram dependency-type: direct:development 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 685ce3dbfe4..7b8cdceff7f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -212,7 +212,7 @@ 2.5.1 7.0.2 5.3.7 -2.1.12 +2.2.1 8.0.1.Final 6.3.2.Final 2.6.1
(camel) branch main updated: Bump org.cometd.java:cometd-java-client-http-jetty (#14186)
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 6e53412bb82 Bump org.cometd.java:cometd-java-client-http-jetty (#14186) 6e53412bb82 is described below commit 6e53412bb8220a1d2cd7f018b92f90c87991f2c3 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 20 10:02:23 2024 +0200 Bump org.cometd.java:cometd-java-client-http-jetty (#14186) Bumps org.cometd.java:cometd-java-client-http-jetty from 8.0.0.beta3 to 8.0.0. --- updated-dependencies: - dependency-name: org.cometd.java:cometd-java-client-http-jetty 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 5af14cb6df8..685ce3dbfe4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -98,7 +98,7 @@ 0.0.10 3.6.2 4.8.172 -8.0.0.beta3 +8.0.0 8.0.0.beta3 1.9.4 1.17.0
(camel) branch main updated (9e240796c35 -> b09d8727eaf)
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 9e240796c35 Bump aws-java-sdk2-version from 2.25.54 to 2.25.55 (#14185) add b09d8727eaf Bump swagger-openapi3-version from 2.2.21 to 2.2.22 (#14190) 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: Bump aws-java-sdk2-version from 2.25.54 to 2.25.55 (#14185)
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 9e240796c35 Bump aws-java-sdk2-version from 2.25.54 to 2.25.55 (#14185) 9e240796c35 is described below commit 9e240796c355c3ac3a97ee55c874b1b6c01526bf Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 20 09:28:21 2024 +0200 Bump aws-java-sdk2-version from 2.25.54 to 2.25.55 (#14185) Bumps `aws-java-sdk2-version` from 2.25.54 to 2.25.55. Updates `software.amazon.awssdk:sqs` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:kinesis` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:s3` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:sns` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:cloudwatch` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:ec2` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:eventbridge` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:iam` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:kms` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:lambda` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:secretsmanager` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:sts` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:dynamodb` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:config` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:apache-client` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:athena` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:bedrock` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:bedrockruntime` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:bedrockagent` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:bedrockagentruntime` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:cloudtrail` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:ecs` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:eks` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:netty-nio-client` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:firehose` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:kafka` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:mq` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:redshiftdata` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:ses` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:sfn` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:timestreamquery` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:timestreamwrite` from 2.25.54 to 2.25.55 Updates `software.amazon.awssdk:translate` from 2.25.54 to 2.25.55 --- updated-dependencies: - dependency-name: software.amazon.awssdk:sqs dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:kinesis dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:s3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sns dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:cloudwatch dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:ec2 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:eventbridge dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:iam dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:kms dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:lambda dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:secretsmanager dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sts dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:dynamodb dependency-type: direct:production update-type: version-update:semver
(camel-spring-boot) branch main updated: CAMEL-20244: camel-core - Supervising route controller should default be DOWN during restarting and exhaust phase
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 5605c0c7afb CAMEL-20244: camel-core - Supervising route controller
should default be DOWN during restarting and exhaust phase
5605c0c7afb is described below
commit 5605c0c7afbca3185488bbc3da5a2b4683b2e414
Author: Claus Ibsen
AuthorDate: Mon May 20 09:16:03 2024 +0200
CAMEL-20244: camel-core - Supervising route controller should default be
DOWN during restarting and exhaust phase
---
core/camel-spring-boot/src/main/docs/spring-boot.json| 8
.../SupervisingRouteControllerConfiguration.java | 16
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.json
b/core/camel-spring-boot/src/main/docs/spring-boot.json
index 1d80c91afb2..fed2f806fc5 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.json
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.json
@@ -1299,16 +1299,16 @@
{
"name": "camel.routecontroller.unhealthy-on-exhausted",
"type": "java.lang.Boolean",
- "description": "Whether to mark the route as unhealthy (down) when all
restarting attempts (backoff) have failed and the route is not successfully
started and the route manager is giving up. Setting this to true allows health
checks to know about this and can report the Camel application as DOWN. The
default is false.",
+ "description": "Whether to mark the route as unhealthy (down) when all
restarting attempts (backoff) have failed and the route is not successfully
started and the route manager is giving up. If setting this to false will make
health checks ignore this problem and allow to report the Camel application as
UP.",
"sourceType":
"org.apache.camel.spring.boot.routecontroller.SupervisingRouteControllerConfiguration",
- "defaultValue": false
+ "defaultValue": true
},
{
"name": "camel.routecontroller.unhealthy-on-restarting",
"type": "java.lang.Boolean",
- "description": "Whether to mark the route as unhealthy (down) when the
route failed to initially start, and is being controlled for restarting
(backoff). Setting this to true allows health checks to know about this and can
report the Camel application as DOWN. The default is false.",
+ "description": "Whether to mark the route as unhealthy (down) when the
route failed to initially start, and is being controlled for restarting
(backoff). If setting this to false will make health checks ignore this problem
and allow to report the Camel application as UP.",
"sourceType":
"org.apache.camel.spring.boot.routecontroller.SupervisingRouteControllerConfiguration",
- "defaultValue": false
+ "defaultValue": true
},
{
"name": "camel.routetemplate.config",
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routecontroller/SupervisingRouteControllerConfiguration.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routecontroller/SupervisingRouteControllerConfiguration.java
index bc7b4e48c44..14269d03cdd 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routecontroller/SupervisingRouteControllerConfiguration.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routecontroller/SupervisingRouteControllerConfiguration.java
@@ -101,21 +101,21 @@ public class SupervisingRouteControllerConfiguration {
* Whether to mark the route as unhealthy (down) when all restarting
attempts (backoff) have failed and the route is
* not successfully started and the route manager is giving up.
*
- * Setting this to true allows health checks to know about this and can
report the Camel application as DOWN.
- *
- * The default is false.
+ * If setting this to false will make health checks ignore this problem
and allow to report the Camel application as
+ * UP.
*/
-private boolean unhealthyOnExhausted;
+@Metadata(label = "advanced", defaultValue = "true")
+private boolean unhealthyOnExhausted = true;
/**
* Whether to mark the route as unhealthy (down) when the route failed to
initially start, and is being controlled
* for restarting (backoff).
*
- * Setting this to true allows health checks to know about this and can
report the Camel application as DOWN.
- *
- * The default is false.
+ * If setting this to false will make health checks ignore this
(camel) branch health-down deleted (was 71adc914c0a)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch health-down in repository https://gitbox.apache.org/repos/asf/camel.git was 71adc914c0a CAMEL-20244: camel-core - Supervising route controller should default be DOWN during restarting and exhaust phase 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-20244: camel-core - Supervising route controller should default be DOWN during restarting and exhaust phase (#14194)
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 72c5a152a14 CAMEL-20244: camel-core - Supervising route controller
should default be DOWN during restarting and exhaust phase (#14194)
72c5a152a14 is described below
commit 72c5a152a14767aaedaa2acc146cafbef51b4905
Author: Claus Ibsen
AuthorDate: Mon May 20 09:27:20 2024 +0200
CAMEL-20244: camel-core - Supervising route controller should default be
DOWN during restarting and exhaust phase (#14194)
---
.../main/camel-main-configuration-metadata.json| 4 ++--
.../camel/spi/SupervisingRouteController.java | 22 +
.../engine/DefaultSupervisingRouteController.java | 4 ++--
.../camel-main-configuration-metadata.json | 4 ++--
core/camel-main/src/main/docs/main.adoc| 4 ++--
.../RouteControllerConfigurationProperties.java| 28 ++
.../ROOT/pages/camel-4x-upgrade-guide-4_7.adoc | 4
.../modules/ROOT/pages/route-controller.adoc | 8 ---
8 files changed, 35 insertions(+), 43 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 3ed4a3937f0..fd96d560fb5 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -250,8 +250,8 @@
{ "name": "camel.routecontroller.includeRoutes", "description": "Pattern
for filtering routes to be included as supervised. The pattern is matching on
route id, and endpoint uri for the route. Multiple patterns can be separated by
comma. For example to include all kafka routes, you can say kafka:. And to
include routes with specific route ids myRoute,myOtherRoute. The pattern
supports wildcards and uses the matcher from
org.apache.camel.support.PatternHelper#matchPattern.", "sourceTy [...]
{ "name": "camel.routecontroller.initialDelay", "description": "Initial
delay in milli seconds before the route controller starts, after CamelContext
has been started.", "sourceType":
"org.apache.camel.main.RouteControllerConfigurationProperties", "type":
"integer", "javaType": "long" },
{ "name": "camel.routecontroller.threadPoolSize", "description": "The
number of threads used by the route controller scheduled thread pool that are
used for restarting routes. The pool uses 1 thread by default, but you can
increase this to allow the controller to concurrently attempt to restart
multiple routes in case more than one route has problems starting.",
"sourceType": "org.apache.camel.main.RouteControllerConfigurationProperties",
"type": "integer", "javaType": "int", "defaul [...]
-{ "name": "camel.routecontroller.unhealthyOnExhausted", "description":
"Whether to mark the route as unhealthy (down) when all restarting attempts
(backoff) have failed and the route is not successfully started and the route
manager is giving up. Setting this to true allows health checks to know about
this and can report the Camel application as DOWN. The default is false.",
"sourceType": "org.apache.camel.main.RouteControllerConfigurationProperties",
"type": "boolean", "javaType": " [...]
-{ "name": "camel.routecontroller.unhealthyOnRestarting", "description":
"Whether to mark the route as unhealthy (down) when the route failed to
initially start, and is being controlled for restarting (backoff). Setting this
to true allows health checks to know about this and can report the Camel
application as DOWN. The default is false.", "sourceType":
"org.apache.camel.main.RouteControllerConfigurationProperties", "type":
"boolean", "javaType": "boolean", "defaultValue": "false" },
+{ "name": "camel.routecontroller.unhealthyOnExhausted", "description":
"Whether to mark the route as unhealthy (down) when all restarting attempts
(backoff) have failed and the route is not successfully started and the route
manager is giving up. If setting this to false will make health checks ignore
this problem and allow to report the Camel ap
(camel) 01/01: CAMEL-20244: camel-core - Supervising route controller should default be DOWN during restarting and exhaust phase
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch health-down
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 71adc914c0a0b2b9f54d7cc275b5080ed28437e3
Author: Claus Ibsen
AuthorDate: Mon May 20 09:11:50 2024 +0200
CAMEL-20244: camel-core - Supervising route controller should default be
DOWN during restarting and exhaust phase
---
.../main/camel-main-configuration-metadata.json| 4 ++--
.../camel/spi/SupervisingRouteController.java | 22 +
.../engine/DefaultSupervisingRouteController.java | 4 ++--
.../camel-main-configuration-metadata.json | 4 ++--
core/camel-main/src/main/docs/main.adoc| 4 ++--
.../RouteControllerConfigurationProperties.java| 28 ++
.../ROOT/pages/camel-4x-upgrade-guide-4_7.adoc | 4
.../modules/ROOT/pages/route-controller.adoc | 8 ---
8 files changed, 35 insertions(+), 43 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 3ed4a3937f0..fd96d560fb5 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -250,8 +250,8 @@
{ "name": "camel.routecontroller.includeRoutes", "description": "Pattern
for filtering routes to be included as supervised. The pattern is matching on
route id, and endpoint uri for the route. Multiple patterns can be separated by
comma. For example to include all kafka routes, you can say kafka:. And to
include routes with specific route ids myRoute,myOtherRoute. The pattern
supports wildcards and uses the matcher from
org.apache.camel.support.PatternHelper#matchPattern.", "sourceTy [...]
{ "name": "camel.routecontroller.initialDelay", "description": "Initial
delay in milli seconds before the route controller starts, after CamelContext
has been started.", "sourceType":
"org.apache.camel.main.RouteControllerConfigurationProperties", "type":
"integer", "javaType": "long" },
{ "name": "camel.routecontroller.threadPoolSize", "description": "The
number of threads used by the route controller scheduled thread pool that are
used for restarting routes. The pool uses 1 thread by default, but you can
increase this to allow the controller to concurrently attempt to restart
multiple routes in case more than one route has problems starting.",
"sourceType": "org.apache.camel.main.RouteControllerConfigurationProperties",
"type": "integer", "javaType": "int", "defaul [...]
-{ "name": "camel.routecontroller.unhealthyOnExhausted", "description":
"Whether to mark the route as unhealthy (down) when all restarting attempts
(backoff) have failed and the route is not successfully started and the route
manager is giving up. Setting this to true allows health checks to know about
this and can report the Camel application as DOWN. The default is false.",
"sourceType": "org.apache.camel.main.RouteControllerConfigurationProperties",
"type": "boolean", "javaType": " [...]
-{ "name": "camel.routecontroller.unhealthyOnRestarting", "description":
"Whether to mark the route as unhealthy (down) when the route failed to
initially start, and is being controlled for restarting (backoff). Setting this
to true allows health checks to know about this and can report the Camel
application as DOWN. The default is false.", "sourceType":
"org.apache.camel.main.RouteControllerConfigurationProperties", "type":
"boolean", "javaType": "boolean", "defaultValue": "false" },
+{ "name": "camel.routecontroller.unhealthyOnExhausted", "description":
"Whether to mark the route as unhealthy (down) when all restarting attempts
(backoff) have failed and the route is not successfully started and the route
manager is giving up. If setting this to false will make health checks ignore
this problem and allow to report the Camel application as UP.", "sourceType":
"org.apache.camel.main.RouteControllerConfigurationProperties", "type":
"boolean", "javaType": "boolean", " [...]
+{ "name": "camel.routecontroller.unh
(camel) branch health-down created (now 71adc914c0a)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch health-down in repository https://gitbox.apache.org/repos/asf/camel.git at 71adc914c0a CAMEL-20244: camel-core - Supervising route controller should default be DOWN during restarting and exhaust phase This branch includes the following new commits: new 71adc914c0a CAMEL-20244: camel-core - Supervising route controller should default be DOWN during restarting and exhaust phase 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-kamelets-examples) branch main updated: CAMEL-20244: camel-core - Supervising route controller should default be DOWN during restarting and exhaust phase
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-kamelets-examples.git The following commit(s) were added to refs/heads/main by this push: new bc0b3de CAMEL-20244: camel-core - Supervising route controller should default be DOWN during restarting and exhaust phase bc0b3de is described below commit bc0b3de4e67986625fb7253e4626a1573d935a36 Author: Claus Ibsen AuthorDate: Mon May 20 09:12:06 2024 +0200 CAMEL-20244: camel-core - Supervising route controller should default be DOWN during restarting and exhaust phase --- jbang/route-controller/application.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/jbang/route-controller/application.properties b/jbang/route-controller/application.properties index 3ec3bd6..8fc806f 100644 --- a/jbang/route-controller/application.properties +++ b/jbang/route-controller/application.properties @@ -9,5 +9,6 @@ camel.route-controller.enabled = true # try to restart up till 10 times camel.route-controller.backOffMaxAttempts = 10 # report DOWN if unhealthy during restarting and exhausted phases +# NOTE: Camel 4.7 onwards have the following 2 options as true by default camel.route-controller.unhealthyOnRestarting = true camel.route-controller.unhealthyOnExhausted = true
(camel) branch main updated: CAMEL-20722 - changes to address flakiness observed on CI (#14183)
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 a7fb907c620 CAMEL-20722 - changes to address flakiness observed on CI
(#14183)
a7fb907c620 is described below
commit a7fb907c6208da1250e224886cbe4df7517ea352
Author: Jang-Vijay Singh
AuthorDate: Mon May 20 08:07:30 2024 +0100
CAMEL-20722 - changes to address flakiness observed on CI (#14183)
Changes to address flakiness:
- most likely cause is resource crunch on CI causing some tests to time
out.
- more unique test-specific topic names approach might be needed later
(after observation)
---
.../KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java | 2 +-
.../kafka/integration/KafkaBreakOnFirstErrorReleaseResourcesIT.java | 6 +++---
.../KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java| 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java
index 26cc15816b6..d77bf3b5f85 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT.java
@@ -100,7 +100,7 @@ class KafkaBreakOnFirstErrorOffUsingKafkaManualCommitIT
extends BaseKafkaTestSup
contextExtension.getContext().getRouteController().startRoute(ROUTE_ID);
Awaitility.await()
-.atMost(10, TimeUnit.SECONDS) // changed to 10 sec for
CAMEL-20722
+.atMost(30, TimeUnit.SECONDS) // changed to 30 sec for
CAMEL-20722
.until(() -> to.getExchanges().size() > 3);
to.assertIsSatisfied(3000);
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 96ab7c16823..024d6714bcf 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
@@ -51,8 +51,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
disabledReason = "This test does not run reliably on some
platforms")
class KafkaBreakOnFirstErrorReleaseResourcesIT extends BaseKafkaTestSupport {
-public static final String ROUTE_ID = "breakOnFirstError-20563";
-public static final String TOPIC = "breakOnFirstError-20563";
+public static final String ROUTE_ID = "breakOnFirstError-20563" +
Thread.currentThread().hashCode(); //CAMEL-20722 - added for similar reason as
CAMEL-20686:
+public static final String TOPIC = "breakOnFirstError-20563" +
Thread.currentThread().hashCode(); //CAMEL-20722 - added for similar reason as
CAMEL-20686:
private static final Logger LOG =
LoggerFactory.getLogger(KafkaBreakOnFirstErrorReleaseResourcesIT.class);
private static final int CONSUMER_COUNT = 3;
@@ -106,7 +106,7 @@ class KafkaBreakOnFirstErrorReleaseResourcesIT extends
BaseKafkaTestSupport {
// let test run for awhile
Awaitility.await()
-.timeout(10, TimeUnit.SECONDS)
+.timeout(30, TimeUnit.SECONDS) // changed to 30 sec for
CAMEL-20722
.pollDelay(8, TimeUnit.SECONDS)
.untilAsserted(() -> assertTrue(true));
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java
index e8868264dc9..37d795ec4cd 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java
@@ -98,7 +98,7 @@ class KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT
extends BaseKafkaT
contextExtension.getContext().getRouteController().startRoute(ROUTE_ID);
Awaitility.await()
-.atMost(10, TimeUnit.SECONDS) // cha
(camel) branch main updated: camel-jbang - Add completion candidates in help
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 8000db31866 camel-jbang - Add completion candidates in help
8000db31866 is described below
commit 8000db3186618c7ca0844eee3bd69e865fc513eb
Author: Claus Ibsen
AuthorDate: Sun May 19 12:10:02 2024 +0200
camel-jbang - Add completion candidates in help
---
.../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 2 +-
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 4 ++--
.../main/java/org/apache/camel/dsl/jbang/core/commands/Script.java| 2 +-
.../org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java | 2 +-
.../camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java | 2 +-
.../org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java | 2 +-
.../org/apache/camel/dsl/jbang/core/commands/version/VersionList.java | 2 +-
.../org/apache/camel/dsl/jbang/core/commands/version/VersionSet.java | 2 +-
8 files changed, 9 insertions(+), 9 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 b0d012a6f2b..3153903cc1e 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
@@ -96,7 +96,7 @@ abstract class ExportBaseCommand extends CamelCommand {
protected String dependencies;
@CommandLine.Option(names = { "--runtime" }, completionCandidates =
RuntimeCompletionCandidates.class,
-description = "Runtime (spring-boot, quarkus, or
camel-main)")
+description = "Runtime (${COMPLETION-CANDIDATES})")
protected String runtime;
@CommandLine.Option(names = { "--gav" }, description = "The Maven
group:artifact:version")
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 311f2fb6789..42ee7b3c775 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
@@ -121,7 +121,7 @@ public class Run extends CamelCommand {
public List files = new ArrayList<>();
@Option(names = { "--runtime" }, completionCandidates =
RuntimeCompletionCandidates.class,
-defaultValue = "camel-main", description = "Runtime (spring-boot,
quarkus, or camel-main)")
+defaultValue = "camel-main", description = "Runtime
(${COMPLETION-CANDIDATES})")
String runtime = "camel-main";
@Option(names = { "--source-dir" },
@@ -203,7 +203,7 @@ public class Run extends CamelCommand {
boolean logging = true;
@Option(names = { "--logging-level" }, completionCandidates =
LoggingLevelCompletionCandidates.class,
-defaultValue = "info", description = "Logging level")
+defaultValue = "info", description = "Logging level
(${COMPLETION-CANDIDATES})")
String loggingLevel;
@Option(names = { "--logging-color" }, defaultValue = "true", description
= "Use colored logging")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Script.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Script.java
index 3b4d893be8a..cfde42ce31a 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Script.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Script.java
@@ -47,7 +47,7 @@ public class Script extends CamelCommand {
boolean logging;
@CommandLine.Option(names = { "--logging-level" }, completionCandidates =
LoggingLevelCompletionCandidates.class,
-defaultValue = "info", description = "Logging level")
+defaultValue = "info", description = "Logging level
(${COMPLETION-CANDIDATES})")
String loggingLevel;
@CommandLine.Option(names = { "--properties" },
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java
b/dsl/
(camel-kafka-connector) branch main updated: Bump com.amazon.redshift:redshift-jdbc42 (#1637)
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-kafka-connector.git The following commit(s) were added to refs/heads/main by this push: new fd118b1d08 Bump com.amazon.redshift:redshift-jdbc42 (#1637) fd118b1d08 is described below commit fd118b1d08e06f0c3a05bc9e3f4e706b0efc6807 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Sun May 19 09:39:43 2024 +0200 Bump com.amazon.redshift:redshift-jdbc42 (#1637) Bumps [com.amazon.redshift:redshift-jdbc42](https://github.com/aws/amazon-redshift-jdbc-driver) from 2.1.0.26 to 2.1.0.28. - [Release notes](https://github.com/aws/amazon-redshift-jdbc-driver/releases) - [Changelog](https://github.com/aws/amazon-redshift-jdbc-driver/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/amazon-redshift-jdbc-driver/compare/v2.1.0.26...v2.1.0.28) --- updated-dependencies: - dependency-name: com.amazon.redshift:redshift-jdbc42 dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- connectors/camel-aws-redshift-source-kafka-connector/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connectors/camel-aws-redshift-source-kafka-connector/pom.xml b/connectors/camel-aws-redshift-source-kafka-connector/pom.xml index 9eeb4109a8..262e90c707 100644 --- a/connectors/camel-aws-redshift-source-kafka-connector/pom.xml +++ b/connectors/camel-aws-redshift-source-kafka-connector/pom.xml @@ -48,7 +48,7 @@ com.amazon.redshift redshift-jdbc42 - 2.1.0.26 + 2.1.0.28 org.apache.camel.kafkaconnector
(camel) 01/01: Remove hibernate from camel-openjpa as it was not working and they dont have Derby database driver anymore
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch hib
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f26e2a370d9bb01120acfc072a9eb6ce9bf913fa
Author: Claus Ibsen
AuthorDate: Sun May 19 09:33:43 2024 +0200
Remove hibernate from camel-openjpa as it was not working and they dont
have Derby database driver anymore
---
components/camel-jpa/pom.xml | 47 --
.../camel-jpa/src/main/docs/jpa-component.adoc | 2 +-
parent/pom.xml | 1 -
3 files changed, 1 insertion(+), 49 deletions(-)
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index 62e834bd1fe..73843128fde 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -126,11 +126,6 @@
openjpa
-
-
-!hibernate
-
-
@@ -211,48 +206,6 @@
-
-hibernate
-
-
-hibernate
-
-
-
-
-
-maven-resources-plugin
-
-
-copy-hibernate-persistence-xml
-
-copy-resources
-
-generate-test-resources
-
-
-
-
-
${project.basedir}/src/test/resources/profiles/hibernate/META-INF
-
-
-
-
${project.build.testOutputDirectory}/META-INF
-
-
-
-
-
-
-
-
-org.hibernate
-hibernate-core-jakarta
-${hibernate-version}
-test
-
-
-
full
diff --git a/components/camel-jpa/src/main/docs/jpa-component.adoc
b/components/camel-jpa/src/main/docs/jpa-component.adoc
index 3c9bb8ae64f..5319ca82f03 100644
--- a/components/camel-jpa/src/main/docs/jpa-component.adoc
+++ b/components/camel-jpa/src/main/docs/jpa-component.adoc
@@ -17,7 +17,7 @@
The JPA component enables you to store and retrieve Java objects from
persistent storage using EJB 3's Java Persistence Architecture (JPA).
JPA is a standard interface layer that wraps Object/Relational Mapping
-(ORM) products such as OpenJPA, Hibernate, TopLink, and so on.
+(ORM) products such as OpenJPA, Hibernate, and so on.
Maven users will need to add the following dependency to their `pom.xml`
for this component:
diff --git a/parent/pom.xml b/parent/pom.xml
index e5241f35eba..10f5b7c8f52 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -214,7 +214,6 @@
5.3.7
2.1.12
8.0.1.Final
-6.3.2.Final
2.6.1
2.7.2
1.7
(camel) branch hib created (now f26e2a370d9)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch hib in repository https://gitbox.apache.org/repos/asf/camel.git at f26e2a370d9 Remove hibernate from camel-openjpa as it was not working and they dont have Derby database driver anymore This branch includes the following new commits: new f26e2a370d9 Remove hibernate from camel-openjpa as it was not working and they dont have Derby database driver anymore 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 openjpa4 created (now 4d4e35d424a)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch openjpa4 in repository https://gitbox.apache.org/repos/asf/camel.git at 4d4e35d424a Upgrade openjpa to 4.0 This branch includes the following new commits: new 4d4e35d424a Upgrade openjpa to 4.0 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: Upgrade openjpa to 4.0
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch openjpa4
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4d4e35d424a3b36e70ba1d0258a209521142f7f6
Author: Claus Ibsen
AuthorDate: Sun May 19 09:27:41 2024 +0200
Upgrade openjpa to 4.0
---
components/camel-jpa/pom.xml | 5 +
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index daaafe2afa0..62e834bd1fe 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -34,7 +34,7 @@
true
-
-javaagent:${project.basedir}/target/openjpa-${openjpa-version}-jakarta.jar
-Xmx3G
+
-javaagent:${project.basedir}/target/openjpa-${openjpa-version}.jar
-Xmx3G
240
@@ -188,7 +188,6 @@
org.apache.openjpa
openjpa
${openjpa-version}
-jakarta
jakarta.transaction
@@ -209,7 +208,6 @@
org.apache.openjpa
openjpa
${openjpa-version}
-jakarta
@@ -280,7 +278,6 @@
org.apache.openjpa
openjpa
${openjpa-version}
-jakarta
${project.build.directory}
diff --git a/parent/pom.xml b/parent/pom.xml
index a473dbaa41c..e5241f35eba 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -381,7 +381,7 @@
5.0.0
3.4.3
7.5.0
-3.2.2
+4.0.0
2.13.0
2.10.2
2.11.0
(camel-spring-boot) branch main updated: CAMEL-20304: camel-nitrite - Deprecated
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 d85d597d688 CAMEL-20304: camel-nitrite - Deprecated d85d597d688 is described below commit d85d597d6882cd68a41400194666a2e93ac3995b Author: Claus Ibsen AuthorDate: Sat May 18 16:45:40 2024 +0200 CAMEL-20304: camel-nitrite - Deprecated --- .../org/apache/camel/springboot/catalog/components/nitrite.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/nitrite.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nitrite.json index ca1c96197c3..98c17be1059 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nitrite.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nitrite.json @@ -4,7 +4,7 @@ "name": "nitrite", "title": "Nitrite", "description": "Access Nitrite databases.", -"deprecated": false, +"deprecated": true, "firstVersion": "3.0.0", "label": "database", "javaType": "org.apache.camel.component.nitrite.NitriteComponent",
(camel) branch main updated: CAMEL-20304: camel-nitrite - Deprecated
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 c9435f8043a CAMEL-20304: camel-nitrite - Deprecated c9435f8043a is described below commit c9435f8043aac9ba2c669660740e4317e5514919 Author: Claus Ibsen AuthorDate: Sat May 18 16:42:42 2024 +0200 CAMEL-20304: camel-nitrite - Deprecated --- .../resources/org/apache/camel/catalog/components/nitrite.json | 2 +- components/camel-nitrite/pom.xml | 2 +- .../META-INF/org/apache/camel/component/nitrite/nitrite.json | 2 +- .../META-INF/services/org/apache/camel/component.properties | 2 +- components/camel-nitrite/src/main/docs/nitrite-component.adoc| 5 +++-- .../org/apache/camel/builder/endpoint/StaticEndpointBuilders.java| 2 ++ .../camel/builder/endpoint/dsl/NitriteEndpointBuilderFactory.java| 3 +++ 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/nitrite.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/nitrite.json index 433cd59cf93..907e24fa6c7 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/nitrite.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/nitrite.json @@ -4,7 +4,7 @@ "name": "nitrite", "title": "Nitrite", "description": "Access Nitrite databases.", -"deprecated": false, +"deprecated": true, "firstVersion": "3.0.0", "label": "database", "javaType": "org.apache.camel.component.nitrite.NitriteComponent", diff --git a/components/camel-nitrite/pom.xml b/components/camel-nitrite/pom.xml index 5a9df626775..96b4f929676 100644 --- a/components/camel-nitrite/pom.xml +++ b/components/camel-nitrite/pom.xml @@ -29,7 +29,7 @@ camel-nitrite jar - Camel :: Nitrite + Camel :: Nitrite (deprecated) Camel Nitrite component diff --git a/components/camel-nitrite/src/generated/resources/META-INF/org/apache/camel/component/nitrite/nitrite.json b/components/camel-nitrite/src/generated/resources/META-INF/org/apache/camel/component/nitrite/nitrite.json index 433cd59cf93..907e24fa6c7 100644 --- a/components/camel-nitrite/src/generated/resources/META-INF/org/apache/camel/component/nitrite/nitrite.json +++ b/components/camel-nitrite/src/generated/resources/META-INF/org/apache/camel/component/nitrite/nitrite.json @@ -4,7 +4,7 @@ "name": "nitrite", "title": "Nitrite", "description": "Access Nitrite databases.", -"deprecated": false, +"deprecated": true, "firstVersion": "3.0.0", "label": "database", "javaType": "org.apache.camel.component.nitrite.NitriteComponent", diff --git a/components/camel-nitrite/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-nitrite/src/generated/resources/META-INF/services/org/apache/camel/component.properties index 28d7bd5086e..78025579cfd 100644 --- a/components/camel-nitrite/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-nitrite/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -3,5 +3,5 @@ components=nitrite groupId=org.apache.camel artifactId=camel-nitrite version=4.7.0-SNAPSHOT -projectName=Camel :: Nitrite +projectName=Camel :: Nitrite (deprecated) projectDescription=Camel Nitrite component diff --git a/components/camel-nitrite/src/main/docs/nitrite-component.adoc b/components/camel-nitrite/src/main/docs/nitrite-component.adoc index 8809e6d2d90..92e7a86427e 100644 --- a/components/camel-nitrite/src/main/docs/nitrite-component.adoc +++ b/components/camel-nitrite/src/main/docs/nitrite-component.adoc @@ -1,10 +1,11 @@ -= Nitrite Component += Nitrite Component (deprecated) :doctitle: Nitrite :shortname: nitrite :artifactid: camel-nitrite :description: Access Nitrite databases. :since: 3.0 -:supportlevel: Stable +:supportlevel: Stable-deprecated +:deprecated: *deprecated* :tabs-sync-option: :component-header: Both producer and consumer are supported //Manually maintained attributes diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java index a4f4808b6a5..06180c1db97 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/cam
(camel-spring-boot) branch main updated: CAMEL-20600: camel-activemq6 for using 6.x brokers
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 f51f7eff350 CAMEL-20600: camel-activemq6 for using 6.x brokers
f51f7eff350 is described below
commit f51f7eff350cb688376c9e08c8d0245566f74bb8
Author: Claus Ibsen
AuthorDate: Sat May 18 15:23:13 2024 +0200
CAMEL-20600: camel-activemq6 for using 6.x brokers
---
.../camel/springboot/catalog/components.properties | 1 +
.../springboot/catalog/components/activemq.json| 4 +-
.../components/{activemq.json => activemq6.json} | 18 +-
components-starter/camel-activemq-starter/pom.xml | 2 +-
.../springboot/ActiveMQComponentConfiguration.java | 4 +-
.../pom.xml| 6 +-
.../src/main/docs/activemq6.json | 746 +
.../ActiveMQComponentAutoConfiguration.java| 77 +++
.../springboot/ActiveMQComponentConfiguration.java | 54 +-
.../springboot/ActiveMQComponentConverter.java | 87 +++
.../src/main/resources/META-INF/LICENSE.txt| 203 ++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
...rk.boot.autoconfigure.AutoConfiguration.imports | 19 +
components-starter/pom.xml | 1 +
tooling/camel-spring-boot-bom/pom.xml | 5 +
tooling/camel-spring-boot-dependencies/pom.xml | 10 +
16 files changed, 1204 insertions(+), 44 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
index 587e4c39b7c..369a4e47652 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
@@ -1,5 +1,6 @@
activemq
+activemq6
amqp
arangodb
as2
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
index 8a602a49bfd..64f9818922a 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
@@ -2,8 +2,8 @@
"component": {
"kind": "component",
"name": "activemq",
-"title": "ActiveMQ",
-"description": "Send messages to (or consume from) Apache ActiveMQ. This
component extends the Camel JMS component.",
+"title": "ActiveMQ 5.x",
+"description": "Send messages to (or consume from) Apache ActiveMQ 5.x.
This component extends the Camel JMS component.",
"deprecated": false,
"firstVersion": "1.0.0",
"label": "messaging",
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq6.json
similarity index 99%
copy from
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
copy to
catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq6.json
index 8a602a49bfd..c11ceedab5e 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq6.json
@@ -1,20 +1,20 @@
{
"component": {
"kind": "component",
-"name": "activemq",
-"title": "ActiveMQ",
-"description": "Send messages to (or consume from) Apache ActiveMQ. This
component extends the Camel JMS component.",
+"name": "activemq6",
+"title": "ActiveMQ 6.x",
+"description": "Send messages to (or consume from) Apache ActiveMQ 6.x.
This component extends the Camel JMS component.",
"deprecated": false,
-"firstVersion": "1.0.0",
+"firstVersion": "4.7.0",
"label": "messaging&
(camel) branch amq6 deleted (was 2970a4efbb9)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch amq6 in repository https://gitbox.apache.org/repos/asf/camel.git was 2970a4efbb9 CAMEL-20600: camel-activemq6 for using 6.x brokers 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 (a7e38a7d527 -> b80cd694fb4)
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 a7e38a7d527 Change aws2 kinesis record body type to byte array (#14179)
add b80cd694fb4 CAMEL-20600: camel-activemq6 for using 6.x brokers (#14181)
No new revisions were added by this update.
Summary of changes:
bom/camel-bom/pom.xml | 5 +
catalog/camel-allcomponents/pom.xml| 5 +
.../org/apache/camel/catalog/components.properties | 1 +
.../apache/camel/catalog/components/activemq.json | 4 +-
.../apache/camel/catalog/components/activemq6.json | 18 +-
components/camel-activemq/pom.xml | 4 +-
.../apache/camel/component/activemq/activemq.json | 4 +-
.../services/org/apache/camel/component.properties | 4 +-
.../src/main/docs/activemq-component.adoc | 12 +-
.../camel/component/activemq/ActiveMQEndpoint.java | 4 +-
.../{camel-activemq => camel-activemq6}/pom.xml| 10 +-
.../activemq6/ActiveMQComponentConfigurer.java | 72 +
.../activemq6/ActiveMQEndpointConfigurer.java | 60
.../activemq6/ActiveMQEndpointUriFactory.java | 177
.../converter/ActiveMQConverterLoader.java | 63 +
.../converter/ActiveMQMessageConverterLoader.java | 65 +
.../camel/component/activemq6/activemq6.json} | 18 +-
.../services/org/apache/camel/TypeConverterLoader | 3 +
.../services/org/apache/camel/component.properties | 7 +
.../services/org/apache/camel/component/activemq6 | 2 +
.../apache/camel/configurer/activemq6-component| 2 +
.../org/apache/camel/configurer/activemq6-endpoint | 2 +
.../org/apache/camel/send-dynamic/activemq6| 2 +
.../org/apache/camel/urifactory/activemq6-endpoint | 2 +
.../src/main/docs/activemq6-component.adoc}| 22 +-
.../component/activemq6/ActiveMQComponent.java | 307 +
.../component/activemq6/ActiveMQConfiguration.java | 233
.../component/activemq6}/ActiveMQEndpoint.java | 8 +-
.../component/activemq6/ActiveMQQueueEndpoint.java | 101 +++
.../activemq6/ActiveMQSendDynamicAware.java| 25 ++
.../activemq6/ActiveMQTemporaryQueueEndpoint.java | 39 +++
.../activemq6/ActiveMQTemporaryTopicEndpoint.java | 33 +++
.../OriginalDestinationPropagateStrategy.java | 55
.../activemq6/converter/ActiveMQConverter.java | 38 +++
.../converter/ActiveMQMessageConverter.java| 97 +++
.../component/activemq6}/converter/package.html| 0
.../component/activemq6/ActiveMQITSupport.java | 64 +
.../camel/component/activemq6/ActiveMQRouteIT.java | 120
.../camel/component/activemq6/ActiveMQToDIT.java | 68 +
.../activemq6/ActiveMQToDSendDynamicIT.java| 70 +
.../src/test/resources/log4j2-test.properties | 28 ++
components/pom.xml | 1 +
.../org/apache/camel/main/components.properties| 1 +
.../modules/ROOT/examples/json/activemq6.json | 1 +
docs/components/modules/ROOT/nav.adoc | 3 +-
.../modules/ROOT/pages/activemq6-component.adoc| 1 +
.../component/ComponentsBuilderFactory.java| 18 +-
java => Activemq6ComponentBuilderFactory.java} | 244
.../dsl/ActivemqComponentBuilderFactory.java | 10 +-
.../builder/endpoint/StaticEndpointBuilders.java | 62 -
.../dsl/ActiveMQEndpointBuilderFactory.java| 36 +--
.../camel-component-known-dependencies.properties | 1 +
.../camel-main-known-dependencies.properties | 1 +
.../{ActivemqUriDsl.kt => Activemq6UriDsl.kt} | 10 +-
.../camel/kotlin/components/ActivemqUriDsl.kt | 2 +-
parent/pom.xml | 6 +
56 files changed, 2045 insertions(+), 206 deletions(-)
copy
components/camel-activemq/src/generated/resources/META-INF/org/apache/camel/component/activemq/activemq.json
=>
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq6.json
(99%)
copy components/{camel-activemq => camel-activemq6}/pom.xml (91%)
create mode 100644
components/camel-activemq6/src/generated/java/org/apache/camel/component/activemq6/ActiveMQComponentConfigurer.java
create mode 100644
components/camel-activemq6/src/generated/java/org/apache/camel/component/activemq6/ActiveMQEndpointConfigurer.java
create mode 100644
components/camel-activemq6/src/generated/java/org/apache/camel/component/activemq6/ActiveMQEndpointUriFactory.java
create mode 100644
components/camel-activemq6/src/generated/java/org/apache/camel/component/activemq6/converter/ActiveMQConverterLoader.java
create mode 100644
components/camel-activemq6/src/generated/java/org/apache/camel/component/activemq6/converter/ActiveMQMessageConverterLoader.java
copy
components/{camel-activem
(camel) branch amq6 updated (7d8a7e4ee0b -> 2970a4efbb9)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch amq6
in repository https://gitbox.apache.org/repos/asf/camel.git
from 7d8a7e4ee0b CAMEL-20600: camel-activemq6 for using 6.x brokers
add 2970a4efbb9 CAMEL-20600: camel-activemq6 for using 6.x brokers
No new revisions were added by this update.
Summary of changes:
.../component/ComponentsBuilderFactory.java| 14 ++
java => Activemq6ComponentBuilderFactory.java} | 242 ++---
2 files changed, 135 insertions(+), 121 deletions(-)
copy
dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/{ActivemqComponentBuilderFactory.java
=> Activemq6ComponentBuilderFactory.java} (89%)
(camel) branch amq6 created (now 7d8a7e4ee0b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch amq6 in repository https://gitbox.apache.org/repos/asf/camel.git at 7d8a7e4ee0b CAMEL-20600: camel-activemq6 for using 6.x brokers This branch includes the following new commits: new 7d8a7e4ee0b CAMEL-20600: camel-activemq6 for using 6.x brokers 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-20600: camel-activemq6 for using 6.x brokers
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch amq6
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7d8a7e4ee0b22bb91f3c7590f414fe5428a4dac3
Author: Claus Ibsen
AuthorDate: Sat May 18 11:50:01 2024 +0200
CAMEL-20600: camel-activemq6 for using 6.x brokers
---
bom/camel-bom/pom.xml | 5 +
catalog/camel-allcomponents/pom.xml| 5 +
.../org/apache/camel/catalog/components.properties | 1 +
.../apache/camel/catalog/components/activemq.json | 4 +-
.../apache/camel/catalog/components/activemq6.json | 18 +-
components/camel-activemq/pom.xml | 4 +-
.../apache/camel/component/activemq/activemq.json | 4 +-
.../services/org/apache/camel/component.properties | 4 +-
.../src/main/docs/activemq-component.adoc | 12 +-
.../camel/component/activemq/ActiveMQEndpoint.java | 4 +-
.../{camel-activemq => camel-activemq6}/pom.xml| 10 +-
.../activemq6/ActiveMQComponentConfigurer.java | 72 +
.../activemq6/ActiveMQEndpointConfigurer.java | 60
.../activemq6/ActiveMQEndpointUriFactory.java | 177
.../converter/ActiveMQConverterLoader.java | 63 +
.../converter/ActiveMQMessageConverterLoader.java | 65 +
.../camel/component/activemq6/activemq6.json} | 18 +-
.../services/org/apache/camel/TypeConverterLoader | 3 +
.../services/org/apache/camel/component.properties | 7 +
.../services/org/apache/camel/component/activemq6 | 2 +
.../apache/camel/configurer/activemq6-component| 2 +
.../org/apache/camel/configurer/activemq6-endpoint | 2 +
.../org/apache/camel/send-dynamic/activemq6| 2 +
.../org/apache/camel/urifactory/activemq6-endpoint | 2 +
.../src/main/docs/activemq6-component.adoc}| 22 +-
.../component/activemq6/ActiveMQComponent.java | 307 +
.../component/activemq6/ActiveMQConfiguration.java | 233
.../component/activemq6}/ActiveMQEndpoint.java | 8 +-
.../component/activemq6/ActiveMQQueueEndpoint.java | 101 +++
.../activemq6/ActiveMQSendDynamicAware.java| 25 ++
.../activemq6/ActiveMQTemporaryQueueEndpoint.java | 39 +++
.../activemq6/ActiveMQTemporaryTopicEndpoint.java | 33 +++
.../OriginalDestinationPropagateStrategy.java | 55
.../activemq6/converter/ActiveMQConverter.java | 38 +++
.../converter/ActiveMQMessageConverter.java| 97 +++
.../component/activemq6/converter/package.html | 30 ++
.../component/activemq6/ActiveMQITSupport.java | 64 +
.../camel/component/activemq6/ActiveMQRouteIT.java | 120
.../camel/component/activemq6/ActiveMQToDIT.java | 68 +
.../activemq6/ActiveMQToDSendDynamicIT.java| 70 +
.../src/test/resources/log4j2-test.properties | 28 ++
components/pom.xml | 1 +
.../org/apache/camel/main/components.properties| 1 +
.../modules/ROOT/examples/json/activemq6.json | 1 +
docs/components/modules/ROOT/nav.adoc | 3 +-
.../modules/ROOT/pages/activemq6-component.adoc| 1 +
.../component/ComponentsBuilderFactory.java| 4 +-
.../dsl/ActivemqComponentBuilderFactory.java | 10 +-
.../builder/endpoint/StaticEndpointBuilders.java | 62 -
.../dsl/ActiveMQEndpointBuilderFactory.java| 36 +--
.../camel-component-known-dependencies.properties | 1 +
.../camel-main-known-dependencies.properties | 1 +
.../{ActivemqUriDsl.kt => Activemq6UriDsl.kt} | 10 +-
.../camel/kotlin/components/ActivemqUriDsl.kt | 2 +-
parent/pom.xml | 6 +
55 files changed, 1939 insertions(+), 84 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 1222027c0a9..e62328dcf25 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -51,6 +51,11 @@
camel-activemq
4.7.0-SNAPSHOT
+
+org.apache.camel
+camel-activemq6
+4.7.0-SNAPSHOT
+
org.apache.camel
camel-amqp
diff --git a/catalog/camel-allcomponents/pom.xml
b/catalog/camel-allcomponents/pom.xml
index 1ad3d5e95c2..2dfc5615942 100644
--- a/catalog/camel-allcomponents/pom.xml
+++ b/catalog/camel-allcomponents/pom.xml
@@ -52,6 +52,11 @@
camel-activemq
${project.version}
+
+org.apache.camel
+camel-activemq6
+${project.version}
+
org.apache.camel
camel-amqp
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
index 73dcf99cd95..eda05e1c4c1 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/c
(camel) branch main updated: Change aws2 kinesis record body type to byte array (#14179)
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 a7e38a7d527 Change aws2 kinesis record body type to byte array (#14179)
a7e38a7d527 is described below
commit a7e38a7d52758351e07fb244c14e9e8e61a6cf10
Author: fanyang
AuthorDate: Sat May 18 16:16:40 2024 +0800
Change aws2 kinesis record body type to byte array (#14179)
Co-authored-by: Fan Yang
---
.../org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java | 2 +-
.../org/apache/camel/component/aws2/kinesis/Kinesis2Producer.java | 6 ++
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java
index 93209375dcd..fd9b1ee098d 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Consumer.java
@@ -303,7 +303,7 @@ public class Kinesis2Consumer extends
ScheduledBatchPollingConsumer implements R
protected Exchange createExchange(Shard shard, Record dataRecord) {
LOG.debug("Received Kinesis record with partition_key={}",
dataRecord.partitionKey());
Exchange exchange = createExchange(true);
-exchange.getIn().setBody(dataRecord.data().asInputStream());
+exchange.getIn().setBody(dataRecord.data().asByteArray());
exchange.getIn().setHeader(Kinesis2Constants.APPROX_ARRIVAL_TIME,
dataRecord.approximateArrivalTimestamp());
exchange.getIn().setHeader(Kinesis2Constants.PARTITION_KEY,
dataRecord.partitionKey());
exchange.getIn().setHeader(Kinesis2Constants.SEQUENCE_NUMBER,
dataRecord.sequenceNumber());
diff --git
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Producer.java
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Producer.java
index 1763dd3fe83..ce8903aa4ac 100644
---
a/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Producer.java
+++
b/components/camel-aws/camel-aws2-kinesis/src/main/java/org/apache/camel/component/aws2/kinesis/Kinesis2Producer.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.aws2.kinesis;
-import java.nio.ByteBuffer;
-
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.support.DefaultProducer;
@@ -57,12 +55,12 @@ public class Kinesis2Producer extends DefaultProducer {
}
private PutRecordRequest createRequest(Exchange exchange) {
-ByteBuffer body = exchange.getIn().getBody(ByteBuffer.class);
+byte[] body = exchange.getIn().getBody(byte[].class);
Object partitionKey =
exchange.getIn().getHeader(Kinesis2Constants.PARTITION_KEY);
Object sequenceNumber =
exchange.getIn().getHeader(Kinesis2Constants.SEQUENCE_NUMBER);
PutRecordRequest.Builder putRecordRequest = PutRecordRequest.builder();
-putRecordRequest.data(SdkBytes.fromByteBuffer(body));
+putRecordRequest.data(SdkBytes.fromByteArray(body));
putRecordRequest.streamName(getEndpoint().getConfiguration().getStreamName());
putRecordRequest.partitionKey(partitionKey.toString());
if (sequenceNumber != null) {
(camel) branch main updated: CAMEL-20216: Update jbang docs how to create kamelets
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 79496e0052d CAMEL-20216: Update jbang docs how to create kamelets
79496e0052d is described below
commit 79496e0052d705c9b4edcad1894f56fd642d5787
Author: Claus Ibsen
AuthorDate: Sat May 18 10:16:02 2024 +0200
CAMEL-20216: Update jbang docs how to create kamelets
---
.../modules/ROOT/pages/camel-jbang.adoc| 53 ++
1 file changed, 53 insertions(+)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
index 0336598c967..889b3ea6bb9 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
@@ -1176,6 +1176,59 @@ spec:
The Camel K JBang plugin also provides the bind command. It enhances the
arbitrary bind command with the option to directly create this resource on the
Kubernetes cluster. Please refer to the plugin documentation for more complex
examples and a full description on how to use the bind command options.
+=== Creating a new Kamelet
+
+You can create a new kamelet with the `init` command by using kamelet naming
convention.
+
+For example to create a new kamelet source, you can do:
+
+[source,bash]
+
+camel init cheese-source.kamelet.yaml
+
+
+This will create a basic kamelet (based on the timer source).
+
+And to use the kamelet you could create the following route:
+
+[source,yaml]
+
+- from:
+uri: "kamelet:cheese-source"
+parameters:
+ period: "2000"
+ message: "Hello World"
+steps:
+ - log: "${body}"
+
+
+If you want to create a sink kamelet, then you just name it with sink as
follows (based on log sink):
+
+[source,bash]
+
+camel init wine-sink.kamelet.yaml
+
+
+You can then change the route to use the wine kamelet as follows:
+
+[source,yaml]
+
+- from:
+uri: "kamelet:cheese-source"
+parameters:
+ period: "2000"
+ message: "Hello World"
+steps:
+ - to: "kamelet:wine-sink"
+
+
+If you want to create a new Kamelet based on an existing Kamelet, for example
to create a new sink based on the existing MySQL:
+
+[source,bash]
+
+camel init orderdb-sink.kamelet.yaml --from-kamelet=mysql-sink
+
+
=== Run from clipboard
You can also run Camel routes directly from the OS clipboard. This allows to
copy some code,
(camel) branch main updated (18ce26bc381 -> 66d9d230e99)
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 18ce26bc381 camel-core - Allow to use custom routes loaded that are configured via the Registry add 66d9d230e99 Upgrade spring-ws 4.0.11 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 (83d07ea457b -> 18ce26bc381)
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 83d07ea457b CAMEL-20782: disable MongoDB tests on ASF CI new 7379a54bae9 Make camel-java-dsl more flexible for parent classloader that other runtimes like SB/Quarkus may need to provide in a custom way. new 18ce26bc381 camel-core - Allow to use custom routes loaded that are configured via the Registry 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: .../java/org/apache/camel/impl/engine/DefaultRoutesLoader.java | 8 .../org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java | 9 - 2 files changed, 16 insertions(+), 1 deletion(-)
(camel) 01/02: Make camel-java-dsl more flexible for parent classloader that other runtimes like SB/Quarkus may need to provide in a custom way.
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 7379a54bae979e6a7cabf6f5850a89dc1727ac55
Author: Claus Ibsen
AuthorDate: Fri May 17 16:42:21 2024 +0200
Make camel-java-dsl more flexible for parent classloader that other
runtimes like SB/Quarkus may need to provide in a custom way.
---
.../org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git
a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
index 1021b543861..317693f93bd 100644
---
a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
+++
b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java
@@ -195,7 +195,7 @@ public class JavaRoutesBuilderLoader extends
ExtendedRouteBuilderLoaderSupport {
}
// include classloader from Camel, so we can load any already compiled
and loaded classes
-ClassLoader parent =
MethodHandles.lookup().lookupClass().getClassLoader();
+ClassLoader parent = resolveParentClassLoader();
if (parent instanceof URLClassLoader ucl) {
ClassLoader cl = new CamelJoorClassLoader(ucl, getCamelContext());
unit.withClassLoader(cl);
@@ -221,6 +221,13 @@ public class JavaRoutesBuilderLoader extends
ExtendedRouteBuilderLoaderSupport {
return result;
}
+/**
+ * Resolves the parent {@link ClassLoader} to use for compilation.
+ */
+protected ClassLoader resolveParentClassLoader() {
+return MethodHandles.lookup().lookupClass().getClassLoader();
+}
+
@Override
protected void doShutdown() throws Exception {
compiled.clear();
(camel) 02/02: camel-core - Allow to use custom routes loaded that are configured via the Registry
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 18ce26bc381bf299c8488e506e88172f0bf9ac69
Author: Claus Ibsen
AuthorDate: Fri May 17 17:07:28 2024 +0200
camel-core - Allow to use custom routes loaded that are configured via the
Registry
---
.../java/org/apache/camel/impl/engine/DefaultRoutesLoader.java| 8
1 file changed, 8 insertions(+)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
index 3270da91b8d..7b3590d0189 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
@@ -249,6 +249,14 @@ public class DefaultRoutesLoader extends ServiceSupport
implements RoutesLoader,
*/
protected RoutesBuilderLoader resolveService(String extension) {
final CamelContext ecc = getCamelContext();
+
+// check registry first
+for (RoutesBuilderLoader loader :
ecc.getRegistry().findByType(RoutesBuilderLoader.class)) {
+if (loader.isSupportedExtension(extension)) {
+return loader;
+}
+}
+
final FactoryFinder finder =
ecc.getCamelContextExtension().getBootstrapFactoryFinder(RoutesBuilderLoader.FACTORY_PATH);
// the marker files are generated with dot as dash
(camel) branch camel-4.4.x updated: CAMEL-20778: intercept EIP should not intercept doTry/doCatch/doFinally. (#14180)
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 3554f177d14 CAMEL-20778: intercept EIP should not intercept
doTry/doCatch/doFinally. (#14180)
3554f177d14 is described below
commit 3554f177d14bdcd7a65a77a60b7c5344b2ef96e2
Author: Denis Istomin
AuthorDate: Sat May 18 11:12:24 2024 +0500
CAMEL-20778: intercept EIP should not intercept doTry/doCatch/doFinally.
(#14180)
Co-authored-by: Claus Ibsen
---
.../apache/camel/spi/InterceptableProcessor.java | 35 ++
.../apache/camel/impl/engine/DefaultChannel.java | 39 ---
.../org/apache/camel/processor/CatchProcessor.java | 8 +++-
.../apache/camel/processor/FinallyProcessor.java | 9 +++-
.../org/apache/camel/processor/TryProcessor.java | 9 +++-
.../org/apache/camel/reifier/InterceptReifier.java | 1 +
.../intercept/InterceptDoTryCatchTest.java | 56 ++
7 files changed, 137 insertions(+), 20 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/InterceptableProcessor.java
b/core/camel-api/src/main/java/org/apache/camel/spi/InterceptableProcessor.java
new file mode 100644
index 000..a3463272a10
--- /dev/null
+++
b/core/camel-api/src/main/java/org/apache/camel/spi/InterceptableProcessor.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.spi;
+
+import org.apache.camel.Processor;
+
+/**
+ * To control whether a {@link Processor} can be intercepted via {@link
InterceptStrategy}.
+ *
+ * Some EIPs such as try/catch/finally cannot be intercepted.
+ */
+public interface InterceptableProcessor {
+
+/**
+ * Whether the processor can be intercepted or not.
+ *
+ * @return true to allow intercepting, false to skip.
+ */
+boolean canIntercept();
+
+}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
index 07539ebedc0..61ba5bc3c03 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
@@ -36,6 +36,7 @@ import org.apache.camel.spi.BacklogDebugger;
import org.apache.camel.spi.Debugger;
import org.apache.camel.spi.ErrorHandlerRedeliveryCustomizer;
import org.apache.camel.spi.InterceptStrategy;
+import org.apache.camel.spi.InterceptableProcessor;
import org.apache.camel.spi.ManagementInterceptStrategy;
import org.apache.camel.spi.MessageHistoryFactory;
import org.apache.camel.spi.Tracer;
@@ -228,24 +229,28 @@ public class DefaultChannel extends
CamelInternalProcessor implements Channel {
Collections.reverse(interceptors);
// wrap the output with the configured interceptors
Processor target = nextProcessor;
-for (InterceptStrategy strategy : interceptors) {
-Processor next = target == nextProcessor ? null : nextProcessor;
-// use the fine grained definition (eg the child if available).
Its always possible to get back to the parent
-Processor wrapped =
strategy.wrapProcessorInInterceptors(route.getCamelContext(), targetOutputDef,
target, next);
-if (!(wrapped instanceof AsyncProcessor)) {
-LOG.warn("Interceptor: {} at: {} does not return an
AsyncProcessor instance."
- + " This causes the asynchronous routing engine to
not work as optimal as possible."
- + " See more details at the InterceptStrategy
javadoc."
- + " Camel will use a bridge to adapt the interceptor
to the asynchronous routing engine,"
- + " but its not the most optimal solution. Please
consider changing your interceptor to comply.",
-strategy, definition);
-}
-if (!(wrapped
(camel) branch main updated: Upgrade spring 6.1.7
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 275a66d0d2b Upgrade spring 6.1.7 275a66d0d2b is described below commit 275a66d0d2b33778a0774ed32f87a5d425be7bcb Author: Claus Ibsen AuthorDate: Fri May 17 12:46:38 2024 +0200 Upgrade spring 6.1.7 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 5c2fa7991c5..ec0fc34a565 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -447,7 +447,7 @@ 3.2.5 3.2.3 3.1.1 -6.1.6 +6.1.7 3.1.4 6.2.4 4.0.10
(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 d3a860c10ba Regen
d3a860c10ba is described below
commit d3a860c10ba1b50f88999feaccd3f565468559f8
Author: Claus Ibsen
AuthorDate: Fri May 17 12:46:19 2024 +0200
Regen
---
.../org/apache/camel/springboot/catalog/components/paho-mqtt5.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/paho-mqtt5.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/paho-mqtt5.json
index 5f77dcbaadf..c76883adeb8 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/paho-mqtt5.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/paho-mqtt5.json
@@ -61,7 +61,8 @@
"CamelMqttQoS": { "index": 1, "kind": "header", "displayName": "",
"group": "consumer", "label": "consumer", "required": false, "javaType":
"Integer", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The quality of service of the incoming
message.", "constantName":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Constants#MQTT_QOS" },
"CamelPahoMqtt5Qos": { "index": 2, "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"Integer", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The client quality of service level (0-2).",
"constantName":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Constants#CAMEL_PAHO_MSG_QOS" },
"CamelPahoMqtt5Retained": { "index": 3, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"Boolean", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "Retain option.", "constantName":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Constants#CAMEL_PAHO_MSG_RETAINED"
},
-"CamelPahoMqtt5OverrideTopic": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The name of topic to override and send
to instead of topic specified on endpoint.", "constantName":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Constants#CAMEL_PAHO_OVERRIDE_TOPIC"
}
+"CamelPahoMqtt5OverrideTopic": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The name of topic to override and send
to instead of topic specified on endpoint.", "constantName":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Constants#CAMEL_PAHO_OVERRIDE_TOPIC"
},
+"CamelPahoMqtt5MsgProperties": { "index": 5, "kind": "header",
"displayName": "", "group": "producer", "label": "consumer,producer",
"required": false, "javaType":
"org.eclipse.paho.mqttv5.common.packet.MqttProperties", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description":
"Consumer: The properties set on the incoming message. Producer: The properties
to be set on the outgoing message.", "constantName":
"org.apache.camel.component.paho.mqtt5. [...]
},
"properties": {
"topic": { "index": 0, "kind": "path", "displayName": "Topic", "group":
"common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Name of the topic" },
(camel) branch main updated: CAMEL-20754: Support for MQTT 5 Publish Properties (#14175)
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 ddd2e40921a CAMEL-20754: Support for MQTT 5 Publish Properties (#14175)
ddd2e40921a is described below
commit ddd2e40921afb570a1dd78c34bd495bfc2b83ac2
Author: Henning Sudbrock
AuthorDate: Fri May 17 12:34:34 2024 +0200
CAMEL-20754: Support for MQTT 5 Publish Properties (#14175)
Adds a message header for MQTT 5 Publish Properties to the Paho MQTT 5
component. This enables support for the MQTT message headers introduced with
MQTT 5 (like, e.g., content-type, response-topic, message-expiry-interval, or
user properties; cf. section 3.3.2.3 of the MQTT 5 spec,
https://docs.oasis-open.org/mqtt/mqtt/v5.0/os/mqtt-v5.0-os.html).
When consuming a message, the contents of the Camel message header are
taken from the properties of the incoming MQT message; when producing an MQTT
message, the properties are taken from the Camel message header if available.
---
.../camel/catalog/components/paho-mqtt5.json | 3 +-
.../camel/component/paho/mqtt5/paho-mqtt5.json | 3 +-
.../component/paho/mqtt5/PahoMqtt5Constants.java | 5
.../component/paho/mqtt5/PahoMqtt5Consumer.java| 1 +
.../component/paho/mqtt5/PahoMqtt5Producer.java| 4 +++
.../integration/PahoMqtt5ComponentMqtt5IT.java | 34 ++
.../dsl/PahoMqtt5EndpointBuilderFactory.java | 14 +
7 files changed, 62 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/paho-mqtt5.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/paho-mqtt5.json
index 54161f7f611..1038353b6a3 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/paho-mqtt5.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/paho-mqtt5.json
@@ -61,7 +61,8 @@
"CamelMqttQoS": { "index": 1, "kind": "header", "displayName": "",
"group": "consumer", "label": "consumer", "required": false, "javaType":
"Integer", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The quality of service of the incoming
message.", "constantName":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Constants#MQTT_QOS" },
"CamelPahoMqtt5Qos": { "index": 2, "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"Integer", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The client quality of service level (0-2).",
"constantName":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Constants#CAMEL_PAHO_MSG_QOS" },
"CamelPahoMqtt5Retained": { "index": 3, "kind": "header", "displayName":
"", "group": "producer", "label": "producer", "required": false, "javaType":
"Boolean", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "Retain option.", "constantName":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Constants#CAMEL_PAHO_MSG_RETAINED"
},
-"CamelPahoMqtt5OverrideTopic": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The name of topic to override and send
to instead of topic specified on endpoint.", "constantName":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Constants#CAMEL_PAHO_OVERRIDE_TOPIC"
}
+"CamelPahoMqtt5OverrideTopic": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "producer", "required": false,
"javaType": "String", "deprecated": false, "depreca
(camel) branch main updated (f5035d583cc -> 4543f953c48)
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 f5035d583cc Bump com.sun.xml.messaging.saaj:saaj-impl from 3.0.3 to
3.0.4 (#14174)
add 4543f953c48 CAMEL-20778: intercept EIP should not intercept
doTry/doCatch/doFinally.
No new revisions were added by this update.
Summary of changes:
...eProcessor.java => InterceptableProcessor.java} | 12 ---
.../apache/camel/impl/engine/DefaultChannel.java | 39 --
.../org/apache/camel/processor/CatchProcessor.java | 8 -
.../apache/camel/processor/FinallyProcessor.java | 9 -
.../org/apache/camel/processor/TryProcessor.java | 9 -
.../org/apache/camel/reifier/InterceptReifier.java | 1 +
...RouteTest.java => InterceptDoTryCatchTest.java} | 13 ++--
7 files changed, 64 insertions(+), 27 deletions(-)
copy
core/camel-api/src/main/java/org/apache/camel/spi/{WrapAwareProcessor.java =>
InterceptableProcessor.java} (72%)
copy
core/camel-core/src/test/java/org/apache/camel/processor/intercept/{InterceptSimpleRouteTest.java
=> InterceptDoTryCatchTest.java} (80%)
(camel) branch main updated (9cbaa0437c3 -> 6116c21e5cf)
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 9cbaa0437c3 Bump djl-version from 0.27.0 to 0.28.0 (#14172) add 6116c21e5cf Bump google-cloud-http-client-version from 1.44.1 to 1.44.2 (#14173) 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 (6116c21e5cf -> f5035d583cc)
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 6116c21e5cf Bump google-cloud-http-client-version from 1.44.1 to 1.44.2 (#14173) add f5035d583cc Bump com.sun.xml.messaging.saaj:saaj-impl from 3.0.3 to 3.0.4 (#14174) No new revisions were added by this update. Summary of changes: components/camel-soap/pom.xml | 2 +- components/camel-spring-ws/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(camel) branch main updated (539fa992224 -> 9cbaa0437c3)
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 539fa992224 Bump com.google.cloud:libraries-bom from 26.38.0 to 26.39.0 (#14171) add 9cbaa0437c3 Bump djl-version from 0.27.0 to 0.28.0 (#14172) 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: Bump com.google.cloud:libraries-bom from 26.38.0 to 26.39.0 (#14171)
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 539fa992224 Bump com.google.cloud:libraries-bom from 26.38.0 to 26.39.0 (#14171) 539fa992224 is described below commit 539fa992224886b59a800a2f9f919d1931780b26 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri May 17 09:03:36 2024 +0200 Bump com.google.cloud:libraries-bom from 26.38.0 to 26.39.0 (#14171) Bumps [com.google.cloud:libraries-bom](https://github.com/googleapis/java-cloud-bom) from 26.38.0 to 26.39.0. - [Release notes](https://github.com/googleapis/java-cloud-bom/releases) - [Changelog](https://github.com/googleapis/java-cloud-bom/blob/main/release-please-config.json) - [Commits](https://github.com/googleapis/java-cloud-bom/compare/v26.38.0...v26.39.0) --- updated-dependencies: - dependency-name: com.google.cloud:libraries-bom dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 6e7fb7a51eb..78933ca9ebd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -188,7 +188,7 @@ v4-rev20240423-2.0.0 v1-rev20240422-2.0.0 1.36.0 -26.38.0 +26.39.0 2.45.0 1.44.1 2.43.0
(camel) branch main updated (86de8cb2620 -> d0d30c1be84)
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 86de8cb2620 Remove unwanted warning for regex add d0d30c1be84 Bump aws-java-sdk2-version from 2.25.53 to 2.25.54 (#14170) 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: Upgrade to vertx 4.5.7
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 47d77164405 Upgrade to vertx 4.5.7 47d77164405 is described below commit 47d77164405e2e75a219fc59a113c50234036a8a Author: Claus Ibsen AuthorDate: Fri May 17 07:13:22 2024 +0200 Upgrade to vertx 4.5.7 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4a091ae65bf..fa7cf2a7a8e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -473,7 +473,7 @@ 0.10.4 3.1 2.3 -4.5.2 +4.5.7 0.7 5.0.0 4.10.0
(camel-spring-boot-examples) branch main updated: Adds http-ssl example (#130)
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-examples.git The following commit(s) were added to refs/heads/main by this push: new 19af663 Adds http-ssl example (#130) 19af663 is described below commit 19af663dc7ad6eee4d72229ee460bef88c9712c7 Author: Marco Carletti AuthorDate: Fri May 17 07:07:24 2024 +0200 Adds http-ssl example (#130) Co-authored-by: Croway --- README.adoc| 4 +- http-ssl/.gitignore| 3 + http-ssl/README.adoc | 66 +++ http-ssl/generate-certificates.sh | 54 + http-ssl/pom.xml | 64 +++ http-ssl/ssl-camel-server/pom.xml | 72 .../httpssl/HttpSslCamelServerApplication.java | 28 + .../example/httpssl/HttpSslCamelServerRouter.java | 30 + .../example/httpssl/SSLConfiguration.java | 47 .../src/main/resources/application.properties | 22 http-ssl/ssl-client/pom.xml| 124 + .../example/httpssl/HttpSslClientApplication.java | 28 + .../example/httpssl/HttpSslClientRouter.java | 36 ++ .../example/httpssl/SSLConfiguration.java | 64 +++ .../main/resources/application-oneway.properties | 18 +++ .../main/resources/application-twoways.properties | 18 +++ .../src/main/resources/application.properties | 26 + http-ssl/ssl-server/pom.xml| 118 .../example/httpssl/HttpSslServerApplication.java | 28 + .../example/httpssl/HttpSslServerRouter.java | 36 ++ .../main/resources/application-oneway.properties | 18 +++ .../main/resources/application-twoways.properties | 21 .../src/main/resources/application.properties | 29 + pom.xml| 1 + 24 files changed, 954 insertions(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 380ccb3..05af9df 100644 --- a/README.adoc +++ b/README.adoc @@ -27,7 +27,7 @@ readme's instructions. === Examples // examples: START -Number of Examples: 56 (0 deprecated) +Number of Examples: 57 (0 deprecated) [width="100%",cols="4,2,4",options="header"] |=== @@ -133,6 +133,8 @@ Number of Examples: 56 (0 deprecated) | link:reactive-streams/readme.adoc[Reactive Streams] (reactive-streams) | Reactive | An example that shows how Camel can exchange data using reactive streams with Spring Boot reactor +| link:http-ssl/README.adoc[Http Ssl] (http-ssl) | Rest | An example showing the Camel HTTP component with Spring Boot and SSL + | link:openapi-contract-first/readme.adoc[Openapi Contract First] (openapi-contract-first) | Rest | Contract First OpenAPI example | link:platform-http/README.adoc[Platform Http] (platform-http) | Rest | An example showing Camel REST DSL with platform HTTP diff --git a/http-ssl/.gitignore b/http-ssl/.gitignore new file mode 100644 index 000..2f75948 --- /dev/null +++ b/http-ssl/.gitignore @@ -0,0 +1,3 @@ +ssl +*.jks +*.pem diff --git a/http-ssl/README.adoc b/http-ssl/README.adoc new file mode 100644 index 000..47ec73d --- /dev/null +++ b/http-ssl/README.adoc @@ -0,0 +1,66 @@ +== Spring Boot Example with HTTP and SSL + +=== Introduction + +This example shows how to configure SSL in different scenarios: + +1. one way SSL, the server exposes REST API using SSL and the client trusts the server certificate. The SSL server configuration is managed by Spring Boot and the Camel inherit it, the SSL client configuration is managed by Camel in HTTP component +2. two ways SSL, the server and the client check both certificates in a mutual trusted handshake +3. same scenario as point 1 but the server configuration is managed directly in Camel (undertow component) instead of Spring Boot + +=== Prerequisites + +keytool installed and available on PATH + +Generate certificates and keystores + +$ ./generate-certificates.sh + +=== Run using one way ssl (server validation on client side) + +Start ssl-server in a separate terminal: + +$ mvn spring-boot:run -f ssl-server/pom.xml + +Start ssl-client in a separate terminal: + +$ mvn spring-boot:run -f ssl-client/pom.xml + +=== Run using two ways ssl (mutual validation) + +Start ssl-server in a separate terminal: + +$ mvn spring-boot:run -f ssl-server/pom.xml -Ptwoways + +Start ssl-client in a separate terminal: + +$ mvn spring-boot:run -f ssl-client/pom.xml -Ptwoways + +=== Run using Camel component as server + +Start ssl-camel-server in a separate terminal: + +$ mvn spring-boot:run -f ssl-camel-server/pom.xml + +Start ssl-client in a separate terminal: + +$ mvn spring-boot:run -f ssl-client/pom.xm
(camel) branch main updated: camel-jbang - Upgrade to Quarkus 3.10.1
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 89d7d8ba9be camel-jbang - Upgrade to Quarkus 3.10.1
89d7d8ba9be is described below
commit 89d7d8ba9bed5559faef4edf1fe1062e2abd638d
Author: Claus Ibsen
AuthorDate: Fri May 17 07:06:46 2024 +0200
camel-jbang - Upgrade to Quarkus 3.10.1
---
.../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 4 ++--
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 4 ++--
.../camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java | 2 +-
3 files changed, 5 insertions(+), 5 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 e01a9fc7622..b0d012a6f2b 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
@@ -163,8 +163,8 @@ abstract class ExportBaseCommand extends CamelCommand {
protected String quarkusArtifactId = "quarkus-bom";
@CommandLine.Option(names = { "--quarkus-version" }, description =
"Quarkus Platform version",
-defaultValue = "3.10.0")
-protected String quarkusVersion = "3.10.0";
+defaultValue = "3.10.1")
+protected String quarkusVersion = "3.10.1";
@CommandLine.Option(names = { "--maven-wrapper" }, defaultValue = "true",
description = "Include Maven Wrapper files in exported
project")
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 480a08e0759..311f2fb6789 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
@@ -141,8 +141,8 @@ public class Run extends CamelCommand {
String kameletsVersion;
@Option(names = { "--quarkus-version" }, description = "Quarkus Platform
version",
-defaultValue = "3.10.0")
-String quarkusVersion = "3.10.0";
+defaultValue = "3.10.1")
+String quarkusVersion = "3.10.1";
@Option(names = { "--spring-boot-version" }, description = "Spring Boot
version",
defaultValue = "3.2.5")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
index 4c75c63e509..926d85c8360 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
@@ -49,7 +49,7 @@ public abstract class CatalogBaseCommand extends CamelCommand
{
String runtime;
@CommandLine.Option(names = { "--quarkus-version" }, description =
"Quarkus Platform version",
-defaultValue = "3.10.0")
+defaultValue = "3.10.1")
String quarkusVersion;
@CommandLine.Option(names = { "--repos" },
(camel) branch main updated: Polished
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 af9689af0ea Polished
af9689af0ea is described below
commit af9689af0ea71b5b8d97a265e158d4c1afe2fa79
Author: Claus Ibsen
AuthorDate: Thu May 16 17:36:52 2024 +0200
Polished
---
.../apache/camel/core/xml/util/jsse/AbstractJsseUtilFactoryBean.java | 5 -
1 file changed, 5 deletions(-)
diff --git
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractJsseUtilFactoryBean.java
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractJsseUtilFactoryBean.java
index 80dec6b6cfe..66d45e5ae02 100644
---
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractJsseUtilFactoryBean.java
+++
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/util/jsse/AbstractJsseUtilFactoryBean.java
@@ -23,11 +23,6 @@ public abstract class AbstractJsseUtilFactoryBean extends
AbstractCamelFactor
@Override
public abstract T getObject() throws Exception;
-@Override
-public boolean isSingleton() {
-return true;
-}
-
@Override
public abstract Class getObjectType();
}
(camel) branch main updated: CAMEL-20777: Update intercept docs for camel v4 where intercept is to be configured via route configurations.
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 f5c1491b30f CAMEL-20777: Update intercept docs for camel v4 where
intercept is to be configured via route configurations.
f5c1491b30f is described below
commit f5c1491b30feec4618bd137372c9cd44703a31f4
Author: Claus Ibsen
AuthorDate: Thu May 16 17:27:26 2024 +0200
CAMEL-20777: Update intercept docs for camel v4 where intercept is to be
configured via route configurations.
---
.../main/docs/modules/eips/pages/intercept.adoc| 37 +-
1 file changed, 1 insertion(+), 36 deletions(-)
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/intercept.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/intercept.adoc
index b63b491813b..25a73f2a1a1 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/intercept.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/intercept.adoc
@@ -23,44 +23,9 @@ messages from this endpoint, then the `interceptFrom` is not
triggered.
=== Interceptor scopes
-All the interceptors can be configured on global, route scope, or with
+All the interceptors can be configured on global, or with
xref:manual::route-configuration.adoc[Route Configuration].
-This means multiple interceptors can be _triggered_.
-
-Most of the examples in this page are on global scope.
-To use route scope, then it is similar, but it is done on the route as shown
in the following example:
-
-[tabs]
-
-
-Java::
-+
-
-[source,java]
--
-from("jms:queue:order")
- .intercept().to("log:hello").end() // intercepts only in this route
- .to("bean:validateOrder")
- .to("bean:processOrder");
--
-
-XML::
-+
-[source,xml]
-
-
-
-
-
-
-
-
-
-
-
-
-
=== Common features of the interceptors
All these interceptors support the following features:
(camel) branch main updated: Camel-20439: move camel-cloudevent api to camel-api (#14160)
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 d13da7ce834 Camel-20439: move camel-cloudevent api to camel-api (#14160) d13da7ce834 is described below commit d13da7ce83453c025d8081803b6fd34927bd5de8 Author: Jono Morris AuthorDate: Thu May 16 23:58:11 2024 +1200 Camel-20439: move camel-cloudevent api to camel-api (#14160) * CAMEL-20439 move camel-cloudevents api to camel-api * CAMEL-20439 update imports on component classes * CAMEL-20439 generated change * CAMEL-20439 remove camel-cloudevents from component poms * CAMEL-20439 add note to upgrade guide --- components/camel-aws/camel-aws-cloudtrail/pom.xml | 8 -- .../CloudtrailCloudEventDataTypeTransformer.java | 4 +- components/camel-aws/camel-aws2-ddb/pom.xml| 8 -- .../Ddb2StreamCloudEventDataTypeTransformer.java | 4 +- components/camel-aws/camel-aws2-kinesis/pom.xml| 8 -- .../KinesisCloudEventDataTypeTransformer.java | 4 +- components/camel-aws/camel-aws2-s3/pom.xml | 8 -- .../AWS2S3CloudEventDataTypeTransformer.java | 4 +- .../AWS2S3CloudEventDataTypeTransformerTest.java | 2 +- .../transform/AWS2S3TransformCloudEventsTest.java | 85 +- components/camel-aws/camel-aws2-sqs/pom.xml| 8 -- .../AWS2SQSCloudEventDataTypeTransformer.java | 4 +- .../AWS2SQSCloudEventDataTypeTransformerTest.java | 2 +- .../camel-azure/camel-azure-cosmosdb/pom.xml | 8 -- .../CosmosDbCloudEventDataTypeTransformer.java | 4 +- .../camel-azure/camel-azure-eventhubs/pom.xml | 8 -- .../EventHubsCloudEventDataTypeTransformer.java| 4 +- components/camel-azure/camel-azure-files/pom.xml | 10 --- .../AzureFilesCloudEventDataTypeTransformer.java | 4 +- .../camel-azure/camel-azure-servicebus/pom.xml | 8 -- .../ServicebusCloudEventDataTypeTransformer.java | 4 +- .../camel-azure/camel-azure-storage-blob/pom.xml | 8 -- ...reStorageBlobCloudEventDataTypeTransformer.java | 4 +- ...orageBlobCloudEventDataTypeTransformerTest.java | 2 +- .../camel-azure-storage-datalake/pom.xml | 9 --- .../DataLakeCloudEventDataTypeTransformer.java | 4 +- .../camel-azure/camel-azure-storage-queue/pom.xml | 8 -- ...eStorageQueueCloudEventDataTypeTransformer.java | 4 +- .../cloudevents/CloudEventTypeConverterLoader.java | 2 +- .../cloudevents/CloudEventTypeConverter.java | 2 + .../CloudEventHttpDataTypeTransformer.java | 4 +- .../CloudEventJsonDataTypeTransformer.java | 4 +- .../CloudEventHttpDataTypeTransformerTest.java | 4 +- .../CloudEventJsonDataTypeTransformerTest.java | 4 +- .../camel-google/camel-google-calendar/pom.xml | 8 -- ...alendarStreamCloudEventDataTypeTransformer.java | 4 +- components/camel-google/camel-google-mail/pom.xml | 8 -- ...gleMailStreamCloudEventDataTypeTransformer.java | 4 +- .../camel-google/camel-google-pubsub/pom.xml | 8 -- .../GooglePubsubCloudEventDataTypeTransformer.java | 4 +- .../camel-google/camel-google-sheets/pom.xml | 8 -- ...eSheetsStreamCloudEventDataTypeTransformer.java | 4 +- .../camel-google/camel-google-storage/pom.xml | 8 -- ...GoogleStorageCloudEventDataTypeTransformer.java | 4 +- ...leStorageCloudEventDataTypeTransformerTest.java | 2 +- components/camel-knative/camel-knative-api/pom.xml | 5 -- .../knative/spi/KnativeTransportConfiguration.java | 2 +- .../component/knative/KnativeConfiguration.java| 2 +- .../camel/component/knative/KnativeEndpoint.java | 4 +- .../knative/ce/AbstractCloudEventProcessor.java| 2 +- .../component/knative/ce/CloudEventProcessor.java | 2 +- .../component/knative/ce/CloudEventProcessors.java | 4 +- .../component/knative/http/KnativeHttpSupport.java | 2 +- .../component/knative/http/KnativeHttpTest.java| 4 +- .../knative/http/KnativeHttpTestSupport.java | 2 +- components/camel-slack/pom.xml | 8 -- .../SlackCloudEventDataTypeTransformer.java| 4 +- .../org/apache/camel}/cloudevents/CloudEvent.java | 2 +- .../camel}/cloudevents/CloudEventAttributes.java | 4 +- .../org/apache/camel}/cloudevents/CloudEvents.java | 2 +- .../ROOT/pages/camel-4x-upgrade-guide-4_7.adoc | 3 + 61 files changed, 106 insertions(+), 266 deletions(-) diff --git a/components/camel-aws/camel-aws-cloudtrail/pom.xml b/components/camel-aws/camel-aws-cloudtrail/pom.xml index 74c87abfb0a..fd094a74132 100644 --- a/components/camel-aws/camel-aws-cloudtrail/pom.xml +++ b/components/camel-aws/camel-aws-cloudtrail/pom.xml @@ -55,14 +55,6 @@ camel-health - - -org.apache.camel -camel-cloudevents -provided -true
(camel) branch main updated: camel-jbang - Make the commands for controlling routes more intuitive.
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 cbca57a14d2 camel-jbang - Make the commands for controlling routes
more intuitive.
cbca57a14d2 is described below
commit cbca57a14d2d0d1dfd9ff583a8e358e90a9cfe55
Author: Claus Ibsen
AuthorDate: Thu May 16 10:09:38 2024 +0200
camel-jbang - Make the commands for controlling routes more intuitive.
---
.../user-manual/modules/ROOT/pages/camel-jbang.adoc | 21 ++---
.../core/commands/action/CamelRouteAction.java | 12 +---
.../jbang/core/commands/action/LoggerAction.java| 14 --
.../dsl/jbang/core/commands/process/ListMetric.java | 3 ++-
.../jbang/core/commands/process/ListVariable.java | 1 -
.../dsl/jbang/core/commands/process/ListVault.java | 6 +-
6 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
index c5a22c954c0..0336598c967 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
@@ -1595,18 +1595,33 @@ To start the routes, you can do:
camel cmd start-route chuck
-To stop _all_ routes in every Camel integration you need to use the `--all`
flag as follows:
+To stop _all_ routes in every Camel integration:
[source,bash]
-camel cmd stop-route --all
+camel cmd stop-route
And you can start _all_ routes using:
[source,bash]
-camel cmd start-route --all
+camel cmd start-route
+
+
+To start a specific route, you need to use `--id` parameter such as the
following,
+which will start routes named `route1` in all running integrations:
+
+[source,bash]
+
+camel cmd start-route --id=route1
+
+
+If you want to do this in a specific integration you must include the name or
pid:
+
+[source,bash]
+
+camel cmd start-route bar --id=route1
TIP: You can stop one or more route by their ids by separating using
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteAction.java
index a23d3602b6f..850449baa0e 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteAction.java
@@ -27,11 +27,7 @@ import picocli.CommandLine;
public abstract class CamelRouteAction extends ActionBaseCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel
integration", arity = "0..1")
-String name;
-
-@CommandLine.Option(names = { "--all" },
-description = "To select all running Camel
integrations")
-boolean all;
+String name = "*";
@CommandLine.Option(names = { "--id" },
description = "Route ids (multiple ids can be
separated by comma)", defaultValue = "*")
@@ -43,12 +39,6 @@ public abstract class CamelRouteAction extends
ActionBaseCommand {
@Override
public Integer doCall() throws Exception {
-if (!all && name == null) {
-return 0;
-} else if (all) {
-name = "*";
-}
-
List pids = findPids(name);
for (long pid : pids) {
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java
index a68a390c9d0..dafe576727f 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java
@@ -39,17 +39,13 @@ import picocli.CommandLine;
description = "List or change logging levels",
sortOptions = false)
public class LoggerAction extends ActionBaseCommand {
+@CommandLine.Parameters(description = "Name or pid of running Camel
integration", arity = "0..1")
+String name = "*";
+
@CommandLine.Option(names = { "--sort" }, completionCandidates =
PidNameAgeCompletionCandidates.class,
description = "Sort by pid, name or age", defaultValue
= "pid")
String sort;
-@CommandLine.Parameters(description = "Name or pid of running Camel
integration", arit
(camel) branch main updated: Bump aws-java-sdk2-version from 2.25.52 to 2.25.53 (#14166)
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 f626d47145b Bump aws-java-sdk2-version from 2.25.52 to 2.25.53 (#14166) f626d47145b is described below commit f626d47145b52a51c22bb1d211ba99971985e475 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu May 16 09:28:51 2024 +0200 Bump aws-java-sdk2-version from 2.25.52 to 2.25.53 (#14166) Bumps `aws-java-sdk2-version` from 2.25.52 to 2.25.53. Updates `software.amazon.awssdk:sqs` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:kinesis` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:s3` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:sns` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:cloudwatch` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:ec2` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:eventbridge` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:iam` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:kms` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:lambda` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:secretsmanager` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:sts` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:dynamodb` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:config` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:apache-client` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:athena` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:bedrock` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:bedrockruntime` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:bedrockagent` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:bedrockagentruntime` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:cloudtrail` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:ecs` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:eks` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:netty-nio-client` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:firehose` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:kafka` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:mq` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:redshiftdata` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:ses` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:sfn` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:timestreamquery` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:timestreamwrite` from 2.25.52 to 2.25.53 Updates `software.amazon.awssdk:translate` from 2.25.52 to 2.25.53 --- updated-dependencies: - dependency-name: software.amazon.awssdk:sqs dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:kinesis dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:s3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sns dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:cloudwatch dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:ec2 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:eventbridge dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:iam dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:kms dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:lambda dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:secretsmanager dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sts dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:dynamodb dependency-type: direct:production update-type: version-update:semver
(camel) branch redis-flush deleted (was b8d80048c4c)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch redis-flush in repository https://gitbox.apache.org/repos/asf/camel.git was b8d80048c4c CAMEL-20768: camel-spring-redis - SpringRedisIdempotentRepository flushes DB on start 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-20768: camel-spring-redis - SpringRedisIdempotentRepository flushes DB on start (#14165)
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 00c3180f899 CAMEL-20768: camel-spring-redis -
SpringRedisIdempotentRepository flushes DB on start (#14165)
00c3180f899 is described below
commit 00c3180f899735b13e5f9d079064ca667882eae5
Author: Claus Ibsen
AuthorDate: Thu May 16 09:25:05 2024 +0200
CAMEL-20768: camel-spring-redis - SpringRedisIdempotentRepository flushes
DB on start (#14165)
---
.../beans/SpringRedisIdempotentRepository.json| 2 +-
.../SpringRedisIdempotentRepositoryConfigurer.java| 6 ++
.../camel/bean/SpringRedisIdempotentRepository.json | 2 +-
.../idempotent/SpringRedisIdempotentRepository.java | 19 ++-
4 files changed, 26 insertions(+), 3 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/SpringRedisIdempotentRepository.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/SpringRedisIdempotentRepository.json
index 715dbbf12ce..c73efef56b7 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/SpringRedisIdempotentRepository.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/SpringRedisIdempotentRepository.json
@@ -10,7 +10,7 @@
"groupId": "org.apache.camel",
"artifactId": "camel-spring-redis",
"version": "4.7.0-SNAPSHOT",
-"properties": { "repositoryName": { "index": 0, "kind": "property",
"displayName": "Repository Name", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Name of repository" }, "redisConfiguration": {
"index": 1, "kind": "property", "displayName": "Redis Configuration",
"required": false, "type": "object", "javaType":
"org.apache.camel.component.redis.RedisConfiguration", "deprecated": false, "a
[...]
+"properties": { "repositoryName": { "index": 0, "kind": "property",
"displayName": "Repository Name", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Name of repository" }, "redisConfiguration": {
"index": 1, "kind": "property", "displayName": "Redis Configuration",
"required": false, "type": "object", "javaType":
"org.apache.camel.component.redis.RedisConfiguration", "deprecated": false, "a
[...]
}
}
diff --git
a/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/processor/idempotent/SpringRedisIdempotentRepositoryConfigurer.java
b/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/processor/idempotent/SpringRedisIdempotentRepositoryConfigurer.java
index e5ffc4b7cf4..dedd38d59b6 100644
---
a/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/processor/idempotent/SpringRedisIdempotentRepositoryConfigurer.java
+++
b/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/processor/idempotent/SpringRedisIdempotentRepositoryConfigurer.java
@@ -23,6 +23,8 @@ public class SpringRedisIdempotentRepositoryConfigurer
extends org.apache.camel.
public boolean configure(CamelContext camelContext, Object obj, String
name, Object value, boolean ignoreCase) {
org.apache.camel.component.redis.processor.idempotent.SpringRedisIdempotentRepository
target =
(org.apache.camel.component.redis.processor.idempotent.SpringRedisIdempotentRepository)
obj;
switch (ignoreCase ? name.toLowerCase() : name) {
+case "flushonstartup":
+case "flushOnStartup": target.setFlushOnStartup(property(camelContext,
boolean.class, value)); return true;
case "repositoryname":
case "repositoryName": target.setRepositoryName(property(camelContext,
java.lang.String.class, value)); return true;
default: return false;
@@ -32,6 +34,8 @@ public class SpringRedisIdempotentRepositoryConfigurer
extends org.apache.camel.
@Override
public Class getOptionType(String name, boolean ignoreCase) {
switch (i
(camel) branch main updated: CAMEL-20773: camel-health - Consumer health checks should be skipped for non autoStartup routes (#14164)
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 389972d544c CAMEL-20773: camel-health - Consumer health checks should
be skipped for non autoStartup routes (#14164)
389972d544c is described below
commit 389972d544cbe4368f171b5472e08a17dbe58256
Author: Claus Ibsen
AuthorDate: Thu May 16 09:24:54 2024 +0200
CAMEL-20773: camel-health - Consumer health checks should be skipped for
non autoStartup routes (#14164)
---
.../java/org/apache/camel/impl/health/ConsumerHealthCheck.java| 4 +++-
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc| 8
docs/user-manual/modules/ROOT/pages/health-check.adoc | 5 +
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git
a/core/camel-health/src/main/java/org/apache/camel/impl/health/ConsumerHealthCheck.java
b/core/camel-health/src/main/java/org/apache/camel/impl/health/ConsumerHealthCheck.java
index 988b6a03672..bbb112111c4 100644
---
a/core/camel-health/src/main/java/org/apache/camel/impl/health/ConsumerHealthCheck.java
+++
b/core/camel-health/src/main/java/org/apache/camel/impl/health/ConsumerHealthCheck.java
@@ -48,7 +48,9 @@ public class ConsumerHealthCheck extends RouteHealthCheck {
protected void doCallCheck(HealthCheckResultBuilder builder, Map options) {
// only need to do consumer check if the route is UP
boolean up = builder.state().compareTo(State.UP) == 0;
-if (up && consumer instanceof HealthCheckAware) {
+// if a route is configured to not to automatically start, then skip
consumer checks
+boolean external = route.getRouteController() == null &&
!route.isAutoStartup();
+if (up && !external && consumer instanceof HealthCheckAware) {
// health check is optional
HealthCheck hc = ((HealthCheckAware) consumer).getHealthCheck();
if (hc != null) {
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
index 14d8478abed..8d6c3bc79db 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
@@ -13,6 +13,14 @@ Add default values to `ThrottlingExceptionRoutePolicy` route
policy.
The `EndpointRegistry` interface has been slightly changed to now directly
extends `Map`
instead of being a parameterized type. This may cause some compilation
failures if the code is declaring a variable for the registry.
+=== camel-health
+
+Routes which has are set to **not** auto-startup are reported as UP in
health-checks.
+We have now implemented similar logic for the consumer health check as well
(the route and consumer health check are linked together).
+
+Previously a route that has not been started due to `auto-startup=false` would
still have its consumer health-check being executed,
+which could lead to DOWN due to consumer failing the check.
+
=== DSL
The Load Balancer EIP has aligned naming and the following balancers has been
renamed in XML and YAML DSL:
diff --git a/docs/user-manual/modules/ROOT/pages/health-check.adoc
b/docs/user-manual/modules/ROOT/pages/health-check.adoc
index 5e579814dba..baefeeb1917 100644
--- a/docs/user-manual/modules/ROOT/pages/health-check.adoc
+++ b/docs/user-manual/modules/ROOT/pages/health-check.adoc
@@ -94,6 +94,11 @@ You can specify multiple patterns (and use wildcards) such
as:
camel.health.exclude-pattern = myroute,foo,bar*
+ Routes that are not automatically started
+
+If a route is configured to not to automatically start (`autoStartup=false`),
+then the route and its corresponding consumer health checks is always up as it
is externally managed.
+
=== Turning off consumer level health-checks
If routes health check is enabled then they will execute consumer
health-checks as well
(camel) branch hc-consumer-autostartup deleted (was de3b8a23c6c)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch hc-consumer-autostartup in repository https://gitbox.apache.org/repos/asf/camel.git was de3b8a23c6c Merge branch 'main' into hc-consumer-autostartup The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-spring-boot) branch main updated: 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 ddc0755e6e0 Regen
ddc0755e6e0 is described below
commit ddc0755e6e0659e73f743f15b95b76c04466
Author: Claus Ibsen
AuthorDate: Thu May 16 09:06:44 2024 +0200
Regen
---
.../springboot/catalog/components/activemq.json| 46 --
.../camel/springboot/catalog/components/amqp.json | 46 --
.../camel/springboot/catalog/components/jms.json | 46 --
.../springboot/catalog/components/salesforce.json | 2 +-
.../src/main/docs/activemq.json| 14 +++
.../springboot/ActiveMQComponentConfiguration.java | 28 +
.../camel-amqp-starter/src/main/docs/amqp.json | 14 +++
.../springboot/AMQPComponentConfiguration.java | 28 +
.../camel-jms-starter/src/main/docs/jms.json | 14 +++
.../jms/springboot/JmsComponentConfiguration.java | 28 +
.../src/main/docs/salesforce.json | 2 +-
.../SalesforceComponentConfiguration.java | 6 +--
tooling/camel-spring-boot-dependencies/pom.xml | 2 +-
13 files changed, 207 insertions(+), 69 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
index 843befb5e58..8a602a49bfd 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
@@ -118,17 +118,19 @@
"useMessageIDAsCorrelationID": { "index": 92, "kind": "property",
"displayName": "Use Message IDAs Correlation ID", "group": "advanced", "label":
"advanced", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration",
"configurationField": "configuration", "description": "Specifies whether
JMSMessageID should always be used as JMSC [...]
"waitForProvisionCorrelationToBeUpdatedCounter": { "index": 93, "kind":
"property", "displayName": "Wait For Provision Correlation To Be Updated
Counter", "group": "advanced", "label": "advanced", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 50, "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Number of times to wait for [...]
"waitForProvisionCorrelationToBeUpdatedThreadSleepingTime": { "index": 94,
"kind": "property", "displayName": "Wait For Provision Correlation To Be
Updated Thread Sleeping Time", "group": "advanced", "label": "advanced",
"required": false, "type": "duration", "javaType": "long", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "100",
"configurationClass": "org.apache.camel.component.jms.JmsConfiguration",
"configurationField": "configuration", "description": [...]
-"headerFilterStrategy": { "index": 95, "kind": "property", "displayName":
"Header Filter Strategy", "group": "filter", "label": "filter", "required":
false, "type": "object", "javaType":
"org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired":
false, "secret": false, "description": "To use a custom
org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel
message." },
-"errorHandlerLoggingLevel": { "index": 96, "kind": "property",
"displayName": "Error Hand
(camel) branch redis-flush created (now b8d80048c4c)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch redis-flush in repository https://gitbox.apache.org/repos/asf/camel.git at b8d80048c4c CAMEL-20768: camel-spring-redis - SpringRedisIdempotentRepository flushes DB on start This branch includes the following new commits: new b8d80048c4c CAMEL-20768: camel-spring-redis - SpringRedisIdempotentRepository flushes DB on start 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-20768: camel-spring-redis - SpringRedisIdempotentRepository flushes DB on start
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch redis-flush
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b8d80048c4cfe1969cc4565b13a89eeab743
Author: Claus Ibsen
AuthorDate: Thu May 16 09:03:51 2024 +0200
CAMEL-20768: camel-spring-redis - SpringRedisIdempotentRepository flushes
DB on start
---
.../beans/SpringRedisIdempotentRepository.json| 2 +-
.../SpringRedisIdempotentRepositoryConfigurer.java| 6 ++
.../camel/bean/SpringRedisIdempotentRepository.json | 2 +-
.../idempotent/SpringRedisIdempotentRepository.java | 19 ++-
4 files changed, 26 insertions(+), 3 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/SpringRedisIdempotentRepository.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/SpringRedisIdempotentRepository.json
index 715dbbf12ce..c73efef56b7 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/SpringRedisIdempotentRepository.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/beans/SpringRedisIdempotentRepository.json
@@ -10,7 +10,7 @@
"groupId": "org.apache.camel",
"artifactId": "camel-spring-redis",
"version": "4.7.0-SNAPSHOT",
-"properties": { "repositoryName": { "index": 0, "kind": "property",
"displayName": "Repository Name", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Name of repository" }, "redisConfiguration": {
"index": 1, "kind": "property", "displayName": "Redis Configuration",
"required": false, "type": "object", "javaType":
"org.apache.camel.component.redis.RedisConfiguration", "deprecated": false, "a
[...]
+"properties": { "repositoryName": { "index": 0, "kind": "property",
"displayName": "Repository Name", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "Name of repository" }, "redisConfiguration": {
"index": 1, "kind": "property", "displayName": "Redis Configuration",
"required": false, "type": "object", "javaType":
"org.apache.camel.component.redis.RedisConfiguration", "deprecated": false, "a
[...]
}
}
diff --git
a/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/processor/idempotent/SpringRedisIdempotentRepositoryConfigurer.java
b/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/processor/idempotent/SpringRedisIdempotentRepositoryConfigurer.java
index e5ffc4b7cf4..dedd38d59b6 100644
---
a/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/processor/idempotent/SpringRedisIdempotentRepositoryConfigurer.java
+++
b/components/camel-spring-redis/src/generated/java/org/apache/camel/component/redis/processor/idempotent/SpringRedisIdempotentRepositoryConfigurer.java
@@ -23,6 +23,8 @@ public class SpringRedisIdempotentRepositoryConfigurer
extends org.apache.camel.
public boolean configure(CamelContext camelContext, Object obj, String
name, Object value, boolean ignoreCase) {
org.apache.camel.component.redis.processor.idempotent.SpringRedisIdempotentRepository
target =
(org.apache.camel.component.redis.processor.idempotent.SpringRedisIdempotentRepository)
obj;
switch (ignoreCase ? name.toLowerCase() : name) {
+case "flushonstartup":
+case "flushOnStartup": target.setFlushOnStartup(property(camelContext,
boolean.class, value)); return true;
case "repositoryname":
case "repositoryName": target.setRepositoryName(property(camelContext,
java.lang.String.class, value)); return true;
default: return false;
@@ -32,6 +34,8 @@ public class SpringRedisIdempotentRepositoryConfigurer
extends org.apache.camel.
@Override
public Class getOptionType(String name, boolean ignoreCase) {
switch (ignoreCase ? name.toLowerCase() : name) {
+case "flushonstartup":
+case "flushOnStartup": return boolean.class;
case "repositoryname":
case "repositoryName&q
(camel) branch hc-consumer-autostartup updated (a025c495cc2 -> de3b8a23c6c)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch hc-consumer-autostartup
in repository https://gitbox.apache.org/repos/asf/camel.git
from a025c495cc2 CAMEL-20773: camel-health - Consumer health checks should
be skipped for non autoStartup routes
add e844404abe3 camel-salesforce: Document CLIENT_CREDENTIALS auth type.
add 042c9797bc9 (chores) camel-test-junit5: decouple the hasAnnotationCheck
add cc07a915dd4 (chores) camel-test-junit5: remove SpringBootTest from the
applyCamelPostProcessor
add 46b33293bd8 (chores) camel-test-junit5: move the JUnitPropertiesSource
to a separate class
add 75ff061a6db (chores) camel-test-junit5: decouple the logging from the
base class
add 427c19faa5d (chores) camel-test-junit5: decouple supported/unsupported
check
add 94a1f361dcf Regen for commit 427c19faa5d2e5a3534f244e30355ec7134422e5
(#14162)
add 25ce112d80e (chores) camel-core-base-engine: remove unused dependencies
add ed970335099 Regen
add de3b8a23c6c Merge branch 'main' into hc-consumer-autostartup
No new revisions were added by this update.
Summary of changes:
.../camel/catalog/components/salesforce.json | 2 +-
.../camel/component/salesforce/salesforce.json | 2 +-
.../src/main/docs/salesforce-component.adoc| 2 +-
.../component/salesforce/SalesforceComponent.java | 4 +-
.../apache/camel/test/junit5/CamelTestSupport.java | 88 +
.../camel/test/junit5/JunitPropertiesSource.java} | 28 +++---
.../camel/test/junit5/util/ExtensionHelper.java| 108 +
.../junit5/util/RouteCoverageDumperExtension.java | 54 +++
core/camel-base-engine/pom.xml | 14 ---
.../dsl/SalesforceComponentBuilderFactory.java | 6 +-
10 files changed, 204 insertions(+), 104 deletions(-)
copy
components/{camel-fastjson/src/test/java/org/apache/camel/component/fastjson/TestPojo.java
=>
camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/JunitPropertiesSource.java}
(64%)
create mode 100644
components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/ExtensionHelper.java
create mode 100644
components/camel-test/camel-test-junit5/src/main/java/org/apache/camel/test/junit5/util/RouteCoverageDumperExtension.java
(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 ed970335099 Regen
ed970335099 is described below
commit ed9703350998704c27c0c06413e3850c1a94c149
Author: Claus Ibsen
AuthorDate: Thu May 16 07:34:31 2024 +0200
Regen
---
.../builder/component/dsl/SalesforceComponentBuilderFactory.java| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
index 3de7a20ba21..d2c4ca5679a 100644
---
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
+++
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SalesforceComponentBuilderFactory.java
@@ -1386,9 +1386,9 @@ public interface SalesforceComponentBuilderFactory {
/**
* Explicit authentication method to be used, one of USERNAME_PASSWORD,
- * REFRESH_TOKEN or JWT. Salesforce component can auto-determine the
- * authentication method to use from the properties set, set this
- * property to eliminate any ambiguity.
+ * REFRESH_TOKEN, CLIENT_CREDENTIALS, or JWT. Salesforce component can
+ * auto-determine the authentication method to use from the properties
+ * set, set this property to eliminate any ambiguity.
*
* The option is a:
*
codeorg.apache.camel.component.salesforce.AuthenticationType/code
type.
(camel) branch hc-consumer-autostartup created (now a025c495cc2)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch hc-consumer-autostartup in repository https://gitbox.apache.org/repos/asf/camel.git at a025c495cc2 CAMEL-20773: camel-health - Consumer health checks should be skipped for non autoStartup routes This branch includes the following new commits: new a025c495cc2 CAMEL-20773: camel-health - Consumer health checks should be skipped for non autoStartup routes 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-20773: camel-health - Consumer health checks should be skipped for non autoStartup routes
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch hc-consumer-autostartup
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a025c495cc220fb3cf5c6fff64651eea10f8e17a
Author: Claus Ibsen
AuthorDate: Thu May 16 07:26:39 2024 +0200
CAMEL-20773: camel-health - Consumer health checks should be skipped for
non autoStartup routes
---
.../java/org/apache/camel/impl/health/ConsumerHealthCheck.java| 4 +++-
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc| 8
docs/user-manual/modules/ROOT/pages/health-check.adoc | 5 +
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git
a/core/camel-health/src/main/java/org/apache/camel/impl/health/ConsumerHealthCheck.java
b/core/camel-health/src/main/java/org/apache/camel/impl/health/ConsumerHealthCheck.java
index 988b6a03672..bbb112111c4 100644
---
a/core/camel-health/src/main/java/org/apache/camel/impl/health/ConsumerHealthCheck.java
+++
b/core/camel-health/src/main/java/org/apache/camel/impl/health/ConsumerHealthCheck.java
@@ -48,7 +48,9 @@ public class ConsumerHealthCheck extends RouteHealthCheck {
protected void doCallCheck(HealthCheckResultBuilder builder, Map options) {
// only need to do consumer check if the route is UP
boolean up = builder.state().compareTo(State.UP) == 0;
-if (up && consumer instanceof HealthCheckAware) {
+// if a route is configured to not to automatically start, then skip
consumer checks
+boolean external = route.getRouteController() == null &&
!route.isAutoStartup();
+if (up && !external && consumer instanceof HealthCheckAware) {
// health check is optional
HealthCheck hc = ((HealthCheckAware) consumer).getHealthCheck();
if (hc != null) {
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
index 14d8478abed..8d6c3bc79db 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
@@ -13,6 +13,14 @@ Add default values to `ThrottlingExceptionRoutePolicy` route
policy.
The `EndpointRegistry` interface has been slightly changed to now directly
extends `Map`
instead of being a parameterized type. This may cause some compilation
failures if the code is declaring a variable for the registry.
+=== camel-health
+
+Routes which has are set to **not** auto-startup are reported as UP in
health-checks.
+We have now implemented similar logic for the consumer health check as well
(the route and consumer health check are linked together).
+
+Previously a route that has not been started due to `auto-startup=false` would
still have its consumer health-check being executed,
+which could lead to DOWN due to consumer failing the check.
+
=== DSL
The Load Balancer EIP has aligned naming and the following balancers has been
renamed in XML and YAML DSL:
diff --git a/docs/user-manual/modules/ROOT/pages/health-check.adoc
b/docs/user-manual/modules/ROOT/pages/health-check.adoc
index 5e579814dba..baefeeb1917 100644
--- a/docs/user-manual/modules/ROOT/pages/health-check.adoc
+++ b/docs/user-manual/modules/ROOT/pages/health-check.adoc
@@ -94,6 +94,11 @@ You can specify multiple patterns (and use wildcards) such
as:
camel.health.exclude-pattern = myroute,foo,bar*
+ Routes that are not automatically started
+
+If a route is configured to not to automatically start (`autoStartup=false`),
+then the route and its corresponding consumer health checks is always up as it
is externally managed.
+
=== Turning off consumer level health-checks
If routes health check is enabled then they will execute consumer
health-checks as well
