[camel-quarkus] branch camel-main updated: Enable fhir tests Fixes #3416
This is an automated email from the ASF dual-hosted git repository.
zbendhiba pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new d5e520a Enable fhir tests Fixes #3416
d5e520a is described below
commit d5e520a22e1815c98788cefac3584e248daca383
Author: Zineb Bendhiba
AuthorDate: Thu Jan 6 09:41:02 2022 +0100
Enable fhir tests
Fixes #3416
---
.../java/org/apache/camel/quarkus/component/fhir/it/FhirClientIT.java | 2 --
.../java/org/apache/camel/quarkus/component/fhir/it/FhirClientTest.java | 2 --
.../org/apache/camel/quarkus/component/fhir/it/FhirDataformatIT.java| 2 --
.../org/apache/camel/quarkus/component/fhir/it/FhirDataformatTest.java | 2 --
4 files changed, 8 deletions(-)
diff --git
a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientIT.java
b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientIT.java
index 7da92c4..27d3862 100644
---
a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientIT.java
+++
b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientIT.java
@@ -17,10 +17,8 @@
package org.apache.camel.quarkus.component.fhir.it;
import io.quarkus.test.junit.NativeImageTest;
-import org.junit.jupiter.api.Disabled;
@NativeImageTest
-@Disabled //https://github.com/apache/camel-quarkus/issues/3416
class FhirClientIT extends FhirClientTest {
}
diff --git
a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientTest.java
b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientTest.java
index 3f677ce..b5967a3 100644
---
a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientTest.java
+++
b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirClientTest.java
@@ -24,12 +24,10 @@ import io.restassured.http.ContentType;
import org.apache.camel.quarkus.component.fhir.FhirFlags;
import org.apache.camel.quarkus.test.EnabledIf;
import org.jboss.logging.Logger;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@QuarkusTest
@QuarkusTestResource(FhirTestResource.class)
-@Disabled //https://github.com/apache/camel-quarkus/issues/3416
class FhirClientTest {
private static final Logger LOG = Logger.getLogger(FhirClientTest.class);
diff --git
a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatIT.java
b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatIT.java
index 9ee54ee..d6b0209 100644
---
a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatIT.java
+++
b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatIT.java
@@ -17,9 +17,7 @@
package org.apache.camel.quarkus.component.fhir.it;
import io.quarkus.test.junit.NativeImageTest;
-import org.junit.jupiter.api.Disabled;
@NativeImageTest
-@Disabled //https://github.com/apache/camel-quarkus/issues/3416
class FhirDataformatIT extends FhirDataformatTest {
}
diff --git
a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatTest.java
b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatTest.java
index 9f8229d..b2a4193 100644
---
a/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatTest.java
+++
b/integration-tests/fhir/src/test/java/org/apache/camel/quarkus/component/fhir/it/FhirDataformatTest.java
@@ -24,11 +24,9 @@ import org.apache.camel.quarkus.component.fhir.FhirFlags;
import org.apache.camel.quarkus.test.EnabledIf;
import org.hl7.fhir.dstu3.model.Patient;
import org.jboss.logging.Logger;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
@QuarkusTest
-@Disabled //https://github.com/apache/camel-quarkus/issues/3416
class FhirDataformatTest {
private static final Logger LOG =
Logger.getLogger(FhirDataformatTest.class);
[camel-examples] branch main updated: CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work properly and causes problems.
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-examples.git The following commit(s) were added to refs/heads/main by this push: new 1a6e9de CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work properly and causes problems. 1a6e9de is described below commit 1a6e9deae5c554c1eaa385e807119e9a584abb90 Author: Claus Ibsen AuthorDate: Thu Jan 6 09:44:37 2022 +0100 CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work properly and causes problems. --- examples/main-lambda/src/main/resources/application.properties | 4 examples/main-xml/src/main/resources/application.properties| 4 examples/main-yaml/src/main/resources/application.properties | 4 examples/main/src/main/resources/application.properties| 4 4 files changed, 16 deletions(-) diff --git a/examples/main-lambda/src/main/resources/application.properties b/examples/main-lambda/src/main/resources/application.properties index 4da5cc9..6781126 100644 --- a/examples/main-lambda/src/main/resources/application.properties +++ b/examples/main-lambda/src/main/resources/application.properties @@ -23,10 +23,6 @@ camel.main.name = MyCoolCamel camel.main.bean-introspection-extended-statistics=true camel.main.bean-introspection-logging-level=INFO -# to configure the camel quartz component -# here we can configure the options on the component level (and we can use dash-naming-style) -camel.component.quartz.start-delayed-seconds = 3 - # properties used in the route myCron = 0/2 * * * * ? diff --git a/examples/main-xml/src/main/resources/application.properties b/examples/main-xml/src/main/resources/application.properties index ee9f831..dcbef5d 100644 --- a/examples/main-xml/src/main/resources/application.properties +++ b/examples/main-xml/src/main/resources/application.properties @@ -29,10 +29,6 @@ camel.main.routes-reload-directory = src/main/resources # pattern(s) for files to watch camel.main.routes-reload-pattern = routes/*.xml -# to configure the camel quartz component -# here we can configure the options on the component level (and we can use dash-naming-style) -camel.component.quartz.start-delayed-seconds = 3 - # properties used in the route myCron = 0/2 * * * * ? diff --git a/examples/main-yaml/src/main/resources/application.properties b/examples/main-yaml/src/main/resources/application.properties index b654e10..3d66ad8 100644 --- a/examples/main-yaml/src/main/resources/application.properties +++ b/examples/main-yaml/src/main/resources/application.properties @@ -28,10 +28,6 @@ camel.main.routes-reload-pattern = routes/*.yaml # on reload should all existing routes be removed first camel.main.routes-reload-remove-all-routes = true -# to configure the camel quartz component -# here we can configure the options on the component level (and we can use dash-naming-style) -camel.component.quartz.start-delayed-seconds = 3 - # properties used in the route myCron = 0/2 * * * * ? diff --git a/examples/main/src/main/resources/application.properties b/examples/main/src/main/resources/application.properties index ac155bd..f47ae27 100644 --- a/examples/main/src/main/resources/application.properties +++ b/examples/main/src/main/resources/application.properties @@ -37,10 +37,6 @@ camel.main.bean-introspection-logging-level=INFO # load additional property placeholders from this folder camel.main.file-configurations=src/main/data/*.properties -# to configure the camel quartz component -# here we can configure the options on the component level (and we can use dash-naming-style) -camel.component.quartz.start-delayed-seconds = 3 - # to configure Hystrix EIP (global and you need to add camel-hystrix to the classpath) ### camel.hystrix.group-key=myGroup ### camel.hystrix.execution-timeout-in-milliseconds=5000
[camel] 01/02: 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
commit 5f4df9aa1c8136eca25290257807e113150b76ce
Author: Claus Ibsen
AuthorDate: Thu Jan 6 07:20:50 2022 +0100
Polished
---
.../src/main/java/org/apache/camel/support/LoggerHelper.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/LoggerHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/LoggerHelper.java
index f5b9ffd..5c7d836 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/LoggerHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/LoggerHelper.java
@@ -20,6 +20,9 @@ import org.apache.camel.LineNumberAware;
import org.apache.camel.NamedRoute;
import org.apache.camel.util.FileUtil;
+/**
+ * Helper for logging purposes.
+ */
public final class LoggerHelper {
private LoggerHelper() {
[camel] branch main updated (2c1451a -> ca24566)
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 2c1451a CAMEL-17435: jakarta.xml.bind-api is already defined as a dependency in that module new 5f4df9a Polished new ca24566 CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work properly and causes problems. 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: .../quartz/QuartzComponentConfigurer.java | 6 --- .../org/apache/camel/component/quartz/quartz.json | 3 +- .../camel/component/quartz/QuartzComponent.java| 47 +++-- .../quartz/QuartzCronRouteFireNowTest.java | 2 +- .../quartz/QuartzStartDelayedOptionTest.java | 46 - .../component/quartz/QuartzStartDelayedTest.java | 48 -- .../QuartzStartDelayedWithReferenceTest.java | 44 .../org/apache/camel/support/LoggerHelper.java | 3 ++ 8 files changed, 10 insertions(+), 189 deletions(-) delete mode 100644 components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedOptionTest.java delete mode 100644 components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedTest.java delete mode 100644 components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedWithReferenceTest.java
[camel] 02/02: CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work properly and causes problems.
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 ca2456645321f1b8c26d8ca1ddf1b1f8b49596ad
Author: Claus Ibsen
AuthorDate: Thu Jan 6 09:47:20 2022 +0100
CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work
properly and causes problems.
---
.../quartz/QuartzComponentConfigurer.java | 6 ---
.../org/apache/camel/component/quartz/quartz.json | 3 +-
.../camel/component/quartz/QuartzComponent.java| 47 +++--
.../quartz/QuartzCronRouteFireNowTest.java | 2 +-
.../quartz/QuartzStartDelayedOptionTest.java | 46 -
.../component/quartz/QuartzStartDelayedTest.java | 48 --
.../QuartzStartDelayedWithReferenceTest.java | 44
7 files changed, 7 insertions(+), 189 deletions(-)
diff --git
a/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzComponentConfigurer.java
b/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzComponentConfigurer.java
index 03c7676..a9027c2 100644
---
a/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzComponentConfigurer.java
+++
b/components/camel-quartz/src/generated/java/org/apache/camel/component/quartz/QuartzComponentConfigurer.java
@@ -43,8 +43,6 @@ public class QuartzComponentConfigurer extends
PropertyConfigurerSupport impleme
case "scheduler": target.setScheduler(property(camelContext,
org.quartz.Scheduler.class, value)); return true;
case "schedulerfactory":
case "schedulerFactory":
target.setSchedulerFactory(property(camelContext,
org.quartz.SchedulerFactory.class, value)); return true;
-case "startdelayedseconds":
-case "startDelayedSeconds":
target.setStartDelayedSeconds(property(camelContext, int.class, value)); return
true;
default: return false;
}
}
@@ -74,8 +72,6 @@ public class QuartzComponentConfigurer extends
PropertyConfigurerSupport impleme
case "scheduler": return org.quartz.Scheduler.class;
case "schedulerfactory":
case "schedulerFactory": return org.quartz.SchedulerFactory.class;
-case "startdelayedseconds":
-case "startDelayedSeconds": return int.class;
default: return null;
}
}
@@ -106,8 +102,6 @@ public class QuartzComponentConfigurer extends
PropertyConfigurerSupport impleme
case "scheduler": return target.getScheduler();
case "schedulerfactory":
case "schedulerFactory": return target.getSchedulerFactory();
-case "startdelayedseconds":
-case "startDelayedSeconds": return target.getStartDelayedSeconds();
default: return null;
}
}
diff --git
a/components/camel-quartz/src/generated/resources/org/apache/camel/component/quartz/quartz.json
b/components/camel-quartz/src/generated/resources/org/apache/camel/component/quartz/quartz.json
index ce98abe..94d93ac 100644
---
a/components/camel-quartz/src/generated/resources/org/apache/camel/component/quartz/quartz.json
+++
b/components/camel-quartz/src/generated/resources/org/apache/camel/component/quartz/quartz.json
@@ -33,8 +33,7 @@
"scheduler": { "kind": "property", "displayName": "Scheduler", "group":
"advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.quartz.Scheduler", "deprecated": false, "autowired": false,
"secret": false, "description": "To use the custom configured Quartz scheduler,
instead of creating a new Scheduler." },
"schedulerFactory": { "kind": "property", "displayName": "Scheduler
Factory", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "org.quartz.SchedulerFactory", "deprecated": false,
"autowired": false, "secret": false, "description": "To use the custom
SchedulerFactory which is used to create the Scheduler." },
"autoStartScheduler": { "kind": "property", "displayName": "Auto Start
Scheduler", "group": "scheduler", "label": "scheduler", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Whether or not
the scheduler should be auto started. This options is default true" },
-"interruptJobsOnShutdown": { "kind": "property", "displayName": "Interrupt
Jobs On Shutdown", "group": "scheduler", "label": "scheduler", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether to interrupt jobs on shutdown which forces the scheduler to shutdown
quicker and attempt to interrupt any running jobs. If this is enabled then any
running jobs can fail due to being i [...]
-"startDelayedSeconds": { "kind": "property", "displ
[camel] branch main updated: CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work properly and causes problems.
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 0ca042e CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work properly and causes problems. 0ca042e is described below commit 0ca042e3de2246802b8cfb1df38617b6ab1ff1c8 Author: Claus Ibsen AuthorDate: Thu Jan 6 09:48:48 2022 +0100 CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work properly and causes problems. --- docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc | 4 1 file changed, 4 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc index 456c909..cae9fd0 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc @@ -92,3 +92,7 @@ The `camel-osg-activator` has been removed. === camel-jbang The JBang app that was previously named `CamelJBang` is now named `camel`. It is still possible to use the older name by installing it using `CamelJBang@apache/camel` but this approach is deprecated and should not be used in the future. + +=== camel-quartz + +Removed the option `startDelaySeconds` as this does not work correctly and causes problems if in use. \ No newline at end of file
[camel-spring-boot] branch main updated: CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work properly and causes problems.
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 a38a343 CAMEL-17440: camel-quartz - Remove startDelayed option as it
does not work properly and causes problems.
a38a343 is described below
commit a38a343a4f6284d719a79c81d9fe02d004cf1f6a
Author: Claus Ibsen
AuthorDate: Thu Jan 6 09:49:36 2022 +0100
CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work
properly and causes problems.
---
.../springboot/catalog/components/quartz.json | 11 -
.../camel-quartz-starter/src/main/docs/quartz.json | 14 ---
.../springboot/QuartzComponentConfiguration.java | 28 +++---
3 files changed, 17 insertions(+), 36 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quartz.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quartz.json
index c6ac1e9..5390dc4 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quartz.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quartz.json
@@ -23,18 +23,17 @@
},
"componentProperties": {
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a me [...]
-"enableJmx": { "kind": "property", "displayName": "Enable Jmx", "group":
"consumer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": true, "description": "Whether to enable Quartz JMX which allows
to manage the Quartz scheduler from JMX. This options is default true" },
-"prefixInstanceName": { "kind": "property", "displayName": "Prefix
Instance Name", "group": "consumer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether to prefix the
Quartz Scheduler instance name with the CamelContext name. This is enabled by
default, to let each CamelContext use its own Quartz scheduler instance by
default. You can set this option to fal [...]
-"prefixJobNameWithEndpointId": { "kind": "property", "displayName":
"Prefix Job Name With Endpoint Id", "group": "consumer", "label": "",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Whether to prefix the quartz job with the endpoint id. This
option is default false." },
+"enableJmx": { "kind": "property", "displayName": "Enable Jmx", "group":
"consumer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": true, "description": "Whether to enable Quartz JMX which allows
to manage the Quartz scheduler from JMX. This options is default true" },
+"prefixInstanceName": { "kind": "property", "displayName": "Prefix
Instance Name", "group": "consumer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether to prefix the
Quartz Scheduler instance name with the CamelContext name. This is
enabled by default, to let each CamelContext use its own Quartz scheduler
instance by default. You can set this option [...]
+"prefixJobNameWithEndpointId": { "kind": "property", "displayName":
"Prefix Job Name With Endpoint Id", "group": "consumer", "label": "",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Whether to prefix the quartz job with the endpoint id.
This option is default false." },
"properties": { "kind": "property", "displayName": "Properties", "group":
"consumer", "label": "", "required": false, "type": "object", "javaType":
"java.util.Map", "deprecated": false, "autowired": false, "secret": false,
"description": "Properties to configure the Quartz scheduler." },
"propertiesFile": { "kind": "property", "displayName": "Properties File",
"group": "consumer", "label": "", "required": false, "type": "
[camel] branch main updated (0ca042e -> 998e7ed)
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 0ca042e CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work properly and causes problems. new 61e3a31 CAMEL-17422: Grammar new 7ac6ee5 CAMEL-17422: Grammar new 998e7ed CAMEL-17422: Grammar The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/camel/catalog/components/quartz.json| 3 +- .../apache/camel/catalog/models/onException.json | 4 +- .../org/apache/camel/catalog/models/split.json | 8 +-- .../main/docs/modules/eips/pages/choice-eip.adoc | 2 +- .../eips/pages/composed-message-processor.adoc | 6 +-- .../modules/eips/pages/dead-letter-channel.adoc| 2 +- .../main/docs/modules/eips/pages/split-eip.adoc| 34 ++--- .../docs/modules/languages/pages/ref-language.adoc | 2 +- .../modules/languages/pages/simple-language.adoc | 2 +- .../org/apache/camel/model/onException.json| 4 +- .../resources/org/apache/camel/model/split.json| 8 +-- .../camel/builder/AggregationStrategies.java | 2 +- .../camel/builder/DefaultErrorHandlerBuilder.java | 4 +- .../apache/camel/model/OnExceptionDefinition.java | 4 +- .../org/apache/camel/model/SplitDefinition.java| 58 +++--- .../java/org/apache/camel/processor/Splitter.java | 2 +- .../camel/issues/SplitPropertiesFileIssueTest.java | 2 +- .../apache/camel/issues/XPathSplitStreamTest.java | 4 +- .../camel/processor/SplitAggregateInOutTest.java | 12 ++--- .../camel/processor/SplitSubUnitOfWorkTest.java| 2 +- .../apache/camel/processor/SplitterPojoTest.java | 4 +- .../SplitterStreamingErrorHandlingTest.java| 2 +- .../SplitterStreamingWithErrorHandlerTest.java | 2 +- .../camel/processor/SplitterWithXqureyTest.java| 2 +- .../org/apache/camel/util/StringQuoteHelper.java | 8 +-- .../modules/ROOT/pages/exception-clause.adoc | 6 +-- ...se-when-or-otherwise-in-a-java-camel-route.adoc | 2 +- 27 files changed, 95 insertions(+), 96 deletions(-)
[camel] 02/03: CAMEL-17422: Grammar
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 7ac6ee568b75a82abc366804786338c690c2226e
Author: Claus Ibsen
AuthorDate: Thu Jan 6 10:10:55 2022 +0100
CAMEL-17422: Grammar
---
.../resources/org/apache/camel/catalog/components/quartz.json | 3 +--
.../resources/org/apache/camel/catalog/models/onException.json| 4 ++--
.../resources/org/apache/camel/catalog/models/split.json | 8
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/quartz.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/quartz.json
index ce98abe..94d93ac 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/quartz.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/quartz.json
@@ -33,8 +33,7 @@
"scheduler": { "kind": "property", "displayName": "Scheduler", "group":
"advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.quartz.Scheduler", "deprecated": false, "autowired": false,
"secret": false, "description": "To use the custom configured Quartz scheduler,
instead of creating a new Scheduler." },
"schedulerFactory": { "kind": "property", "displayName": "Scheduler
Factory", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "org.quartz.SchedulerFactory", "deprecated": false,
"autowired": false, "secret": false, "description": "To use the custom
SchedulerFactory which is used to create the Scheduler." },
"autoStartScheduler": { "kind": "property", "displayName": "Auto Start
Scheduler", "group": "scheduler", "label": "scheduler", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Whether or not
the scheduler should be auto started. This options is default true" },
-"interruptJobsOnShutdown": { "kind": "property", "displayName": "Interrupt
Jobs On Shutdown", "group": "scheduler", "label": "scheduler", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether to interrupt jobs on shutdown which forces the scheduler to shutdown
quicker and attempt to interrupt any running jobs. If this is enabled then any
running jobs can fail due to being i [...]
-"startDelayedSeconds": { "kind": "property", "displayName": "Start Delayed
Seconds", "group": "scheduler", "label": "scheduler", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "description": "Seconds to wait before starting the quartz
scheduler." }
+"interruptJobsOnShutdown": { "kind": "property", "displayName": "Interrupt
Jobs On Shutdown", "group": "scheduler", "label": "scheduler", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether to interrupt jobs on shutdown which forces the scheduler to shutdown
quicker and attempt to interrupt any running jobs. If this is enabled then any
running jobs can fail due to being i [...]
},
"properties": {
"groupName": { "kind": "path", "displayName": "Group Name", "group":
"consumer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "Camel", "description": "The quartz group name to use. The
combination of group name and trigger name should be unique." },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onException.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onException.json
index bbfc73d..730af6b 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onException.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/onException.json
@@ -21,8 +21,8 @@
"continued": { "kind": "expression", "displayName": "Continued",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.ExpressionSubElementDefinition", "oneOf": [ "constant",
"csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser",
"joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple",
"spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false,
"autowired": false, "secret": false, "asPredicate": true, "descrip [...]
"onRedeliveryRef": { "kind": "attribute", "displayName": "On Redelivery
Ref", "required": false, "type": "string", "javaType": "java.lang.String",
"depre
[camel] 03/03: CAMEL-17422: Grammar
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 998e7ed358b395f0186cd2b75e86d40eb664cb76 Author: Claus Ibsen AuthorDate: Thu Jan 6 10:12:30 2022 +0100 CAMEL-17422: Grammar --- docs/user-manual/modules/ROOT/pages/exception-clause.adoc | 6 +++--- .../why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/exception-clause.adoc b/docs/user-manual/modules/ROOT/pages/exception-clause.adoc index 808549f..4c6310a 100644 --- a/docs/user-manual/modules/ROOT/pages/exception-clause.adoc +++ b/docs/user-manual/modules/ROOT/pages/exception-clause.adoc @@ -691,10 +691,10 @@ would be: The original input means the input message that are bounded by the current unit of work. An unit of work typically spans one route, or multiple routes if they are connected using internal endpoints such as direct or seda. When messages are passed via external endpoints such as JMS or HTTP then the consumer will create a new unit of work, with the -message it received as input as the original input. Also some EIP patterns such as splitter, +message it received as input as the original input. Also, some EIP patterns such as splitter, multicast, will create a new unit of work boundary for the messages in their sub-route -(eg the splitted message); however these EIPs have an option named shareUnitOfWork which -allows to combine with the parent unit of work in regard to error handling and therefore use +(i.e. the split message); however these EIPs have an option named shareUnitOfWork which +allows combining with the parent unit of work in regard to error handling and therefore use the parent original message. == Using `useOriginalBody` diff --git a/docs/user-manual/modules/faq/pages/why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc b/docs/user-manual/modules/faq/pages/why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc index a995b9d..73d74e7 100644 --- a/docs/user-manual/modules/faq/pages/why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc +++ b/docs/user-manual/modules/faq/pages/why-can-i-not-use-when-or-otherwise-in-a-java-camel-route.adoc @@ -81,7 +81,7 @@ xref:components:eips:enterprise-integration-patterns.adoc[EIP]s which often have methods to configure or as part of the xref:components:eips:enterprise-integration-patterns.adoc[EIP] itself. For example the xref:components:eips:split-eip.adoc[Splitter] EIP has a sub-route which denotes the -routing of each splitted message. You would also have to use +routing of each split message. You would also have to use `.endChoice()` to indicate the end of the sub-route and to return back to the xref:components:eips:choice-eip.adoc[Content Based Router].
[camel] 01/03: CAMEL-17422: Grammar
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 61e3a311990c79451b7ec12e98c2c1502208f50a
Author: Claus Ibsen
AuthorDate: Thu Jan 6 10:09:59 2022 +0100
CAMEL-17422: Grammar
---
.../main/docs/modules/eips/pages/choice-eip.adoc | 2 +-
.../eips/pages/composed-message-processor.adoc | 6 +--
.../modules/eips/pages/dead-letter-channel.adoc| 2 +-
.../main/docs/modules/eips/pages/split-eip.adoc| 34 ++---
.../docs/modules/languages/pages/ref-language.adoc | 2 +-
.../modules/languages/pages/simple-language.adoc | 2 +-
.../org/apache/camel/model/onException.json| 4 +-
.../resources/org/apache/camel/model/split.json| 8 +--
.../camel/builder/AggregationStrategies.java | 2 +-
.../camel/builder/DefaultErrorHandlerBuilder.java | 4 +-
.../apache/camel/model/OnExceptionDefinition.java | 4 +-
.../org/apache/camel/model/SplitDefinition.java| 58 +++---
.../java/org/apache/camel/processor/Splitter.java | 2 +-
.../camel/issues/SplitPropertiesFileIssueTest.java | 2 +-
.../apache/camel/issues/XPathSplitStreamTest.java | 4 +-
.../camel/processor/SplitAggregateInOutTest.java | 12 ++---
.../camel/processor/SplitSubUnitOfWorkTest.java| 2 +-
.../apache/camel/processor/SplitterPojoTest.java | 4 +-
.../SplitterStreamingErrorHandlingTest.java| 2 +-
.../SplitterStreamingWithErrorHandlerTest.java | 2 +-
.../camel/processor/SplitterWithXqureyTest.java| 2 +-
.../org/apache/camel/util/StringQuoteHelper.java | 8 +--
22 files changed, 84 insertions(+), 84 deletions(-)
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/choice-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/choice-eip.adoc
index 0d1cab4..2f45113 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/choice-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/choice-eip.adoc
@@ -130,7 +130,7 @@ You only need to use `.endChoice()` when using certain
xref:eips:enterprise-integration-patterns.adoc[EIP]s which often have
additional
methods to configure or as part of the EIP itself. For example the
xref:split-eip.adoc[Split] EIP has a sub-route which denotes the
-routing of each _splitted_ message. You would also have to use
+routing of each _split_ message. You would also have to use
`.endChoice()` to indicate the end of the sub-route and to return
to the Choice EIP.
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/composed-message-processor.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/composed-message-processor.adoc
index 6d2dd8a..8f55d39 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/composed-message-processor.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/composed-message-processor.adoc
@@ -33,12 +33,12 @@ a single response message via the custom
`AggregationStrategy` (`MyOrderStrategy
// own strategy with the class MyOrderStrategy.
from("direct:start")
.split(body().tokenize("@"), new MyOrderStrategy())
-// each splitted message is then send to this bean where we can
process it
+// each split message is then send to this bean where we can process it
.to("bean:MyOrderService?method=handleOrder")
// this is important to end the splitter route as we do not want to do
more routing
-// on each splitted message
+// on each split message
.end()
-// after we have splitted and handled each message we want to send a
single combined
+// after we have split and handled each message we want to send a single
combined
// response back to the original caller, so we let this bean build it for
us
// this bean will receive the result of the aggregate strategy:
MyOrderStrategy
.to("bean:MyOrderService?method=buildCombinedResponse")
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/dead-letter-channel.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/dead-letter-channel.adoc
index 9cb6a64..b8872c2 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/dead-letter-channel.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/dead-letter-channel.adoc
@@ -215,7 +215,7 @@ The original input means the input message that are bounded
by the current unit
A unit of work typically spans one route, or multiple routes if they are
connected using internal endpoints such as direct or seda.
When messages are passed via external endpoints such as JMS or HTT then the
consumer will create a new unit of work, with the message it received as input
as the original input.
Also, some EIP patterns such as splitter, multicast, will create a new unit of
work boundary for the messages in
-their sub-route (i.e. the _splitted_ message); however
[GitHub] [camel-kamelets] djencks commented on issue #673: Kamelet for ElasticSearch Sink provides no mechanism to set indexId or ce-indexId
djencks commented on issue #673: URL: https://github.com/apache/camel-kamelets/issues/673#issuecomment-1006402456 OK, so I read https://camel.apache.org/camel-k/next/kamelets/kamelets-user.html and have perhaps some clues and some questions. - I think it would be helpful to directly link to the user guide from the kamelets catalog index page, something like "consult the user guide for information about how to use these". - AFAICT the user guide doesn't mention actions. IIUC these have both a source and sink, so you can string them together. An example in the user guide would be great. - The kamelets in the catalog have what appear to be toy sources and sinks. Is their function for testing? Mentioning this in the user guide might be helpful. I also think the description of extract field action is pretty close to useless "Extract a field from the body" and then what? Trying to find the source code behind this one, it appears to be in ` - "github:apache.camel-kamelets:camel-kamelets-utils:main-SNAPSHOT"` which I can't locate and which by the "main-SNAPSHOT" makes me wonder if it violates the Apache policy against directing people to unreleased code. Personally, when someone says the docs are useless, I tend to interpret it as "I'm so frustrated I can't figure out how to do what I want!!!" and try to respond to that. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] opened a new pull request #6664: Generated sources regen
github-actions[bot] opened a new pull request #6664: URL: https://github.com/apache/camel/pull/6664 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus merged pull request #6664: Generated sources regen
davsclaus merged pull request #6664: URL: https://github.com/apache/camel/pull/6664 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated (998e7ed -> 115581d)
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 998e7ed CAMEL-17422: Grammar add 115581d CAMEL-17441: camel-health - Loading custom health-check from classpath scanning is not added to registry No new revisions were added by this update. Summary of changes: .../org/apache/camel/impl/health/DefaultHealthCheckRegistry.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
[camel] branch camel-3.14.x updated: CAMEL-17441: camel-health - Loading custom health-check from classpath scanning is not added to registry
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.14.x by this push:
new 4463bb0 CAMEL-17441: camel-health - Loading custom health-check from
classpath scanning is not added to registry
4463bb0 is described below
commit 4463bb028105400d2a092045fc8ba3966137ddb8
Author: Claus Ibsen
AuthorDate: Thu Jan 6 10:44:42 2022 +0100
CAMEL-17441: camel-health - Loading custom health-check from classpath
scanning is not added to registry
---
.../org/apache/camel/impl/health/DefaultHealthCheckRegistry.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git
a/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java
b/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java
index d602162..29b38c8 100644
---
a/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java
+++
b/core/camel-health/src/main/java/org/apache/camel/impl/health/DefaultHealthCheckRegistry.java
@@ -233,11 +233,10 @@ public class DefaultHealthCheckRegistry extends
ServiceSupport implements Health
if (!loadHealthChecksDone) {
loadHealthChecksDone = true;
-
DefaultHealthChecksLoader loader = new
DefaultHealthChecksLoader(camelContext);
Collection col = loader.loadHealthChecks();
-
-// report how many health checks we have loaded
+// register loaded health-checks
+col.forEach(this::register);
if (col.size() > 0) {
String time = TimeUtils.printDuration(watch.taken());
LOG.info("Health checks (scanned: {}) loaded in {}",
col.size(), time);
[camel] branch regen_bot updated (2c1451a -> 92712f5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 2c1451a CAMEL-17435: jakarta.xml.bind-api is already defined as a dependency in that module add 5f4df9a Polished add ca24566 CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work properly and causes problems. add 0ca042e CAMEL-17440: camel-quartz - Remove startDelayed option as it does not work properly and causes problems. add 92712f5 Regen for commit 0ca042e3de2246802b8cfb1df38617b6ab1ff1c8 No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/components/quartz.json| 3 +- .../quartz/QuartzComponentConfigurer.java | 6 --- .../org/apache/camel/component/quartz/quartz.json | 3 +- .../camel/component/quartz/QuartzComponent.java| 47 +++-- .../quartz/QuartzCronRouteFireNowTest.java | 2 +- .../quartz/QuartzStartDelayedOptionTest.java | 46 - .../component/quartz/QuartzStartDelayedTest.java | 48 -- .../QuartzStartDelayedWithReferenceTest.java | 44 .../org/apache/camel/support/LoggerHelper.java | 3 ++ .../ROOT/pages/camel-3x-upgrade-guide-3_15.adoc| 4 ++ .../dsl/QuartzComponentBuilderFactory.java | 16 11 files changed, 15 insertions(+), 207 deletions(-) delete mode 100644 components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedOptionTest.java delete mode 100644 components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedTest.java delete mode 100644 components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzStartDelayedWithReferenceTest.java
[camel] branch main updated: Regen for commit 0ca042e3de2246802b8cfb1df38617b6ab1ff1c8 (#6664)
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 40595b4 Regen for commit 0ca042e3de2246802b8cfb1df38617b6ab1ff1c8
(#6664)
40595b4 is described below
commit 40595b44f61de2921b886ee540da9bef2ecbac73
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Jan 6 10:47:55 2022 +0100
Regen for commit 0ca042e3de2246802b8cfb1df38617b6ab1ff1c8 (#6664)
Signed-off-by: GitHub
Co-authored-by: davsclaus
---
.../component/dsl/QuartzComponentBuilderFactory.java | 16
1 file changed, 16 deletions(-)
diff --git
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/QuartzComponentBuilderFactory.java
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/QuartzComponentBuilderFactory.java
index dd5f478..e5fe7f8 100644
---
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/QuartzComponentBuilderFactory.java
+++
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/QuartzComponentBuilderFactory.java
@@ -262,21 +262,6 @@ public interface QuartzComponentBuilderFactory {
doSetProperty("interruptJobsOnShutdown", interruptJobsOnShutdown);
return this;
}
-/**
- * Seconds to wait before starting the quartz scheduler.
- *
- * The option is a: int type.
- *
- * Group: scheduler
- *
- * @param startDelayedSeconds the value to set
- * @return the dsl builder
- */
-default QuartzComponentBuilder startDelayedSeconds(
-int startDelayedSeconds) {
-doSetProperty("startDelayedSeconds", startDelayedSeconds);
-return this;
-}
}
class QuartzComponentBuilderImpl
@@ -306,7 +291,6 @@ public interface QuartzComponentBuilderFactory {
case "schedulerFactory": ((QuartzComponent)
component).setSchedulerFactory((org.quartz.SchedulerFactory) value); return
true;
case "autoStartScheduler": ((QuartzComponent)
component).setAutoStartScheduler((boolean) value); return true;
case "interruptJobsOnShutdown": ((QuartzComponent)
component).setInterruptJobsOnShutdown((boolean) value); return true;
-case "startDelayedSeconds": ((QuartzComponent)
component).setStartDelayedSeconds((int) value); return true;
default: return false;
}
}
[GitHub] [camel-kamelets] djencks commented on issue #673: Kamelet for ElasticSearch Sink provides no mechanism to set indexId or ce-indexId
djencks commented on issue #673: URL: https://github.com/apache/camel-kamelets/issues/673#issuecomment-1006430064 I found camel-kamelets-utils I had my search set wrong in IDEA. I'll look into what the extract field action is doing more tomorrow. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] opened a new pull request #6665: Generated sources regen
github-actions[bot] opened a new pull request #6665: URL: https://github.com/apache/camel/pull/6665 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] apupier opened a new pull request #3440: Remove redundancy in pom description
apupier opened a new pull request #3440: URL: https://github.com/apache/camel-quarkus/pull/3440 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (92712f5 -> 7727c4e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. omit 92712f5 Regen for commit 0ca042e3de2246802b8cfb1df38617b6ab1ff1c8 add 61e3a31 CAMEL-17422: Grammar add 7ac6ee5 CAMEL-17422: Grammar add 998e7ed CAMEL-17422: Grammar add 7727c4e Regen for commit 998e7ed358b395f0186cd2b75e86d40eb664cb76 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (92712f5) \ N -- N -- N refs/heads/regen_bot (7727c4e) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/models/onException.json | 4 +- .../org/apache/camel/catalog/models/split.json | 8 +-- .../apache/camel/catalog/schemas/camel-spring.xsd | 46 - .../main/docs/modules/eips/pages/choice-eip.adoc | 2 +- .../eips/pages/composed-message-processor.adoc | 6 +-- .../modules/eips/pages/dead-letter-channel.adoc| 2 +- .../main/docs/modules/eips/pages/split-eip.adoc| 34 ++--- .../docs/modules/languages/pages/ref-language.adoc | 2 +- .../modules/languages/pages/simple-language.adoc | 2 +- .../org/apache/camel/model/onException.json| 4 +- .../resources/org/apache/camel/model/split.json| 8 +-- .../camel/builder/AggregationStrategies.java | 2 +- .../camel/builder/DefaultErrorHandlerBuilder.java | 4 +- .../apache/camel/model/OnExceptionDefinition.java | 4 +- .../org/apache/camel/model/SplitDefinition.java| 58 +++--- .../java/org/apache/camel/processor/Splitter.java | 2 +- .../camel/issues/SplitPropertiesFileIssueTest.java | 2 +- .../apache/camel/issues/XPathSplitStreamTest.java | 4 +- .../camel/processor/SplitAggregateInOutTest.java | 12 ++--- .../camel/processor/SplitSubUnitOfWorkTest.java| 2 +- .../apache/camel/processor/SplitterPojoTest.java | 4 +- .../SplitterStreamingErrorHandlingTest.java| 2 +- .../SplitterStreamingWithErrorHandlerTest.java | 2 +- .../camel/processor/SplitterWithXqureyTest.java| 2 +- .../org/apache/camel/util/StringQuoteHelper.java | 8 +-- .../modules/ROOT/pages/exception-clause.adoc | 6 +-- ...se-when-or-otherwise-in-a-java-camel-route.adoc | 2 +- 27 files changed, 117 insertions(+), 117 deletions(-)
[GitHub] [camel-kamelets] lburgazzoli commented on issue #673: Kamelet for ElasticSearch Sink provides no mechanism to set indexId or ce-indexId
lburgazzoli commented on issue #673: URL: https://github.com/apache/camel-kamelets/issues/673#issuecomment-1006436054 > * AFAICT the user guide doesn't mention actions. IIUC these have both a source and sink, so you can string them together. An example in the user guide would be great. > The `kamelets` documentation certainly need some refactoring and improvements but please bear in mind that `kamelets` are still under heavy development. We are trying to make the `kamelets` and the related ecosystem a generic `camel` concept rather that a `camel-k` specific thing so there are things that are still missing or poorly documented. However if you look at the [kamelet-component](https://camel.apache.org/components/3.14.x/kamelet-component.html) document, I think it is pretty easy to understand what the various actions types are meant to be used as they are pretty much like any other component/eip. You are very welcome to improve the documentation to include a paragraph about actions. > * The kamelets in the catalog have what appear to be toy sources and sinks. Is their function for testing? Mentioning this in the user guide might be helpful. > It would be nice to report what the various sources and sinks are missing. Bear in mind that `kamelets` are opinionated and aimed to hide the complexity of the underlying components/EIPs so don't expect them to offer the same flexibility as the underlying components, if you need that flexibility then you probably should not look at `kamelets`. > > I also think the description of extract field action is pretty close to useless "Extract a field from the body" and then what? I agree that in general there should be a better description of what an action is doing but about the `then what`, well it depends on what you want to achieve. Like when using the setHeader EIP you know that the the EIP sets an header, that's all, isn't it ? > Trying to find the source code behind this one, it appears to be in ` - "github:apache.camel-kamelets:camel-kamelets-utils:main-SNAPSHOT"` which I can't locate and which by the "main-SNAPSHOT" makes me wonder if it violates the Apache policy against directing people to unreleased code. > The code is available in this repository, according to the doc [dependencies](https://camel.apache.org/camel-k/1.7.x/configuration/dependencies.html), the `github:` syntax is about using [jitpack](https://jitpack.io/) as a way to get the latest snapshot. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] lburgazzoli edited a comment on issue #673: Kamelet for ElasticSearch Sink provides no mechanism to set indexId or ce-indexId
lburgazzoli edited a comment on issue #673: URL: https://github.com/apache/camel-kamelets/issues/673#issuecomment-1006436054 > * AFAICT the user guide doesn't mention actions. IIUC these have both a source and sink, so you can string them together. An example in the user guide would be great. > The `kamelets` documentation certainly need some refactoring and improvements but please bear in mind that `kamelets` are still under heavy development. We are trying to make the `kamelets` and the related ecosystem a generic `camel` concept rather that a `camel-k` specific thing so there are things that are still missing or poorly documented. However if you look at the [kamelet-component](https://camel.apache.org/components/3.14.x/kamelet-component.html) document, I think it is pretty easy to understand what the various actions types are meant to be used as they are pretty much like any other component/eip. You are very welcome to improve the documentation to include a paragraph about actions. > * The kamelets in the catalog have what appear to be toy sources and sinks. Is their function for testing? Mentioning this in the user guide might be helpful. > It would be nice to report what the various sources and sinks are missing. Bear in mind that `kamelets` are opinionated and aimed to hide the complexity of the underlying components/EIPs so don't expect them to offer the same flexibility as the underlying components, if you need that flexibility then you probably should not look at `kamelets`. > > I also think the description of extract field action is pretty close to useless "Extract a field from the body" and then what? I agree that in general there should be a better description of what an action is doing but about the `then what`, well it depends on what you want to achieve. Like when using the setHeader EIP you know that the EIP sets an header, that's all, isn't it ? > Trying to find the source code behind this one, it appears to be in ` - "github:apache.camel-kamelets:camel-kamelets-utils:main-SNAPSHOT"` which I can't locate and which by the "main-SNAPSHOT" makes me wonder if it violates the Apache policy against directing people to unreleased code. > The code is available in this repository, according to the doc [dependencies](https://camel.apache.org/camel-k/1.7.x/configuration/dependencies.html), the `github:` syntax is about using [jitpack](https://jitpack.io/) as a way to get the latest snapshot. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton commented on pull request #3440: Remove redundancy in pom description
jamesnetherton commented on pull request #3440: URL: https://github.com/apache/camel-quarkus/pull/3440#issuecomment-1006449949 The description is referenced in some other places. Please run `mvn clean install cq:update-quarkus-metadata` in `extensions-core/core/runtime` and commit the modified files. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot_3.14.x updated (2b96b67 -> 4463bb0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 2b96b67 Regen for commit 45ca4e2d4e1559717d6c068045681393c3367ecd add 4463bb0 CAMEL-17441: camel-health - Loading custom health-check from classpath scanning is not added to registry No new revisions were added by this update. Summary of changes: .../org/apache/camel/impl/health/DefaultHealthCheckRegistry.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
[camel] branch regen_bot updated (7727c4e -> 26e592d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. discard 7727c4e Regen for commit 998e7ed358b395f0186cd2b75e86d40eb664cb76 add 115581d CAMEL-17441: camel-health - Loading custom health-check from classpath scanning is not added to registry add 40595b4 Regen for commit 0ca042e3de2246802b8cfb1df38617b6ab1ff1c8 (#6664) add 26e592d Regen for commit 40595b44f61de2921b886ee540da9bef2ecbac73 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7727c4e) \ N -- N -- N refs/heads/regen_bot (26e592d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../org/apache/camel/impl/health/DefaultHealthCheckRegistry.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
[GitHub] [camel-website] github-actions[bot] commented on pull request #747: DO NOT MERGE PREVIEW ONLY preview playbook for RI work
github-actions[bot] commented on pull request #747: URL: https://github.com/apache/camel-website/pull/747#issuecomment-1006479683 🚀 Preview is available at https://pr-747--camel.netlify.app -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request #6666: (chores) camel-hdfs: adjust Windows build profile name to match others in the code
orpiske opened a new pull request #: URL: https://github.com/apache/camel/pull/ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/02: CAMEL-17417: camel-core - Route stack trace to include source file:line
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 f712ed9aa77d121d623e173f8629808f36d7b110
Author: Claus Ibsen
AuthorDate: Thu Jan 6 12:06:23 2022 +0100
CAMEL-17417: camel-core - Route stack trace to include source file:line
---
.../java/org/apache/camel/support/MessageHelper.java | 19 +++
.../ROOT/pages/camel-3x-upgrade-guide-3_15.adoc | 20 ++--
2 files changed, 21 insertions(+), 18 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
index fd98a0f..7959313 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
@@ -49,8 +49,8 @@ import org.slf4j.Logger;
@EagerClassloaded
public final class MessageHelper {
-private static final String MESSAGE_HISTORY_HEADER = "%-30s %-20s %-20s
%-50s %-12s";
-private static final String MESSAGE_HISTORY_OUTPUT = "%-30.30s %-20.20s
%-20.20s %-50.50s %12.12s";
+private static final String MESSAGE_HISTORY_HEADER = "%-40s %-30s %-50s
%-12s";
+private static final String MESSAGE_HISTORY_OUTPUT = "%-40.40s %-30.30s
%-50.50s %12.12s";
/**
* Utility classes should not have a public constructor.
@@ -570,13 +570,16 @@ public final class MessageHelper {
"---\n");
String goMessageHistoryHeader =
exchange.getContext().getGlobalOption(Exchange.MESSAGE_HISTORY_HEADER_FORMAT);
sb.append(String.format(goMessageHistoryHeader == null ?
MESSAGE_HISTORY_HEADER : goMessageHistoryHeader,
-"Location", "RouteId", "ProcessorId", "Processor", "Elapsed
(ms)"));
+"Source", "ID", "Processor", "Elapsed (ms)"));
sb.append("\n");
// add incoming origin of message on the top
String routeId = exchange.getFromRouteId();
Route route = exchange.getContext().getRoute(routeId);
-String loc = route != null ? route.getSourceLocation() : "";
+String loc = route != null ? route.getSourceLocation() : null;
+if (loc == null) {
+loc = "";
+}
String id = routeId;
String label = "";
if (exchange.getFromEndpoint() != null) {
@@ -587,7 +590,7 @@ public final class MessageHelper {
String goMessageHistoryOutput =
exchange.getContext().getGlobalOption(Exchange.MESSAGE_HISTORY_OUTPUT_FORMAT);
goMessageHistoryOutput = goMessageHistoryOutput == null ?
MESSAGE_HISTORY_OUTPUT : goMessageHistoryOutput;
-sb.append(String.format(goMessageHistoryOutput, loc, routeId, id,
label, elapsed));
+sb.append(String.format(goMessageHistoryOutput, loc, routeId + "/" +
id, label, elapsed));
sb.append("\n");
if (list == null || list.isEmpty()) {
@@ -613,7 +616,7 @@ public final class MessageHelper {
// we do not have elapsed time
elapsed = 0;
sb.append("\t...\n");
-sb.append(String.format(goMessageHistoryOutput, loc, routeId,
id, label, elapsed));
+sb.append(String.format(goMessageHistoryOutput, loc, routeId +
"/" + id, label, elapsed));
sb.append("\n");
}
} else {
@@ -635,7 +638,7 @@ public final class MessageHelper {
label =
URISupport.sanitizeUri(StringHelper.limitLength(history.getNode().getLabel(),
100));
elapsed = history.getElapsed();
-sb.append(String.format(goMessageHistoryOutput, loc, routeId,
id, label, elapsed));
+sb.append(String.format(goMessageHistoryOutput, loc, routeId +
"/" + id, label, elapsed));
sb.append("\n");
}
}
@@ -651,7 +654,7 @@ public final class MessageHelper {
if (logStackTrace) {
sb.append("\nStacktrace\n");
sb.append(
-
"---\n");
+
"---");
}
return sb.toString();
}
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
index cae9fd0..011e4d2 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_15.adoc
@@ -22,16 +22,16 @@
[camel] branch main updated (40595b4 -> 661c36e)
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 40595b4 Regen for commit 0ca042e3de2246802b8cfb1df38617b6ab1ff1c8 (#6664) new f712ed9 CAMEL-17417: camel-core - Route stack trace to include source file:line new 661c36e CAMEL-17417: camel-core - Route stack trace to include source file:line The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/camel/support/MessageHelper.java| 53 +- .../ROOT/pages/camel-3x-upgrade-guide-3_15.adoc| 20 2 files changed, 42 insertions(+), 31 deletions(-)
[camel] 02/02: CAMEL-17417: camel-core - Route stack trace to include source file:line
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 661c36e0e45c1bde2b638cb199b230e0f77f96a5
Author: Claus Ibsen
AuthorDate: Thu Jan 6 12:13:42 2022 +0100
CAMEL-17417: camel-core - Route stack trace to include source file:line
---
.../org/apache/camel/support/MessageHelper.java| 42 +-
1 file changed, 25 insertions(+), 17 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
index 7959313..12eefaf 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
@@ -556,22 +556,6 @@ public final class MessageHelper {
@SuppressWarnings("unchecked")
private static String doDumpMessageHistoryStacktrace(
Exchange exchange, ExchangeFormatter exchangeFormatter, boolean
logStackTrace) {
-List list =
exchange.getProperty(ExchangePropertyKey.MESSAGE_HISTORY, List.class);
-boolean enabled = list != null;
-
-StringBuilder sb = new StringBuilder();
-sb.append("\n");
-sb.append("Message History");
-if (!enabled) {
-sb.append(" (complete message history is disabled)");
-}
-sb.append("\n");
-sb.append(
-
"---\n");
-String goMessageHistoryHeader =
exchange.getContext().getGlobalOption(Exchange.MESSAGE_HISTORY_HEADER_FORMAT);
-sb.append(String.format(goMessageHistoryHeader == null ?
MESSAGE_HISTORY_HEADER : goMessageHistoryHeader,
-"Source", "ID", "Processor", "Elapsed (ms)"));
-sb.append("\n");
// add incoming origin of message on the top
String routeId = exchange.getFromRouteId();
@@ -588,6 +572,28 @@ public final class MessageHelper {
}
long elapsed = new StopWatch(exchange.getCreated()).taken();
+List list =
exchange.getProperty(ExchangePropertyKey.MESSAGE_HISTORY, List.class);
+boolean enabled = list != null;
+boolean source = !loc.isEmpty();
+
+StringBuilder sb = new StringBuilder();
+sb.append("\n");
+sb.append("Message History");
+if (!source && !enabled) {
+sb.append(" (source location and message history is disabled)");
+} else if (!source) {
+sb.append(" (source location is disabled)");
+} else if (!enabled) {
+sb.append(" (complete message history is disabled)");
+}
+sb.append("\n");
+sb.append(
+
"---\n");
+String goMessageHistoryHeader =
exchange.getContext().getGlobalOption(Exchange.MESSAGE_HISTORY_HEADER_FORMAT);
+sb.append(String.format(goMessageHistoryHeader == null ?
MESSAGE_HISTORY_HEADER : goMessageHistoryHeader,
+"Source", "ID", "Processor", "Elapsed (ms)"));
+sb.append("\n");
+
String goMessageHistoryOutput =
exchange.getContext().getGlobalOption(Exchange.MESSAGE_HISTORY_OUTPUT_FORMAT);
goMessageHistoryOutput = goMessageHistoryOutput == null ?
MESSAGE_HISTORY_OUTPUT : goMessageHistoryOutput;
sb.append(String.format(goMessageHistoryOutput, loc, routeId + "/" +
id, label, elapsed));
@@ -598,8 +604,10 @@ public final class MessageHelper {
// instead
id = exchange.adapt(ExtendedExchange.class).getHistoryNodeId();
if (id != null) {
-// compute route id
loc =
exchange.adapt(ExtendedExchange.class).getHistoryNodeSource();
+if (loc == null) {
+loc = "";
+}
String rid = ExchangeHelper.getAtRouteId(exchange);
if (rid != null) {
routeId = rid;
[camel] branch main updated: CAMEL-17417: camel-core - Route stack trace to include source file:line
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 71b45e1 CAMEL-17417: camel-core - Route stack trace to include source
file:line
71b45e1 is described below
commit 71b45e18ad175d77bffaa72f9de7165ed7b3926b
Author: Claus Ibsen
AuthorDate: Thu Jan 6 12:26:52 2022 +0100
CAMEL-17417: camel-core - Route stack trace to include source file:line
---
.../docs/modules/eips/pages/message-history.adoc | 105 ++---
1 file changed, 52 insertions(+), 53 deletions(-)
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/message-history.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/message-history.adoc
index 802c50e..9addbc6 100644
---
a/core/camel-core-engine/src/main/docs/modules/eips/pages/message-history.adoc
+++
b/core/camel-core-engine/src/main/docs/modules/eips/pages/message-history.adoc
@@ -137,82 +137,81 @@ And example is provided below:
[source,text]
-2020-01-15 11:58:34,834 [read #3 - Delay] ERROR DefaultErrorHandler
- Failed delivery for (MessageId: ID-davsclaus-pro-local-1579085914402-0-2 on
ExchangeId: ID-davsclaus-pro-local-1579085914402-0-3). Exhausted after delivery
attempt: 1 caught: java.lang.IllegalArgumentException: Forced to dump message
history
+2022-01-06 12:13:06.721 ERROR 67729 --- [ - timer://java]
o.a.c.p.e.DefaultErrorHandler: Failed delivery for (MessageId:
B4365D4CED3E5E1-0004 on ExchangeId:
B4365D4CED3E5E1-0004). Exhausted after delivery attempt: 1 caught:
java.lang.IllegalArgumentException: The number is too low
-Message History
+Message History (source location is disabled)
---
-RouteId ProcessorId Processor
Elapsed (ms)
-[route1] [route1] [from[seda://start]
] [ 432]
-[route1] [to1 ] [log:foo
] [ 5]
-[route1] [to2 ] [direct:bar
] [ 111]
-[route2] [to5 ] [log:bar
] [ 0]
-[route2] [delay2] [delay[100]
] [ 110]
-[route2] [to6 ] [mock:bar
] [ 0]
-[route1] [delay1] [delay[300]
] [ 305]
-[route1] [to3 ] [log:baz
] [ 2]
-[route1] [process1 ] [Processor@0x5e600dd5
] [ 0]
+Source ID
Processor Elapsed (ms)
+ route1/route1
from[timer://java?period=2s] 2
+ route1/setBody1
setBody[bean[MyJavaRouteBuilder method:randomNumbe0
+ route1/log1log
1
+ route1/filter1
filter[simple{${body} < 30}] 0
+ route1/throwException1
throwException[java.lang.IllegalArgumentException]0
Stacktrace
---
-java.lang.IllegalArgumentException: Forced to dump message history
- at
org.apache.camel.processor.MessageHistoryDumpRoutingTest$1$1.process(MessageHistoryDumpRoutingTest.java:52)
~[test-classes/:?]
- at
org.apache.camel.support.processor.DelegateSyncProcessor.process(DelegateSyncProcessor.java:64)
~[classes/:?]
- at
org.apache.camel.processor.errorhandler.RedeliveryErrorHandler$RedeliveryState.run(RedeliveryErrorHandler.java:477)
~[classes/:?]
- at
org.apache.camel.impl.engine.DefaultReactiveExecutor$Worker.schedule(DefaultReactiveExecutor.java:186)
~[classes/:?]
- at
org.apache.camel.impl.engine.DefaultReac
[GitHub] [camel] davsclaus merged pull request #6665: Generated sources regen
davsclaus merged pull request #6665: URL: https://github.com/apache/camel/pull/6665 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Regen for commit 40595b44f61de2921b886ee540da9bef2ecbac73 (#6665)
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 7f5d2e3 Regen for commit 40595b44f61de2921b886ee540da9bef2ecbac73 (#6665) 7f5d2e3 is described below commit 7f5d2e3cc3bb282805ab0f063709fb93ff0f96e2 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Jan 6 12:29:25 2022 +0100 Regen for commit 40595b44f61de2921b886ee540da9bef2ecbac73 (#6665) Signed-off-by: GitHub Co-authored-by: davsclaus --- .../apache/camel/catalog/schemas/camel-spring.xsd | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index 9f68b93..6c718ff 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 @@ -9377,10 +9377,10 @@ direct or seda. When messages is passed via external endpoints such as JMS or HTTP then the consumer will create a new unit of work, with the message it received as input as the original input. Also some EIP patterns such as splitter, multicast, will create a new unit of work boundary for the messages in -their sub-route (eg the splitted message); however these EIPs have an option -named shareUnitOfWork which allows to combine with the parent unit of work -in regard to error handling and therefore use the parent original message. -By default this feature is off. Default value: false +their sub-route (eg the split message); however these EIPs have an option named +shareUnitOfWork which allows to combine with the parent unit of work in +regard to error handling and therefore use the parent original message. By +default this feature is off. Default value: false ]]> @@ -9411,10 +9411,10 @@ direct or seda. When messages is passed via external endpoints such as JMS or HTTP then the consumer will create a new unit of work, with the message it received as input as the original input. Also some EIP patterns such as splitter, multicast, will create a new unit of work boundary for the messages in -their sub-route (eg the splitted message); however these EIPs have an option -named shareUnitOfWork which allows to combine with the parent unit of work -in regard to error handling and therefore use the parent original message. -By default this feature is off. Default value: false +their sub-route (eg the split message); however these EIPs have an option named +shareUnitOfWork which allows to combine with the parent unit of work in +regard to error handling and therefore use the parent original message. By +default this feature is off. Default value: false ]]> @@ -11516,7 +11516,7 @@ Delimiter used in splitting messages. Can be turned off using the value @@ -11564,17 +11564,17 @@ have to enable that option as well. @@ -11620,8 +11620,8 @@ needed before the exchange is send.
[GitHub] [camel] github-actions[bot] opened a new pull request #6667: Generated sources regen
github-actions[bot] opened a new pull request #6667: URL: https://github.com/apache/camel/pull/6667 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] closed pull request #6667: Generated sources regen
github-actions[bot] closed pull request #6667: URL: https://github.com/apache/camel/pull/6667 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (26e592d -> 8a2a56d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. omit 26e592d Regen for commit 40595b44f61de2921b886ee540da9bef2ecbac73 add f712ed9 CAMEL-17417: camel-core - Route stack trace to include source file:line add 661c36e CAMEL-17417: camel-core - Route stack trace to include source file:line add 8a2a56d Regen for commit 661c36e0e45c1bde2b638cb199b230e0f77f96a5 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (26e592d) \ N -- N -- N refs/heads/regen_bot (8a2a56d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../org/apache/camel/support/MessageHelper.java| 53 +- .../ROOT/pages/camel-3x-upgrade-guide-3_15.adoc| 20 2 files changed, 42 insertions(+), 31 deletions(-)
[GitHub] [camel] JiriOndrusek opened a new pull request #6668: CAMEL-17437 Camel-aws2-sqs: Deadletter fails with sqs client from registry
JiriOndrusek opened a new pull request #6668: URL: https://github.com/apache/camel/pull/6668 Issue: https://issues.apache.org/jira/browse/CAMEL-17437 Problem was caused by less severe problem - one validation was executed too early. Validation of sqs client has to be done after endpoint configuration, to cover a case when client is autowired. I fixed several tests which covers this validation + added a new junit integration test using deadletter and autowired client. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus merged pull request #6666: (chores) camel-hdfs: adjust Windows build profile name to match others in the code
davsclaus merged pull request #: URL: https://github.com/apache/camel/pull/ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (8a2a56d -> 7f5d2e3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. discard 8a2a56d Regen for commit 661c36e0e45c1bde2b638cb199b230e0f77f96a5 add 71b45e1 CAMEL-17417: camel-core - Route stack trace to include source file:line add 7f5d2e3 Regen for commit 40595b44f61de2921b886ee540da9bef2ecbac73 (#6665) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8a2a56d) \ N -- N -- N refs/heads/regen_bot (7f5d2e3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../docs/modules/eips/pages/message-history.adoc | 105 ++--- 1 file changed, 52 insertions(+), 53 deletions(-)
[GitHub] [camel] davsclaus commented on pull request #6668: CAMEL-17437 Camel-aws2-sqs: Deadletter fails with sqs client from registry
davsclaus commented on pull request #6668: URL: https://github.com/apache/camel/pull/6668#issuecomment-1006543101 @JiriOndrusek could you take a look at the other aws components as some may also do some kind of validation check at the same phase, that can be corrected as well -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated (7f5d2e3 -> 0ce9eaa)
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 7f5d2e3 Regen for commit 40595b44f61de2921b886ee540da9bef2ecbac73 (#6665) add 0ce9eaa (chores) camel-hdfs: adjust Windows build profile name to match others in the code (#) No new revisions were added by this update. Summary of changes: components/camel-hdfs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [camel] JiriOndrusek commented on pull request #6668: CAMEL-17437 Camel-aws2-sqs: Deadletter fails with sqs client from registry
JiriOndrusek commented on pull request #6668: URL: https://github.com/apache/camel/pull/6668#issuecomment-1006544604 @davsclaus Yes, I was planning to do it. Should I raise a ticket for it? (even if I don't know now whether there are any similar problems?) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #6668: CAMEL-17437 Camel-aws2-sqs: Deadletter fails with sqs client from registry
davsclaus commented on pull request #6668: URL: https://github.com/apache/camel/pull/6668#issuecomment-1006556636 You are welcome to create a JIRA if you think that you may not do this soon and risk forgetting, otherwise if you just work on it soon then you can point to the same JIRA -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] oscerd commented on issue #673: Kamelet for ElasticSearch Sink provides no mechanism to set indexId or ce-indexId
oscerd commented on issue #673: URL: https://github.com/apache/camel-kamelets/issues/673#issuecomment-1006561869 David, you're not trying to do that, you're always trying to find faults in how this PMC work. This is the only thing frustrating, nothing else -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (7f5d2e3 -> 0ce9eaa)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 7f5d2e3 Regen for commit 40595b44f61de2921b886ee540da9bef2ecbac73 (#6665) add 0ce9eaa (chores) camel-hdfs: adjust Windows build profile name to match others in the code (#) No new revisions were added by this update. Summary of changes: components/camel-hdfs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch main updated: CAMEL-17427: Some scheduled consumers should be regarded as UP in their health-check from initial phase such as camel-scheduler.
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 1c4fd4a CAMEL-17427: Some scheduled consumers should be regarded as
UP in their health-check from initial phase such as camel-scheduler.
1c4fd4a is described below
commit 1c4fd4aac2ccb1a1ee11904e293ffac9e929789d
Author: Claus Ibsen
AuthorDate: Thu Jan 6 14:35:40 2022 +0100
CAMEL-17427: Some scheduled consumers should be regarded as UP in their
health-check from initial phase such as camel-scheduler.
---
.../component/scheduler/SchedulerConsumer.java | 7 +++
.../health/SchedulerConsumerHealthCheckTest.java | 52 ++
.../camel/support/ScheduledPollConsumer.java | 16 ++-
.../support/ScheduledPollConsumerHealthCheck.java | 17 ++-
4 files changed, 90 insertions(+), 2 deletions(-)
diff --git
a/components/camel-scheduler/src/main/java/org/apache/camel/component/scheduler/SchedulerConsumer.java
b/components/camel-scheduler/src/main/java/org/apache/camel/component/scheduler/SchedulerConsumer.java
index d21c023..bea04d6 100644
---
a/components/camel-scheduler/src/main/java/org/apache/camel/component/scheduler/SchedulerConsumer.java
+++
b/components/camel-scheduler/src/main/java/org/apache/camel/component/scheduler/SchedulerConsumer.java
@@ -21,6 +21,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.health.HealthCheck;
import org.apache.camel.support.ScheduledPollConsumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,6 +35,12 @@ public class SchedulerConsumer extends ScheduledPollConsumer
{
}
@Override
+protected HealthCheck.State initialHealthCheckState() {
+// the scheduler should be regarded as healthy on startup
+return HealthCheck.State.UP;
+}
+
+@Override
public SchedulerEndpoint getEndpoint() {
return (SchedulerEndpoint) super.getEndpoint();
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/impl/health/SchedulerConsumerHealthCheckTest.java
b/core/camel-core/src/test/java/org/apache/camel/impl/health/SchedulerConsumerHealthCheckTest.java
new file mode 100644
index 000..fb1ee1c
--- /dev/null
+++
b/core/camel-core/src/test/java/org/apache/camel/impl/health/SchedulerConsumerHealthCheckTest.java
@@ -0,0 +1,52 @@
+/*
+ * 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.health;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Route;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.scheduler.SchedulerConsumer;
+import org.apache.camel.health.HealthCheck;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class SchedulerConsumerHealthCheckTest {
+
+private static final String TEST_ROUTE_ID = "Test-Route";
+
+@Test
+public void testShouldBeUP() throws Exception {
+CamelContext context = new DefaultCamelContext();
+context.addRoutes(new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+
from("scheduler:foo?initialDelay=5000").id(TEST_ROUTE_ID).log("Message");
+}
+});
+context.start();
+
+Route route = context.getRoute(TEST_ROUTE_ID);
+SchedulerConsumer consumer = (SchedulerConsumer) route.getConsumer();
+HealthCheck.Result result = consumer.getHealthCheck().call();
+
+Assertions.assertEquals(HealthCheck.State.UP, result.getState());
+
+context.stop();
+}
+
+}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
index db4368d..0cf8c9b 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumer.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollCon
[GitHub] [camel] davsclaus merged pull request #6668: CAMEL-17437 Camel-aws2-sqs: Deadletter fails with sqs client from registry
davsclaus merged pull request #6668: URL: https://github.com/apache/camel/pull/6668 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-17437 Camel-aws2-sqs: Deadletter fails with sqs client from registry (could impact more components) (#6668)
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 dea0876 CAMEL-17437 Camel-aws2-sqs: Deadletter fails with sqs client
from registry (could impact more components) (#6668)
dea0876 is described below
commit dea08765141850be915593f0e30bd71e9974f54f
Author: JiriOndrusek
AuthorDate: Thu Jan 6 14:39:09 2022 +0100
CAMEL-17437 Camel-aws2-sqs: Deadletter fails with sqs client from registry
(could impact more components) (#6668)
---
.../camel/component/aws2/sqs/Sqs2Component.java| 4 --
.../camel/component/aws2/sqs/Sqs2Endpoint.java | 8 +++
.../aws2/sqs/SqsComponentClientRegistryTest.java | 1 +
.../aws2/sqs/SqsComponentConfigurationTest.java| 4 +-
...qsDeadletterWithClientRegistryLocalstackIT.java | 82 ++
5 files changed, 93 insertions(+), 6 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
index 1b6c730..2fc27e7 100644
---
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
+++
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
@@ -68,10 +68,6 @@ public class Sqs2Component extends DefaultComponent {
}
Sqs2Endpoint sqsEndpoint = new Sqs2Endpoint(uri, this, configuration);
setProperties(sqsEndpoint, parameters);
-if (!configuration.isUseDefaultCredentialsProvider() &&
configuration.getAmazonSQSClient() == null
-&& (configuration.getAccessKey() == null ||
configuration.getSecretKey() == null)) {
-throw new IllegalArgumentException("AmazonSQSClient or accessKey
and secretKey must be specified.");
-}
// Verify that visibilityTimeout is set if extendMessageVisibility is
// set to true.
diff --git
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
index 74ff936..0c5cc2e 100644
---
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
+++
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
@@ -147,6 +147,14 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint
implements HeaderFilterS
@Override
protected void doInit() throws Exception {
super.doInit();
+
+//validation of client has to be done after endpoint initialization
(in case that sqs client is autowired)
+// - covered by SqsDeadletterWithClientRegistryLocalstackIT
+if (!configuration.isUseDefaultCredentialsProvider() &&
configuration.getAmazonSQSClient() == null
+&& (configuration.getAccessKey() == null ||
configuration.getSecretKey() == null)) {
+throw new IllegalArgumentException("AmazonSQSClient or accessKey
and secretKey must be specified.");
+}
+
client = configuration.getAmazonSQSClient() != null
? configuration.getAmazonSQSClient() :
Sqs2ClientFactory.getSqsClient(configuration).getSQSClient();
diff --git
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
index 8f606b6..7ee2697 100644
---
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
+++
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
@@ -42,6 +42,7 @@ public class SqsComponentClientRegistryTest extends
CamelTestSupport {
Sqs2Component component = context.getComponent("aws2-sqs",
Sqs2Component.class);
assertThrows(IllegalArgumentException.class, () -> {
Sqs2Endpoint endpoint = (Sqs2Endpoint)
component.createEndpoint("aws2-sqs://MyQueue");
+endpoint.start();
});
}
diff --git
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java
index f7b7c6c..d63734a 100644
---
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java
+++
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentCo
[camel] branch camel-3.14.x updated: CAMEL-17437 Camel-aws2-sqs: Deadletter fails with sqs client from registry (could impact more components) (#6668)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.14.x by this push:
new 79c25f3 CAMEL-17437 Camel-aws2-sqs: Deadletter fails with sqs client
from registry (could impact more components) (#6668)
79c25f3 is described below
commit 79c25f32d26c71c64005fb3cdf3d922eaf9c8f41
Author: JiriOndrusek
AuthorDate: Thu Jan 6 14:39:09 2022 +0100
CAMEL-17437 Camel-aws2-sqs: Deadletter fails with sqs client from registry
(could impact more components) (#6668)
---
.../camel/component/aws2/sqs/Sqs2Component.java| 4 --
.../camel/component/aws2/sqs/Sqs2Endpoint.java | 8 +++
.../aws2/sqs/SqsComponentClientRegistryTest.java | 1 +
.../aws2/sqs/SqsComponentConfigurationTest.java| 4 +-
...qsDeadletterWithClientRegistryLocalstackIT.java | 82 ++
5 files changed, 93 insertions(+), 6 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
index 1b6c730..2fc27e7 100644
---
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
+++
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Component.java
@@ -68,10 +68,6 @@ public class Sqs2Component extends DefaultComponent {
}
Sqs2Endpoint sqsEndpoint = new Sqs2Endpoint(uri, this, configuration);
setProperties(sqsEndpoint, parameters);
-if (!configuration.isUseDefaultCredentialsProvider() &&
configuration.getAmazonSQSClient() == null
-&& (configuration.getAccessKey() == null ||
configuration.getSecretKey() == null)) {
-throw new IllegalArgumentException("AmazonSQSClient or accessKey
and secretKey must be specified.");
-}
// Verify that visibilityTimeout is set if extendMessageVisibility is
// set to true.
diff --git
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
index 74ff936..0c5cc2e 100644
---
a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
+++
b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2Endpoint.java
@@ -147,6 +147,14 @@ public class Sqs2Endpoint extends ScheduledPollEndpoint
implements HeaderFilterS
@Override
protected void doInit() throws Exception {
super.doInit();
+
+//validation of client has to be done after endpoint initialization
(in case that sqs client is autowired)
+// - covered by SqsDeadletterWithClientRegistryLocalstackIT
+if (!configuration.isUseDefaultCredentialsProvider() &&
configuration.getAmazonSQSClient() == null
+&& (configuration.getAccessKey() == null ||
configuration.getSecretKey() == null)) {
+throw new IllegalArgumentException("AmazonSQSClient or accessKey
and secretKey must be specified.");
+}
+
client = configuration.getAmazonSQSClient() != null
? configuration.getAmazonSQSClient() :
Sqs2ClientFactory.getSqsClient(configuration).getSQSClient();
diff --git
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
index 8f606b6..7ee2697 100644
---
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
+++
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentClientRegistryTest.java
@@ -42,6 +42,7 @@ public class SqsComponentClientRegistryTest extends
CamelTestSupport {
Sqs2Component component = context.getComponent("aws2-sqs",
Sqs2Component.class);
assertThrows(IllegalArgumentException.class, () -> {
Sqs2Endpoint endpoint = (Sqs2Endpoint)
component.createEndpoint("aws2-sqs://MyQueue");
+endpoint.start();
});
}
diff --git
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java
index f7b7c6c..d63734a 100644
---
a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/SqsComponentConfigurationTest.java
+++
b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sq
[GitHub] [camel] orpiske opened a new pull request #6669: CAMEL-17435: dependency cleanup
orpiske opened a new pull request #6669: URL: https://github.com/apache/camel/pull/6669 This is the first part of the dependency cleanup. It moves them to the dependency management section so that they are not included by default in all modules. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske commented on pull request #6669: CAMEL-17435: dependency cleanup
orpiske commented on pull request #6669: URL: https://github.com/apache/camel/pull/6669#issuecomment-1006610130 Oh. It also adds a (temp) profile so that unused dependencies can be analyzed more easily with the dependency plugin. To do so: `mvn -PdependencyReview dependency:analyze` or `mvn -PdependencyReview dependency:analyze-report` If the idea of using the `maven-dependency-plugin` is well received, I think we could move it to the sourceCheck plugin and run it by default ... so that we can catch unused dependencies before they are even added to the code base. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot_3.14.x updated (4463bb0 -> 79c25f3)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot_3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4463bb0 CAMEL-17441: camel-health - Loading custom health-check from
classpath scanning is not added to registry
add 79c25f3 CAMEL-17437 Camel-aws2-sqs: Deadletter fails with sqs client
from registry (could impact more components) (#6668)
No new revisions were added by this update.
Summary of changes:
.../camel/component/aws2/sqs/Sqs2Component.java| 4 ---
.../camel/component/aws2/sqs/Sqs2Endpoint.java | 8 +
.../aws2/sqs/SqsComponentClientRegistryTest.java | 1 +
.../aws2/sqs/SqsComponentConfigurationTest.java| 4 +--
...sDeadletterWithClientRegistryLocalstackIT.java} | 41 ++
5 files changed, 37 insertions(+), 21 deletions(-)
copy
components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/{SqsConsumerMessageLocalstackIT.java
=> SqsDeadletterWithClientRegistryLocalstackIT.java} (59%)
[camel] branch regen_bot updated (0ce9eaa -> dea0876)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 0ce9eaa (chores) camel-hdfs: adjust Windows build profile name to
match others in the code (#)
add 1c4fd4a CAMEL-17427: Some scheduled consumers should be regarded as
UP in their health-check from initial phase such as camel-scheduler.
add dea0876 CAMEL-17437 Camel-aws2-sqs: Deadletter fails with sqs client
from registry (could impact more components) (#6668)
No new revisions were added by this update.
Summary of changes:
.../camel/component/aws2/sqs/Sqs2Component.java| 4 ---
.../camel/component/aws2/sqs/Sqs2Endpoint.java | 8 +
.../aws2/sqs/SqsComponentClientRegistryTest.java | 1 +
.../aws2/sqs/SqsComponentConfigurationTest.java| 4 +--
...sDeadletterWithClientRegistryLocalstackIT.java} | 41 ++
.../component/scheduler/SchedulerConsumer.java | 7
java => SchedulerConsumerHealthCheckTest.java} | 19 +-
.../camel/support/ScheduledPollConsumer.java | 16 -
.../support/ScheduledPollConsumerHealthCheck.java | 17 -
9 files changed, 84 insertions(+), 33 deletions(-)
copy
components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/{SqsConsumerMessageLocalstackIT.java
=> SqsDeadletterWithClientRegistryLocalstackIT.java} (59%)
copy
core/camel-core/src/test/java/org/apache/camel/impl/health/{RouteHealthCheckTest.java
=> SchedulerConsumerHealthCheckTest.java} (72%)
[camel] branch regen_bot updated (dea0876 -> 1c4fd4a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. omit dea0876 CAMEL-17437 Camel-aws2-sqs: Deadletter fails with sqs client from registry (could impact more components) (#6668) This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/regen_bot (1c4fd4a) \ O -- O -- O (dea0876) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../camel/component/aws2/sqs/Sqs2Component.java| 4 ++ .../camel/component/aws2/sqs/Sqs2Endpoint.java | 8 --- .../aws2/sqs/SqsComponentClientRegistryTest.java | 1 - .../aws2/sqs/SqsComponentConfigurationTest.java| 4 +- ...qsDeadletterWithClientRegistryLocalstackIT.java | 82 -- 5 files changed, 6 insertions(+), 93 deletions(-) delete mode 100644 components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/SqsDeadletterWithClientRegistryLocalstackIT.java
[GitHub] [camel-quarkus] ppalaga merged pull request #3439: 2.2.x Backports
ppalaga merged pull request #3439: URL: https://github.com/apache/camel-quarkus/pull/3439 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] 01/12: Ban com.google.code.findbugs:jsr305 unconditionally #3335
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 2.2.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 295ebcd0ba8c5e0d9084cbaeb31f7897bdb63f82 Author: Peter Palaga AuthorDate: Wed Jan 5 13:49:13 2022 +0100 Ban com.google.code.findbugs:jsr305 unconditionally #3335 --- .../google-http-client/runtime/pom.xml | 6 +++ extensions/cassandraql/runtime/pom.xml | 6 +++ extensions/google-bigquery/deployment/pom.xml | 6 +++ extensions/google-bigquery/runtime/pom.xml | 6 +++ extensions/google-pubsub/deployment/pom.xml| 6 +++ extensions/google-pubsub/runtime/pom.xml | 6 +++ extensions/google-storage/runtime/pom.xml | 6 +++ extensions/grpc/deployment/pom.xml | 6 +++ extensions/grpc/runtime/pom.xml| 4 ++ extensions/opentelemetry/runtime/pom.xml | 6 +++ integration-tests/xchange/pom.xml | 6 +++ pom.xml| 5 ++ poms/bom/pom.xml | 58 ++ 13 files changed, 127 insertions(+) diff --git a/extensions-support/google-http-client/runtime/pom.xml b/extensions-support/google-http-client/runtime/pom.xml index a5980e9..155b924 100644 --- a/extensions-support/google-http-client/runtime/pom.xml +++ b/extensions-support/google-http-client/runtime/pom.xml @@ -58,6 +58,12 @@ com.google.http-client google-http-client + + +com.google.code.findbugs +jsr305 + + diff --git a/extensions/cassandraql/runtime/pom.xml b/extensions/cassandraql/runtime/pom.xml index 3c7eba1..abd8361 100644 --- a/extensions/cassandraql/runtime/pom.xml +++ b/extensions/cassandraql/runtime/pom.xml @@ -63,6 +63,12 @@ com.datastax.oss java-driver-core + + +com.google.code.findbugs +jsr305 + + com.datastax.oss diff --git a/extensions/google-bigquery/deployment/pom.xml b/extensions/google-bigquery/deployment/pom.xml index ea3c751..cc2e5f0 100644 --- a/extensions/google-bigquery/deployment/pom.xml +++ b/extensions/google-bigquery/deployment/pom.xml @@ -33,6 +33,12 @@ io.quarkiverse.googlecloudservices quarkus-google-cloud-bigquery-deployment + + +com.google.code.findbugs +jsr305 + + org.apache.camel.quarkus diff --git a/extensions/google-bigquery/runtime/pom.xml b/extensions/google-bigquery/runtime/pom.xml index 28a5963..749fdf9 100644 --- a/extensions/google-bigquery/runtime/pom.xml +++ b/extensions/google-bigquery/runtime/pom.xml @@ -51,6 +51,12 @@ io.quarkiverse.googlecloudservices quarkus-google-cloud-bigquery + + +com.google.code.findbugs +jsr305 + + org.apache.camel.quarkus diff --git a/extensions/google-pubsub/deployment/pom.xml b/extensions/google-pubsub/deployment/pom.xml index 8f54802..636c74e 100644 --- a/extensions/google-pubsub/deployment/pom.xml +++ b/extensions/google-pubsub/deployment/pom.xml @@ -37,6 +37,12 @@ io.quarkiverse.googlecloudservices quarkus-google-cloud-pubsub-deployment + + +com.google.code.findbugs +jsr305 + + org.apache.camel.quarkus diff --git a/extensions/google-pubsub/runtime/pom.xml b/extensions/google-pubsub/runtime/pom.xml index a5a3382..cbed13b 100644 --- a/extensions/google-pubsub/runtime/pom.xml +++ b/extensions/google-pubsub/runtime/pom.xml @@ -65,6 +65,12 @@ io.quarkiverse.googlecloudservices quarkus-google-cloud-pubsub + + +com.google.code.findbugs +jsr305 + + org.apache.camel.quarkus diff --git a/extensions/google-storage/runtime/pom.xml b/extensions/google-storage/runtime/pom.xml index 91d7ccb..5202e10 100644 --- a/extensions/google-storage/runtime/pom.xml +++ b/extensions/google-storage/runtime/pom.xml @@ -65,6 +65,12 @@ io.quarkiverse.googlecloudservices quarkus-google-cloud-storage + + +com.google.code.findbugs +jsr305 + + diff --git a/extensions/grpc/deployment/pom.xml b/extensions/grp
[camel-quarkus] 03/12: Ban geronimo-jms_*_spec #3363
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 2.2.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 2a7b6efd7158386b131425e4bbaaf274f6f99f39 Author: Peter Palaga AuthorDate: Tue Dec 7 15:23:19 2021 +0100 Ban geronimo-jms_*_spec #3363 --- extensions/activemq/runtime/pom.xml | 12 ++-- extensions/amqp/deployment/pom.xml | 10 ++ extensions/amqp/runtime/pom.xml | 10 ++ extensions/jms/runtime/pom.xml | 10 ++ integration-tests/jms-artemis-client/pom.xml | 6 ++ integration-tests/jms-qpid-amqp-client/pom.xml | 10 ++ integration-tests/jta/pom.xml| 6 ++ integration-tests/messaging/common/pom.xml | 5 ++--- integration-tests/messaging/jms/pom.xml | 5 - integration-tests/messaging/sjms/pom.xml | 5 - integration-tests/sjms-artemis-client/pom.xml| 6 ++ integration-tests/sjms-qpid-amqp-client/pom.xml | 10 ++ integration-tests/sjms2-artemis-client/pom.xml | 6 ++ integration-tests/sjms2-qpid-amqp-client/pom.xml | 10 ++ pom.xml | 6 -- poms/bom-test/pom.xml| 5 - poms/bom/pom.xml | 5 + 17 files changed, 105 insertions(+), 22 deletions(-) diff --git a/extensions/activemq/runtime/pom.xml b/extensions/activemq/runtime/pom.xml index 77f5af1..358f892 100644 --- a/extensions/activemq/runtime/pom.xml +++ b/extensions/activemq/runtime/pom.xml @@ -65,16 +65,24 @@ org.apache.camel camel-activemq - - + + org.apache.activemq activemq-broker + +org.apache.geronimo.specs +geronimo-jms_1.1_spec + +jakarta.jms +jakarta.jms-api + + org.graalvm.nativeimage svm provided diff --git a/extensions/amqp/deployment/pom.xml b/extensions/amqp/deployment/pom.xml index 9c12911..634e5b1 100644 --- a/extensions/amqp/deployment/pom.xml +++ b/extensions/amqp/deployment/pom.xml @@ -33,6 +33,16 @@ org.amqphub.quarkus quarkus-qpid-jms-deployment + + +org.apache.geronimo.specs +geronimo-jms_2.0_spec + + + + +jakarta.jms +jakarta.jms-api org.apache.camel.quarkus diff --git a/extensions/amqp/runtime/pom.xml b/extensions/amqp/runtime/pom.xml index 99bb992..92de778 100644 --- a/extensions/amqp/runtime/pom.xml +++ b/extensions/amqp/runtime/pom.xml @@ -50,6 +50,16 @@ org.amqphub.quarkus quarkus-qpid-jms + + +org.apache.geronimo.specs +geronimo-jms_2.0_spec + + + + +jakarta.jms +jakarta.jms-api org.apache.camel.quarkus diff --git a/extensions/jms/runtime/pom.xml b/extensions/jms/runtime/pom.xml index 35f1c8b..d5537ed 100644 --- a/extensions/jms/runtime/pom.xml +++ b/extensions/jms/runtime/pom.xml @@ -58,6 +58,16 @@ org.apache.camel camel-jms + + +org.apache.geronimo.specs +geronimo-jms_2.0_spec + + + + +jakarta.jms +jakarta.jms-api diff --git a/integration-tests/jms-artemis-client/pom.xml b/integration-tests/jms-artemis-client/pom.xml index 28219ab..a4bd7c7 100644 --- a/integration-tests/jms-artemis-client/pom.xml +++ b/integration-tests/jms-artemis-client/pom.xml @@ -46,6 +46,12 @@ io.quarkus quarkus-artemis-jms + + +org.apache.geronimo.specs +geronimo-jms_2.0_spec + + diff --git a/integration-tests/jms-qpid-amqp-client/pom.xml b/integration-tests/jms-qpid-amqp-client/pom.xml index cb76a8a..7961098 100644 --- a/integration-tests/jms-qpid-amqp-client/pom.xml +++ b/integration-tests/jms-qpid-amqp-client/pom.xml @@ -46,6 +46,16 @@ org.amqphub.quarkus quarkus-qpid-jms + + +org.apache.geronimo.specs +geronimo-jms_2.0_spec + + + + +jakarta.jms +jakarta.jms-api
[camel-quarkus] 11/12: Add missing shiro reflective class configuration for commons-beanutils converters
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 69c355d4a7551f240dcce3c267dc4bab2db1d56a
Author: James Netherton
AuthorDate: Wed Oct 20 10:53:47 2021 +0100
Add missing shiro reflective class configuration for commons-beanutils
converters
Fixes #3208
---
.../component/shiro/deployment/ShiroProcessor.java | 55 ++
1 file changed, 45 insertions(+), 10 deletions(-)
diff --git
a/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
b/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
index ae3dfc3..daef76b 100644
---
a/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
+++
b/extensions/shiro/deployment/src/main/java/org/apache/camel/quarkus/component/shiro/deployment/ShiroProcessor.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.quarkus.component.shiro.deployment;
+import java.io.File;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.URL;
import java.sql.Time;
import java.sql.Timestamp;
import java.util.Calendar;
@@ -50,23 +54,54 @@ class ShiroProcessor {
@BuildStep
ReflectiveClassBuildItem registerForReflection(CombinedIndexBuildItem
combinedIndex) {
-List dtos = combinedIndex.getIndex()
+List reflectiveClasses = combinedIndex.getIndex()
.getAllKnownSubclasses(SHIRO_EXCEPTION_NAME)
.stream()
.map(c -> c.name().toString())
.filter(n -> n.startsWith("org.apache.shiro.auth"))
.collect(Collectors.toList());
-dtos.add(CamelAuthorizationException.class.getName());
-dtos.add(Boolean[].class.getName());
-dtos.add(Float[].class.getName());
-dtos.add(java.util.Date[].class.getName());
-dtos.add(Calendar[].class.getName());
-dtos.add(java.sql.Date[].class.getName());
-dtos.add(Time[].class.getName());
-dtos.add(Timestamp[].class.getName());
+reflectiveClasses.add(CamelAuthorizationException.class.getName());
-return new ReflectiveClassBuildItem(false, false, dtos.toArray(new
String[dtos.size()]));
+// commons-beanutils converter types and their array counterparts need
to be registered for reflection
+reflectiveClasses.add(BigDecimal.class.getName());
+reflectiveClasses.add(BigDecimal[].class.getName());
+reflectiveClasses.add(BigInteger.class.getName());
+reflectiveClasses.add(BigInteger[].class.getName());
+reflectiveClasses.add(Boolean.class.getName());
+reflectiveClasses.add(Boolean[].class.getName());
+reflectiveClasses.add(Byte.class.getName());
+reflectiveClasses.add(Byte[].class.getName());
+reflectiveClasses.add(Calendar.class.getName());
+reflectiveClasses.add(Calendar[].class.getName());
+reflectiveClasses.add(Character.class.getName());
+reflectiveClasses.add(Character[].class.getName());
+reflectiveClasses.add(java.util.Date.class.getName());
+reflectiveClasses.add(java.util.Date[].class.getName());
+reflectiveClasses.add(java.sql.Date.class.getName());
+reflectiveClasses.add(java.sql.Date[].class.getName());
+reflectiveClasses.add(Double.class.getName());
+reflectiveClasses.add(Double[].class.getName());
+reflectiveClasses.add(File.class.getName());
+reflectiveClasses.add(File[].class.getName());
+reflectiveClasses.add(Float.class.getName());
+reflectiveClasses.add(Float[].class.getName());
+reflectiveClasses.add(Integer.class.getName());
+reflectiveClasses.add(Integer[].class.getName());
+reflectiveClasses.add(Long.class.getName());
+reflectiveClasses.add(Long[].class.getName());
+reflectiveClasses.add(Short.class.getName());
+reflectiveClasses.add(Short[].class.getName());
+reflectiveClasses.add(String.class.getName());
+reflectiveClasses.add(String[].class.getName());
+reflectiveClasses.add(Time.class.getName());
+reflectiveClasses.add(Time[].class.getName());
+reflectiveClasses.add(Timestamp.class.getName());
+reflectiveClasses.add(Timestamp[].class.getName());
+reflectiveClasses.add(URL.class.getName());
+reflectiveClasses.add(URL[].class.getName());
+
+return new ReflectiveClassBuildItem(false, false,
reflectiveClasses.toArray(new String[reflectiveClasses.size()]));
}
@BuildStep
[camel-quarkus] 07/12: Ban commons-logging and commons-logging-api #3405
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 2.2.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit b20242aedbba5db5f0ed8e86dd91a780920d1ca4 Author: Peter Palaga AuthorDate: Tue Dec 21 18:37:05 2021 +0100 Ban commons-logging and commons-logging-api #3405 --- extensions-jvm/atmos/runtime/pom.xml | 10 ++ extensions-jvm/aws-secrets-manager/runtime/pom.xml | 10 ++ extensions-jvm/cm-sms/runtime/pom.xml | 10 ++ extensions-jvm/google-functions/runtime/pom.xml| 10 ++ extensions-jvm/iota/runtime/pom.xml| 10 ++ extensions-jvm/ribbon/runtime/pom.xml | 10 ++ extensions-jvm/splunk-hec/runtime/pom.xml | 10 ++ extensions-jvm/thrift/runtime/pom.xml | 10 ++ extensions-jvm/workday/runtime/pom.xml | 8 extensions/as2/runtime/pom.xml | 8 extensions/aws2-athena/runtime/pom.xml | 10 ++ extensions/aws2-cw/runtime/pom.xml | 10 ++ extensions/aws2-ddb/runtime/pom.xml| 10 ++ extensions/aws2-ec2/runtime/pom.xml| 10 ++ extensions/aws2-ecs/runtime/pom.xml| 10 ++ extensions/aws2-eks/runtime/pom.xml| 10 ++ extensions/aws2-eventbridge/runtime/pom.xml| 10 ++ extensions/aws2-iam/runtime/pom.xml| 10 ++ extensions/aws2-kinesis/runtime/pom.xml| 10 ++ extensions/aws2-kms/runtime/pom.xml| 10 ++ extensions/aws2-lambda/runtime/pom.xml | 10 ++ extensions/aws2-mq/runtime/pom.xml | 10 ++ extensions/aws2-msk/runtime/pom.xml| 10 ++ extensions/aws2-s3/runtime/pom.xml | 10 ++ extensions/aws2-ses/runtime/pom.xml| 10 ++ extensions/aws2-sns/runtime/pom.xml| 10 ++ extensions/aws2-sqs/runtime/pom.xml| 10 ++ extensions/aws2-sts/runtime/pom.xml| 10 ++ extensions/aws2-translate/runtime/pom.xml | 10 ++ extensions/box/runtime/pom.xml | 10 ++ extensions/grpc/runtime/pom.xml| 8 extensions/hystrix/runtime/pom.xml | 10 ++ integration-tests-support/wiremock/pom.xml | 10 ++ integration-tests/fop/pom.xml | 10 ++ pom.xml| 2 ++ 35 files changed, 336 insertions(+) diff --git a/extensions-jvm/atmos/runtime/pom.xml b/extensions-jvm/atmos/runtime/pom.xml index be44971..7957296 100644 --- a/extensions-jvm/atmos/runtime/pom.xml +++ b/extensions-jvm/atmos/runtime/pom.xml @@ -54,6 +54,16 @@ org.apache.camel camel-atmos + + +commons-logging +commons-logging + + + + +org.jboss.logging +commons-logging-jboss-logging diff --git a/extensions-jvm/aws-secrets-manager/runtime/pom.xml b/extensions-jvm/aws-secrets-manager/runtime/pom.xml index 34ad4b5..5a43058 100644 --- a/extensions-jvm/aws-secrets-manager/runtime/pom.xml +++ b/extensions-jvm/aws-secrets-manager/runtime/pom.xml @@ -54,6 +54,16 @@ org.apache.camel camel-aws-secrets-manager + + +commons-logging +commons-logging + + + + +org.jboss.logging +commons-logging-jboss-logging diff --git a/extensions-jvm/cm-sms/runtime/pom.xml b/extensions-jvm/cm-sms/runtime/pom.xml index 5d05c62..4240cc7 100644 --- a/extensions-jvm/cm-sms/runtime/pom.xml +++ b/extensions-jvm/cm-sms/runtime/pom.xml @@ -54,6 +54,16 @@ org.apache.camel camel-cm-sms + + +commons-logging +commons-logging + + + + +org.jboss.logging +commons-logging-jboss-logging diff --git a/extensions-jvm/google-functions/runtime/pom.xml b/extensions-jvm/google-functions/runtime/pom.xml index b0fc234..90ac2f9 100644 --- a/extensions-jvm/google-functions/runtime/pom.xml +++ b/extensions-jvm/google-functions/runtime/pom.xml @@ -54,6 +54,16 @@ org.apache.camel camel-google-functions + + +commons-logging +commons-logging + + + + +org.jboss.logging
[camel-quarkus] 02/12: Ban com.sun.activation:javax.activation #3361
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 2.2.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 5b40717e87dd0817946462fef527769347d2c15f Author: Peter Palaga AuthorDate: Tue Dec 7 14:28:27 2021 +0100 Ban com.sun.activation:javax.activation #3361 --- extensions-core/http-common/runtime/pom.xml | 11 +++ extensions-jvm/jbpm/runtime/pom.xml | 8 extensions-jvm/jcr/runtime/pom.xml | 10 ++ extensions-jvm/pulsar/runtime/pom.xml | 10 ++ extensions-jvm/spark/runtime/pom.xml| 10 ++ extensions/attachments/runtime/pom.xml | 10 ++ extensions/mail/runtime/pom.xml | 10 ++ extensions/servlet/runtime/pom.xml | 10 ++ extensions/solr/runtime/pom.xml | 10 ++ pom.xml | 2 ++ 10 files changed, 91 insertions(+) diff --git a/extensions-core/http-common/runtime/pom.xml b/extensions-core/http-common/runtime/pom.xml index 39c4165..4d6d48e 100644 --- a/extensions-core/http-common/runtime/pom.xml +++ b/extensions-core/http-common/runtime/pom.xml @@ -55,6 +55,17 @@ org.apache.camel camel-http-common + + +com.sun.activation +javax.activation + + + + + +com.sun.activation +jakarta.activation diff --git a/extensions-jvm/jbpm/runtime/pom.xml b/extensions-jvm/jbpm/runtime/pom.xml index 891fa23..f8adff6 100644 --- a/extensions-jvm/jbpm/runtime/pom.xml +++ b/extensions-jvm/jbpm/runtime/pom.xml @@ -67,8 +67,16 @@ jakarta.xml.bind jakarta.xml.bind-api + +javax.activation +activation + + +com.sun.activation +jakarta.activation + diff --git a/extensions-jvm/jcr/runtime/pom.xml b/extensions-jvm/jcr/runtime/pom.xml index 1d6aa55..5487b30 100644 --- a/extensions-jvm/jcr/runtime/pom.xml +++ b/extensions-jvm/jcr/runtime/pom.xml @@ -54,6 +54,16 @@ org.apache.camel camel-jcr + + +javax.activation +activation + + + + +com.sun.activation +jakarta.activation diff --git a/extensions-jvm/pulsar/runtime/pom.xml b/extensions-jvm/pulsar/runtime/pom.xml index 106fb16..e47e135 100644 --- a/extensions-jvm/pulsar/runtime/pom.xml +++ b/extensions-jvm/pulsar/runtime/pom.xml @@ -54,6 +54,16 @@ org.apache.camel camel-pulsar + + +com.sun.activation +javax.activation + + + + +com.sun.activation +jakarta.activation diff --git a/extensions-jvm/spark/runtime/pom.xml b/extensions-jvm/spark/runtime/pom.xml index 75c17d9..50d75eb 100644 --- a/extensions-jvm/spark/runtime/pom.xml +++ b/extensions-jvm/spark/runtime/pom.xml @@ -79,6 +79,16 @@ org.apache.camel camel-spark + + +javax.activation +activation + + + + +com.sun.activation +jakarta.activation org.jboss.spec.javax.ws.rs diff --git a/extensions/attachments/runtime/pom.xml b/extensions/attachments/runtime/pom.xml index 34c520a..dd4fbd9 100644 --- a/extensions/attachments/runtime/pom.xml +++ b/extensions/attachments/runtime/pom.xml @@ -54,6 +54,16 @@ org.apache.camel camel-attachments + + +com.sun.activation +javax.activation + + + + +com.sun.activation +jakarta.activation diff --git a/extensions/mail/runtime/pom.xml b/extensions/mail/runtime/pom.xml index 14763d9..57f4744 100644 --- a/extensions/mail/runtime/pom.xml +++ b/extensions/mail/runtime/pom.xml @@ -58,6 +58,16 @@ org.apache.camel camel-mail + + +com.sun.activation +javax.activation + + + + +com.sun.activation +jakarta.activation diff --git a/extensions/servlet/runtime/pom.xml b/extensions/servlet/runtime/pom.xml index 4658a4e..5275c92 100644 --- a/extensions/servlet/runtime/pom.xml +++ b/extensions/servlet/runtime/pom.xml @@ -57,6 +57,1
[camel-quarkus] 12/12: Backport missing RuntimeInitializedClassBuildItems to OptaPlanner to make GraalVM 21.3.0 happy
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 9b1a3c328c33566d98023ddb1a319796d42e8ded
Author: Peter Palaga
AuthorDate: Thu Jan 6 13:17:23 2022 +0100
Backport missing RuntimeInitializedClassBuildItems to OptaPlanner to make
GraalVM 21.3.0 happy
---
.../component/optaplanner/deployment/OptaplannerProcessor.java | 10 ++
1 file changed, 10 insertions(+)
diff --git
a/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
b/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
index 140c65b..488752b 100644
---
a/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
+++
b/extensions/optaplanner/deployment/src/main/java/org/apache/camel/quarkus/component/optaplanner/deployment/OptaplannerProcessor.java
@@ -16,8 +16,10 @@
*/
package org.apache.camel.quarkus.component.optaplanner.deployment;
+import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
+import
io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem;
class OptaplannerProcessor {
@@ -27,4 +29,12 @@ class OptaplannerProcessor {
FeatureBuildItem feature() {
return new FeatureBuildItem(FEATURE);
}
+
+@BuildStep
+void
runtimeInitializedClasses(BuildProducer
runtimeInitializedClass) {
+runtimeInitializedClass.produce(new
RuntimeInitializedClassBuildItem("org.drools.core.util.Drools$XSTreamChekcer"));
+runtimeInitializedClass
+.produce(new
RuntimeInitializedClassBuildItem("org.drools.compiler.kproject.models.KieModuleMarshaller"));
+runtimeInitializedClass.produce(new
RuntimeInitializedClassBuildItem("org.drools.core.rule.JavaDialectRuntimeData"));
+}
}
[camel-quarkus] 04/12: Ban javax.enterprise:cdi-api in favor of jakarta.enterprise:jakarta.enterprise.cdi-api #3364
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 2.2.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 6be823b57ab02bc353db39e9f25a1469671cb508 Author: Peter Palaga AuthorDate: Tue Dec 7 15:38:05 2021 +0100 Ban javax.enterprise:cdi-api in favor of jakarta.enterprise:jakarta.enterprise.cdi-api #3364 --- extensions/microprofile-health/runtime/pom.xml | 10 ++ pom.xml| 1 + 2 files changed, 11 insertions(+) diff --git a/extensions/microprofile-health/runtime/pom.xml b/extensions/microprofile-health/runtime/pom.xml index 831b3ae..382b92c 100644 --- a/extensions/microprofile-health/runtime/pom.xml +++ b/extensions/microprofile-health/runtime/pom.xml @@ -60,6 +60,16 @@ org.apache.camel camel-microprofile-health + + +javax.enterprise +cdi-api + + + + +jakarta.enterprise +jakarta.enterprise.cdi-api diff --git a/pom.xml b/pom.xml index 295b3b8..b7c7ff9 100644 --- a/pom.xml +++ b/pom.xml @@ -652,6 +652,7 @@ javax.activation:activation org.apache.geronimo.specs:geronimo-jms_1.1_spec org.apache.geronimo.specs:geronimo-jms_2.0_spec + javax.enterprise:cdi-api
[camel-quarkus] 05/12: Sort bannedDependencies alphabetically
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 2.2.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 227a7e410e1f2b5af900735454b47fc681acb6ba Author: Peter Palaga AuthorDate: Fri Dec 10 14:22:50 2021 +0100 Sort bannedDependencies alphabetically --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b7c7ff9..fc2d203 100644 --- a/pom.xml +++ b/pom.xml @@ -650,9 +650,9 @@ com.google.code.findbugs:jsr305 com.sun.activation:javax.activation javax.activation:activation + javax.enterprise:cdi-api org.apache.geronimo.specs:geronimo-jms_1.1_spec org.apache.geronimo.specs:geronimo-jms_2.0_spec - javax.enterprise:cdi-api
[camel-quarkus] 06/12: Ban log4j-core and log4j-slf4j-impl #3377
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 2.2.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 67b7e10afef8ee87aff80d8cb9528ce3c7310299 Author: Peter Palaga AuthorDate: Fri Dec 10 14:51:05 2021 +0100 Ban log4j-core and log4j-slf4j-impl #3377 --- extensions-jvm/corda/runtime/pom.xml | 14 ++ extensions/nats/runtime/pom.xml | 14 ++ extensions/nsq/runtime/pom.xml | 8 ++-- pom.xml | 4 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/extensions-jvm/corda/runtime/pom.xml b/extensions-jvm/corda/runtime/pom.xml index 30e4a0b..6c5e5a9 100644 --- a/extensions-jvm/corda/runtime/pom.xml +++ b/extensions-jvm/corda/runtime/pom.xml @@ -52,8 +52,22 @@ camel-quarkus-core +org.jboss.logmanager +log4j2-jboss-logmanager + + org.apache.camel camel-corda + + +org.apache.logging.log4j +log4j-api + + +org.apache.logging.log4j +log4j-core + + diff --git a/extensions/nats/runtime/pom.xml b/extensions/nats/runtime/pom.xml index a406d72..abedc9c 100644 --- a/extensions/nats/runtime/pom.xml +++ b/extensions/nats/runtime/pom.xml @@ -53,8 +53,22 @@ camel-quarkus-core +org.jboss.logmanager +log4j2-jboss-logmanager + + org.apache.camel camel-nats + + +org.apache.logging.log4j +log4j-api + + +org.apache.logging.log4j +log4j-core + + diff --git a/extensions/nsq/runtime/pom.xml b/extensions/nsq/runtime/pom.xml index de1bcb8..6e50db7 100644 --- a/extensions/nsq/runtime/pom.xml +++ b/extensions/nsq/runtime/pom.xml @@ -53,8 +53,8 @@ camel-quarkus-core - org.jboss.logmanager - log4j2-jboss-logmanager +org.jboss.logmanager +log4j2-jboss-logmanager org.apache.camel @@ -64,6 +64,10 @@ org.apache.logging.log4j log4j-api + +org.apache.logging.log4j +log4j-core + diff --git a/pom.xml b/pom.xml index fc2d203..0225e70 100644 --- a/pom.xml +++ b/pom.xml @@ -653,6 +653,10 @@ javax.enterprise:cdi-api org.apache.geronimo.specs:geronimo-jms_1.1_spec org.apache.geronimo.specs:geronimo-jms_2.0_spec + + + org.apache.logging.log4j:log4j-core + org.apache.logging.log4j:log4j-slf4j-impl
[camel-quarkus] 10/12: Upgrade to Quarkus 2.2.5.Final
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 93d0c28aced1f62d2338c3429e83ccd509b0a486
Author: Peter Palaga
AuthorDate: Wed Jan 5 22:27:14 2022 +0100
Upgrade to Quarkus 2.2.5.Final
---
docs/antora.yml | 2 +-
pom.xml | 8
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 7871f94..e8b4a2a 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -24,7 +24,7 @@ asciidoc:
attributes:
min-maven-version: 3.6.2 # replace ${min-maven-version}
target-maven-version: 3.8.1 # replace ${target-maven-version}
-quarkus-version: 2.2.0.Final # replace ${quarkus.version}
+quarkus-version: 2.2.5.Final # replace ${quarkus.version}
# properties used in xrefs to other Antora components
cq-camel-components: 3.11.x@components # replace
${camel.docs.components.xref}
quarkus-examples-version: latest
diff --git a/pom.xml b/pom.xml
index d1b32b8..261519c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
8.9.1.Final
0.3.0
2.0.0
-2.2.0.Final
+2.2.5.Final
0.10.0
2.0.0
0.27.0
@@ -76,7 +76,7 @@
1.1.2
1.111
29.0-jre
-21.2.0
+21.3.0
1.38.1
2.8.6
${hadoop2-version}
@@ -99,9 +99,9 @@
${jetty9-version}
2.1.2
2.4.7
-2.8.0
+2.8.1
${kudu-version}
-1.5.21
+1.5.30
${netty3-version}
${minio-version}
${mvel-version}
[camel-quarkus] 08/12: Workaround for NoSuchFileException: .../target/classes when executing a codegen task https://github.com/quarkusio/quarkus/issues/21718
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch 2.2.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 747bc1261a051d69a4c909415c76162f4a4a8f55 Author: Peter Palaga AuthorDate: Tue Dec 7 13:41:16 2021 +0100 Workaround for NoSuchFileException: .../target/classes when executing a codegen task https://github.com/quarkusio/quarkus/issues/21718 --- integration-tests/avro/pom.xml | 1 + integration-tests/protobuf/pom.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/integration-tests/avro/pom.xml b/integration-tests/avro/pom.xml index 076aa59..0e3535b 100644 --- a/integration-tests/avro/pom.xml +++ b/integration-tests/avro/pom.xml @@ -89,6 +89,7 @@ io.quarkus quarkus-maven-plugin +true generate-code diff --git a/integration-tests/protobuf/pom.xml b/integration-tests/protobuf/pom.xml index 211c2f5..69188bf 100644 --- a/integration-tests/protobuf/pom.xml +++ b/integration-tests/protobuf/pom.xml @@ -89,6 +89,7 @@ io.quarkus quarkus-maven-plugin +true quarkus-generate-code
[camel-quarkus] branch 2.2.x updated (6fe7528 -> 9b1a3c3)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch 2.2.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. from 6fe7528 generated change in qute.json new 295ebcd Ban com.google.code.findbugs:jsr305 unconditionally #3335 new 5b40717 Ban com.sun.activation:javax.activation #3361 new 2a7b6ef Ban geronimo-jms_*_spec #3363 new 6be823b Ban javax.enterprise:cdi-api in favor of jakarta.enterprise:jakarta.enterprise.cdi-api #3364 new 227a7e4 Sort bannedDependencies alphabetically new 67b7e10 Ban log4j-core and log4j-slf4j-impl #3377 new b20242a Ban commons-logging and commons-logging-api #3405 new 747bc12 Workaround for NoSuchFileException: .../target/classes when executing a codegen task https://github.com/quarkusio/quarkus/issues/21718 new cfae7fa Fix timestamp validation in syslog integration tests new 93d0c28 Upgrade to Quarkus 2.2.5.Final new 69c355d Add missing shiro reflective class configuration for commons-beanutils converters new 9b1a3c3 Backport missing RuntimeInitializedClassBuildItems to OptaPlanner to make GraalVM 21.3.0 happy The 12 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: docs/antora.yml| 2 +- extensions-core/http-common/runtime/pom.xml| 11 extensions-jvm/atmos/runtime/pom.xml | 10 extensions-jvm/aws-secrets-manager/runtime/pom.xml | 10 extensions-jvm/cm-sms/runtime/pom.xml | 10 extensions-jvm/corda/runtime/pom.xml | 14 + extensions-jvm/google-functions/runtime/pom.xml| 10 extensions-jvm/iota/runtime/pom.xml| 10 extensions-jvm/jbpm/runtime/pom.xml| 8 +++ extensions-jvm/jcr/runtime/pom.xml | 10 extensions-jvm/pulsar/runtime/pom.xml | 10 extensions-jvm/ribbon/runtime/pom.xml | 10 extensions-jvm/spark/runtime/pom.xml | 10 extensions-jvm/splunk-hec/runtime/pom.xml | 10 extensions-jvm/thrift/runtime/pom.xml | 10 extensions-jvm/workday/runtime/pom.xml | 8 +++ .../google-http-client/runtime/pom.xml | 6 +++ extensions/activemq/runtime/pom.xml| 12 - extensions/amqp/deployment/pom.xml | 10 extensions/amqp/runtime/pom.xml| 10 extensions/as2/runtime/pom.xml | 8 +++ extensions/attachments/runtime/pom.xml | 10 extensions/aws2-athena/runtime/pom.xml | 10 extensions/aws2-cw/runtime/pom.xml | 10 extensions/aws2-ddb/runtime/pom.xml| 10 extensions/aws2-ec2/runtime/pom.xml| 10 extensions/aws2-ecs/runtime/pom.xml| 10 extensions/aws2-eks/runtime/pom.xml| 10 extensions/aws2-eventbridge/runtime/pom.xml| 10 extensions/aws2-iam/runtime/pom.xml| 10 extensions/aws2-kinesis/runtime/pom.xml| 10 extensions/aws2-kms/runtime/pom.xml| 10 extensions/aws2-lambda/runtime/pom.xml | 10 extensions/aws2-mq/runtime/pom.xml | 10 extensions/aws2-msk/runtime/pom.xml| 10 extensions/aws2-s3/runtime/pom.xml | 10 extensions/aws2-ses/runtime/pom.xml| 10 extensions/aws2-sns/runtime/pom.xml| 10 extensions/aws2-sqs/runtime/pom.xml| 10 extensions/aws2-sts/runtime/pom.xml| 10 extensions/aws2-translate/runtime/pom.xml | 10 extensions/box/runtime/pom.xml | 10 extensions/cassandraql/runtime/pom.xml | 6 +++ extensions/google-bigquery/deployment/pom.xml | 6 +++ extensions/google-bigquery/runtime/pom.xml | 6 +++ extensions/google-pubsub/deployment/pom.xml| 6 +++ extensions/google-pubsub/runtime/pom.xml | 6 +++ extensions/google-storage/runtime/pom.xml | 6 +++ extensions/grpc/deployment/pom.xml | 6 +++ extensions/grpc/runtime/pom.xml| 12 + extensions/hystrix/runtime/pom.xml | 10 extensions/jms/runtime/pom.xml | 10 extensions/mail/runtime/pom.xml| 10 extensions/microprofile-health/runtime/pom.xml | 10 extensions/nats/runtime/pom.xml| 14 + extensions/nsq/runtime/pom.xml | 8 ++- extensions/opentelemetry/runtime/pom.xml | 6 +++ .../deployment/Opta
[camel-quarkus] 09/12: Fix timestamp validation in syslog integration tests
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch 2.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit cfae7fabc7527ffe6298fdb76f452455a6dafcc4
Author: James Netherton
AuthorDate: Tue Jan 4 14:46:59 2022 +
Fix timestamp validation in syslog integration tests
---
.../quarkus/component/syslog/it/SyslogTest.java | 21 -
.../syslog/src/test/resources/rfc3164.txt | 1 -
.../syslog/src/test/resources/rfc5425.txt | 1 -
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git
a/integration-tests/syslog/src/test/java/org/apache/camel/quarkus/component/syslog/it/SyslogTest.java
b/integration-tests/syslog/src/test/java/org/apache/camel/quarkus/component/syslog/it/SyslogTest.java
index 858a899..ec1c0ac 100644
---
a/integration-tests/syslog/src/test/java/org/apache/camel/quarkus/component/syslog/it/SyslogTest.java
+++
b/integration-tests/syslog/src/test/java/org/apache/camel/quarkus/component/syslog/it/SyslogTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.camel.quarkus.component.syslog.it;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
+import java.time.Year;
+import java.util.HashMap;
import java.util.Locale;
+import java.util.Map;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
-import org.apache.commons.io.IOUtils;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
@@ -35,10 +35,17 @@ import static org.hamcrest.Matchers.startsWith;
@QuarkusTestResource(SyslogTestResource.class)
class SyslogTest {
+private static final Map SYSLOG_MESSAGES = new HashMap<>()
{
+{
+put("rfc3164", "<1>Feb 2 10:11:12 localhost Test SysLog RFC3164
Message");
+put("rfc5425", "<1>1 " + Year.now() + "-02-02T10:11:12Z localhost
test - ID01 - Test SysLog RFC5425 Message");
+}
+};
+
@ParameterizedTest
@ValueSource(strings = { "rfc3164", "rfc5425" })
public void syslogDataFormat(String rfcVersion) throws Exception {
-final String message = readSyslogMessage(rfcVersion);
+final String message = SYSLOG_MESSAGES.get(rfcVersion);
// Send message
RestAssured.given()
@@ -55,7 +62,7 @@ class SyslogTest {
.body(
"hostname", equalTo("localhost"),
"logMessage", equalTo("Test SysLog " +
rfcVersion.toUpperCase(Locale.US) + " Message"),
-"timestamp", startsWith("2021-02-02T10:11:12"));
+"timestamp", startsWith(Year.now() +
"-02-02T10:11:12"));
// Get the raw SyslogMessage marshalled message
RestAssured.get("/syslog/messages/raw")
@@ -63,8 +70,4 @@ class SyslogTest {
.statusCode(200)
.body(is(message));
}
-
-private String readSyslogMessage(String rfcVersion) throws IOException {
-return IOUtils.toString(SyslogTest.class.getResourceAsStream("/" +
rfcVersion + ".txt"), StandardCharsets.UTF_8);
-}
}
diff --git a/integration-tests/syslog/src/test/resources/rfc3164.txt
b/integration-tests/syslog/src/test/resources/rfc3164.txt
deleted file mode 100644
index b4875ae..000
--- a/integration-tests/syslog/src/test/resources/rfc3164.txt
+++ /dev/null
@@ -1 +0,0 @@
-<1>Feb 2 10:11:12 localhost Test SysLog RFC3164 Message
\ No newline at end of file
diff --git a/integration-tests/syslog/src/test/resources/rfc5425.txt
b/integration-tests/syslog/src/test/resources/rfc5425.txt
deleted file mode 100644
index c3d1863..000
--- a/integration-tests/syslog/src/test/resources/rfc5425.txt
+++ /dev/null
@@ -1 +0,0 @@
-<1>1 2021-02-02T10:11:12Z localhost test - ID01 - Test SysLog RFC5425 Message
\ No newline at end of file
[GitHub] [camel] orpiske commented on pull request #6669: CAMEL-17435: dependency cleanup
orpiske commented on pull request #6669: URL: https://github.com/apache/camel/pull/6669#issuecomment-1006690054 This one probably needs a review to make sure I did not miss anything. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request #6670: (chores) camel-jetty: fixed incorrect scope for awaitility
orpiske opened a new pull request #6670: URL: https://github.com/apache/camel/pull/6670 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton commented on a change in pull request #3441: Upgrade to Camel 3.11.5
jamesnetherton commented on a change in pull request #3441:
URL: https://github.com/apache/camel-quarkus/pull/3441#discussion_r779648397
##
File path: pom.xml
##
@@ -39,7 +39,7 @@
3.11
-${camel.major.minor}.1
+${camel.major.minor}.5
Review comment:
You'll need to bump the parent version too.
Maybe we should introduce a CI check to make sure things are in sync?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-quarkus] ppalaga commented on a change in pull request #3441: Upgrade to Camel 3.11.5
ppalaga commented on a change in pull request #3441:
URL: https://github.com/apache/camel-quarkus/pull/3441#discussion_r779652762
##
File path: pom.xml
##
@@ -39,7 +39,7 @@
3.11
-${camel.major.minor}.1
+${camel.major.minor}.5
Review comment:
I think I did it some where already, but apparently not in this branch.
Thanks for the catch!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] javaduke opened a new pull request #6671: ManagedDebugger exposes Message History
javaduke opened a new pull request #6671: URL: https://github.com/apache/camel/pull/6671 This PR resolves the https://issues.apache.org/jira/browse/CAMEL-17444 The message history is exposed as a List of Maps containing String pairs, so that the tooling can use it in debugging and displaying stack traces. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: camel-yaml-dsl - Fix line number if using comments, and from should use line number from uri if present
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 2789c21 camel-yaml-dsl - Fix line number if using comments, and from
should use line number from uri if present
2789c21 is described below
commit 2789c213e22f222a56136bce00ad062fb5863cac
Author: Claus Ibsen
AuthorDate: Thu Jan 6 17:20:13 2022 +0100
camel-yaml-dsl - Fix line number if using comments, and from should use
line number from uri if present
---
.../deserializers/FromDefinitionDeserializer.java | 18
.../apache/camel/dsl/yaml/LineNumberTest.groovy| 42 ++-
.../src/test/resources/stuff/my-route-comment.yaml | 49 ++
3 files changed, 107 insertions(+), 2 deletions(-)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/FromDefinitionDeserializer.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/FromDefinitionDeserializer.java
index 87a6ed8..b8e3ef0 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/FromDefinitionDeserializer.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/FromDefinitionDeserializer.java
@@ -24,8 +24,12 @@ import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.annotations.YamlProperty;
import org.apache.camel.spi.annotations.YamlType;
import org.snakeyaml.engine.v2.api.ConstructNode;
+import org.snakeyaml.engine.v2.nodes.MappingNode;
import org.snakeyaml.engine.v2.nodes.Node;
+import org.snakeyaml.engine.v2.nodes.NodeTuple;
+import org.snakeyaml.engine.v2.nodes.NodeType;
+import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asText;
import static
org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.getDeserializationContext;
@YamlType(
@@ -46,6 +50,20 @@ public class FromDefinitionDeserializer implements
ConstructNode {
line = node.getStartMark().get().getLine();
}
+// we want the line number of the "uri" when using from
+if (node.getNodeType() == NodeType.MAPPING) {
+final MappingNode mn = (MappingNode) node;
+for (NodeTuple tuple : mn.getValue()) {
+final String key = asText(tuple.getKeyNode());
+if ("uri".equals(key)) {
+if (tuple.getKeyNode().getStartMark().isPresent()) {
+line =
tuple.getKeyNode().getStartMark().get().getLine() + 1;
+}
+break;
+}
+}
+}
+
// from must be wrapped in a route, so use existing route or create a
new route
RouteDefinition route = (RouteDefinition)
node.getProperty(RouteDefinition.class.getName());
if (route == null) {
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy
index 104aa55..10b02ae 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LineNumberTest.groovy
@@ -69,7 +69,7 @@ class LineNumberTest extends YamlTestSupport {
context.routeDefinitions.size() == 1
with(context.routeDefinitions[0], RouteDefinition) {
-input.lineNumber == 3
+input.lineNumber == 4
input.endpointUri == 'direct:info'
with (outputs[0], LogDefinition) {
@@ -90,7 +90,7 @@ class LineNumberTest extends YamlTestSupport {
with(context.routeDefinitions[0].input, FromDefinition) {
uri == "quartz:foo?cron={{myCron}}"
-lineNumber == 19
+lineNumber == 20
}
with(context.routeDefinitions[0].outputs[0], LogDefinition) {
message == 'Start'
@@ -117,4 +117,42 @@ class LineNumberTest extends YamlTestSupport {
}
}
+def "line number file with comments"() {
+setup:
+def rloc = 'classpath:/stuff/my-route-comment.yaml'
+def rdsl = context.resourceLoader.resolveResource(rloc)
+when:
+loadRoutes rdsl
+then:
+context.routeDefinitions.size() == 1
+
+with(context.routeDefinitions[0].input, FromDefinition) {
+uri == "quartz:foo?cron={{myCron}}"
+lineNumber == 22
+}
+with(context.routeDefinitions[0].outputs[0], LogDefinition) {
+message == 'Start'
+lineNumber == 25
+}
+with(context.routeDefinitions[0].outputs[1], ToDefinition) {
+uri ==
[GitHub] [camel] orpiske opened a new pull request #6672: CAMEL-17442: adjusted scope for the camel-test-infra-common
orpiske opened a new pull request #6672: URL: https://github.com/apache/camel/pull/6672 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] phantomjinx closed issue #2749: Generated bundle created from `make bundle` contains separate service-account resource
phantomjinx closed issue #2749: URL: https://github.com/apache/camel-k/issues/2749 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] phantomjinx commented on issue #2749: Generated bundle created from `make bundle` contains separate service-account resource
phantomjinx commented on issue #2749: URL: https://github.com/apache/camel-k/issues/2749#issuecomment-1006738602 Fixed in #2755. Closing. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] ReggieCarey commented on issue #673: Kamelet for ElasticSearch Sink provides no mechanism to set indexId or ce-indexId
ReggieCarey commented on issue #673: URL: https://github.com/apache/camel-kamelets/issues/673#issuecomment-1006743329 I'm glad this issue has sparked a lot of conversation. Consider this some documentation feedback. 1) The user community can't help with the documentation if we have no clue as to how the code works or how it was intended to work. 2) The links to the kamelet code in the kameletbinding docs usually end up at a GitHub 404 page. 3) When the links do work, its generally to a yaml file instead of the underlying code that someone could explore to improve the documentation. 4) The kameletbinding documentation has been largely untouched for at least 6 months - as noted its autogenerated. Camel-K developers: You've done an excellent job with the product. I should point out that you'll get much more constructive feedback and increased usage if you bring the documentation up to minimum viable product level. The user community would love to provide constructive feedback but we are working with what appears to be a lot of barriers to success and its due primarily to not being able to understand how these yaml files (KameletBindings) can be used to get something done. I'll say it again ``` steps: - ref: kind: Kamelet apiVersion: camel.apache.org/v1alpha1 name: insert-field-action properties: field: The Field value: The Value ``` is not adequate documentation especially for a product that boasts releasing version 3.11.5 on 31 Dec 2021. But the above is ALL the documentation there is on this capability. Disheartening as it is to hear, the documentation sucks. What are appropriate values for "field"? What are legal values for "value"? Is there a way to pull values from the cloud event headers? Is there a syntax you're abiding by to specify where in a json payload the 'value' will be placed? Is there a templating tool to bring some intelligence to "The Field" and "The Value" strings? Can I pull values from previous steps of the kameletbinding? If so, how? Is there more to the syntax than what is shown in the KameletBinding exemplars? If so, where is it documented? What can we do? What functionality is present? What can we not do? What functionality is missing or broken? Basically, if the feature is not complete, please help us help you. Tell us what's missing, what's broken, what's planned. Include a link in the documentation for the feature if not to the specific code implementing the feature, then at least to the repo containing the code. A note on your documentation audience: Users coming to Kamelets from a Knative/CloudEvent/Kamel Operator perspective interact with your product via resources deployed into a K8s cluster. Listing language specific dependencies in this scenario is a bad code smell. What value is there in telling your audience about your various Java dependencies for your code? It may be of value to people writing more in-depth camel integrations or raw custom kamelets but in general your implementation details should not be a concern to people consuming the solution at the K8s integration tier. Does any of that dependency info in the docs result in something actionable by camel-k users? I submit that your documentation should focus on how to use all of the nifty things you've built into those Kamelets used in KameletBinding files (the semantics) instead of just what makes a syntactically correct yaml file. With respect, Reggie -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (1c4fd4a -> 2789c21)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 1c4fd4a CAMEL-17427: Some scheduled consumers should be regarded as
UP in their health-check from initial phase such as camel-scheduler.
add dea0876 CAMEL-17437 Camel-aws2-sqs: Deadletter fails with sqs client
from registry (could impact more components) (#6668)
add 2789c21 camel-yaml-dsl - Fix line number if using comments, and from
should use line number from uri if present
No new revisions were added by this update.
Summary of changes:
.../camel/component/aws2/sqs/Sqs2Component.java| 4 ---
.../camel/component/aws2/sqs/Sqs2Endpoint.java | 8 +
.../aws2/sqs/SqsComponentClientRegistryTest.java | 1 +
.../aws2/sqs/SqsComponentConfigurationTest.java| 4 +--
...sDeadletterWithClientRegistryLocalstackIT.java} | 41 +
.../deserializers/FromDefinitionDeserializer.java | 18 ++
.../apache/camel/dsl/yaml/LineNumberTest.groovy| 42 --
.../stuff/{my-route.yaml => my-route-comment.yaml} | 10 ++
8 files changed, 105 insertions(+), 23 deletions(-)
copy
components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/integration/{SqsConsumerMessageLocalstackIT.java
=> SqsDeadletterWithClientRegistryLocalstackIT.java} (59%)
copy dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/resources/stuff/{my-route.yaml
=> my-route-comment.yaml} (83%)
[GitHub] [camel] davsclaus commented on pull request #6671: ManagedDebugger exposes Message History
davsclaus commented on pull request #6671: URL: https://github.com/apache/camel/pull/6671#issuecomment-1006763360 In a pure JMX world such sheet data would be represented as a javax.management.openmbean.TabularData instead. We do this in some other MBeans in Camel. However I not sure sure how well you can invoke that from the IDEA Camel plugin. If not a tabular data, then I think its better to make this like the others as a XML - then its similar to the other opreations. We have to consider that this is not only for IDEA but for other tools that comes - and also we should make it similar to the "Camel standard" we have today. Yeah XML is "old school" but it works for everyone ;) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] oscerd commented on issue #673: Kamelet for ElasticSearch Sink provides no mechanism to set indexId or ce-indexId
oscerd commented on issue #673: URL: https://github.com/apache/camel-kamelets/issues/673#issuecomment-1006774975 This is not a product. It's an open source project. Also there is no camel-k release 3.11.5. What you are refer too is plain camel version, and the documentation you need to refer to is different. Again there is no product here. You're using something for free here. So you need to respect the work done here. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] javaduke commented on pull request #6671: ManagedDebugger exposes Message History
javaduke commented on pull request #6671: URL: https://github.com/apache/camel/pull/6671#issuecomment-1006781608 OK, no problem I can rewrite it to return XML, give me a few min :) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] lburgazzoli commented on issue #673: Kamelet for ElasticSearch Sink provides no mechanism to set indexId or ce-indexId
lburgazzoli commented on issue #673: URL: https://github.com/apache/camel-kamelets/issues/673#issuecomment-1006781799 > > Listing language specific dependencies in this scenario is a bad code smell. What value is there in telling your audience about your various Java dependencies for your code? It may be of value to people writing more in-depth camel integrations or raw custom kamelets but in general your implementation details should not be a concern to people consuming the solution at the K8s integration tier. Does any of that dependency info in the docs result in something actionable by camel-k users? > For a user POV what matter are the properties the kamelet exposes, like for any camel endpoint. Then as for each artifact, a kamelet CR come with some additional metadata which in this case are the dependencies and routes. Such metadata is needed by the machinery, like the camel-k operator, tooling and other stuffs to work but no one expects users to look at them. Hope this clarifies at least this aspect. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske merged pull request #6670: (chores) camel-jetty: fixed incorrect scope for awaitility
orpiske merged pull request #6670: URL: https://github.com/apache/camel/pull/6670 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] javaduke commented on pull request #6671: ManagedDebugger exposes Message History
javaduke commented on pull request #6671: URL: https://github.com/apache/camel/pull/6671#issuecomment-1006799000 @davsclaus Done, history is now an XML, I can easily parse it in the debugger. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated (2789c21 -> 73c508b)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 2789c21 camel-yaml-dsl - Fix line number if using comments, and from should use line number from uri if present add 73c508b (chores) camel-jetty: fixed incorrect scope for awaitility No new revisions were added by this update. Summary of changes: components/camel-jetty/pom.xml | 1 + 1 file changed, 1 insertion(+)
[GitHub] [camel-kafka-connector] arjun180 opened a new issue #1311: Using Kubernetes secrets to update AWS credentials in connector YAML
arjun180 opened a new issue #1311: URL: https://github.com/apache/camel-kafka-connector/issues/1311 I have a AWS s3 source connector with the following configurations : ``` apiVersion: kafka.strimzi.io/v1beta2 kind: KafkaConnector metadata: name: cloudtrail-s3-source-connector namespace : my-kafka labels: strimzi.io/cluster: my-kafka-connect-cluster spec: class: org.apache.camel.kafkaconnector.aws2s3.CamelAws2s3SourceConnector tasksMax: 1 config: topics: camel.source.path.bucketNameOrArn: camel.component.aws2-s3.useDefaultCredentialsProvider: false camel.component.aws2-s3.moveAfterRead: false camel.source.endpoint.region: camel.component.aws2-s3.deleteAfterRead: true camel.component.aws2-s3.accessKey:x camel.component.aws2-s3.secretKey:xxx camel.component.aws2-s3.region: ``` I also have a Kubernetes secret which contains the access key, secret key and region. The Kubernetes secret keeps getting rotated every x duration. How can I link the credentials in the YAML file to the credentials present in the Kubernetes secret? I'm trying to avoid hardcoding credentials in the YAML file. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on a change in pull request #6671: ManagedDebugger exposes Message History
davsclaus commented on a change in pull request #6671: URL: https://github.com/apache/camel/pull/6671#discussion_r779777153 ## File path: core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java ## @@ -172,4 +172,7 @@ @ManagedOperation(description = "Updates/adds the exchange property (with a new type) on the suspended breakpoint at the given node id") void setExchangePropertyOnBreakpoint(String nodeId, String exchangePropertyName, Object value, String type); + +@ManagedOperation(description = "Returns the message history at the given node id as XML") +String getMessageHistory(String nodeId); Review comment: Can we rename this to messageHistorayOnBreakpointAsXml because we made a mistake a long time ago that a JMX operation should not be named getter/setter - there are some tools/jconsole etc that dont work well with this. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] javaduke commented on a change in pull request #6671: ManagedDebugger exposes Message History
javaduke commented on a change in pull request #6671: URL: https://github.com/apache/camel/pull/6671#discussion_r779779228 ## File path: core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java ## @@ -172,4 +172,7 @@ @ManagedOperation(description = "Updates/adds the exchange property (with a new type) on the suspended breakpoint at the given node id") void setExchangePropertyOnBreakpoint(String nodeId, String exchangePropertyName, Object value, String type); + +@ManagedOperation(description = "Returns the message history at the given node id as XML") +String getMessageHistory(String nodeId); Review comment: Yes, makes perfect sense. Done. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (2789c21 -> 73c508b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. from 2789c21 camel-yaml-dsl - Fix line number if using comments, and from should use line number from uri if present add 73c508b (chores) camel-jetty: fixed incorrect scope for awaitility No new revisions were added by this update. Summary of changes: components/camel-jetty/pom.xml | 1 + 1 file changed, 1 insertion(+)
[GitHub] [camel] davsclaus commented on a change in pull request #6669: CAMEL-17435: dependency cleanup
davsclaus commented on a change in pull request #6669: URL: https://github.com/apache/camel/pull/6669#discussion_r779798482 ## File path: components/camel-spring-xml/pom.xml ## @@ -137,6 +137,11 @@ derby test + +javax.annotation +javax.annotation-api +test Review comment: spring-xml uses JAXB as parser so I would assume the JAXB annotations are required, not test scoped ## File path: core/camel-xml-io/pom.xml ## @@ -44,6 +44,11 @@ org.apache.camel camel-xml-io-util + Review comment: Do you know why camel-xml-io needs those JAXB annotations? ## File path: components/camel-spring-xml/pom.xml ## @@ -137,6 +137,11 @@ derby test + +javax.annotation +javax.annotation-api +test Review comment: That is the same for camel-cdi as it also has a XML that is loaded via JAXB. And so does camel-blueprint in camel-karaf project ## File path: core/camel-api/pom.xml ## @@ -54,6 +54,12 @@ slf4j-api + Review comment: Since JAXB annotations are only needed when using XML legacy parsing, then I wonder if the scope should be optional. Another goal for the future is to get rid of JAXB annotations all together - but that is another battle. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus merged pull request #6671: ManagedDebugger exposes Message History
davsclaus merged pull request #6671: URL: https://github.com/apache/camel/pull/6671 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus merged pull request #6672: CAMEL-17442: adjusted scope for the camel-test-infra-common
davsclaus merged pull request #6672: URL: https://github.com/apache/camel/pull/6672 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: ManagedDebugger exposes Message History (#6671)
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 eb7bb93 ManagedDebugger exposes Message History (#6671)
eb7bb93 is described below
commit eb7bb93a6966b1d0308b46239185b1c8d6ea208a
Author: javaduke
AuthorDate: Thu Jan 6 12:24:43 2022 -0700
ManagedDebugger exposes Message History (#6671)
* Message History as list implementation
* History as XML
* Need to encode attributes as XML
* Renamed the operation
---
.../mbean/ManagedBacklogDebuggerMBean.java | 3 +
.../management/mbean/ManagedBacklogDebugger.java | 73 ++
.../camel/management/BacklogDebuggerTest.java | 67
.../modules/ROOT/pages/backlog-debugger.adoc | 1 +
4 files changed, 144 insertions(+)
diff --git
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java
index 7695974..b824a84 100644
---
a/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java
+++
b/core/camel-management-api/src/main/java/org/apache/camel/api/management/mbean/ManagedBacklogDebuggerMBean.java
@@ -172,4 +172,7 @@ public interface ManagedBacklogDebuggerMBean {
@ManagedOperation(description = "Updates/adds the exchange property (with
a new type) on the suspended breakpoint at the given node id")
void setExchangePropertyOnBreakpoint(String nodeId, String
exchangePropertyName, Object value, String type);
+
+@ManagedOperation(description = "Returns the message history at the given
node id as XML")
+String messageHistoryOnBreakpointAsXml(String nodeId);
}
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
index 6188f0f..9db605a 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/mbean/ManagedBacklogDebugger.java
@@ -18,14 +18,18 @@ package org.apache.camel.management.mbean;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePropertyKey;
import org.apache.camel.Expression;
+import org.apache.camel.MessageHistory;
import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.Predicate;
+import org.apache.camel.Route;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.api.management.ManagedResource;
import org.apache.camel.api.management.mbean.BacklogTracerEventMessage;
@@ -33,8 +37,11 @@ import
org.apache.camel.api.management.mbean.ManagedBacklogDebuggerMBean;
import org.apache.camel.impl.debugger.BacklogDebugger;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.ManagementStrategy;
+import org.apache.camel.support.LoggerHelper;
import org.apache.camel.util.ObjectHelper;
+import org.apache.camel.util.StopWatch;
import org.apache.camel.util.StringHelper;
+import org.apache.camel.util.URISupport;
@ManagedResource(description = "Managed BacklogDebugger")
public class ManagedBacklogDebugger implements ManagedBacklogDebuggerMBean {
@@ -368,6 +375,72 @@ public class ManagedBacklogDebugger implements
ManagedBacklogDebuggerMBean {
return null;
}
+@Override
+public String messageHistoryOnBreakpointAsXml(String nodeId) {
+StringBuffer messageHistoryBuffer = new StringBuffer();
+messageHistoryBuffer.append("\n");
+
+Exchange suspendedExchange =
backlogDebugger.getSuspendedExchange(nodeId);
+if (suspendedExchange != null) {
+List list =
suspendedExchange.getProperty(ExchangePropertyKey.MESSAGE_HISTORY, List.class);
+if (list != null) {
+// add incoming origin of message on the top
+String routeId = suspendedExchange.getFromRouteId();
+Route route = suspendedExchange.getContext().getRoute(routeId);
+String loc = route != null ? route.getSourceLocation() : "";
+String id = routeId;
+String label = "";
+if (suspendedExchange.getFromEndpoint() != null) {
+label = "from["
++ URISupport
+.sanitizeUri(
+
StringHelper.limitLength(suspendedExchange.getFromEndpoint().getEndpoint
[camel] branch main updated: CAMEL-17442: adjusted scope for the camel-test-infra-common (#6672)
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 d585921 CAMEL-17442: adjusted scope for the camel-test-infra-common (#6672) d585921 is described below commit d585921555a4e8ff1fbb6f23fa8497f06034cf7d Author: Otavio Rodolfo Piske AuthorDate: Thu Jan 6 20:24:58 2022 +0100 CAMEL-17442: adjusted scope for the camel-test-infra-common (#6672) * CAMEL-17442: adjusted scope for the camel-test-infra-common in test-infra modules * CAMEL-17442: removed camel-test-infra-common and other unnecessary test infra dependencies from component poms * CAMEL-17442: updated test infra documentation --- components/camel-activemq/pom.xml| 8 components/camel-amqp/pom.xml| 8 components/camel-arangodb/pom.xml| 8 components/camel-aws/camel-aws-secrets-manager/pom.xml | 16 components/camel-aws/camel-aws2-cw/pom.xml | 16 components/camel-aws/camel-aws2-ddb/pom.xml | 16 components/camel-aws/camel-aws2-ec2/pom.xml | 16 components/camel-aws/camel-aws2-eventbridge/pom.xml | 16 components/camel-aws/camel-aws2-iam/pom.xml | 16 components/camel-aws/camel-aws2-kms/pom.xml | 16 components/camel-aws/camel-aws2-lambda/pom.xml | 16 components/camel-aws/camel-aws2-s3/pom.xml | 16 components/camel-aws/camel-aws2-sns/pom.xml | 16 components/camel-aws/camel-aws2-sqs/pom.xml | 16 components/camel-aws/camel-aws2-sts/pom.xml | 16 components/camel-azure/camel-azure-storage-blob/pom.xml | 16 .../camel-azure/camel-azure-storage-datalake/pom.xml | 14 -- components/camel-azure/camel-azure-storage-queue/pom.xml | 16 components/camel-cassandraql/pom.xml | 8 components/camel-chatscript/pom.xml | 8 components/camel-consul/pom.xml | 8 components/camel-couchbase/pom.xml | 7 --- components/camel-couchdb/pom.xml | 8 components/camel-elasticsearch-rest/pom.xml | 8 components/camel-etcd/pom.xml| 8 components/camel-fhir/camel-fhir-component/pom.xml | 8 components/camel-ftp/pom.xml | 8 components/camel-google/camel-google-pubsub/pom.xml | 8 components/camel-hbase/pom.xml | 10 -- components/camel-hdfs/pom.xml| 8 components/camel-ignite/pom.xml | 8 components/camel-infinispan/camel-infinispan/pom.xml | 8 +--- components/camel-jms/pom.xml | 8 components/camel-kafka/pom.xml | 8 components/camel-ldif/pom.xml| 8 +--- components/camel-minio/pom.xml | 8 components/camel-mllp/pom.xml| 8 components/camel-mongodb-gridfs/pom.xml | 8 components/camel-mongodb/pom.xml | 8 components/camel-nats/pom.xml| 8 components/camel-nsq/pom.xml | 8 components/camel-paho-mqtt5/pom.xml | 7 --- components/camel-paho/pom.xml| 8 components/camel-pg-replication-slot/pom.xml | 8 components/camel-pgevent/pom.xml | 8 components/camel-pulsar/pom.xml | 8 components/camel-rabbitmq/pom.xml| 8 components/camel-redis/pom.xml | 8 components/camel-sjms/pom.xml| 8 components/camel-solr/pom.xml| 7 --- components/camel-spring-rabbitmq/pom.xml | 8 components/camel-stomp/pom.xml | 8 .../camel-vertx-kafka-component/pom.xml | 8 components/camel-xmpp/pom.xml| 8 components/camel-zookeeper-master/pom.xml| 8 components/camel-zookeeper/pom.xml | 8 test-infra/README.md
[camel] branch main updated: CAMEL-17445: Remove dead link in javadoc
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 06ee963 CAMEL-17445: Remove dead link in javadoc
06ee963 is described below
commit 06ee963bbdce0f903accdca8a2611aced48a1906
Author: Claus Ibsen
AuthorDate: Thu Jan 6 20:28:08 2022 +0100
CAMEL-17445: Remove dead link in javadoc
---
core/camel-api/src/main/java/org/apache/camel/CamelContext.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
index 749a16a..72f7210 100644
--- a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
@@ -60,8 +60,7 @@ import org.apache.camel.support.jsse.SSLContextParameters;
*
* The CamelContext offers the following methods {@link CamelContextLifecycle}
to control the lifecycle:
*
- * {@link #start()} - to start (important: the start method is not
blocked, see more details
- * http://camel.apache.org/running-camel-standalone-and-have-it-keep-running.html";>here)
+ * {@link #start()} - to start
* {@link #stop()} - to shutdown (will stop all
routes/components/endpoints etc and clear internal state/cache)
* {@link #suspend()} - to pause routing messages
* {@link #resume()} - to resume after a suspend
[GitHub] [camel] orpiske commented on a change in pull request #6669: CAMEL-17435: dependency cleanup
orpiske commented on a change in pull request #6669: URL: https://github.com/apache/camel/pull/6669#discussion_r779827344 ## File path: components/camel-spring-xml/pom.xml ## @@ -137,6 +137,11 @@ derby test + +javax.annotation +javax.annotation-api +test Review comment: Thanks. I added them in the test scope because it was test code that was failing, but I'll change it to the default one. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske commented on a change in pull request #6669: CAMEL-17435: dependency cleanup
orpiske commented on a change in pull request #6669: URL: https://github.com/apache/camel/pull/6669#discussion_r779827999 ## File path: core/camel-api/pom.xml ## @@ -54,6 +54,12 @@ slf4j-api + Review comment: Do you mean we could set them to use the `provided` scope? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
