(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
(camel) branch main updated: camel-main - Avoid adding duplicate properties location in camel-main
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 050c4c8b986 camel-main - Avoid adding duplicate properties location in
camel-main
050c4c8b986 is described below
commit 050c4c8b986fbde7a681825dd551193490c99cfa
Author: Claus Ibsen
AuthorDate: Wed May 15 20:26:40 2024 +0200
camel-main - Avoid adding duplicate properties location in camel-main
---
.../src/main/java/org/apache/camel/main/BaseMainSupport.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index b7f7f0fc6e3..8ef5d715da3 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -384,7 +384,9 @@ public abstract class BaseMainSupport extends BaseService {
if (profile != null) {
mainConfigurationProperties.setProfile(profile);
String loc = profilePropertyPlaceholderLocation(profile);
-defaultPropertyPlaceholderLocation = loc + "," +
defaultPropertyPlaceholderLocation;
+if (!defaultPropertyPlaceholderLocation.contains(loc)) {
+defaultPropertyPlaceholderLocation = loc + "," +
defaultPropertyPlaceholderLocation;
+}
}
locations
=
MainHelper.lookupPropertyFromSysOrEnv(MainConstants.PROPERTY_PLACEHOLDER_LOCATION)
(camel) branch jms-temp deleted (was aef4c892afe)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch jms-temp in repository https://gitbox.apache.org/repos/asf/camel.git was aef4c892afe CAMEL-20769: camel-jms: TemporaryReplyQueueExceptionListener may be causing an endless lock 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 jms-temp updated (cb63024968e -> aef4c892afe)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch jms-temp in repository https://gitbox.apache.org/repos/asf/camel.git from cb63024968e CAMEL-20769: camel-jms: TemporaryReplyQueueExceptionListener may be causing an endless lock add aef4c892afe CAMEL-20769: camel-jms: TemporaryReplyQueueExceptionListener may be causing an endless lock No new revisions were added by this update. Summary of changes: .../dsl/ActivemqComponentBuilderFactory.java | 39 ++ .../component/dsl/AmqpComponentBuilderFactory.java | 39 ++ .../component/dsl/JmsComponentBuilderFactory.java | 2 +- 3 files changed, 79 insertions(+), 1 deletion(-)
(camel) branch jms-temp updated: CAMEL-20769: camel-jms: TemporaryReplyQueueExceptionListener may be causing an endless lock
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch jms-temp
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/jms-temp by this push:
new cb63024968e CAMEL-20769: camel-jms:
TemporaryReplyQueueExceptionListener may be causing an endless lock
cb63024968e is described below
commit cb63024968e18fc77323399578f1eb1f4b8bfec2
Author: Claus Ibsen
AuthorDate: Wed May 15 16:36:38 2024 +0200
CAMEL-20769: camel-jms: TemporaryReplyQueueExceptionListener may be causing
an endless lock
---
.../org/apache/camel/catalog/components/activemq.json| 4 ++--
.../resources/org/apache/camel/catalog/components/amqp.json | 4 ++--
.../resources/org/apache/camel/catalog/components/jms.json | 4 ++--
.../org/apache/camel/component/activemq/activemq.json| 4 ++--
.../META-INF/org/apache/camel/component/amqp/amqp.json | 4 ++--
.../META-INF/org/apache/camel/component/jms/jms.json | 4 ++--
.../org/apache/camel/component/jms/JmsConfiguration.java | 2 +-
.../camel/component/jms/reply/ReplyManagerSupport.java | 2 +-
.../builder/endpoint/dsl/AMQPEndpointBuilderFactory.java | 12 ++--
.../builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java | 12 ++--
.../builder/endpoint/dsl/JmsEndpointBuilderFactory.java | 12 ++--
11 files changed, 32 insertions(+), 32 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
index 9f08908a75d..b4ed7dedf93 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/activemq.json
@@ -118,7 +118,7 @@
"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": [...]
-"waitForTemporaryReplyToToBeUpdatedCounter": { "index": 95, "kind":
"property", "displayName": "Wait For Temporary Reply To 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 tempora [...]
+"waitForTe
(camel) branch jms-temp created (now 91cc87c2938)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch jms-temp in repository https://gitbox.apache.org/repos/asf/camel.git at 91cc87c2938 CAMEL-20769: camel-jms: TemporaryReplyQueueExceptionListener may be causing an endless lock This branch includes the following new commits: new 91cc87c2938 CAMEL-20769: camel-jms: TemporaryReplyQueueExceptionListener may be causing an endless lock 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 m709 deleted (was 99409193b2f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch m709 in repository https://gitbox.apache.org/repos/asf/camel.git was 99409193b2f camel-core - Isolate some tests that are flaky on CI (#14156) 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: Upgrade mongodb container to 7.0.9 (#14157)
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 d59bb5c33db Upgrade mongodb container to 7.0.9 (#14157) d59bb5c33db is described below commit d59bb5c33db341d7f668a03a570d7c4e58a29520 Author: Claus Ibsen AuthorDate: Wed May 15 15:46:49 2024 +0200 Upgrade mongodb container to 7.0.9 (#14157) * Upgrade mongodb container to 7.0.9 * Make incremental-build action generic * Ref is required when $repo/$project is specified * camel-core - Isolate some tests that are flaky on CI (#14156) - Co-authored-by: Croway --- .../org/apache/camel/test/infra/mongodb/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties b/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties index b16550cc4dc..1fe8fe2c114 100644 --- a/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties +++ b/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -mongodb.container=mongo:7.0.4-jammy \ No newline at end of file +mongodb.container=mongo:7.0.9-jammy \ No newline at end of file
(camel) branch m709 updated (9f3649e825a -> 99409193b2f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch m709 in repository https://gitbox.apache.org/repos/asf/camel.git from 9f3649e825a Upgrade mongodb container to 7.0.9 add 1c9d533eb9b Make incremental-build action generic add 045353ada6b Ref is required when $repo/$project is specified add 99409193b2f camel-core - Isolate some tests that are flaky on CI (#14156) No new revisions were added by this update. Summary of changes: .github/actions/incremental-build/action.yaml | 8 ++-- .github/actions/incremental-build/incremental-build.sh | 14 -- .../apache/camel/support/jsse/FilterParametersTest.java| 2 ++ .../camel/support/jsse/KeyManagersParametersTest.java | 4 +++- .../apache/camel/support/jsse/KeyStoreParametersTest.java | 2 +- .../camel/support/jsse/SSLContextParametersTest.java | 4 +++- .../camel/support/jsse/SecureRandomParametersTest.java | 2 ++ .../camel/support/jsse/TrustManagersParametersTest.java| 4 +++- .../org/apache/camel/support/jsse/test.properties | 2 +- 9 files changed, 29 insertions(+), 13 deletions(-)
(camel) branch iso deleted (was 9d889f42c64)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch iso in repository https://gitbox.apache.org/repos/asf/camel.git was 9d889f42c64 camel-core - Isolate some tests that are flaky on CI 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-core - Isolate some tests that are flaky on CI (#14156)
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 b5dcef0fda6 camel-core - Isolate some tests that are flaky on CI
(#14156)
b5dcef0fda6 is described below
commit b5dcef0fda6b91d8db409c04c9f3544c10761ce9
Author: Claus Ibsen
AuthorDate: Wed May 15 14:04:38 2024 +0200
camel-core - Isolate some tests that are flaky on CI (#14156)
---
.../test/java/org/apache/camel/support/jsse/FilterParametersTest.java | 2 ++
.../java/org/apache/camel/support/jsse/KeyManagersParametersTest.java | 4 +++-
.../java/org/apache/camel/support/jsse/KeyStoreParametersTest.java| 2 +-
.../java/org/apache/camel/support/jsse/SSLContextParametersTest.java | 4 +++-
.../org/apache/camel/support/jsse/SecureRandomParametersTest.java | 2 ++
.../org/apache/camel/support/jsse/TrustManagersParametersTest.java| 4 +++-
.../src/test/resources/org/apache/camel/support/jsse/test.properties | 2 +-
7 files changed, 15 insertions(+), 5 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/FilterParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/FilterParametersTest.java
index 1d3754b6154..aaabdc92c2f 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/FilterParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/FilterParametersTest.java
@@ -22,9 +22,11 @@ import java.util.regex.Pattern;
import org.apache.camel.CamelContext;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import static org.junit.jupiter.api.Assertions.*;
+@Isolated("This test is regularly flaky")
public class FilterParametersTest extends AbstractJsseParametersTest {
@Test
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyManagersParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyManagersParametersTest.java
index 6187b4b6396..35faf6a5779 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyManagersParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyManagersParametersTest.java
@@ -27,9 +27,11 @@ import javax.net.ssl.X509KeyManager;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import static org.junit.jupiter.api.Assertions.*;
+@Isolated("This test is regularly flaky")
public class KeyManagersParametersTest extends AbstractJsseParametersTest {
protected KeyStoreParameters createMinimalKeyStoreParameters() {
@@ -63,7 +65,7 @@ public class KeyManagersParametersTest extends
AbstractJsseParametersTest {
ksp.setType("{{keyStoreParameters.type}}");
ksp.setProvider("{{keyStoreParameters.provider}}");
ksp.setResource("{{keyStoreParameters.resource}}");
-ksp.setPassword("{{keyStoreParamerers.password}}");
+ksp.setPassword("{{keyStoreParameters.password}}");
KeyManagersParameters kmp = new KeyManagersParameters();
kmp.setCamelContext(context);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java
index 11e83a1ee4c..fae068e7b8e 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java
@@ -56,7 +56,7 @@ public class KeyStoreParametersTest extends
AbstractJsseParametersTest {
ksp.setType("{{keyStoreParameters.type}}");
ksp.setProvider("{{keyStoreParameters.provider}}");
ksp.setResource("{{keyStoreParameters.resource}}");
-ksp.setPassword("{{keyStoreParamerers.password}}");
+ksp.setPassword("{{keyStoreParameters.password}}");
KeyStore ks = ksp.createKeyStore();
assertNotNull(ks.getCertificate("localhost"));
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java
index 9971e981646..cdbe21a823c 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java
@@ -30,9 +30,11 @@ import javax.net.ssl.SSLSocket;
import org.apache.camel.CamelContext;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import stat
(camel) 01/01: Upgrade mongodb container to 7.0.9
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch m709 in repository https://gitbox.apache.org/repos/asf/camel.git commit 9f3649e825abb85859756b220eca07a60a4f3ffd Author: Claus Ibsen AuthorDate: Wed May 15 13:53:57 2024 +0200 Upgrade mongodb container to 7.0.9 --- .../org/apache/camel/test/infra/mongodb/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties b/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties index b16550cc4dc..1fe8fe2c114 100644 --- a/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties +++ b/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -mongodb.container=mongo:7.0.4-jammy \ No newline at end of file +mongodb.container=mongo:7.0.9-jammy \ No newline at end of file
(camel) branch m709 created (now 9f3649e825a)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch m709 in repository https://gitbox.apache.org/repos/asf/camel.git at 9f3649e825a Upgrade mongodb container to 7.0.9 This branch includes the following new commits: new 9f3649e825a Upgrade mongodb container to 7.0.9 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 iso created (now 9d889f42c64)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch iso in repository https://gitbox.apache.org/repos/asf/camel.git at 9d889f42c64 camel-core - Isolate some tests that are flaky on CI This branch includes the following new commits: new 9d889f42c64 camel-core - Isolate some tests that are flaky on CI 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-core - Isolate some tests that are flaky on CI
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch iso
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9d889f42c648cf4fa5cf7f15e5ddd502ac263791
Author: Claus Ibsen
AuthorDate: Wed May 15 13:41:54 2024 +0200
camel-core - Isolate some tests that are flaky on CI
---
.../test/java/org/apache/camel/support/jsse/FilterParametersTest.java | 2 ++
.../java/org/apache/camel/support/jsse/KeyManagersParametersTest.java | 4 +++-
.../java/org/apache/camel/support/jsse/KeyStoreParametersTest.java| 2 +-
.../java/org/apache/camel/support/jsse/SSLContextParametersTest.java | 4 +++-
.../org/apache/camel/support/jsse/SecureRandomParametersTest.java | 2 ++
.../org/apache/camel/support/jsse/TrustManagersParametersTest.java| 4 +++-
.../src/test/resources/org/apache/camel/support/jsse/test.properties | 2 +-
7 files changed, 15 insertions(+), 5 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/FilterParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/FilterParametersTest.java
index 1d3754b6154..aaabdc92c2f 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/FilterParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/FilterParametersTest.java
@@ -22,9 +22,11 @@ import java.util.regex.Pattern;
import org.apache.camel.CamelContext;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import static org.junit.jupiter.api.Assertions.*;
+@Isolated("This test is regularly flaky")
public class FilterParametersTest extends AbstractJsseParametersTest {
@Test
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyManagersParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyManagersParametersTest.java
index 6187b4b6396..35faf6a5779 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyManagersParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyManagersParametersTest.java
@@ -27,9 +27,11 @@ import javax.net.ssl.X509KeyManager;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultCamelContext;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import static org.junit.jupiter.api.Assertions.*;
+@Isolated("This test is regularly flaky")
public class KeyManagersParametersTest extends AbstractJsseParametersTest {
protected KeyStoreParameters createMinimalKeyStoreParameters() {
@@ -63,7 +65,7 @@ public class KeyManagersParametersTest extends
AbstractJsseParametersTest {
ksp.setType("{{keyStoreParameters.type}}");
ksp.setProvider("{{keyStoreParameters.provider}}");
ksp.setResource("{{keyStoreParameters.resource}}");
-ksp.setPassword("{{keyStoreParamerers.password}}");
+ksp.setPassword("{{keyStoreParameters.password}}");
KeyManagersParameters kmp = new KeyManagersParameters();
kmp.setCamelContext(context);
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java
index 11e83a1ee4c..fae068e7b8e 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/KeyStoreParametersTest.java
@@ -56,7 +56,7 @@ public class KeyStoreParametersTest extends
AbstractJsseParametersTest {
ksp.setType("{{keyStoreParameters.type}}");
ksp.setProvider("{{keyStoreParameters.provider}}");
ksp.setResource("{{keyStoreParameters.resource}}");
-ksp.setPassword("{{keyStoreParamerers.password}}");
+ksp.setPassword("{{keyStoreParameters.password}}");
KeyStore ks = ksp.createKeyStore();
assertNotNull(ks.getCertificate("localhost"));
diff --git
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java
index 9971e981646..cdbe21a823c 100644
---
a/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/support/jsse/SSLContextParametersTest.java
@@ -30,9 +30,11 @@ import javax.net.ssl.SSLSocket;
import org.apache.camel.CamelContext;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
import static org.junit.jupiter.api.Assertions.*;
+@Isolated("This test is regularly flaky")
public class SSLContextParametersTest extends AbstractJsseParametersTest {
@Test
@
(camel) branch camel-4.4.x updated: CAMEL-20763: camel-support Handle special characters in REST templates (#14145)
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 3897de5f14e CAMEL-20763: camel-support Handle special characters in
REST templates (#14145)
3897de5f14e is described below
commit 3897de5f14ee96d430db0817305ce224a06178e1
Author: David Riseley <6659301+drise...@users.noreply.github.com>
AuthorDate: Wed May 15 11:23:38 2024 +0100
CAMEL-20763: camel-support Handle special characters in REST templates
(#14145)
Ensure that any hypens or underscores in parameters in REST templates
are removed before being parsed into a regular expression
---
.../support/RestConsumerContextPathMatcher.java| 28 ++-
.../RestConsumerContextPathMatcherTest.java| 31 ++
2 files changed, 58 insertions(+), 1 deletion(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/RestConsumerContextPathMatcher.java
b/core/camel-support/src/main/java/org/apache/camel/support/RestConsumerContextPathMatcher.java
index ba534ae8a44..1b5683c5854 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/RestConsumerContextPathMatcher.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/RestConsumerContextPathMatcher.java
@@ -39,6 +39,7 @@ import java.util.stream.Collectors;
*/
public final class RestConsumerContextPathMatcher {
+private static final Pattern CONSUMER_PATH_PARAMETER_PATTERN =
Pattern.compile("([^{]*)(\\{.*?\\})([^{]*)");
private static final Map PATH_PATTERN = new
ConcurrentHashMap<>();
private RestConsumerContextPathMatcher() {
@@ -252,9 +253,14 @@ public final class RestConsumerContextPathMatcher {
* @param consumerPath a consumer path
*/
public static void register(String consumerPath) {
+// Remove hyphens and underscores from parameter names
+// as these are not supported in regex named group names
+String regex = prepareConsumerPathRegex(consumerPath);
+
// Convert URI template to a regex pattern
-String regex = consumerPath
+regex = regex
.replace("/", "\\/")
+.replace("-", "\\-")
.replace("{", "(?<")
.replace("}", ">[^\\/]+)");
@@ -409,4 +415,24 @@ public final class RestConsumerContextPathMatcher {
return matcher.matches();
}
+/**
+ * Removes any hyphens or underscores from parameter names to create valid
java regex named group names
+ *
+ * @param consumerPath
+ * @return
+ */
+private static String prepareConsumerPathRegex(String consumerPath) {
+Matcher m = CONSUMER_PATH_PARAMETER_PATTERN.matcher(consumerPath);
+StringBuilder regexBuilder = new StringBuilder();
+while (m.find()) {
+m.appendReplacement(regexBuilder, m.group(1) +
m.group(2).replaceAll("[\\_\\-]", "") + m.group(3));
+}
+// No matches so return the original path
+if (regexBuilder.isEmpty()) {
+return consumerPath;
+} else {
+return regexBuilder.toString();
+}
+}
+
}
diff --git
a/core/camel-support/src/test/java/org/apache/camel/support/RestConsumerContextPathMatcherTest.java
b/core/camel-support/src/test/java/org/apache/camel/support/RestConsumerContextPathMatcherTest.java
index 067905951ab..44f82107369 100644
---
a/core/camel-support/src/test/java/org/apache/camel/support/RestConsumerContextPathMatcherTest.java
+++
b/core/camel-support/src/test/java/org/apache/camel/support/RestConsumerContextPathMatcherTest.java
@@ -18,9 +18,14 @@ package org.apache.camel.support;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -81,6 +86,32 @@ public class RestConsumerContextPathMatcherTest {
assertEquals(path.getConsumerPath(), "/camel/a/b/{c}");
}
+@ParameterizedTest
+@MethodSource
+public void testRestConsumerContextPathMatcherTemplateParseSuccess(String
consumerPath, String requestPath) {
+
+assertDoesNotThrow(() ->
RestConsumerContextPathMatcher.register(consumerPath));
+
+List>
consumerPaths = new ArrayList<>();
+consumerPaths.add(new Mo
(camel) branch main updated: CAMEL-20763: camel-support Handle special characters in REST templates (#14145)
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 66610aea8da CAMEL-20763: camel-support Handle special characters in
REST templates (#14145)
66610aea8da is described below
commit 66610aea8da63fb1977aaf7627ad954f3ef91f9b
Author: David Riseley <6659301+drise...@users.noreply.github.com>
AuthorDate: Wed May 15 11:23:38 2024 +0100
CAMEL-20763: camel-support Handle special characters in REST templates
(#14145)
Ensure that any hypens or underscores in parameters in REST templates
are removed before being parsed into a regular expression
---
.../support/RestConsumerContextPathMatcher.java| 28 ++-
.../RestConsumerContextPathMatcherTest.java| 31 ++
2 files changed, 58 insertions(+), 1 deletion(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/RestConsumerContextPathMatcher.java
b/core/camel-support/src/main/java/org/apache/camel/support/RestConsumerContextPathMatcher.java
index 100d0980e87..c0a8d0eb0ec 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/RestConsumerContextPathMatcher.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/RestConsumerContextPathMatcher.java
@@ -39,6 +39,7 @@ import java.util.stream.Collectors;
*/
public final class RestConsumerContextPathMatcher {
+private static final Pattern CONSUMER_PATH_PARAMETER_PATTERN =
Pattern.compile("([^{]*)(\\{.*?\\})([^{]*)");
private static final Map PATH_PATTERN = new
ConcurrentHashMap<>();
private RestConsumerContextPathMatcher() {
@@ -242,9 +243,14 @@ public final class RestConsumerContextPathMatcher {
* @param consumerPath a consumer path
*/
public static void register(String consumerPath) {
+// Remove hyphens and underscores from parameter names
+// as these are not supported in regex named group names
+String regex = prepareConsumerPathRegex(consumerPath);
+
// Convert URI template to a regex pattern
-String regex = consumerPath
+regex = regex
.replace("/", "\\/")
+.replace("-", "\\-")
.replace("{", "(?<")
.replace("}", ">[^\\/]+)");
@@ -394,4 +400,24 @@ public final class RestConsumerContextPathMatcher {
return matcher.matches();
}
+/**
+ * Removes any hyphens or underscores from parameter names to create valid
java regex named group names
+ *
+ * @param consumerPath
+ * @return
+ */
+private static String prepareConsumerPathRegex(String consumerPath) {
+Matcher m = CONSUMER_PATH_PARAMETER_PATTERN.matcher(consumerPath);
+StringBuilder regexBuilder = new StringBuilder();
+while (m.find()) {
+m.appendReplacement(regexBuilder, m.group(1) +
m.group(2).replaceAll("[\\_\\-]", "") + m.group(3));
+}
+// No matches so return the original path
+if (regexBuilder.isEmpty()) {
+return consumerPath;
+} else {
+return regexBuilder.toString();
+}
+}
+
}
diff --git
a/core/camel-support/src/test/java/org/apache/camel/support/RestConsumerContextPathMatcherTest.java
b/core/camel-support/src/test/java/org/apache/camel/support/RestConsumerContextPathMatcherTest.java
index 8f872fb194f..069a177eebc 100644
---
a/core/camel-support/src/test/java/org/apache/camel/support/RestConsumerContextPathMatcherTest.java
+++
b/core/camel-support/src/test/java/org/apache/camel/support/RestConsumerContextPathMatcherTest.java
@@ -18,9 +18,14 @@ package org.apache.camel.support;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -81,6 +86,32 @@ public class RestConsumerContextPathMatcherTest {
assertEquals(path.getConsumerPath(), "/camel/a/b/{c}");
}
+@ParameterizedTest
+@MethodSource
+public void testRestConsumerContextPathMatcherTemplateParseSuccess(String
consumerPath, String requestPath) {
+
+assertDoesNotThrow(() ->
RestConsumerContextPathMatcher.register(consumerPath));
+
+List>
consumerPaths = new ArrayList<>();
+consumerPaths.add(new Mo
(camel) branch main updated (924ee0ab663 -> b41efedd5f5)
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 924ee0ab663 CAMEL-20771: camel-jbang - Does not hot-reload java source changes add b41efedd5f5 Bump mockito-version from 5.11.0 to 5.12.0 (#14150) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch camel-4.4.x updated: CAMEL-20771: camel-jbang - Does not hot-reload java source changes
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 d5221711eb9 CAMEL-20771: camel-jbang - Does not hot-reload java source
changes
d5221711eb9 is described below
commit d5221711eb9398e97813ba50ba1c790d761857b9
Author: Claus Ibsen
AuthorDate: Wed May 15 11:13:38 2024 +0200
CAMEL-20771: camel-jbang - Does not hot-reload java source changes
---
.../org/apache/camel/language/joor/JavaJoorClassLoader.java | 12
.../apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java | 2 ++
2 files changed, 14 insertions(+)
diff --git
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaJoorClassLoader.java
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaJoorClassLoader.java
index e1694f04a9d..ab9dae26f78 100644
---
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaJoorClassLoader.java
+++
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaJoorClassLoader.java
@@ -76,6 +76,18 @@ public class JavaJoorClassLoader extends ClassLoader {
}
}
+public void removeClass(String name) {
+if (name != null) {
+classes.remove(name);
+if (compileDirectory != null) {
+String fname = name.replace('.', '/');
+fname = compileDirectory + "/" + fname + ".class";
+File target = new File(fname);
+FileUtil.deleteFile(target);
+}
+}
+}
+
private static void saveByteCodeToDisk(String outputDirectory, String
name, byte[] byteCode) {
// write to disk (can be triggered multiple times so only write once)
String fname = name.replace('.', '/');
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 73f74bbe366..1021b543861 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
@@ -188,6 +188,8 @@ public class JavaRoutesBuilderLoader extends
ExtendedRouteBuilderLoaderSupport {
String content = IOHelper.loadText(is);
String name = determineName(resource, content);
unit.addClass(name, content);
+// ensure class gets recompiled
+classLoader.removeClass(name);
nameToResource.put(name, resource);
}
}
(camel) branch main updated: CAMEL-20771: camel-jbang - Does not hot-reload java source changes
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 924ee0ab663 CAMEL-20771: camel-jbang - Does not hot-reload java source
changes
924ee0ab663 is described below
commit 924ee0ab663562c48d6556a31d90d90272a94753
Author: Claus Ibsen
AuthorDate: Wed May 15 11:13:38 2024 +0200
CAMEL-20771: camel-jbang - Does not hot-reload java source changes
---
.../org/apache/camel/language/joor/JavaJoorClassLoader.java | 12
.../apache/camel/dsl/java/joor/JavaRoutesBuilderLoader.java | 2 ++
2 files changed, 14 insertions(+)
diff --git
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaJoorClassLoader.java
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaJoorClassLoader.java
index e1694f04a9d..ab9dae26f78 100644
---
a/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaJoorClassLoader.java
+++
b/components/camel-joor/src/main/java/org/apache/camel/language/joor/JavaJoorClassLoader.java
@@ -76,6 +76,18 @@ public class JavaJoorClassLoader extends ClassLoader {
}
}
+public void removeClass(String name) {
+if (name != null) {
+classes.remove(name);
+if (compileDirectory != null) {
+String fname = name.replace('.', '/');
+fname = compileDirectory + "/" + fname + ".class";
+File target = new File(fname);
+FileUtil.deleteFile(target);
+}
+}
+}
+
private static void saveByteCodeToDisk(String outputDirectory, String
name, byte[] byteCode) {
// write to disk (can be triggered multiple times so only write once)
String fname = name.replace('.', '/');
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 73f74bbe366..1021b543861 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
@@ -188,6 +188,8 @@ public class JavaRoutesBuilderLoader extends
ExtendedRouteBuilderLoaderSupport {
String content = IOHelper.loadText(is);
String name = determineName(resource, content);
unit.addClass(name, content);
+// ensure class gets recompiled
+classLoader.removeClass(name);
nameToResource.put(name, resource);
}
}
(camel) branch main updated: Bump com.google.cloud:google-cloud-functions-bom from 2.44.0 to 2.45.0 (#14152)
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 ed62b936d0c Bump com.google.cloud:google-cloud-functions-bom from 2.44.0 to 2.45.0 (#14152) ed62b936d0c is described below commit ed62b936d0c3766aaee1de65868f6f12a6cd092e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed May 15 09:52:11 2024 +0200 Bump com.google.cloud:google-cloud-functions-bom from 2.44.0 to 2.45.0 (#14152) Bumps com.google.cloud:google-cloud-functions-bom from 2.44.0 to 2.45.0. --- updated-dependencies: - dependency-name: com.google.cloud:google-cloud-functions-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 2da2277fa65..3e995a09784 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -189,7 +189,7 @@ v1-rev20240422-2.0.0 1.36.0 26.38.0 - 2.44.0 + 2.45.0 1.44.1 2.43.0 24.0.1
(camel) branch main updated: Bump io.camunda:zeebe-client-java from 8.5.0 to 8.5.1 (#14153)
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 6764007d349 Bump io.camunda:zeebe-client-java from 8.5.0 to 8.5.1 (#14153) 6764007d349 is described below commit 6764007d3495638dde4ad104a6f4066e54cbcc49 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed May 15 09:51:44 2024 +0200 Bump io.camunda:zeebe-client-java from 8.5.0 to 8.5.1 (#14153) Bumps [io.camunda:zeebe-client-java](https://github.com/camunda/zeebe) from 8.5.0 to 8.5.1. - [Release notes](https://github.com/camunda/zeebe/releases) - [Changelog](https://github.com/camunda/zeebe/blob/main/CHANGELOG.md) - [Commits](https://github.com/camunda/zeebe/compare/8.5.0...8.5.1) --- updated-dependencies: - dependency-name: io.camunda:zeebe-client-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 01b2555b83a..2da2277fa65 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -494,7 +494,7 @@ 1.1.4c 3.0.3 0.15.0 -8.5.0 +8.5.1 0.25.0 3.9.2 3.5.3
(camel) branch main updated: Bump io.projectreactor.netty:reactor-netty from 1.1.18 to 1.1.19 (#14151)
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 a9340581cc2 Bump io.projectreactor.netty:reactor-netty from 1.1.18 to 1.1.19 (#14151) a9340581cc2 is described below commit a9340581cc2071334cc318d5ee1eeda40dee12e9 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed May 15 09:51:28 2024 +0200 Bump io.projectreactor.netty:reactor-netty from 1.1.18 to 1.1.19 (#14151) Bumps [io.projectreactor.netty:reactor-netty](https://github.com/reactor/reactor-netty) from 1.1.18 to 1.1.19. - [Release notes](https://github.com/reactor/reactor-netty/releases) - [Commits](https://github.com/reactor/reactor-netty/compare/v1.1.18...v1.1.19) --- updated-dependencies: - dependency-name: io.projectreactor.netty:reactor-netty 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>
(camel) branch main updated: CAMEL-20206: split overly complex method in ValidateMojo (#14147)
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 97a5f12cdad CAMEL-20206: split overly complex method in ValidateMojo
(#14147)
97a5f12cdad is described below
commit 97a5f12cdad219fc542cc94e4ae5d1516244cf9c
Author: Antoine Wils
AuthorDate: Wed May 15 09:00:18 2024 +0200
CAMEL-20206: split overly complex method in ValidateMojo (#14147)
Co-authored-by: Antoine Wils
---
.../java/org/apache/camel/maven/ValidateMojo.java | 318 +
1 file changed, 201 insertions(+), 117 deletions(-)
diff --git
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
index 9ce8f310dc3..7f5579ba73b 100644
---
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
+++
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/ValidateMojo.java
@@ -237,31 +237,7 @@ public class ValidateMojo extends AbstractMojo {
return;
}
-// Download extra sources only if artifacts sources are defined and
the current project is not a parent project
-if (!"pom".equals(project.getPackaging()) && sourcesArtifacts != null
&& sourcesArtifacts.length > 0) {
-// setup MavenDownloader, it will be used to download and locate
artifacts declared via sourcesArtifacts
-
-List artifacts = Arrays.asList(sourcesArtifacts);
-
-artifacts
-.parallelStream()
-.forEach(artifact -> {
-if (!artifact.contains(":sources:")) {
-getLog().warn("The artifact " + artifact
- + " does not contain sources
classifier, and may be excluded in future releases");
-}
-});
-
-try (MavenDownloaderImpl downloader
-= new MavenDownloaderImpl(repositorySystem,
repositorySystemSession, session.getSettings())) {
-downloadArtifacts(downloader, artifacts);
-} catch (IOException e) {
-throw new MojoExecutionException(e);
-} catch (MavenResolutionException e) {
-// missing artifact, log and proceed
-getLog().warn(e.getMessage());
-}
-}
+downloadExtraSources();
CamelCatalog catalog = new DefaultCamelCatalog();
// add activemq as known component
@@ -281,6 +257,19 @@ public class ValidateMojo extends AbstractMojo {
getLog().info("Detected Camel version used in project: " +
detectedVersion);
}
+downloadCamelCatalogVersion(catalog);
+
+if (catalog.getLoadedVersion() != null) {
+getLog().info("Validating using downloaded Camel version: " +
catalog.getLoadedVersion());
+} else {
+getLog().info("Validating using Camel version: " +
catalog.getCatalogVersion());
+}
+
+doExecuteRoutes(catalog);
+doExecuteConfigurationFiles(catalog);
+}
+
+private void downloadCamelCatalogVersion(CamelCatalog catalog) {
if (downloadVersion) {
String catalogVersion = catalog.getCatalogVersion();
String version = findCamelVersion(project);
@@ -293,15 +282,36 @@ public class ValidateMojo extends AbstractMojo {
}
}
}
+}
-if (catalog.getLoadedVersion() != null) {
-getLog().info("Validating using downloaded Camel version: " +
catalog.getLoadedVersion());
-} else {
-getLog().info("Validating using Camel version: " +
catalog.getCatalogVersion());
-}
+/**
+ * Download extra sources only if artifacts sources are defined and the
current project is not a parent project
+ */
+private void downloadExtraSources() throws MojoExecutionException {
+if (!"pom".equals(project.getPackaging()) && sourcesArtifacts != null
&& sourcesArtifacts.length > 0) {
+// setup MavenDownloader, it will be used to download and locate
artifacts declared via sourcesArtifacts
-doExecuteRoutes(catalog);
-doExecuteConfigurationFiles(catalog);
+List artifacts = Arrays.asList(sourcesArtifacts);
+
+artifacts
+.parallelStream()
+.forEach(artifact -> {
+if (!artifact.contains(":sources:")) {
+getLog().warn("The artifact " + artifact
+
(camel) branch main updated (112e3312167 -> c1fd705d13e)
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 112e3312167 Upgrade micrometer tracing 1.3.0 add c1fd705d13e Bump org.opensearch.client:opensearch-java from 2.10.1 to 2.10.2 (#14148) 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 (8334ef23444 -> 112e3312167)
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 8334ef23444 Make EndpointRegistry extends Map (#14066) add 112e3312167 Upgrade micrometer tracing 1.3.0 No new revisions were added by this update. Summary of changes: parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(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 914b19c90e4 Polished
914b19c90e4 is described below
commit 914b19c90e48175f23546a5a24671c361475cd0b
Author: Claus Ibsen
AuthorDate: Tue May 14 15:01:45 2024 +0200
Polished
---
.../kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dsl/camel-kotlin-dsl/src/main/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt
b/dsl/camel-kotlin-dsl/src/main/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt
index db92705233e..04bbd26fe36 100644
---
a/dsl/camel-kotlin-dsl/src/main/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt
+++
b/dsl/camel-kotlin-dsl/src/main/kotlin/org/apache/camel/dsl/kotlin/KotlinRoutesBuilderLoader.kt
@@ -32,7 +32,7 @@ import
kotlin.script.experimental.jvmhost.createJvmCompilationConfigurationFromT
@Experimental
@ManagedResource(description = "Managed KotlinRoutesBuilderLoader")
@RoutesLoader(EXTENSION)
-class KotlinRoutesBuilderLoader :
org.apache.camel.endpointdsl.support.EndpointRouteBuilderLoaderSupport(EXTENSION)
{
+class KotlinRoutesBuilderLoader : EndpointRouteBuilderLoaderSupport(EXTENSION)
{
@Throws(Exception::class)
override fun doLoadEndpointRouteBuilder(reader: Reader, builder:
EndpointRouteBuilder) {
val host = BasicJvmScriptingHost()
(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 163087ba4b0 Regen
163087ba4b0 is described below
commit 163087ba4b0f7a47da7e37dca356c01e0ef1fb26
Author: Claus Ibsen
AuthorDate: Tue May 14 14:47:08 2024 +0200
Regen
---
.../camel/springboot/catalog/components/aws-bedrock.json | 4 ++--
tooling/camel-spring-boot-dependencies/pom.xml | 12 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock.json
index 1c4a32c7760..fe1726c9071 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-bedrock.json
@@ -25,7 +25,7 @@
"componentProperties": {
"configuration": { "index": 0, "kind": "property", "displayName":
"Configuration", "group": "producer", "label": "", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description":
"Component configuration" },
"lazyStartProducer": { "index": 1, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
-"modelId": { "index": 2, "kind": "property", "displayName": "Model Id",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "enum": [ "amazon.titan-text-express-v1",
"amazon.titan-text-lite-v1", "amazon.titan-image-generator-v1",
"amazon.titan-embed-text-v1", "ai21.j2-ultra-v1", "ai21.j2-mid-v1",
"anthropic.claude-instant-v1", "anthropic.claude-v2", "anthropic.claude-v2:1",
"anthropic.claude-3-sonnet-20240229-v1:0", "anthropic.claude- [...]
+"modelId": { "index": 2, "kind": "property", "displayName": "Model Id",
"group": "producer", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "enum": [ "amazon.titan-text-express-v1",
"amazon.titan-text-lite-v1", "amazon.titan-image-generator-v1",
"amazon.titan-embed-text-v1", "ai21.j2-ultra-v1", "ai21.j2-mid-v1",
"anthropic.claude-instant-v1", "anthropic.claude-v2", "anthropic.claude-v2:1",
"anthropic.claude-3-sonnet-20240229-v1:0", "anthropic.claude- [...]
"operation": { "index": 3, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockOperations", "enum": [
"invokeTextModel", "invokeImageModel", "invokeEmbeddingsModel" ], "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.bedrock.runtime.BedrockConfiguration",
"configurat [...]
"overrideEndpoint": { "index": 4, "kind": "property", "displayName":
"Override Endpoint"
(camel) branch main updated: Bump com.google.api-client:google-api-client from 2.4.1 to 2.5.0 (#14143)
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 419134f9edb Bump com.google.api-client:google-api-client from 2.4.1 to 2.5.0 (#14143) 419134f9edb is described below commit 419134f9edb284cf332736544901392f2dcc101b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 14:26:55 2024 +0200 Bump com.google.api-client:google-api-client from 2.4.1 to 2.5.0 (#14143) Bumps [com.google.api-client:google-api-client](https://github.com/googleapis/google-api-java-client) from 2.4.1 to 2.5.0. - [Release notes](https://github.com/googleapis/google-api-java-client/releases) - [Changelog](https://github.com/googleapis/google-api-java-client/blob/main/CHANGELOG.md) - [Commits](https://github.com/googleapis/google-api-java-client/compare/v2.4.1...v2.5.0) --- updated-dependencies: - dependency-name: com.google.api-client:google-api-client 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 2bad4d06b33..3f7d750644a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -182,7 +182,7 @@ 4.0.5 3.0.2 1.23.0 -2.4.1 +2.5.0 v3-rev20240327-2.0.0 v3-rev20240419-2.0.0 v4-rev20240423-2.0.0
(camel) branch main updated: Bump google-oauth-client-version from 1.35.0 to 1.36.0 (#14138)
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 dce0cabc7e8 Bump google-oauth-client-version from 1.35.0 to 1.36.0 (#14138) dce0cabc7e8 is described below commit dce0cabc7e8851f1cd35630781875244c9c5eef4 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 14:26:45 2024 +0200 Bump google-oauth-client-version from 1.35.0 to 1.36.0 (#14138) Bumps `google-oauth-client-version` from 1.35.0 to 1.36.0. Updates `com.google.oauth-client:google-oauth-client` from 1.35.0 to 1.36.0 - [Release notes](https://github.com/googleapis/google-oauth-java-client/releases) - [Changelog](https://github.com/googleapis/google-oauth-java-client/blob/main/CHANGELOG.md) - [Commits](https://github.com/googleapis/google-oauth-java-client/compare/v1.35.0...v1.36.0) Updates `com.google.oauth-client:google-oauth-client-jetty` from 1.35.0 to 1.36.0 - [Release notes](https://github.com/googleapis/google-oauth-java-client/releases) - [Changelog](https://github.com/googleapis/google-oauth-java-client/blob/main/CHANGELOG.md) - [Commits](https://github.com/googleapis/google-oauth-java-client/compare/v1.35.0...v1.36.0) --- updated-dependencies: - dependency-name: com.google.oauth-client:google-oauth-client dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.google.oauth-client:google-oauth-client-jetty 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 7306fc7be43..2bad4d06b33 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -187,7 +187,7 @@ v3-rev20240419-2.0.0 v4-rev20240423-2.0.0 v1-rev20240422-2.0.0 -1.35.0 +1.36.0 26.38.0 2.44.0 1.44.1
(camel) branch main updated: Bump org.jboss.logging:jboss-logging from 3.5.3.Final to 3.6.0.Final (#14137)
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 af93c0260ee Bump org.jboss.logging:jboss-logging from 3.5.3.Final to 3.6.0.Final (#14137) af93c0260ee is described below commit af93c0260ee0f79bc90463cc1e87a0daeba49dc1 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 14:26:33 2024 +0200 Bump org.jboss.logging:jboss-logging from 3.5.3.Final to 3.6.0.Final (#14137) Bumps [org.jboss.logging:jboss-logging](https://github.com/jboss-logging/jboss-logging) from 3.5.3.Final to 3.6.0.Final. - [Release notes](https://github.com/jboss-logging/jboss-logging/releases) - [Commits](https://github.com/jboss-logging/jboss-logging/compare/3.5.3.Final...3.6.0.Final) --- updated-dependencies: - dependency-name: org.jboss.logging:jboss-logging 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 c7b7af2cbaf..7306fc7be43 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -264,7 +264,7 @@ 3.2.0 1.4.5 2.0.0.Final -3.5.3.Final +3.6.0.Final 1.4.10.Final 7.6.1.Final 3.3.8.Final
(camel) branch main updated: Bump micrometer-version from 1.12.5 to 1.13.0 (#14140)
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 29ccb1c6932 Bump micrometer-version from 1.12.5 to 1.13.0 (#14140)
29ccb1c6932 is described below
commit 29ccb1c6932aa0646edae0245f4df41d19c844c5
Author: Claus Ibsen
AuthorDate: Tue May 14 14:25:45 2024 +0200
Bump micrometer-version from 1.12.5 to 1.13.0 (#14140)
---
.../micrometer/prometheus/MicrometerPrometheus.java | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git
a/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
b/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
index 3adf0b9fc16..833c7ba4cd1 100644
---
a/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
+++
b/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
@@ -27,9 +27,8 @@ import java.util.StringJoiner;
import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.binder.MeterBinder;
-import io.micrometer.prometheus.PrometheusConfig;
-import io.micrometer.prometheus.PrometheusMeterRegistry;
-import io.prometheus.client.exporter.common.TextFormat;
+import io.micrometer.prometheusmetrics.PrometheusConfig;
+import io.micrometer.prometheusmetrics.PrometheusMeterRegistry;
import io.vertx.core.Handler;
import io.vertx.core.http.HttpMethod;
import io.vertx.ext.web.Route;
@@ -73,6 +72,9 @@ public class MicrometerPrometheus extends ServiceSupport
implements CamelMetrics
private static final Logger LOG =
LoggerFactory.getLogger(MicrometerPrometheus.class);
+private static final String CONTENT_TYPE_004 = "text/plain; version=0.0.4;
charset=utf-8";
+private static final String CONTENT_TYPE_100 =
"application/openmetrics-text; version=1.0.0; charset=utf-8";
+
private MainHttpServer server;
private VertxPlatformHttpRouter router;
private PlatformHttpComponent platformHttpComponent;
@@ -389,7 +391,7 @@ public class MicrometerPrometheus extends ServiceSupport
implements CamelMetrics
metrics.method(HttpMethod.GET);
final String format
-= "0.0.4".equals(textFormatVersion) ?
TextFormat.CONTENT_TYPE_004 : TextFormat.CONTENT_TYPE_OPENMETRICS_100;
+= "0.0.4".equals(textFormatVersion) ? CONTENT_TYPE_004 :
CONTENT_TYPE_100;
metrics.produces(format);
Handler handler = new Handler() {
@@ -399,7 +401,7 @@ public class MicrometerPrometheus extends ServiceSupport
implements CamelMetrics
// the client may ask for version 1.0.0 via accept header
String ah = ctx.request().getHeader("Accept");
if (ah != null && ah.contains("application/openmetrics-text"))
{
-ct = TextFormat.chooseContentType(ah);
+ct = CONTENT_TYPE_100;
}
ctx.response().putHeader("Content-Type", ct);
(camel) branch main updated: Bump com.google.guava:guava from 33.1.0-jre to 33.2.0-jre (#14139)
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 ea43a0d0e2e Bump com.google.guava:guava from 33.1.0-jre to 33.2.0-jre (#14139) ea43a0d0e2e is described below commit ea43a0d0e2e8574377bdf46392f3a1442a27abf7 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 14:12:01 2024 +0200 Bump com.google.guava:guava from 33.1.0-jre to 33.2.0-jre (#14139) Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.1.0-jre to 33.2.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava 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 4572fd41659..c7b7af2cbaf 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -203,7 +203,7 @@ 4.4.0 2.0.59.Final 2.10.1 -33.1.0-jre +33.2.0-jre 3.0 3.4.0 2.2
(camel) branch main updated: Bump com.box:box-java-sdk from 4.8.0 to 4.9.0 (#14136)
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 305db174123 Bump com.box:box-java-sdk from 4.8.0 to 4.9.0 (#14136) 305db174123 is described below commit 305db17412352504df3adb4de96b8ee7756c5275 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 14:11:37 2024 +0200 Bump com.box:box-java-sdk from 4.8.0 to 4.9.0 (#14136) Bumps [com.box:box-java-sdk](https://github.com/box/box-java-sdk) from 4.8.0 to 4.9.0. - [Release notes](https://github.com/box/box-java-sdk/releases) - [Changelog](https://github.com/box/box-java-sdk/blob/main/CHANGELOG.md) - [Commits](https://github.com/box/box-java-sdk/compare/v4.8.0...v4.9.0) --- updated-dependencies: - dependency-name: com.box:box-java-sdk 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 f3125a33bec..4572fd41659 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -81,7 +81,7 @@ 12.0.0-beta.19 3.0.0 1.78 -4.8.0 +4.9.0 3.34.0 3.5.0 1.14.15
(camel) branch main updated: Bump com.dylibso.chicory:runtime from 0.0.9 to 0.0.10 (#14142)
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 bf4e50d7ba3 Bump com.dylibso.chicory:runtime from 0.0.9 to 0.0.10 (#14142) bf4e50d7ba3 is described below commit bf4e50d7ba323ef5d74546cebdcec3450133da42 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 14:11:25 2024 +0200 Bump com.dylibso.chicory:runtime from 0.0.9 to 0.0.10 (#14142) Bumps [com.dylibso.chicory:runtime](https://github.com/dylibso/chicory) from 0.0.9 to 0.0.10. - [Commits](https://github.com/dylibso/chicory/compare/0.0.9...0.0.10) --- updated-dependencies: - dependency-name: com.dylibso.chicory:runtime 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 35fcd771253..f3125a33bec 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -94,7 +94,7 @@ 4.17.0 1.2 3.3.0 -0.0.9 +0.0.10 3.6.2 4.8.172 8.0.0.beta3
(camel) branch main updated: Bump micrometer-version from 1.12.5 to 1.13.0 (#14140)
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 ea9fb268c35 Bump micrometer-version from 1.12.5 to 1.13.0 (#14140) ea9fb268c35 is described below commit ea9fb268c353d09a8150be1823adebf651b0adc5 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 14:11:13 2024 +0200 Bump micrometer-version from 1.12.5 to 1.13.0 (#14140) Bumps `micrometer-version` from 1.12.5 to 1.13.0. Updates `io.micrometer:micrometer-commons` from 1.12.5 to 1.13.0 - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.12.5...v1.13.0) Updates `io.micrometer:micrometer-core` from 1.12.5 to 1.13.0 - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.12.5...v1.13.0) Updates `io.micrometer:micrometer-observation` from 1.12.5 to 1.13.0 - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.12.5...v1.13.0) Updates `io.micrometer:micrometer-registry-jmx` from 1.12.5 to 1.13.0 - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.12.5...v1.13.0) Updates `io.micrometer:micrometer-registry-prometheus` from 1.12.5 to 1.13.0 - [Release notes](https://github.com/micrometer-metrics/micrometer/releases) - [Commits](https://github.com/micrometer-metrics/micrometer/compare/v1.12.5...v1.13.0) --- updated-dependencies: - dependency-name: io.micrometer:micrometer-commons dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.micrometer:micrometer-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.micrometer:micrometer-observation dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.micrometer:micrometer-registry-jmx dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.micrometer:micrometer-registry-prometheus 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 675dd12c9b3..35fcd771253 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -351,7 +351,7 @@ 3.5.2 3.4.0 4.2.25 -1.12.5 +1.13.0 1.2.5 3.1 4.0.2
(camel) branch main updated: Bump org.snmp4j:snmp4j from 3.8.1 to 3.8.2 (#14141)
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 f43a3dd9b19 Bump org.snmp4j:snmp4j from 3.8.1 to 3.8.2 (#14141) f43a3dd9b19 is described below commit f43a3dd9b1905fe02936d14d6fa62a185a98df8b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 14:11:02 2024 +0200 Bump org.snmp4j:snmp4j from 3.8.1 to 3.8.2 (#14141) Bumps org.snmp4j:snmp4j from 3.8.1 to 3.8.2. --- updated-dependencies: - dependency-name: org.snmp4j:snmp4j 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 b324f70fb11..675dd12c9b3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -440,7 +440,7 @@ 0.13.0 2.2 2.7 -3.8.1 +3.8.2 1.9.5_1 2.3-groovy-4.0 5.1.1
(camel) branch main updated: Bump elasticsearch-java-client-version from 8.13.3 to 8.13.4 (#14135)
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 641bbb33b0b Bump elasticsearch-java-client-version from 8.13.3 to 8.13.4 (#14135) 641bbb33b0b is described below commit 641bbb33b0bc45c1bb7dfadae8d35bc3b5540e52 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 14:06:23 2024 +0200 Bump elasticsearch-java-client-version from 8.13.3 to 8.13.4 (#14135) Bumps `elasticsearch-java-client-version` from 8.13.3 to 8.13.4. Updates `co.elastic.clients:elasticsearch-java` from 8.13.3 to 8.13.4 - [Release notes](https://github.com/elastic/elasticsearch-java/releases) - [Changelog](https://github.com/elastic/elasticsearch-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch-java/compare/v8.13.3...v8.13.4) Updates `org.elasticsearch.client:elasticsearch-rest-client` from 8.13.3 to 8.13.4 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/compare/v8.13.3...v8.13.4) --- updated-dependencies: - dependency-name: co.elastic.clients:elasticsearch-java dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index f8c3b78ae06..b324f70fb11 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -145,7 +145,7 @@ 0.3.0 2.1.5 3.10.8 - 8.13.3 + 8.13.4 8.13.4 4.1.0.Final 3.2.0
(camel) branch main updated: Bump huaweicloud-sdk-version from 3.1.94 to 3.1.95 (#14134)
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 19d0cad158d Bump huaweicloud-sdk-version from 3.1.94 to 3.1.95 (#14134) 19d0cad158d is described below commit 19d0cad158d767398f9fed42bab8f0c7a1a45451 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 14:06:05 2024 +0200 Bump huaweicloud-sdk-version from 3.1.94 to 3.1.95 (#14134) Bumps `huaweicloud-sdk-version` from 3.1.94 to 3.1.95. Updates `com.huaweicloud.sdk:huaweicloud-sdk-core` from 3.1.94 to 3.1.95 - [Release notes](https://github.com/huaweicloud/huaweicloud-sdk-java-v3/releases) - [Commits](https://github.com/huaweicloud/huaweicloud-sdk-java-v3/compare/v3.1.94...v3.1.95) Updates `com.huaweicloud.sdk:huaweicloud-sdk-frs` from 3.1.94 to 3.1.95 Updates `com.huaweicloud.sdk:huaweicloud-sdk-functiongraph` from 3.1.94 to 3.1.95 Updates `com.huaweicloud.sdk:huaweicloud-sdk-iam` from 3.1.94 to 3.1.95 Updates `com.huaweicloud.sdk:huaweicloud-sdk-image` from 3.1.94 to 3.1.95 Updates `com.huaweicloud.sdk:huaweicloud-sdk-smn` from 3.1.94 to 3.1.95 --- 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 fdce32ef9f4..f8c3b78ae06 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -223,7 +223,7 @@ 4.5.14 4.1.5 3.24.3 -3.1.94 +3.1.95 3.2.18 75.1 2.16.0
(camel) branch main updated: Bump bytebuddy-version from 1.14.14 to 1.14.15 (#14133)
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 8cd925564e6 Bump bytebuddy-version from 1.14.14 to 1.14.15 (#14133) 8cd925564e6 is described below commit 8cd925564e6dfcb8ab2fe42293a14a88c8af9dfd Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 14:05:55 2024 +0200 Bump bytebuddy-version from 1.14.14 to 1.14.15 (#14133) Bumps `bytebuddy-version` from 1.14.14 to 1.14.15. Updates `net.bytebuddy:byte-buddy` from 1.14.14 to 1.14.15 - [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.14...byte-buddy-1.14.15) Updates `net.bytebuddy:byte-buddy-agent` from 1.14.14 to 1.14.15 - [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.14...byte-buddy-1.14.15) --- 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 2fdb9da5694..fdce32ef9f4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -84,7 +84,7 @@ 4.8.0 3.34.0 3.5.0 -1.14.14 +1.14.15 0.9.5.5 3.1.8 3.11.0
(camel) branch main updated: Bump aws-java-sdk2-version from 2.25.50 to 2.25.51 (#14132)
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 8c9d0e0ade3 Bump aws-java-sdk2-version from 2.25.50 to 2.25.51 (#14132) 8c9d0e0ade3 is described below commit 8c9d0e0ade3954893b0fc0dcb5197aea46e2b070 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue May 14 14:05:42 2024 +0200 Bump aws-java-sdk2-version from 2.25.50 to 2.25.51 (#14132) Bumps `aws-java-sdk2-version` from 2.25.50 to 2.25.51. Updates `software.amazon.awssdk:sqs` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:kinesis` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:s3` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:sns` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:cloudwatch` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:ec2` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:eventbridge` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:iam` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:kms` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:lambda` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:secretsmanager` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:sts` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:dynamodb` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:config` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:apache-client` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:athena` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:bedrock` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:bedrockruntime` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:bedrockagent` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:bedrockagentruntime` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:cloudtrail` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:ecs` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:eks` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:netty-nio-client` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:firehose` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:kafka` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:mq` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:redshiftdata` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:ses` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:sfn` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:timestreamquery` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:timestreamwrite` from 2.25.50 to 2.25.51 Updates `software.amazon.awssdk:translate` from 2.25.50 to 2.25.51 --- 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 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 b46266f348f Regen
b46266f348f is described below
commit b46266f348faa06fe63b96af0f079e9d8d860fb3
Author: Claus Ibsen
AuthorDate: Tue May 14 14:00:27 2024 +0200
Regen
---
.../org/apache/camel/impl/debugger/DebuggerJmxConnectorService.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DebuggerJmxConnectorService.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DebuggerJmxConnectorService.java
index 95411d9640c..64ad17a51c0 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DebuggerJmxConnectorService.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DebuggerJmxConnectorService.java
@@ -94,7 +94,9 @@ public class DebuggerJmxConnectorService extends
ServiceSupport implements Camel
cs.stop();
LOG.debug("Stopped Debugger JMX Connector");
} catch (IOException e) {
-LOG.debug("Error occurred during stopping CamelDebugger JMX
Connector: " + cs + ". This exception will be ignored.", e);
+LOG.debug("Error occurred during stopping CamelDebugger JMX
Connector: " + cs
+ + ". This exception will be ignored.",
+e);
}
cs = null;
}
@@ -129,7 +131,7 @@ public class DebuggerJmxConnectorService extends
ServiceSupport implements Camel
// we do not allow remote RMI access so this code is disabled
url = new JMXServiceURL(
"service:jmx:rmi://" + host + ":" + connectorPort +
"/jndi/rmi://" + host
-+ ":" + registryPort + path);
++ ":" + registryPort + path);
} else {
url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://" + host +
":" + registryPort + path);
}
(camel) branch main updated: Remove flaky test
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 b9f3208a0ee Remove flaky test
b9f3208a0ee is described below
commit b9f3208a0eed049d49fb86e8a90fc9d03f3957b8
Author: Claus Ibsen
AuthorDate: Tue May 14 12:38:51 2024 +0200
Remove flaky test
---
.../camel/spring/file/SpringFileRouteTest.java | 78 --
.../spring/file/SpringFileRouteTest-context.xml| 43
2 files changed, 121 deletions(-)
diff --git
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java
b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java
deleted file mode 100644
index 003c17d26b9..000
---
a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * 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.spring.file;
-
-import java.nio.file.Path;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.file.FileEndpoint;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.spring.SpringRunWithTestSupport;
-import
org.apache.camel.spring.file.SpringFileRouteTest.TestDirectoryContextInitializer;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.io.TempDir;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContextInitializer;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.test.context.ContextConfiguration;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-@ContextConfiguration(initializers = TestDirectoryContextInitializer.class)
-public class SpringFileRouteTest extends SpringRunWithTestSupport {
-protected String expectedBody = "Hello World!";
-@Autowired
-protected ProducerTemplate template;
-@Autowired
-protected Endpoint inputFile;
-@EndpointInject("mock:result")
-protected MockEndpoint result;
-@TempDir
-private static Path tempDir;
-
-@Test
-public void testMocksAreValid() throws Exception {
-// lets check that our injected endpoint is valid
-FileEndpoint fileEndpoint = assertIsInstanceOf(FileEndpoint.class,
inputFile);
-assertEquals(testDirectory().toFile(), fileEndpoint.getFile(), "File");
-
-result.expectedBodiesReceived(expectedBody);
-result.setResultWaitTime(5000);
-
-template.sendBodyAndHeader(inputFile, expectedBody,
Exchange.FILE_NAME, "hello.txt");
-
-result.assertIsSatisfied();
-}
-
-@Override
-public Path testDirectory() {
-return tempDir;
-}
-
-static class TestDirectoryContextInitializer
-implements
-ApplicationContextInitializer {
-@Override
-public void initialize(ConfigurableApplicationContext context) {
-
context.getEnvironment().getSystemProperties().put("testDirectory",
tempDir.toString());
-}
-}
-
-}
diff --git
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml
b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml
deleted file mode 100644
index 3a494b7112a..000
---
a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-http://www.springframework.org/schema/beans;
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
-">
-
-
-http://camel.apache.org/schema/spring;>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
(camel) branch main updated: camel-kotlin-api: remove flaky test and use port finder to avoid port number in use exception.
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 1e75577b5c4 camel-kotlin-api: remove flaky test and use port finder to
avoid port number in use exception.
1e75577b5c4 is described below
commit 1e75577b5c4111504ebf0fdc735e9785e7305c0a
Author: Claus Ibsen
AuthorDate: Tue May 14 12:37:01 2024 +0200
camel-kotlin-api: remove flaky test and use port finder to avoid port
number in use exception.
---
dsl/camel-kotlin-api/pom.xml | 15 +---
.../kotlin/org/apache/camel/kotlin/BeansTest.kt| 94 --
.../kotlin/org/apache/camel/kotlin/RestTest.kt | 16 +---
3 files changed, 3 insertions(+), 122 deletions(-)
diff --git a/dsl/camel-kotlin-api/pom.xml b/dsl/camel-kotlin-api/pom.xml
index 9ee5ed41563..12b1c2c3da2 100644
--- a/dsl/camel-kotlin-api/pom.xml
+++ b/dsl/camel-kotlin-api/pom.xml
@@ -93,7 +93,7 @@
org.apache.camel
-camel-netty-http
+camel-jetty
test
@@ -112,19 +112,6 @@
test
-
-io.projectreactor.netty
-reactor-netty-core
-${reactor-netty-version}
-test
-
-
-io.projectreactor.netty
-reactor-netty-http
-${reactor-netty-version}
-test
-
-
org.apache.logging.log4j
log4j-core
diff --git
a/dsl/camel-kotlin-api/src/test/kotlin/org/apache/camel/kotlin/BeansTest.kt
b/dsl/camel-kotlin-api/src/test/kotlin/org/apache/camel/kotlin/BeansTest.kt
deleted file mode 100644
index c1b58b9fc1e..000
--- a/dsl/camel-kotlin-api/src/test/kotlin/org/apache/camel/kotlin/BeansTest.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 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.kotlin
-
-import org.apache.camel.impl.DefaultCamelContext
-import org.apache.camel.kotlin.components.mock
-import org.apache.camel.kotlin.components.`netty-http`
-import org.junit.jupiter.api.AfterEach
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertDoesNotThrow
-import kotlin.test.assertEquals
-import kotlin.test.assertTrue
-
-class BeansTest {
-
-private lateinit var ctx: DefaultCamelContext
-
-@BeforeEach
-fun beforeEach() {
-ctx = DefaultCamelContext()
-}
-
-@AfterEach
-fun afterEach() {
-ctx.stop()
-}
-
-@Test
-fun testBeanRuntimeInstantiation() {
-camel(ctx) {
-bean("map", mutableMapOf(Pair("key", "value")))
-bean {
-name("test")
-type("org.apache.camel.kotlin.Example")
-property("map", "#map")
-}
-}
-
-val example = ctx.registry.lookupByName("test")
-assertTrue(example is Example)
-assertEquals("value", example.map["key"])
-
-}
-
-@Test
-fun testBeanBinding() {
-camel(ctx) {
-route {
-from {
-`netty-http` {
-protocol("http")
-host("localhost")
-port(8080)
-path("/")
-bossGroup("#nioELG")
-}
-}
-steps {
-to {
-mock {
-name("end")
-}
-}
-}
-}
-bean {
-name("nioELG")
-type("io.netty.channel.nio.NioEventLoopGroup")
-}
-}
-assertDoesNotThrow {
-ctx.start()
-}
-}
-}
-
-class Example {
-lateinit var map: MutableMap
-}
\ No newline at end of file
diff --git
a/dsl/ca
(camel) branch main updated: Use same description in bean property in model so regen generates same
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 0c32d218b5f Use same description in bean property in model so regen generates same 0c32d218b5f is described below commit 0c32d218b5f99cbd302617b77c0a14ab387ad907 Author: Claus Ibsen AuthorDate: Tue May 14 12:04:44 2024 +0200 Use same description in bean property in model so regen generates same --- .../resources/org/apache/camel/catalog/models-app/property.json | 2 +- .../resources/META-INF/org/apache/camel/model/app/property.json | 2 +- .../src/main/java/org/apache/camel/model/PropertyDefinition.java| 2 -- .../main/java/org/apache/camel/model/app/BeanPropertyDefinition.java| 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/property.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/property.json index 652a4bfc534..ec0a88cca36 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/property.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/property.json @@ -3,7 +3,7 @@ "kind": "model", "name": "property", "title": "Property", -"description": "Bean property", +"description": "A key value pair where the value is a literal value", "deprecated": false, "label": "configuration", "javaType": "org.apache.camel.model.app.BeanPropertyDefinition", diff --git a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/app/property.json b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/app/property.json index 652a4bfc534..ec0a88cca36 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/app/property.json +++ b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/app/property.json @@ -3,7 +3,7 @@ "kind": "model", "name": "property", "title": "Property", -"description": "Bean property", +"description": "A key value pair where the value is a literal value", "deprecated": false, "label": "configuration", "javaType": "org.apache.camel.model.app.BeanPropertyDefinition", diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinition.java index 3869693cf7c..8e3aa8b2f86 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/PropertyDefinition.java @@ -25,8 +25,6 @@ import org.apache.camel.spi.Metadata; /** * A key value pair where the value is a literal value - * - * @see PropertyExpressionDefinition */ @Metadata(label = "configuration") @XmlRootElement(name = "property") diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/app/BeanPropertyDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/app/BeanPropertyDefinition.java index d48184e5508..d31a900ad4e 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/app/BeanPropertyDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/app/BeanPropertyDefinition.java @@ -25,7 +25,7 @@ import jakarta.xml.bind.annotation.XmlType; import org.apache.camel.spi.Metadata; /** - * Bean property + * A key value pair where the value is a literal value */ @Metadata(label = "configuration") @XmlType
(camel) branch main updated: CAMEL-20767: camel-spring-redis - Creating SpringRedisIdempotentRepository via SB should be possible
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 90a4ca746de CAMEL-20767: camel-spring-redis - Creating
SpringRedisIdempotentRepository via SB should be possible
90a4ca746de is described below
commit 90a4ca746de4c4cae49f1cd59bb8e95e9b751d41
Author: Claus Ibsen
AuthorDate: Tue May 14 11:27:23 2024 +0200
CAMEL-20767: camel-spring-redis - Creating SpringRedisIdempotentRepository
via SB should be possible
---
.../processor/idempotent/SpringRedisIdempotentRepository.java| 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git
a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/processor/idempotent/SpringRedisIdempotentRepository.java
b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/processor/idempotent/SpringRedisIdempotentRepository.java
index 361e1b71943..443df8b0db3 100644
---
a/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/processor/idempotent/SpringRedisIdempotentRepository.java
+++
b/components/camel-spring-redis/src/main/java/org/apache/camel/component/redis/processor/idempotent/SpringRedisIdempotentRepository.java
@@ -24,6 +24,7 @@ import org.apache.camel.spi.Configurer;
import org.apache.camel.spi.IdempotentRepository;
import org.apache.camel.spi.Metadata;
import org.apache.camel.support.service.ServiceSupport;
+import org.apache.camel.util.ObjectHelper;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.SetOperations;
@@ -107,10 +108,14 @@ public class SpringRedisIdempotentRepository extends
ServiceSupport implements I
@Override
protected void doStart() throws Exception {
-if (redisConfiguration == null) {
+if (redisConfiguration == null && this.redisTemplate == null) {
+// create configuration if no custom template has been configured
redisConfiguration = new RedisConfiguration();
}
-this.redisTemplate = (RedisTemplate)
redisConfiguration.getRedisTemplate();
+if (this.redisTemplate == null) {
+this.redisTemplate = (RedisTemplate)
redisConfiguration.getRedisTemplate();
+}
+ObjectHelper.notNull(this.redisTemplate, "redisTemplate", this);
this.setOperations = redisTemplate.opsForSet();
redisTemplate.getConnectionFactory().getConnection().flushDb();
}
(camel) branch main updated (95397a15f04 -> e52662b9de6)
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 95397a15f04 Debug jmx (#14129) new 81f66bb7be0 CAMEL-20766: Make it easier to configure camel profile for standalone, spring-boot, or quarkus new e52662b9de6 Regen The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/camel/catalog/schemas/camel-spring.xsd | 2 +- .../org/apache/camel/main/BaseMainSupport.java | 2 +- .../main/DebuggerConfigurationProperties.java | 8 +++--- .../org/apache/camel/main/ProfileConfigurer.java | 30 +++--- 4 files changed, 32 insertions(+), 10 deletions(-)
(camel) 01/02: CAMEL-20766: Make it easier to configure camel profile for standalone, spring-boot, or quarkus
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 81f66bb7be0c42c58b6d50810e4848ee49289415
Author: Claus Ibsen
AuthorDate: Tue May 14 11:13:05 2024 +0200
CAMEL-20766: Make it easier to configure camel profile for standalone,
spring-boot, or quarkus
---
.../org/apache/camel/main/BaseMainSupport.java | 2 +-
.../main/DebuggerConfigurationProperties.java | 8 +++---
.../org/apache/camel/main/ProfileConfigurer.java | 30 +++---
3 files changed, 31 insertions(+), 9 deletions(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index fd3ffdd137d..b7f7f0fc6e3 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -457,7 +457,7 @@ public abstract class BaseMainSupport extends BaseService {
final OrderedLocationProperties autoConfiguredProperties = new
OrderedLocationProperties();
// configure the profile with pre-configured settings
-ProfileConfigurer.configure(camelContext,
mainConfigurationProperties.getProfile(), mainConfigurationProperties);
+ProfileConfigurer.configureMain(camelContext,
mainConfigurationProperties.getProfile(), mainConfigurationProperties);
// need to eager allow to auto-configure properties component
if (mainConfigurationProperties.isAutoConfigurationEnabled()) {
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/DebuggerConfigurationProperties.java
b/core/camel-main/src/main/java/org/apache/camel/main/DebuggerConfigurationProperties.java
index 711a650761d..bed92227708 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/DebuggerConfigurationProperties.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/DebuggerConfigurationProperties.java
@@ -230,8 +230,8 @@ public class DebuggerConfigurationProperties implements
BootstrapCloseable {
}
/**
- * Whether to create JMX connector that allows tooling to control the
Camel debugger.
- * This is what the IDEA and VSCode tooling is using.
+ * Whether to create JMX connector that allows tooling to control the
Camel debugger. This is what the IDEA and
+ * VSCode tooling is using.
*/
public void setJmxConnectorEnabled(boolean jmxConnectorEnabled) {
this.jmxConnectorEnabled = jmxConnectorEnabled;
@@ -362,8 +362,8 @@ public class DebuggerConfigurationProperties implements
BootstrapCloseable {
}
/**
- * Whether to create JMX connector that allows tooling to control the
Camel debugger.
- * This is what the IDEA and VSCode tooling is using.
+ * Whether to create JMX connector that allows tooling to control the
Camel debugger. This is what the IDEA and
+ * VSCode tooling is using.
*/
public DebuggerConfigurationProperties withJmxConnectorEnabled(boolean
jmxConnectorEnabled) {
this.jmxConnectorEnabled = jmxConnectorEnabled;
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/ProfileConfigurer.java
b/core/camel-main/src/main/java/org/apache/camel/main/ProfileConfigurer.java
index e4466396de2..be369a19bd5 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/ProfileConfigurer.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/ProfileConfigurer.java
@@ -30,9 +30,33 @@ public class ProfileConfigurer {
protected static final Logger LOG =
LoggerFactory.getLogger(ProfileConfigurer.class);
-public static void configure(CamelContext camelContext, String profile,
MainConfigurationProperties config)
-throws Exception {
+/**
+ * Configures camel-main to run in given profile
+ *
+ * @param camelContext the camel context
+ * @param profile the profile
+ * @param config the main configuration
+ */
+public static void configureMain(CamelContext camelContext, String
profile, MainConfigurationProperties config) {
+if (profile == null || profile.isBlank()) {
+// no profile is active
+return;
+}
+
+// enable backlog tracing
+config.tracerConfig().withEnabled(true);
+
+configureCommon(camelContext, profile, config);
+}
+/**
+ * Configures camel in general (standalone, quarkus, spring-boot etc) to
run in given profile
+ *
+ * @param camelContext the camel context
+ * @param profile the profile
+ * @param config the core configuration
+ */
+public static void configureCommon(CamelContext camelContext, String
profile, DefaultConfigurationProperties config) {
camelContext.getCamelContextExtension().setProfile(profile);
if (profile == null || profile.isBlank
(camel) 02/02: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit e52662b9de6ed0c943699473d98ffad3b872bfb6 Author: Claus Ibsen AuthorDate: Tue May 14 11:21:07 2024 +0200 Regen --- .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index 4ed45457135..61209fbf610 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd @@ -1199,7 +1199,7 @@ Properties to use with properties placeholder
(camel-spring-boot) branch main updated: CAMEL-20760: camel-core - Allow to turn on|off RMI connector for tooling based debuggers
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 ef077cb61a5 CAMEL-20760: camel-core - Allow to turn on|off RMI
connector for tooling based debuggers
ef077cb61a5 is described below
commit ef077cb61a5e7caae4aa65e8bfe3d1524f394728
Author: Claus Ibsen
AuthorDate: Tue May 14 11:01:31 2024 +0200
CAMEL-20760: camel-core - Allow to turn on|off RMI connector for tooling
based debuggers
---
.../camel-debug-starter/src/main/docs/debug.json | 14 +++
.../boot/debug/CamelDebugAutoConfiguration.java| 15 ++-
.../debug/CamelDebugConfigurationProperties.java | 29 ++
3 files changed, 52 insertions(+), 6 deletions(-)
diff --git a/components-starter/camel-debug-starter/src/main/docs/debug.json
b/components-starter/camel-debug-starter/src/main/docs/debug.json
index fb29c30ae23..34a5d0e05ae 100644
--- a/components-starter/camel-debug-starter/src/main/docs/debug.json
+++ b/components-starter/camel-debug-starter/src/main/docs/debug.json
@@ -69,6 +69,20 @@
"sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties",
"defaultValue": true
},
+{
+ "name": "camel.debug.jmx-connector-enabled",
+ "type": "java.lang.Boolean",
+ "description": "Whether to create JMX connector that allows tooling to
control the Camel debugger. This is what the IDEA and VSCode tooling is using.",
+ "sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties",
+ "defaultValue": true
+},
+{
+ "name": "camel.debug.jmx-connector-port",
+ "type": "java.lang.Integer",
+ "description": "Port number to expose a JMX RMI connector for tooling
that needs to control the debugger.",
+ "sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties",
+ "defaultValue": 1099
+},
{
"name": "camel.debug.logging-level",
"type": "org.apache.camel.LoggingLevel",
diff --git
a/components-starter/camel-debug-starter/src/main/java/org/apache/camel/spring/boot/debug/CamelDebugAutoConfiguration.java
b/components-starter/camel-debug-starter/src/main/java/org/apache/camel/spring/boot/debug/CamelDebugAutoConfiguration.java
index 8a0c8033430..3cc332397ef 100644
---
a/components-starter/camel-debug-starter/src/main/java/org/apache/camel/spring/boot/debug/CamelDebugAutoConfiguration.java
+++
b/components-starter/camel-debug-starter/src/main/java/org/apache/camel/spring/boot/debug/CamelDebugAutoConfiguration.java
@@ -17,7 +17,7 @@
package org.apache.camel.spring.boot.debug;
import org.apache.camel.CamelContext;
-import org.apache.camel.component.debug.JmxConnectorService;
+import org.apache.camel.impl.debugger.DebuggerJmxConnectorService;
import org.apache.camel.impl.debugger.DefaultBacklogDebugger;
import org.apache.camel.spi.BacklogDebugger;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
@@ -66,6 +66,14 @@ public class CamelDebugAutoConfiguration {
debugger.setSuspendMode(config.isWaitForAttach());
debugger.setFallbackTimeout(config.getFallbackTimeout());
+// enable jmx connector if port is set
+if (config.isJmxConnectorEnabled()) {
+DebuggerJmxConnectorService connector = new
DebuggerJmxConnectorService();
+connector.setCreateConnector(true);
+connector.setRegistryPort(config.getJmxConnectorPort());
+camelContext.addService(connector);
+}
+
// start debugger after context is started
camelContext.addLifecycleStrategy(new LifecycleStrategySupport() {
@Override
@@ -84,11 +92,6 @@ public class CamelDebugAutoConfiguration {
}
});
-// to make debugging possible for tooling we need to make it possible
to do remote JMX connection
-if (config.isEnabled() || config.isStandby()) {
-camelContext.addService(new JmxConnectorService());
-}
-
camelContext.addService(debugger);
return debugger;
diff --git
a/components-starter/camel-debug-starter/src/main/java/org/apache/camel/spring/boot/debug/CamelDebugConfigurationProperties.java
b/components-starter/camel-debug-starter/src/main/java/org/apache/camel/spring/boot/debug/CamelDebugConfigurationProperties.java
index 03fda00fd62..d91c8b32ff8 100644
---
a/components-starter/camel-debug-starter/src/main/java/org/apache/camel/spring/boot/debug/CamelDebugConfigurationProperties.java
+++
b/components-starter/camel-debug-starter/src/
(camel) branch main updated: Debug jmx (#14129)
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 95397a15f04 Debug jmx (#14129)
95397a15f04 is described below
commit 95397a15f0433886d04941273c2643b6de977722
Author: Claus Ibsen
AuthorDate: Tue May 14 11:14:14 2024 +0200
Debug jmx (#14129)
* CAMEL-20760: camel-core - Allow to turn on|off RMI connector for tooling
based debuggers
---
.../main/camel-main-configuration-metadata.json| 2 +
.../component/debug/CamelDebuggerFactory.java | 9 +++--
.../impl/debugger/DebuggerJmxConnectorService.java | 37 ++
.../DebuggerConfigurationPropertiesConfigurer.java | 12 ++
.../camel-main-configuration-metadata.json | 2 +
core/camel-main/src/main/docs/main.adoc| 4 +-
.../org/apache/camel/main/BaseMainSupport.java | 11 +-
.../main/DebuggerConfigurationProperties.java | 44 ++
8 files changed, 100 insertions(+), 21 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 6a5e64eabbf..3ed4a3937f0 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
@@ -145,6 +145,8 @@
{ "name": "camel.debug.includeException", "description": "Trace messages
to include exception if the message failed", "sourceType":
"org.apache.camel.main.DebuggerConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
{ "name": "camel.debug.includeExchangeProperties", "description": "Whether
to include the exchange properties in the traced message", "sourceType":
"org.apache.camel.main.DebuggerConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
{ "name": "camel.debug.includeExchangeVariables", "description": "Whether
to include the exchange variables in the traced message", "sourceType":
"org.apache.camel.main.DebuggerConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
+{ "name": "camel.debug.jmxConnectorEnabled", "description": "Whether to
create JMX connector that allows tooling to control the Camel debugger. This is
what the IDEA and VSCode tooling is using.", "sourceType":
"org.apache.camel.main.DebuggerConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
+{ "name": "camel.debug.jmxConnectorPort", "description": "Port number to
expose a JMX RMI connector for tooling that needs to control the debugger.",
"sourceType": "org.apache.camel.main.DebuggerConfigurationProperties", "type":
"integer", "javaType": "int", "defaultValue": 1099 },
{ "name": "camel.debug.loggingLevel", "description": "The debugger logging
level to use when logging activity.", "sourceType":
"org.apache.camel.main.DebuggerConfigurationProperties", "type": "object",
"javaType": "org.apache.camel.LoggingLevel", "defaultValue": "INFO", "enum": [
"ERROR", "WARN", "INFO", "DEBUG", "TRACE", "OFF" ] },
{ "name": "camel.debug.singleStepIncludeStartEnd", "description": "In
single step mode, then when the exchange is created and completed, then
simulate a breakpoint at start and end, that allows to suspend and watch the
incoming\/complete exchange at the route (you can see message body as response,
failed exception etc).", "sourceType":
"org.apache.camel.main.DebuggerConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.debug.standby", "description": "To set the debugger in
standby mode, where the debugger
(camel) branch debug-jmx deleted (was 63260ce139a)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch debug-jmx in repository https://gitbox.apache.org/repos/asf/camel.git was 63260ce139a CAMEL-20760: camel-core - Allow to turn on|off RMI connector for tooling based debuggers 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 debug-jmx updated: CAMEL-20760: camel-core - Allow to turn on|off RMI connector for tooling based debuggers
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch debug-jmx in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/debug-jmx by this push: new 63260ce139a CAMEL-20760: camel-core - Allow to turn on|off RMI connector for tooling based debuggers 63260ce139a is described below commit 63260ce139aa2b44f529b365df7273899ab9e4b3 Author: Claus Ibsen AuthorDate: Tue May 14 10:58:14 2024 +0200 CAMEL-20760: camel-core - Allow to turn on|off RMI connector for tooling based debuggers --- .../camel/impl/debugger/DebuggerJmxConnectorService.java | 16 1 file changed, 16 insertions(+) diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DebuggerJmxConnectorService.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DebuggerJmxConnectorService.java index eab2ef53d06..95411d9640c 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DebuggerJmxConnectorService.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DebuggerJmxConnectorService.java @@ -1,3 +1,19 @@ +/* + * 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.impl.debugger; import java.io.IOException;
(camel) 01/02: CAMEL-20760: camel-core - Allow to turn on|off RMI connector for tooling based debuggers
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch debug-jmx
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8ee88834f9a3bb1ba5488c6786f275a04fa62306
Author: Claus Ibsen
AuthorDate: Tue May 14 09:57:08 2024 +0200
CAMEL-20760: camel-core - Allow to turn on|off RMI connector for tooling
based debuggers
---
.../component/debug/CamelDebuggerFactory.java | 9 ++--
.../impl/debugger/DebuggerJmxConnectorService.java | 53 +-
.../DebuggerConfigurationPropertiesConfigurer.java | 12 +
.../camel-main-configuration-metadata.json | 2 +
core/camel-main/src/main/docs/main.adoc| 4 +-
.../org/apache/camel/main/BaseMainSupport.java | 11 -
.../main/DebuggerConfigurationProperties.java | 44 ++
7 files changed, 98 insertions(+), 37 deletions(-)
diff --git
a/components/camel-debug/src/main/java/org/apache/camel/component/debug/CamelDebuggerFactory.java
b/components/camel-debug/src/main/java/org/apache/camel/component/debug/CamelDebuggerFactory.java
index aaf032cc051..fb85af6fb1b 100644
---
a/components/camel-debug/src/main/java/org/apache/camel/component/debug/CamelDebuggerFactory.java
+++
b/components/camel-debug/src/main/java/org/apache/camel/component/debug/CamelDebuggerFactory.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.debug;
import org.apache.camel.CamelContext;
+import org.apache.camel.impl.debugger.DebuggerJmxConnectorService;
import org.apache.camel.impl.debugger.DefaultBacklogDebugger;
import org.apache.camel.spi.BacklogDebugger;
import org.apache.camel.spi.Debugger;
@@ -43,6 +44,11 @@ public class CamelDebuggerFactory implements DebuggerFactory
{
// enable debugger on camel
camelContext.setDebugging(true);
+// to make debugging possible for tooling we need to make it
possible to do remote JMX connection
+DebuggerJmxConnectorService connector = new
DebuggerJmxConnectorService();
+connector.setCreateConnector(true);
+camelContext.addService(connector);
+
// we need to enable debugger after context is started
camelContext.addLifecycleStrategy(new LifecycleStrategySupport() {
@Override
@@ -61,9 +67,6 @@ public class CamelDebuggerFactory implements DebuggerFactory {
camelContext.addService(backlog, true, true);
}
-// to make debugging possible for tooling we need to make it possible
to do remote JMX connection
-camelContext.addService(new JmxConnectorService());
-
// return null as we fool camel-core into using this backlog debugger
as we added it as a service
return null;
}
diff --git
a/components/camel-debug/src/main/java/org/apache/camel/component/debug/JmxConnectorService.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DebuggerJmxConnectorService.java
similarity index 66%
rename from
components/camel-debug/src/main/java/org/apache/camel/component/debug/JmxConnectorService.java
rename to
core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DebuggerJmxConnectorService.java
index d0c75f85561..eab2ef53d06 100644
---
a/components/camel-debug/src/main/java/org/apache/camel/component/debug/JmxConnectorService.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/debugger/DebuggerJmxConnectorService.java
@@ -1,20 +1,4 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.debug;
+package org.apache.camel.impl.debugger;
import java.io.IOException;
import java.lang.management.ManagementFactory;
@@ -36,22 +20,23 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * To make it possible to do JMX debugging via JMX remote
+ * To make it possible to do Camel debugging via JMX remote
*/
-public class JmxConnectorService extends ServiceSupport implements
CamelContextAware {
+public class DebuggerJmxConnectorService extends ServiceSupport implements
CamelContextAware {
public static final String DEFAULT_HOST = "localhost";
public static f
(camel) 02/02: CAMEL-20760: camel-core - Allow to turn on|off RMI connector for tooling based debuggers
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch debug-jmx
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1ace71cf14138289aa59b48a05f55435c9f9ff80
Author: Claus Ibsen
AuthorDate: Tue May 14 10:54:07 2024 +0200
CAMEL-20760: camel-core - Allow to turn on|off RMI connector for tooling
based debuggers
---
.../apache/camel/catalog/main/camel-main-configuration-metadata.json| 2 ++
1 file changed, 2 insertions(+)
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 6a5e64eabbf..3ed4a3937f0 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
@@ -145,6 +145,8 @@
{ "name": "camel.debug.includeException", "description": "Trace messages
to include exception if the message failed", "sourceType":
"org.apache.camel.main.DebuggerConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
{ "name": "camel.debug.includeExchangeProperties", "description": "Whether
to include the exchange properties in the traced message", "sourceType":
"org.apache.camel.main.DebuggerConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
{ "name": "camel.debug.includeExchangeVariables", "description": "Whether
to include the exchange variables in the traced message", "sourceType":
"org.apache.camel.main.DebuggerConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
+{ "name": "camel.debug.jmxConnectorEnabled", "description": "Whether to
create JMX connector that allows tooling to control the Camel debugger. This is
what the IDEA and VSCode tooling is using.", "sourceType":
"org.apache.camel.main.DebuggerConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
+{ "name": "camel.debug.jmxConnectorPort", "description": "Port number to
expose a JMX RMI connector for tooling that needs to control the debugger.",
"sourceType": "org.apache.camel.main.DebuggerConfigurationProperties", "type":
"integer", "javaType": "int", "defaultValue": 1099 },
{ "name": "camel.debug.loggingLevel", "description": "The debugger logging
level to use when logging activity.", "sourceType":
"org.apache.camel.main.DebuggerConfigurationProperties", "type": "object",
"javaType": "org.apache.camel.LoggingLevel", "defaultValue": "INFO", "enum": [
"ERROR", "WARN", "INFO", "DEBUG", "TRACE", "OFF" ] },
{ "name": "camel.debug.singleStepIncludeStartEnd", "description": "In
single step mode, then when the exchange is created and completed, then
simulate a breakpoint at start and end, that allows to suspend and watch the
incoming\/complete exchange at the route (you can see message body as response,
failed exception etc).", "sourceType":
"org.apache.camel.main.DebuggerConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.debug.standby", "description": "To set the debugger in
standby mode, where the debugger will be installed by not automatic enabled.
The debugger can then later be enabled explicit from Java, JMX or tooling.",
"sourceType": "org.apache.camel.main.DebuggerConfigurationProperties", "type":
"boolean", "javaType": "boolean", "defaultValue": "false" },
(camel) branch debug-jmx created (now 1ace71cf141)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch debug-jmx in repository https://gitbox.apache.org/repos/asf/camel.git at 1ace71cf141 CAMEL-20760: camel-core - Allow to turn on|off RMI connector for tooling based debuggers This branch includes the following new commits: new 8ee88834f9a CAMEL-20760: camel-core - Allow to turn on|off RMI connector for tooling based debuggers new 1ace71cf141 CAMEL-20760: camel-core - Allow to turn on|off RMI connector for tooling based debuggers 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.
(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 0a0e373575d Regen
0a0e373575d is described below
commit 0a0e373575d80861e2d4af476c2f794a6fae0ed3
Author: Claus Ibsen
AuthorDate: Tue May 14 06:21:35 2024 +0200
Regen
---
.../org/apache/camel/springboot/catalog/components/dataset-test.json | 4 ++--
.../org/apache/camel/springboot/catalog/components/dataset.json | 4 ++--
.../org/apache/camel/springboot/catalog/components/mock.json | 4 ++--
components-starter/camel-dataset-starter/src/main/docs/dataset.json | 4 ++--
.../component/dataset/springboot/DataSetComponentConfiguration.java | 2 +-
.../dataset/springboot/DataSetTestComponentConfiguration.java | 2 +-
components-starter/camel-mock-starter/src/main/docs/mock.json | 2 +-
.../camel/component/mock/springboot/MockComponentConfiguration.java | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset-test.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset-test.json
index a666a8e8a95..627f43a7fd7 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset-test.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset-test.json
@@ -24,14 +24,14 @@
},
"componentProperties": {
"lazyStartProducer": { "index": 0, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
-"log": { "index": 1, "kind": "property", "displayName": "Log", "group":
"producer", "label": "producer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "To turn on logging when the mock
receives an incoming message. This will log only one time at INFO level for the
incoming message. For more detailed logging then set the logger to DEBUG level
for the org.apache.camel.componen [...]
+"log": { "index": 1, "kind": "property", "displayName": "Log", "group":
"producer", "label": "producer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "To turn on logging when the mock
receives an incoming message. This will log only one time at INFO level for the
incoming message. For more detailed logging, then set the logger to DEBUG level
for the org.apache.camel.compone [...]
"autowiredEnabled": { "index": 2, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
"exchangeFormatter": { "index": 3, "kind": "property", "displayName":
"Exchange Formatter", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType": "org.apache.camel.spi.ExchangeFormatter&
(camel) branch main updated: Bump opentelemetry-version from 1.37.0 to 1.38.0 (#14118)
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 87686381b97 Bump opentelemetry-version from 1.37.0 to 1.38.0 (#14118) 87686381b97 is described below commit 87686381b97ced27eb11cac66b1792f6927016ce Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 13 16:37:21 2024 +0200 Bump opentelemetry-version from 1.37.0 to 1.38.0 (#14118) Bumps `opentelemetry-version` from 1.37.0 to 1.38.0. Updates `io.opentelemetry:opentelemetry-sdk-testing` from 1.37.0 to 1.38.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.37.0...v1.38.0) Updates `io.opentelemetry:opentelemetry-sdk` from 1.37.0 to 1.38.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.37.0...v1.38.0) Updates `io.opentelemetry:opentelemetry-api` from 1.37.0 to 1.38.0 - [Release notes](https://github.com/open-telemetry/opentelemetry-java/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java/compare/v1.37.0...v1.38.0) --- updated-dependencies: - dependency-name: io.opentelemetry:opentelemetry-sdk-testing dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry:opentelemetry-sdk dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry:opentelemetry-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 60a6a99cc21..4eb788cf944 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -386,7 +386,7 @@ 2.11.0 2.0.1 3.11 -1.37.0 +1.38.0 1.23.1-alpha 9.44.0.Final 1.2.5
(camel) branch main updated: Fix typo in LoadBalancer description (#14123)
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 dfcce6f6f60 Fix typo in LoadBalancer description (#14123)
dfcce6f6f60 is described below
commit dfcce6f6f60fe7bf392539c525ffc5e2c6de3b4d
Author: Aurélien Pupier
AuthorDate: Mon May 13 16:25:24 2024 +0200
Fix typo in LoadBalancer description (#14123)
Signed-off-by: Aurélien Pupier
---
.../org/apache/camel/catalog/models/failoverLoadBalancer.json | 2 +-
.../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 4 ++--
.../org/apache/camel/model/loadbalancer/failoverLoadBalancer.json | 2 +-
.../camel/model/loadbalancer/FailoverLoadBalancerDefinition.java | 2 +-
.../org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java | 2 +-
.../camel-yaml-dsl/src/generated/resources/schema/camelYamlDsl.json | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/failoverLoadBalancer.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/failoverLoadBalancer.json
index ac052a46177..7121ecf7dfd 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/failoverLoadBalancer.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/failoverLoadBalancer.json
@@ -16,6 +16,6 @@
"exception": { "index": 1, "kind": "element", "displayName": "Exception",
"group": "common", "required": false, "type": "array", "javaType":
"java.util.List", "deprecated": false, "autowired": false,
"secret": false, "description": "A list of class names for specific exceptions
to monitor. If no exceptions are configured then all exceptions are monitored"
},
"roundRobin": { "index": 2, "kind": "attribute", "displayName": "Round
Robin", "group": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Whether or not the failover load balancer should operate in
round robin mode or not. If not, then it will always start from the first
endpoint when a new message is to be processed. In other words it restart from
the top for every message. If roun [...]
"sticky": { "index": 3, "kind": "attribute", "displayName": "Sticky",
"group": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Whether or not the failover load balancer should operate in
sticky mode or not. If not, then it will always start from the first endpoint
when a new message is to be processed. In other words it restart from the top
for every message. If sticky is enabled, [...]
-"maximumFailoverAttempts": { "index": 4, "kind": "attribute",
"displayName": "Maximum Failover Attempts", "group": "common", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "-1", "description": "A
value to indicate after X failover attempts we should exhaust (give up). Use -1
to indicate never give up and continuously try to failover. Use 0 to never
failover. And use e.g. 3 to failover at m [...]
+"maximumFailoverAttempts": { "index": 4, "kind": "attribute",
"displayName": "Maximum Failover Attempts", "group": "common", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "-1", "description": "A
value to indicate after X failover attempts we should exhaust (give up). Use -1
to indicate never give up and continuously try to failover. Use 0 to never
failover. And use e.g. 3 to failover at m [...]
}
}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/came
(camel-spring-boot) branch main updated: CAMEL-20758: camel-debug-starter - Should be created sooner so the debugger is configured before routes is created. Also turn on debug by default if you have c
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 818c7cb6018 CAMEL-20758: camel-debug-starter - Should be created
sooner so the debugger is configured before routes is created. Also turn on
debug by default if you have camel-debug-starter on the classpath.
818c7cb6018 is described below
commit 818c7cb60184dabaa3dc8ba7c1d38e2d1a6e868e
Author: Claus Ibsen
AuthorDate: Mon May 13 16:05:11 2024 +0200
CAMEL-20758: camel-debug-starter - Should be created sooner so the debugger
is configured before routes is created. Also turn on debug by default if you
have camel-debug-starter on the classpath.
---
.../camel-debug-starter/src/main/docs/debug.json | 2 +-
.../boot/debug/CamelDebugAutoConfiguration.java| 27 ++
.../debug/CamelDebugConfigurationProperties.java | 2 +-
3 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/components-starter/camel-debug-starter/src/main/docs/debug.json
b/components-starter/camel-debug-starter/src/main/docs/debug.json
index 8a6dfa969ed..fb29c30ae23 100644
--- a/components-starter/camel-debug-starter/src/main/docs/debug.json
+++ b/components-starter/camel-debug-starter/src/main/docs/debug.json
@@ -39,7 +39,7 @@
"type": "java.lang.Boolean",
"description": "Enables Debugger in your Camel application.",
"sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties",
- "defaultValue": false
+ "defaultValue": true
},
{
"name": "camel.debug.fallback-timeout",
diff --git
a/components-starter/camel-debug-starter/src/main/java/org/apache/camel/spring/boot/debug/CamelDebugAutoConfiguration.java
b/components-starter/camel-debug-starter/src/main/java/org/apache/camel/spring/boot/debug/CamelDebugAutoConfiguration.java
index 87d001aae49..8a0c8033430 100644
---
a/components-starter/camel-debug-starter/src/main/java/org/apache/camel/spring/boot/debug/CamelDebugAutoConfiguration.java
+++
b/components-starter/camel-debug-starter/src/main/java/org/apache/camel/spring/boot/debug/CamelDebugAutoConfiguration.java
@@ -21,8 +21,10 @@ import org.apache.camel.component.debug.JmxConnectorService;
import org.apache.camel.impl.debugger.DefaultBacklogDebugger;
import org.apache.camel.spi.BacklogDebugger;
import org.apache.camel.spring.boot.CamelAutoConfiguration;
+import org.apache.camel.spring.boot.CamelSpringBootApplicationListener;
import org.apache.camel.support.LifecycleStrategySupport;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import
org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
@@ -32,23 +34,24 @@ import org.springframework.context.annotation.Configuration;
@ConditionalOnBean(CamelAutoConfiguration.class)
@EnableConfigurationProperties(CamelDebugConfigurationProperties.class)
@AutoConfigureAfter(CamelAutoConfiguration.class)
+@AutoConfigureBefore(CamelSpringBootApplicationListener.class)
public class CamelDebugAutoConfiguration {
@Bean
public BacklogDebugger backlogDebugger(CamelContext camelContext,
CamelDebugConfigurationProperties config)
throws Exception {
-if (!config.isEnabled() && !config.isStandby()) {
-return null;
-}
-
-// must enable source location so debugger tooling knows to map
breakpoints to source code
-camelContext.setSourceLocationEnabled(true);
-
// enable debugger on camel
camelContext.setDebugging(config.isEnabled());
camelContext.setDebugStandby(config.isStandby());
+if (config.isEnabled() || config.isStandby()) {
+// must enable source location and history
+// so debugger tooling knows to map breakpoints to source code
+camelContext.setSourceLocationEnabled(true);
+camelContext.setMessageHistory(true);
+}
+
BacklogDebugger debugger =
DefaultBacklogDebugger.createDebugger(camelContext);
debugger.setStandby(config.isStandby());
debugger.setInitialBreakpoints(config.getBreakpoints());
@@ -68,19 +71,23 @@ public class CamelDebugAutoConfiguration {
@Override
public void onContextStarted(CamelContext context) {
// only enable debugger if not in standby mode
-if (!debugger.isStandby()) {
+if (config.isEnabled() && !debugger.isStandby()) {
debugger.enableDebugger();
(camel) 04/04: CAMEL-20761: camel-jbang debug need to deal with message history from camel 4.7 onwards include current node.
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 0ae100d3e4a5009325b97b72a3c4552b3ef83e56
Author: Claus Ibsen
AuthorDate: Mon May 13 16:21:29 2024 +0200
CAMEL-20761: camel-jbang debug need to deal with message history from camel
4.7 onwards include current node.
---
.../camel/impl/engine/CamelInternalProcessor.java | 5 -
.../apache/camel/impl/console/DebugDevConsole.java | 1 +
.../ROOT/pages/camel-4x-upgrade-guide-4_7.adoc | 8 +++
.../camel/dsl/jbang/core/commands/Debug.java | 26 ++
4 files changed, 31 insertions(+), 9 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
index 29514649b3c..ea0bc711009 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java
@@ -743,11 +743,6 @@ public class CamelInternalProcessor extends
DelegateAsyncProcessor implements In
}
}
-@Override
-public boolean hasState() {
-return true;
-}
-
}
/**
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/DebugDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/DebugDevConsole.java
index 4146bdd1b47..4e3dcfb774e 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/DebugDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/DebugDevConsole.java
@@ -151,6 +151,7 @@ public class DebugDevConsole extends AbstractDevConsole {
BacklogDebugger backlog =
getCamelContext().hasService(BacklogDebugger.class);
if (backlog != null) {
+root.put("version", getCamelContext().getVersion());
root.put("enabled", backlog.isEnabled());
root.put("standby", backlog.isStandby());
root.put("suspendedMode", backlog.isSuspendMode());
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 59fecdd7a5d..19e9dd64d9a 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
@@ -59,6 +59,14 @@ To:
+=== camel-debug
+
+The debugger (using `org.apache.camel.spi.BacklogDebugger`) used for tooling
such as IDEA and Visual Studio, is fixed
+to work better out-of-the-box by just having `camel-debug` JAR or
`camel-debug-starter` (for Spring Boot) on the classpath.
+
+An internal change is that the MBean operation
`messageHistoryOnBreakpointAsXml` on `ManagedBacklogDebugger` now includes
+the current node as last message history, which was expected by IDEA tooling,
to make it function again.
+
=== camel-spring-security
The `camel-spring-security` component has been updated to improve readiness
for Spring Security 7.x. Since Spring Security 5.8 the `AccessDecisionManager`
interface and the related cooperating classes have been deprecated in favor of
`AuthorizationManager` based patterns.
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
index 702489f69e5..49367ed2fd2 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
@@ -34,6 +34,7 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.camel.dsl.jbang.core.commands.action.MessageTableHelper;
import org.apache.camel.dsl.jbang.core.common.CamelCommandHelper;
import org.apache.camel.dsl.jbang.core.common.CommandLineHelper;
+import org.apache.camel.dsl.jbang.core.common.VersionHelper;
import org.apache.camel.main.KameletMain;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
@@ -338,6 +339,7 @@ public class Debug extends Run {
// only read if expecting new data
long cnt = jo.getLongOrDefault("debugCounter", 0);
+String version = jo.getString("version");
if (cnt > debugCounter.get()) {
JsonArray arr = jo.getCollection("suspended");
if (arr != null) {
@@ -351,7 +353,7 @@ public class Debug extends Run {
for (Object o : arr) {
SuspendedRow row = new SuspendedRow();
(camel) branch main updated (d9062d5b5d0 -> 0ae100d3e4a)
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 d9062d5b5d0 Regen for commit 725cf43bf28a2e787d26a7875c871aa6522d5d60 (#14125) new 8568fca7120 CAMEL-20761: camel-debug - Message history must be enabled when debugging. Also history must come before debugger advice. new a77b526e4f3 CAMEL-20758: camel-debug-starter - Should be created sooner so the debugger is configured before routes is created. Also turn on debug by default if you have camel-debug-starter on the classpath. new d6f7988ec26 CAMEL-20762: camel-main - Detect camel-debug JAR on classpath eager to turn on source location which is needed for khaving Java DSL working. new 0ae100d3e4a CAMEL-20761: camel-jbang debug need to deal with message history from camel 4.7 onwards include current node. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../component/debug/CamelDebuggerFactory.java | 8 +++ .../camel/impl/engine/CamelInternalProcessor.java | 5 .../apache/camel/impl/engine/DefaultChannel.java | 17 - .../apache/camel/impl/console/DebugDevConsole.java | 1 + .../org/apache/camel/main/BaseMainSupport.java | 17 - .../camel/management/BacklogDebuggerTest.java | 2 +- .../ROOT/pages/camel-4x-upgrade-guide-4_7.adoc | 28 +- .../camel/dsl/jbang/core/commands/Debug.java | 26 8 files changed, 81 insertions(+), 23 deletions(-)
(camel) 02/04: CAMEL-20758: camel-debug-starter - Should be created sooner so the debugger is configured before routes is created. Also turn on debug by default if you have camel-debug-starter on the
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 a77b526e4f36b90b250a30302b499899d69b640c
Author: Claus Ibsen
AuthorDate: Mon May 13 13:10:04 2024 +0200
CAMEL-20758: camel-debug-starter - Should be created sooner so the debugger
is configured before routes is created. Also turn on debug by default if you
have camel-debug-starter on the classpath.
---
.../ROOT/pages/camel-4x-upgrade-guide-4_7.adoc | 22 +++---
1 file changed, 15 insertions(+), 7 deletions(-)
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 0ff669f76da..59fecdd7a5d 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
@@ -59,25 +59,30 @@ To:
-
=== camel-spring-security
The `camel-spring-security` component has been updated to improve readiness
for Spring Security 7.x. Since Spring Security 5.8 the `AccessDecisionManager`
interface and the related cooperating classes have been deprecated in favor of
`AuthorizationManager` based patterns.
If you are creating Spring Security route policies in your code, you must now
refactor them to be based on an `AuthorizationManager`.
For example, you might have a route policy defined as follows:
-```java
+
+[source,java]
+
SpringSecurityAuthorizationPolicy authorizationPolicy = new
SpringSecurityAuthorizationPolicy();
authorizationPolicy.setAuthenticationManager(authenticationManager);
authorizationPolicy.setSpringSecurityAccessPolicy(new
SpringSecurityAccessPolicy("ROLE_ADMIN"));
authorizationPolicy.setAccessDecisionManager(new
AffirmativeBased(Collections.singletonList(new RoleVoter(;
-```
+
+
With the changes implemented in this release, that must be refactored to:
-```java
+
+[source,java]
+
SpringSecurityAuthorizationPolicy authorizationPolicy = new
SpringSecurityAuthorizationPolicy();
authorizationPolicy.setAuthenticationManager(authenticationManager);
authorizationPolicy.setAuthorizationManager(AuthorityAuthorizationManager.hasRole("ADMIN"));
-```
+
+
This new pattern supports a more expressive language to define your own
authorization rules, exposing the full power of the Spring Security framework
to Camel route policies.
See the
https://docs.spring.io/spring-security/reference/5.8/migration/servlet/authorization.html#servlet-replace-permissionevaluator-bean-with-methodsecurityexpression-handler[spring
documentation] for further details on how to migrate your custom code from
`AccessDecisionManager` to `AuthorizationManager`.
@@ -87,10 +92,13 @@ The `camel-as2` component has been updated so that the
client can compress a MIM
sections https://datatracker.ietf.org/doc/html/rfc5402/#section-3.2[3.2] and
https://datatracker.ietf.org/doc/html/rfc5402/#section-3.5[3.5] of
https://datatracker.ietf.org/doc/html/rfc5402/[rfc 5402].
-== Camel Spring Boot
+=== Camel Spring Boot
-=== camel-debug-starter
+ camel-debug-starter
Using camel debugger with Spring Boot is now moved from `camel-spring-boot`
into `camel-debug-starter` where you can configure the debugger
via `camel.debug.` options in `application.properties`.
+The `camel-debug-starter` now has `camel.debug.enabled=true` by default to let
the debugger be installed out of the box,
+by having the JAR on the classpath (as intended). You can turn this off via
`camel.debug.enabled=false`.
+
(camel) 01/04: CAMEL-20761: camel-debug - Message history must be enabled when debugging. Also history must come before debugger advice.
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 8568fca71200d78a170b3f80553f97d9dbcbfa54
Author: Claus Ibsen
AuthorDate: Mon May 13 12:38:17 2024 +0200
CAMEL-20761: camel-debug - Message history must be enabled when debugging.
Also history must come before debugger advice.
---
.../camel/component/debug/CamelDebuggerFactory.java | 8
.../org/apache/camel/impl/engine/DefaultChannel.java| 17 +++--
.../java/org/apache/camel/main/BaseMainSupport.java | 4 +++-
.../apache/camel/management/BacklogDebuggerTest.java| 2 +-
4 files changed, 23 insertions(+), 8 deletions(-)
diff --git
a/components/camel-debug/src/main/java/org/apache/camel/component/debug/CamelDebuggerFactory.java
b/components/camel-debug/src/main/java/org/apache/camel/component/debug/CamelDebuggerFactory.java
index 204947c447b..aaf032cc051 100644
---
a/components/camel-debug/src/main/java/org/apache/camel/component/debug/CamelDebuggerFactory.java
+++
b/components/camel-debug/src/main/java/org/apache/camel/component/debug/CamelDebuggerFactory.java
@@ -35,6 +35,14 @@ public class CamelDebuggerFactory implements DebuggerFactory
{
BacklogDebugger backlog =
DefaultBacklogDebugger.createDebugger(camelContext);
backlog.setStandby(camelContext.isDebugStandby());
+// must enable source location and history
+// so debugger tooling knows to map breakpoints to source code
+camelContext.setSourceLocationEnabled(true);
+camelContext.setMessageHistory(true);
+
+// enable debugger on camel
+camelContext.setDebugging(true);
+
// we need to enable debugger after context is started
camelContext.addLifecycleStrategy(new LifecycleStrategySupport() {
@Override
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..d6be2911808 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
@@ -176,8 +176,10 @@ public class DefaultChannel extends CamelInternalProcessor
implements Channel {
// as we do not want regular tracer to trace the debugger)
if (camelContext.isDebugStandby() || route.isDebugging()) {
final Debugger customDebugger = camelContext.getDebugger();
+final MessageHistoryFactory messageHistoryFactory =
camelContext.getMessageHistoryFactory();
if (customDebugger != null) {
// use custom debugger
+addAdvice(new MessageHistoryAdvice(messageHistoryFactory,
targetOutputDef));
addAdvice(new DebuggerAdvice(customDebugger, nextProcessor,
targetOutputDef));
}
BacklogDebugger debugger = getBacklogDebugger(camelContext,
customDebugger == null);
@@ -192,12 +194,13 @@ public class DefaultChannel extends
CamelInternalProcessor implements Channel {
if (!skip && routeDefinition != null) {
backlogDebuggerSetupInitialBreakpoints(definition,
routeDefinition, first, debugger, targetOutputDef);
if (first && debugger.isSingleStepIncludeStartEnd()) {
-// add breakpoint on route input instead of first node
-addAdvice(new BacklogDebuggerAdvice(debugger,
nextProcessor, routeDefinition.getInput()));
// debugger captures message history, and we need to
capture history of incoming
addAdvice(
new
MessageHistoryAdvice(camelContext.getMessageHistoryFactory(),
routeDefinition.getInput()));
+// add breakpoint on route input instead of first node
+addAdvice(new BacklogDebuggerAdvice(debugger,
nextProcessor, routeDefinition.getInput()));
}
+addAdvice(new MessageHistoryAdvice(messageHistoryFactory,
targetOutputDef));
addAdvice(new BacklogDebuggerAdvice(debugger,
nextProcessor, targetOutputDef));
}
}
@@ -214,10 +217,12 @@ public class DefaultChannel extends
CamelInternalProcessor implements Channel {
addAdvice(new TracingAdvice(tracer, targetOutputDef,
routeDefinition, first));
}
-if (route.isMessageHistory()) {
-// add message history advice
-MessageHistoryFactory factory =
camelContext.getMessageHistoryFactory();
-addAdvice(new MessageHistoryAdvice(factory, targetOutputDef));
+// debugger will automatically include message history
(camel) 03/04: CAMEL-20762: camel-main - Detect camel-debug JAR on classpath eager to turn on source location which is needed for khaving Java DSL working.
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 d6f7988ec262822fa9831e16e4d68011b2152805
Author: Claus Ibsen
AuthorDate: Mon May 13 14:09:04 2024 +0200
CAMEL-20762: camel-main - Detect camel-debug JAR on classpath eager to turn
on source location which is needed for khaving Java DSL working.
---
.../main/java/org/apache/camel/main/BaseMainSupport.java| 13 +
1 file changed, 13 insertions(+)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index 4bfddc7212a..52f5bb07217 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -65,6 +65,8 @@ import org.apache.camel.spi.CamelTracingService;
import org.apache.camel.spi.CompileStrategy;
import org.apache.camel.spi.ContextReloadStrategy;
import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.Debugger;
+import org.apache.camel.spi.DebuggerFactory;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.LifecycleStrategy;
import org.apache.camel.spi.PackageScanClassResolver;
@@ -689,6 +691,8 @@ public abstract class BaseMainSupport extends BaseService {
configureLifecycle(camelContext);
if (standalone) {
+// detect if camel-debug JAR is on classpath as we need to know
this before configuring routes
+detectCamelDebugJar(camelContext);
step = recorder.beginStep(BaseMainSupport.class,
"configureRoutes", "Collect Routes");
configureRoutes(camelContext);
recorder.endStep(step);
@@ -711,6 +715,15 @@ public abstract class BaseMainSupport extends BaseService {
}
}
+protected void detectCamelDebugJar(CamelContext camelContext) {
+DebuggerFactory df =
camelContext.getCamelContextExtension().getBootstrapFactoryFinder()
+.newInstance(Debugger.FACTORY,
DebuggerFactory.class).orElse(null);
+if (df != null) {
+// if camel-debug is on classpath then we need to eager to turn on
source location which is needed for Java DSL
+camelContext.setSourceLocationEnabled(true);
+}
+}
+
protected void autoConfigurationFailFast(CamelContext camelContext,
OrderedLocationProperties autoConfiguredProperties)
throws Exception {
// load properties
(camel) branch main updated (a911a45b4c6 -> d1b8e72d9ce)
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 a911a45b4c6 Bump org.elasticsearch.client:elasticsearch-rest-client-sniffer (#14115) add d1b8e72d9ce Bump gg.jte:jte from 3.1.9 to 3.1.10 (#14117) 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 org.elasticsearch.client:elasticsearch-rest-client-sniffer (#14115)
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 a911a45b4c6 Bump org.elasticsearch.client:elasticsearch-rest-client-sniffer (#14115) a911a45b4c6 is described below commit a911a45b4c6b70b2786d9777302dd78a264d0aae Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 13 10:59:36 2024 +0200 Bump org.elasticsearch.client:elasticsearch-rest-client-sniffer (#14115) Bumps [org.elasticsearch.client:elasticsearch-rest-client-sniffer](https://github.com/elastic/elasticsearch) from 8.13.3 to 8.13.4. - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/commits) --- updated-dependencies: - dependency-name: org.elasticsearch.client:elasticsearch-rest-client-sniffer 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 0f0cedc3cf4..aebc8af2678 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -146,7 +146,7 @@ 2.1.5 3.10.8 8.13.3 - 8.13.3 + 8.13.4 4.1.0.Final 3.2.0 2.0.50
(camel) branch main updated: Bump org.apache.camel.k:camel-k-crds from 2.3.0 to 2.3.1 (#14116)
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 776c0d8c446 Bump org.apache.camel.k:camel-k-crds from 2.3.0 to 2.3.1 (#14116) 776c0d8c446 is described below commit 776c0d8c44648390a18b4067fe14e98b95af577a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 13 10:59:25 2024 +0200 Bump org.apache.camel.k:camel-k-crds from 2.3.0 to 2.3.1 (#14116) Bumps [org.apache.camel.k:camel-k-crds](https://github.com/apache/camel-k) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/apache/camel-k/releases) - [Changelog](https://github.com/apache/camel-k/blob/main/CHANGELOG.md) - [Commits](https://github.com/apache/camel-k/compare/v2.3.0...v2.3.1) --- updated-dependencies: - dependency-name: org.apache.camel.k:camel-k-crds dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 3006b8d9339..0f0cedc3cf4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -90,7 +90,7 @@ 3.11.0 3.11.0 7.21.0 -2.3.0 +2.3.1 4.17.0 1.2 3.3.0
(camel) branch main updated: Bump org.apache.commons:commons-csv from 1.10.0 to 1.11.0 (#14114)
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 c5677630971 Bump org.apache.commons:commons-csv from 1.10.0 to 1.11.0 (#14114) c5677630971 is described below commit c56776309716167fe36bcc61f350e847f9e61052 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 13 09:17:03 2024 +0200 Bump org.apache.commons:commons-csv from 1.10.0 to 1.11.0 (#14114) Bumps [org.apache.commons:commons-csv](https://github.com/apache/commons-csv) from 1.10.0 to 1.11.0. - [Changelog](https://github.com/apache/commons-csv/blob/master/RELEASE-NOTES.txt) - [Commits](https://github.com/apache/commons-csv/compare/rel/commons-csv-1.10.0...rel/commons-csv-1.11.0) --- updated-dependencies: - dependency-name: org.apache.commons:commons-csv 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 ad3fe5f6fcb..3006b8d9339 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -104,7 +104,7 @@ 3.2.2 4.4 1.26.1 -1.10.0 +1.11.0 1.4 1.4 2.12.0
(camel) branch main updated (ca3d4bb00c6 -> 425934813f2)
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 ca3d4bb00c6 Bump aws-java-sdk2-version from 2.25.49 to 2.25.50 (#14112) add 425934813f2 Bump com.alibaba:fastjson from 2.0.49 to 2.0.50 (#14113) 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 (477eb74e8a7 -> ca3d4bb00c6)
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 477eb74e8a7 Camel 20759 allow client compression before signing (#14110) add ca3d4bb00c6 Bump aws-java-sdk2-version from 2.25.49 to 2.25.50 (#14112) 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: 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 60b02646aa3 Regen
60b02646aa3 is described below
commit 60b02646aa3b8f9eccdc4f3353d355c443ec7719
Author: Claus Ibsen
AuthorDate: Mon May 13 06:55:57 2024 +0200
Regen
---
.../resources/org/apache/camel/springboot/catalog/components/as2.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/as2.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/as2.json
index f928a87b219..fa7fd309008 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/as2.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/as2.json
@@ -33,7 +33,7 @@
"apiName": { "index": 0, "kind": "path", "displayName": "Api Name",
"group": "common", "label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.as2.internal.AS2ApiName", "enum": [ "CLIENT",
"SERVER", "RECEIPT" ], "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.as2.AS2Configuration", "configurationField":
"configuration", "description": "What kind of operation to perform" },
"methodName": { "index": 1, "kind": "path", "displayName": "Method Name",
"group": "common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.as2.AS2Configuration", "configurationField":
"configuration", "description": "What sub operation to use for the selected
operation" },
"as2From": { "index": 2, "kind": "parameter", "displayName": "As2 From",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.as2.AS2Configuration", "configurationField":
"configuration", "description": "The value of the AS2From header of AS2
message." },
-"as2MessageStructure": { "index": 3, "kind": "parameter", "displayName":
"As2 Message Structure", "group": "common", "label": "", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.as2.api.AS2MessageStructure", "enum": [ "PLAIN",
"SIGNED", "ENCRYPTED", "SIGNED_ENCRYPTED", "PLAIN_COMPRESSED",
"SIGNED_COMPRESSED", "ENCRYPTED_COMPRESSED", "ENCRYPTED_COMPRESSED_SIGNED" ],
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache [...]
+"as2MessageStructure": { "index": 3, "kind": "parameter", "displayName":
"As2 Message Structure", "group": "common", "label": "", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.as2.api.AS2MessageStructure", "enum": [ "PLAIN",
"SIGNED", "ENCRYPTED", "SIGNED_ENCRYPTED", "PLAIN_COMPRESSED",
"COMPRESSED_SIGNED", "SIGNED_COMPRESSED", "ENCRYPTED_COMPRESSED",
"ENCRYPTED_COMPRESSED_SIGNED", "ENCRYPTED_SIGNED_COMPRESSED" ], "deprecated":
false, "autowired": false [...]
"as2To": { "index": 4, "kind": "parameter", "displayName&quo
(camel) branch main updated: Camel 20759 allow client compression before signing (#14110)
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 477eb74e8a7 Camel 20759 allow client compression before signing
(#14110)
477eb74e8a7 is described below
commit 477eb74e8a754c749a7cf81a0cf27e0f0896d480
Author: Jono Morris
AuthorDate: Mon May 13 16:49:58 2024 +1200
Camel 20759 allow client compression before signing (#14110)
* CAMEL-20759 allow client compression for signing
* CAMEL-20759 add generated changes
-
Co-authored-by: Claus Ibsen
---
.../org/apache/camel/catalog/components/as2.json | 4 +-
.../camel/component/as2/api/AS2ClientManager.java | 68 -
.../component/as2/api/AS2MessageStructure.java | 4 +-
.../camel/component/as2/api/AS2MessageTest.java| 119 ++-
.../org/apache/camel/component/as2/as2.json| 4 +-
.../camel/component/as2/AS2ServerManagerIT.java| 166 +
.../ROOT/pages/camel-4x-upgrade-guide-4_7.adoc | 6 +
7 files changed, 360 insertions(+), 11 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json
index a4c4ba24786..45dffabaaba 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json
@@ -33,7 +33,7 @@
"apiName": { "index": 0, "kind": "path", "displayName": "Api Name",
"group": "common", "label": "", "required": true, "type": "object", "javaType":
"org.apache.camel.component.as2.internal.AS2ApiName", "enum": [ "CLIENT",
"SERVER", "RECEIPT" ], "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.as2.AS2Configuration", "configurationField":
"configuration", "description": "What kind of operation to perform" },
"methodName": { "index": 1, "kind": "path", "displayName": "Method Name",
"group": "common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.as2.AS2Configuration", "configurationField":
"configuration", "description": "What sub operation to use for the selected
operation" },
"as2From": { "index": 2, "kind": "parameter", "displayName": "As2 From",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.as2.AS2Configuration", "configurationField":
"configuration", "description": "The value of the AS2From header of AS2
message." },
-"as2MessageStructure": { "index": 3, "kind": "parameter", "displayName":
"As2 Message Structure", "group": "common", "label": "", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.as2.api.AS2MessageStructure", "enum": [ "PLAIN",
"SIGNED", "ENCRYPTED", "SIGNED_ENCRYPTED", "PLAIN_COMPRESSED",
"SIGNED_COMPRESSED", "ENCRYPTED_COMPRESSED", "ENCRYPTED_COMPRESSED_SIGNED" ],
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache [...]
+"as2MessageStructure": { "index": 3, "kind": "parameter", "displayName":
"As2 Message Structure", "group": "common", "label": "", "required": false,
"type": "object", "javaType":
"org.apache.came
(camel-spring-boot) branch deb deleted (was 05cb736504a)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch deb in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was 05cb736504a CAMEL-20758: camel-spring-boot - Debugger is created twice 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: debugger is created twice (#14106)
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 bf4a6a951e1 debugger is created twice (#14106)
bf4a6a951e1 is described below
commit bf4a6a951e1e33bfef555b66fd1d4c373b8cbb9c
Author: Claus Ibsen
AuthorDate: Sun May 12 20:19:15 2024 +0200
debugger is created twice (#14106)
* CAMEL-20758: camel-spring-boot - Debugger is created twice
* CAMEL-20758: camel-spring-boot - Debugger is created twice
---
.../org/apache/camel/impl/engine/AbstractCamelContext.java | 10 ++
.../modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc | 7 +++
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 59eb0afd92c..57d08b48da5 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -2293,10 +2293,12 @@ public abstract class AbstractCamelContext extends
BaseService
}
}
if (!debuggerDetected && (isDebugging() || isDebugStandby())) {
-// debugging enabled but camel-debug was not auto-detected from
classpath
-// so install default debugger
-BacklogDebugger backlog =
DefaultBacklogDebugger.createDebugger(this);
-addService(backlog, true, true);
+if (hasService(BacklogDebugger.class) == null) {
+// debugging enabled but camel-debug was not auto-detected
from classpath
+// so install default debugger
+BacklogDebugger backlog =
DefaultBacklogDebugger.createDebugger(this);
+addService(backlog, true, true);
+}
}
addService(getManagementStrategy(), false);
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 2f6577738ee..a595510a771 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
@@ -81,3 +81,10 @@
authorizationPolicy.setAuthorizationManager(AuthorityAuthorizationManager.hasRol
This new pattern supports a more expressive language to define your own
authorization rules, exposing the full power of the Spring Security framework
to Camel route policies.
See the
https://docs.spring.io/spring-security/reference/5.8/migration/servlet/authorization.html#servlet-replace-permissionevaluator-bean-with-methodsecurityexpression-handler[spring
documentation] for further details on how to migrate your custom code from
`AccessDecisionManager` to `AuthorizationManager`.
+
+== Camel Spring Boot
+
+=== camel-debug-starter
+
+Using camel debugger with Spring Boot is now moved from `camel-spring-boot`
into `camel-debug-starter` where you can configure the debugger
+via `camel.debug.` options in `application.properties`.
(camel-spring-boot) branch main updated: CAMEL-20758: camel-spring-boot - Debugger is created twice (#1145)
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 e8566492b31 CAMEL-20758: camel-spring-boot - Debugger is created twice
(#1145)
e8566492b31 is described below
commit e8566492b3131e3c6a4bd8891ba28bf37381bd53
Author: Claus Ibsen
AuthorDate: Sun May 12 20:19:25 2024 +0200
CAMEL-20758: camel-spring-boot - Debugger is created twice (#1145)
---
.../camel-debug-starter/src/main/docs/debug.json | 114 ++---
.../boot/debug/CamelDebugAutoConfiguration.java| 5 +
.../debug/CamelDebugConfigurationProperties.java | 0
...rk.boot.autoconfigure.AutoConfiguration.imports | 18
.../src/main/docs/spring-boot.json | 94 -
...rk.boot.autoconfigure.AutoConfiguration.imports | 1 -
6 files changed, 123 insertions(+), 109 deletions(-)
diff --git a/components-starter/camel-debug-starter/src/main/docs/debug.json
b/components-starter/camel-debug-starter/src/main/docs/debug.json
index f0caf83295a..8a6dfa969ed 100644
--- a/components-starter/camel-debug-starter/src/main/docs/debug.json
+++ b/components-starter/camel-debug-starter/src/main/docs/debug.json
@@ -1,15 +1,101 @@
{
- "other": {
-"kind": "other",
-"name": "debug",
-"title": "Debug",
-"description": "Enables Camel Route Debugging",
-"deprecated": false,
-"firstVersion": "3.15.0",
-"label": "tooling",
-"supportLevel": "Stable",
-"groupId": "org.apache.camel.springboot",
-"artifactId": "camel-debug-starter",
-"version": "4.7.0-SNAPSHOT"
- }
-}
+ "groups": [
+{
+ "name": "camel.debug",
+ "type":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties",
+ "sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties"
+}
+ ],
+ "properties": [
+{
+ "name": "camel.debug.body-include-files",
+ "type": "java.lang.Boolean",
+ "description": "Whether to include the message body of file based
messages. The overhead is that the file content has to be read from the file.",
+ "sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties",
+ "defaultValue": true
+},
+{
+ "name": "camel.debug.body-include-streams",
+ "type": "java.lang.Boolean",
+ "description": "Whether to include the message body of stream based
messages. If enabled then beware the stream may not be re-readable later. See
more about Stream Caching.",
+ "sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties",
+ "defaultValue": false
+},
+{
+ "name": "camel.debug.body-max-chars",
+ "type": "java.lang.Integer",
+ "description": "To limit the message body to a maximum size in the
traced message. Use 0 or negative value to use unlimited size.",
+ "sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties",
+ "defaultValue": 0
+},
+{
+ "name": "camel.debug.breakpoints",
+ "type": "java.lang.String",
+ "description": "Allows to pre-configure breakpoints (node ids) to use
with debugger on startup. Multiple ids can be separated by comma. Use special
value _all_routes_ to add a breakpoint for the first node for every route, in
other words this makes it easy to debug from the beginning of every route
without knowing the exact node ids.",
+ "sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties"
+},
+{
+ "name": "camel.debug.enabled",
+ "type": "java.lang.Boolean",
+ "description": "Enables Debugger in your Camel application.",
+ "sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties",
+ "defaultValue": false
+},
+{
+ "name": "camel.debug.fallback-timeout",
+ "type": "java.lang.Long",
+ "description": "Fallback Timeout in seconds (300 seconds as default)
when block the message processing in Camel. A timeout used for waiting fo
(camel) branch deb deleted (was f0bd378c2f2)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch deb in repository https://gitbox.apache.org/repos/asf/camel.git was f0bd378c2f2 CAMEL-20758: camel-spring-boot - Debugger is created twice 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) 01/01: CAMEL-20758: camel-spring-boot - Debugger is created twice
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch deb
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 05cb736504a9943154160f3a9b6e178694fef88e
Author: Claus Ibsen
AuthorDate: Sun May 12 10:32:48 2024 +0200
CAMEL-20758: camel-spring-boot - Debugger is created twice
---
.../camel-debug-starter/src/main/docs/debug.json | 114 ++---
.../boot/debug/CamelDebugAutoConfiguration.java| 5 +
.../debug/CamelDebugConfigurationProperties.java | 0
...rk.boot.autoconfigure.AutoConfiguration.imports | 18
.../src/main/docs/spring-boot.json | 94 -
...rk.boot.autoconfigure.AutoConfiguration.imports | 1 -
6 files changed, 123 insertions(+), 109 deletions(-)
diff --git a/components-starter/camel-debug-starter/src/main/docs/debug.json
b/components-starter/camel-debug-starter/src/main/docs/debug.json
index f0caf83295a..8a6dfa969ed 100644
--- a/components-starter/camel-debug-starter/src/main/docs/debug.json
+++ b/components-starter/camel-debug-starter/src/main/docs/debug.json
@@ -1,15 +1,101 @@
{
- "other": {
-"kind": "other",
-"name": "debug",
-"title": "Debug",
-"description": "Enables Camel Route Debugging",
-"deprecated": false,
-"firstVersion": "3.15.0",
-"label": "tooling",
-"supportLevel": "Stable",
-"groupId": "org.apache.camel.springboot",
-"artifactId": "camel-debug-starter",
-"version": "4.7.0-SNAPSHOT"
- }
-}
+ "groups": [
+{
+ "name": "camel.debug",
+ "type":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties",
+ "sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties"
+}
+ ],
+ "properties": [
+{
+ "name": "camel.debug.body-include-files",
+ "type": "java.lang.Boolean",
+ "description": "Whether to include the message body of file based
messages. The overhead is that the file content has to be read from the file.",
+ "sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties",
+ "defaultValue": true
+},
+{
+ "name": "camel.debug.body-include-streams",
+ "type": "java.lang.Boolean",
+ "description": "Whether to include the message body of stream based
messages. If enabled then beware the stream may not be re-readable later. See
more about Stream Caching.",
+ "sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties",
+ "defaultValue": false
+},
+{
+ "name": "camel.debug.body-max-chars",
+ "type": "java.lang.Integer",
+ "description": "To limit the message body to a maximum size in the
traced message. Use 0 or negative value to use unlimited size.",
+ "sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties",
+ "defaultValue": 0
+},
+{
+ "name": "camel.debug.breakpoints",
+ "type": "java.lang.String",
+ "description": "Allows to pre-configure breakpoints (node ids) to use
with debugger on startup. Multiple ids can be separated by comma. Use special
value _all_routes_ to add a breakpoint for the first node for every route, in
other words this makes it easy to debug from the beginning of every route
without knowing the exact node ids.",
+ "sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties"
+},
+{
+ "name": "camel.debug.enabled",
+ "type": "java.lang.Boolean",
+ "description": "Enables Debugger in your Camel application.",
+ "sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties",
+ "defaultValue": false
+},
+{
+ "name": "camel.debug.fallback-timeout",
+ "type": "java.lang.Long",
+ "description": "Fallback Timeout in seconds (300 seconds as default)
when block the message processing in Camel. A timeout used for waiting for a
message to arrive at a given breakpoint.",
+ "sourceType":
"org.apache.camel.spring.boot.debug.CamelDebugConfigurationProperties",
+ "defaultValue&quo
(camel) 02/02: CAMEL-20758: camel-spring-boot - Debugger is created twice
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch deb in repository https://gitbox.apache.org/repos/asf/camel.git commit f0bd378c2f21fbadf85826226c203d8be85b0b0d Author: Claus Ibsen AuthorDate: Sun May 12 10:40:08 2024 +0200 CAMEL-20758: camel-spring-boot - Debugger is created twice --- .../user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc | 7 +++ 1 file changed, 7 insertions(+) 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 2f6577738ee..a595510a771 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 @@ -81,3 +81,10 @@ authorizationPolicy.setAuthorizationManager(AuthorityAuthorizationManager.hasRol This new pattern supports a more expressive language to define your own authorization rules, exposing the full power of the Spring Security framework to Camel route policies. See the https://docs.spring.io/spring-security/reference/5.8/migration/servlet/authorization.html#servlet-replace-permissionevaluator-bean-with-methodsecurityexpression-handler[spring documentation] for further details on how to migrate your custom code from `AccessDecisionManager` to `AuthorizationManager`. + +== Camel Spring Boot + +=== camel-debug-starter + +Using camel debugger with Spring Boot is now moved from `camel-spring-boot` into `camel-debug-starter` where you can configure the debugger +via `camel.debug.` options in `application.properties`.
(camel-spring-boot) branch deb created (now 05cb736504a)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch deb in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at 05cb736504a CAMEL-20758: camel-spring-boot - Debugger is created twice This branch includes the following new commits: new 05cb736504a CAMEL-20758: camel-spring-boot - Debugger is created twice 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/02: CAMEL-20758: camel-spring-boot - Debugger is created twice
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch deb
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0d6b14b5202d2275d2def8be0f1cb34aa14cba87
Author: Claus Ibsen
AuthorDate: Sun May 12 10:33:24 2024 +0200
CAMEL-20758: camel-spring-boot - Debugger is created twice
---
.../org/apache/camel/impl/engine/AbstractCamelContext.java | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index 59eb0afd92c..57d08b48da5 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -2293,10 +2293,12 @@ public abstract class AbstractCamelContext extends
BaseService
}
}
if (!debuggerDetected && (isDebugging() || isDebugStandby())) {
-// debugging enabled but camel-debug was not auto-detected from
classpath
-// so install default debugger
-BacklogDebugger backlog =
DefaultBacklogDebugger.createDebugger(this);
-addService(backlog, true, true);
+if (hasService(BacklogDebugger.class) == null) {
+// debugging enabled but camel-debug was not auto-detected
from classpath
+// so install default debugger
+BacklogDebugger backlog =
DefaultBacklogDebugger.createDebugger(this);
+addService(backlog, true, true);
+}
}
addService(getManagementStrategy(), false);
(camel) branch deb created (now f0bd378c2f2)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch deb in repository https://gitbox.apache.org/repos/asf/camel.git at f0bd378c2f2 CAMEL-20758: camel-spring-boot - Debugger is created twice This branch includes the following new commits: new 0d6b14b5202 CAMEL-20758: camel-spring-boot - Debugger is created twice new f0bd378c2f2 CAMEL-20758: camel-spring-boot - Debugger is created twice 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.
(camel) branch par deleted (was d5724f2d815)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch par in repository https://gitbox.apache.org/repos/asf/camel.git was d5724f2d815 Upgrade parquet 1.14.0 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 (b7b1620ef48 -> ccafac70337)
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 b7b1620ef48 Upgrade picocli 4.7.6 add ccafac70337 Upgrade parquet 1.14.0 (#14104) No new revisions were added by this update. Summary of changes: parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(camel) 01/01: Upgrade parquet 1.14.0
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch par in repository https://gitbox.apache.org/repos/asf/camel.git commit d5724f2d815dcb7e467a1e653122ec07435e3ec3 Author: Claus Ibsen AuthorDate: Sun May 12 08:29:02 2024 +0200 Upgrade parquet 1.14.0 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0f557df8a52..ab54a4410d6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -391,8 +391,8 @@ 9.44.0.Final 1.2.5 1.1.6 -1.13.1 -1.13.1 +1.14.0 +1.14.0 3.0.2 42.7.3 0.8.9
