Re: [I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-205369 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 8677862247-1452-d99cd2e9-4fd8-4f36-bf00-64f0d9e81cde * Camel Quarkus Commit: 13469c508b3a0c113b5fef55e5215ba2a66f655e * Quarkus Main Commit: d4fc79f88cc67c5f80ca39a0af1f7e0139cff26b * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8677862247 -- 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
Re: [I] [CI] - Camel Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-2053823187 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 8677165677-1348-2e00f2f2-2d32-47d4-978f-57d7f70bd608 * Camel Quarkus Commit: 1e801c703f2d78f8a1ea4d58d91f9306de98dd6a * Camel Main Commit: d4fc79f88cc67c5f80ca39a0af1f7e0139cff26b * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8677165677 -- 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-k) branch main updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 14b637df8 chore: nightly automatic updates 14b637df8 is described below commit 14b637df8e387b1e2ef537c9ac18e9ddf34a1afe Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Apr 13 23:45:29 2024 + chore: nightly automatic updates --- CHANGELOG.md | 1 + README.adoc | 2 +- badge.out| 2 +- coverage | 2 +- coverage.out | 133 ++- 5 files changed, 72 insertions(+), 68 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 548c4a8e7..5ce5fdbf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ **Merged pull requests:** +- fix: Fix garbage collection trait [\#5365](https://github.com/apache/camel-k/pull/5365) ([christophd](https://github.com/christophd)) - chore\(ci\): Fix license check [\#5364](https://github.com/apache/camel-k/pull/5364) ([gansheer](https://github.com/gansheer)) - feat\(trait\): Spectrum deprecation notice [\#5363](https://github.com/apache/camel-k/pull/5363) ([squakez](https://github.com/squakez)) - chore\(deps\): bump knative.dev/serving from 0.39.3 to 0.40.1 [\#5358](https://github.com/apache/camel-k/pull/5358) ([dependabot[bot]](https://github.com/apps/dependabot)) diff --git a/README.adoc b/README.adoc index ea098ab47..caeec2246 100644 --- a/README.adoc +++ b/README.adoc @@ -11,7 +11,7 @@ image:https://github.com/apache/camel-k/actions/workflows/common.yml/badge.svg["; image:https://github.com/apache/camel-k/workflows/knative/badge.svg["Knative";, link="https://github.com/apache/camel-k/actions/workflows/knative.yml";] image:https://github.com/apache/camel-k/actions/workflows/nightly-release.yml/badge.svg["Nightly releases", link="https://github.com/apache/camel-k/actions/workflows/nightly-release.yml";] image:https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml/badge.svg["Quarkus native", link="https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml";] -image:https://img.shields.io/badge/Coverage-37.8%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml";] +image:https://img.shields.io/badge/Coverage-38.0%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml";] image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg["Chat on Zulip", link="https://camel.zulipchat.com";] Apache Camel K is a lightweight integration framework built from **Apache Camel** that runs natively on Kubernetes and is specifically designed for serverless and microservice architectures. Users of `Camel K` can instantly run integration code written in Camel DSL on their preferred **Cloud** provider. diff --git a/badge.out b/badge.out index ce513f8db..978eddac3 100644 --- a/badge.out +++ b/badge.out @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/coverage b/coverage index ddaa2f00b..1f515588b 100644 --- a/coverage +++ b/coverage @@ -1 +1 @@ -37.8 +38.0 diff --git a/coverage.out b/coverage.out index dfb3549bc..03f6c4588 100644 --- a/coverage.out +++ b/coverage.out @@ -159,44 +159,44 @@ github.com/apache/camel-k/v2/pkg/apis/camel/v1/error_handler_types_support.go:11 github.com/apache/camel-k/v2/pkg/apis/camel/v1/error_handler_types_support.go:122: Endpoint 0.0% github.com/apache/camel-k/v2/pkg/apis/camel/v1/error_handler_types_support.go:127: Configuration 0.0% github.com/apache/camel-k/v2/pkg/apis/camel/v1/error_handler_types_support.go:138: Validate 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/integration_types_support.go:40: NewIntegration 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/integration_types_support.go:53: NewIntegrationList 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/integration_types_support.go:62: Initialize 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/integration_types_support.go:74: AllSources 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/integration_types_support.go:82: U
Re: [PR] CAMEL-20521: camel-amqp - AMQP publisher application is losing messages with local JMS transaction enabled [camel]
luigidemasi commented on PR #13403: URL: https://github.com/apache/camel/pull/13403#issuecomment-2053638409 > spring upgrade here: #13778 Updated the PR. -- 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 route-eh-xml deleted (was 17c78a96eb4)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch route-eh-xml in repository https://gitbox.apache.org/repos/asf/camel.git was 17c78a96eb4 CAMEL-20665: YAML DSL Inconsistency - StreamCaching vs streamCache. Also mark some DSL in Java DSL as deprecated to make the DSLs consistent so Java DSL does not have special options. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: Align DSL for Java, XML and YAML for error handler and stream caching (#13780)
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 9de62afad05 Align DSL for Java, XML and YAML for error handler and
stream caching (#13780)
9de62afad05 is described below
commit 9de62afad05220f6fd413bbbc71c5c3ae2a66daf
Author: Claus Ibsen
AuthorDate: Sat Apr 13 12:41:44 2024 +0200
Align DSL for Java, XML and YAML for error handler and stream caching
(#13780)
* CAMEL-20666: Add errorHandler on route for EIP model (XML and YAML DSL)
to be consistent.
* CAMEL-20665: YAML DSL Inconsistency - StreamCaching vs streamCache. Also
mark some DSL in Java DSL as deprecated to make the DSLs consistent so Java DSL
does not have special options.
* CAMEL-20665: YAML DSL Inconsistency - StreamCaching vs streamCache. Also
mark some DSL in Java DSL as deprecated to make the DSLs consistent so Java DSL
does not have special options.
---
.../org/apache/camel/catalog/models/route.json | 9 +--
.../apache/camel/catalog/schemas/camel-spring.xsd | 1 +
.../camel/spring/config/ErrorHandlerRouteTest.java | 58 +
.../camel/spring/config/errorHandlerRoute.xml | 41
.../java/org/apache/camel/impl/DefaultModel.java | 2 +-
.../META-INF/org/apache/camel/model/route.json | 9 +--
.../org/apache/camel/model/RouteDefinition.java| 74 +-
.../camel/model/RouteTemplateDefinition.java | 1 +
.../java/org/apache/camel/xml/in/ModelParser.java | 1 +
.../java/org/apache/camel/xml/out/ModelWriter.java | 1 +
.../test/resources/routeInlinedErrorHandler.xml| 32 ++
.../org/apache/camel/yaml/out/ModelWriter.java | 1 +
.../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 30 -
.../modules/ROOT/pages/error-handler.adoc | 20 +-
.../deserializers/RouteDefinitionDeserializer.java | 11 +++-
.../generated/resources/schema/camelYamlDsl.json | 2 +-
.../apache/camel/dsl/yaml/PipeLoaderTest.groovy| 2 +-
.../apache/camel/dsl/yaml/RouteTemplateTest.groovy | 2 +-
.../org/apache/camel/dsl/yaml/RoutesTest.groovy| 6 +-
.../kamelets/route-timer-source.kamelet.yaml | 2 +-
.../camel/maven/packaging/SchemaGeneratorMojo.java | 8 +++
21 files changed, 292 insertions(+), 21 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/route.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/route.json
index 8c9a21bbb1c..0451e8ceeb8 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/route.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/route.json
@@ -29,9 +29,10 @@
"shutdownRoute": { "index": 14, "kind": "attribute", "displayName":
"Shutdown Route", "label": "advanced", "required": false, "type": "enum",
"javaType": "org.apache.camel.ShutdownRoute", "enum": [ "Default", "Defer" ],
"deprecated": false, "autowired": false, "secret": false, "description": "To
control how to shutdown the route." },
"shutdownRunningTask": { "index": 15, "kind": "attribute", "displayName":
"Shutdown Running Task", "label": "advanced", "required": false, "type":
"enum", "javaType": "org.apache.camel.ShutdownRunningTask", "enum": [
"CompleteCurrentTaskOnly", "CompleteAllTasks" ], "deprecated": false,
"autowired": false, "secret": false, "description": "To control how to shut
down the route." },
"precondition": { "index": 16, "kind": "attribute", "displayName":
"Precondition", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The predicate of the precondition in simple
language to evaluate in order to determine if this route should be included or
not." },
-"inputType": { "index": 17, "kind": "element", "displayName": "Input
Type", "label": "advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.model.InputTypeDefinition", "deprecated": false, "autowired":
false, "secret": false, "description": "Declare the expected data type of the
input message. If the actual message type is different at runtime, camel look
for a required org.apache.camel.spi.Transformer and apply if exists. The type
name consists of two parts, [...]
-"outputType": { "index": 18, "kind": "element", "displayName": "Output
Type", "label": "advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OutputTypeDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Declare the expected data
type of the output message. If the actual message type is different at runtime,
camel look for a required org.apache.camel.spi.Transformer and apply if exists.
The ty
Re: [PR] Align DSL for Java, XML and YAML for error handler and stream caching [camel]
davsclaus merged PR #13780: URL: https://github.com/apache/camel/pull/13780 -- 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 route-eh-xml updated (88813a5bd0b -> 17c78a96eb4)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch route-eh-xml in repository https://gitbox.apache.org/repos/asf/camel.git from 88813a5bd0b CAMEL-20665: YAML DSL Inconsistency - StreamCaching vs streamCache. Also mark some DSL in Java DSL as deprecated to make the DSLs consistent so Java DSL does not have special options. add 17c78a96eb4 CAMEL-20665: YAML DSL Inconsistency - StreamCaching vs streamCache. Also mark some DSL in Java DSL as deprecated to make the DSLs consistent so Java DSL does not have special options. No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/model/RouteDefinition.java | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-)
(camel) 01/02: CAMEL-20666: Add errorHandler on route for EIP model (XML and YAML DSL) to be consistent.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch route-eh-xml
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dbe14a530b89fcbf5e1864fe8471f7d7782867f1
Author: Claus Ibsen
AuthorDate: Sat Apr 13 11:32:02 2024 +0200
CAMEL-20666: Add errorHandler on route for EIP model (XML and YAML DSL) to
be consistent.
---
.../org/apache/camel/catalog/models/route.json | 9 ++--
.../apache/camel/catalog/schemas/camel-spring.xsd | 1 +
.../camel/spring/config/ErrorHandlerRouteTest.java | 58 ++
.../camel/spring/config/errorHandlerRoute.xml | 41 +++
.../java/org/apache/camel/impl/DefaultModel.java | 2 +-
.../META-INF/org/apache/camel/model/route.json | 9 ++--
.../org/apache/camel/model/RouteDefinition.java| 18 ++-
.../camel/model/RouteTemplateDefinition.java | 1 +
.../java/org/apache/camel/xml/in/ModelParser.java | 1 +
.../java/org/apache/camel/xml/out/ModelWriter.java | 1 +
.../test/resources/routeInlinedErrorHandler.xml| 32
.../org/apache/camel/yaml/out/ModelWriter.java | 1 +
.../modules/ROOT/pages/error-handler.adoc | 20 +++-
.../camel/maven/packaging/SchemaGeneratorMojo.java | 8 +++
14 files changed, 191 insertions(+), 11 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/route.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/route.json
index 8c9a21bbb1c..0451e8ceeb8 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/route.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/route.json
@@ -29,9 +29,10 @@
"shutdownRoute": { "index": 14, "kind": "attribute", "displayName":
"Shutdown Route", "label": "advanced", "required": false, "type": "enum",
"javaType": "org.apache.camel.ShutdownRoute", "enum": [ "Default", "Defer" ],
"deprecated": false, "autowired": false, "secret": false, "description": "To
control how to shutdown the route." },
"shutdownRunningTask": { "index": 15, "kind": "attribute", "displayName":
"Shutdown Running Task", "label": "advanced", "required": false, "type":
"enum", "javaType": "org.apache.camel.ShutdownRunningTask", "enum": [
"CompleteCurrentTaskOnly", "CompleteAllTasks" ], "deprecated": false,
"autowired": false, "secret": false, "description": "To control how to shut
down the route." },
"precondition": { "index": 16, "kind": "attribute", "displayName":
"Precondition", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The predicate of the precondition in simple
language to evaluate in order to determine if this route should be included or
not." },
-"inputType": { "index": 17, "kind": "element", "displayName": "Input
Type", "label": "advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.model.InputTypeDefinition", "deprecated": false, "autowired":
false, "secret": false, "description": "Declare the expected data type of the
input message. If the actual message type is different at runtime, camel look
for a required org.apache.camel.spi.Transformer and apply if exists. The type
name consists of two parts, [...]
-"outputType": { "index": 18, "kind": "element", "displayName": "Output
Type", "label": "advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.model.OutputTypeDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Declare the expected data
type of the output message. If the actual message type is different at runtime,
camel look for a required org.apache.camel.spi.Transformer and apply if exists.
The type name consists of two par [...]
-"input": { "index": 19, "kind": "element", "displayName": "Input",
"required": true, "type": "object", "javaType":
"org.apache.camel.model.FromDefinition", "oneOf": [ "from" ], "deprecated":
false, "autowired": false, "secret": false, "description": "Input to the
route." },
-"outputs": { "index": 20, "kind": "element", "displayName": "Outputs",
"required": true, "type": "array", "javaType":
"java.util.List>", "oneOf": [
"aggregate", "bean", "choice", "circuitBreaker", "claimCheck", "convertBodyTo",
"convertHeaderTo", "convertVariableTo", "delay", "doCatch", "doFinally",
"doTry", "dynamicRouter", "enrich", "filter", "idempotentConsumer",
"intercept", "interceptFrom", "interceptSendToEndpoint", "kamelet", "load [...]
+"errorHandler": { "index": 17, "kind": "element", "displayName": "Error
Handler", "label": "error", "required": false, "type": "object", "javaType":
"org.apache.camel.model.ErrorHandlerDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the error handler to
use for this route" },
+
Re: [PR] Align DSL for Java, XML and YAML for error handler and stream caching [camel]
github-actions[bot] commented on PR #13780: URL: https://github.com/apache/camel/pull/13780#issuecomment-2053596824 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- 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) 02/02: CAMEL-20665: YAML DSL Inconsistency - StreamCaching vs streamCache. Also mark some DSL in Java DSL as deprecated to make the DSLs consistent so Java DSL does not have special options.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch route-eh-xml
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 88813a5bd0b5f41dfdc0bd20f84748a5125339c6
Author: Claus Ibsen
AuthorDate: Sat Apr 13 11:57:34 2024 +0200
CAMEL-20665: YAML DSL Inconsistency - StreamCaching vs streamCache. Also
mark some DSL in Java DSL as deprecated to make the DSLs consistent so Java DSL
does not have special options.
---
.../org/apache/camel/model/RouteDefinition.java| 54 ++
.../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 30 +++-
.../deserializers/RouteDefinitionDeserializer.java | 11 -
.../generated/resources/schema/camelYamlDsl.json | 2 +-
.../apache/camel/dsl/yaml/PipeLoaderTest.groovy| 2 +-
.../apache/camel/dsl/yaml/RouteTemplateTest.groovy | 2 +-
.../org/apache/camel/dsl/yaml/RoutesTest.groovy| 6 +--
.../kamelets/route-timer-source.kamelet.yaml | 2 +-
8 files changed, 100 insertions(+), 9 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
index 9941dd27a3b..3e0e103e449 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/RouteDefinition.java
@@ -328,6 +328,7 @@ public class RouteDefinition extends
OutputDefinition
*
* @return the builder
*/
+@Deprecated
public RouteDefinition noStreamCaching() {
setStreamCache("false");
return this;
@@ -338,6 +339,7 @@ public class RouteDefinition extends
OutputDefinition
*
* @return the builder
*/
+@Deprecated
public RouteDefinition streamCaching() {
setStreamCache("true");
return this;
@@ -348,17 +350,31 @@ public class RouteDefinition extends
OutputDefinition
*
* @param streamCache whether to use stream caching (true or false), the
value can be a property placeholder
* @return the builder
+ * @deprecated use {@link #streamCache(String)}
*/
+@Deprecated
public RouteDefinition streamCaching(String streamCache) {
setStreamCache(streamCache);
return this;
}
+/**
+ * Enable or disables stream caching for this route.
+ *
+ * @param streamCache whether to use stream caching (true or false), the
value can be a property placeholder
+ * @return the builder
+ */
+public RouteDefinition streamCache(String streamCache) {
+setStreamCache(streamCache);
+return this;
+}
+
/**
* Disable tracing for this route.
*
* @return the builder
*/
+@Deprecated
public RouteDefinition noTracing() {
setTrace("false");
return this;
@@ -369,6 +385,7 @@ public class RouteDefinition extends
OutputDefinition
*
* @return the builder
*/
+@Deprecated
public RouteDefinition tracing() {
setTrace("true");
return this;
@@ -380,11 +397,34 @@ public class RouteDefinition extends
OutputDefinition
* @param tracing whether to use tracing (true or false), the value can
be a property placeholder
* @return the builder
*/
+@Deprecated
public RouteDefinition tracing(String tracing) {
setTrace(tracing);
return this;
}
+/**
+ * Enables or disables tracing for this route.
+ *
+ * @param trace whether to use tracing (true or false)
+ * @return the builder
+ */
+public RouteDefinition trace(boolean trace) {
+setTrace(Boolean.toString(trace));
+return this;
+}
+
+/**
+ * Enables or disables tracing for this route.
+ *
+ * @param trace whether to use tracing (true or false), the value can
be a property placeholder
+ * @return the builder
+ */
+public RouteDefinition trace(String trace) {
+setTrace(trace);
+return this;
+}
+
/**
* Enable message history for this route.
*
@@ -395,6 +435,17 @@ public class RouteDefinition extends
OutputDefinition
return this;
}
+/**
+ * Enable message history for this route.
+ *
+ * @param messageHistory whether to use message history (true or false)
+ * @returnthe builder
+ */
+public RouteDefinition messageHistory(boolean messageHistory) {
+setMessageHistory(Boolean.toString(messageHistory));
+return this;
+}
+
/**
* Enable message history for this route.
*
@@ -433,6 +484,7 @@ public class RouteDefinition extends
OutputDefinition
*
* @return the builder
*/
+@Deprecated
public RouteDefinition noMessageHistory() {
setMessageHistory("false");
return this;
@@
(camel) branch route-eh-xml created (now 88813a5bd0b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch route-eh-xml in repository https://gitbox.apache.org/repos/asf/camel.git at 88813a5bd0b CAMEL-20665: YAML DSL Inconsistency - StreamCaching vs streamCache. Also mark some DSL in Java DSL as deprecated to make the DSLs consistent so Java DSL does not have special options. This branch includes the following new commits: new dbe14a530b8 CAMEL-20666: Add errorHandler on route for EIP model (XML and YAML DSL) to be consistent. new 88813a5bd0b CAMEL-20665: YAML DSL Inconsistency - StreamCaching vs streamCache. Also mark some DSL in Java DSL as deprecated to make the DSLs consistent so Java DSL does not have special options. 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.
[PR] Align DSL for Java, XML and YAML for error handler and stream caching [camel]
davsclaus opened a new pull request, #13780: URL: https://github.com/apache/camel/pull/13780 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- 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
Re: [PR] fix: Fix garbage collection trait [camel-k]
christophd merged PR #5365: URL: https://github.com/apache/camel-k/pull/5365 -- 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-k) branch main updated: fix: Fix garbage collection trait
This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 9c14037ae fix: Fix garbage collection trait
9c14037ae is described below
commit 9c14037ae4e30465982f1d844c2a3e2eb1ddbe82
Author: Christoph Deppisch
AuthorDate: Fri Apr 12 17:03:46 2024 +0200
fix: Fix garbage collection trait
- Run garbage collection trait also in Integration initialization phase
- Fallback to minimal set of deletable types when auto discovery fails
(e.g. in OpenShift)
- Add some unit and E2E test
---
e2e/common/config/config_test.go | 42 +++--
e2e/common/traits/gc_test.go | 61 +++
e2e/knative/files/PlatformHttpServer.java | 26 +++
e2e/knative/gc_test.go | 65
pkg/apis/camel/v1/integration_types_support.go | 3 +
pkg/trait/gc.go| 105 ++--
pkg/trait/gc_test.go | 218 +
pkg/trait/trait.go | 7 +-
pkg/util/test/client.go| 25 +++
9 files changed, 524 insertions(+), 28 deletions(-)
diff --git a/e2e/common/config/config_test.go b/e2e/common/config/config_test.go
index c60267d75..58a3578a9 100644
--- a/e2e/common/config/config_test.go
+++ b/e2e/common/config/config_test.go
@@ -73,7 +73,8 @@ func TestRunConfigExamples(t *testing.T) {
t.Run("Property from ConfigMap", func(t *testing.T) {
var cmData = make(map[string]string)
cmData["my.message"] = "my-configmap-property-value"
- CreatePlainTextConfigmap(t, ctx, ns,
"my-cm-test-property", cmData)
+ err := CreatePlainTextConfigmap(t, ctx, ns,
"my-cm-test-property", cmData)
+ g.Expect(err).To(BeNil())
g.Expect(KamelRunWithID(t, ctx, operatorID, ns,
"./files/property-route.groovy", "-p",
"configmap:my-cm-test-property").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ctx, ns,
"property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
@@ -85,7 +86,8 @@ func TestRunConfigExamples(t *testing.T) {
t.Run("Property from ConfigMap as property file", func(t
*testing.T) {
var cmData = make(map[string]string)
cmData["my.properties"] =
"my.message=my-configmap-property-entry"
- CreatePlainTextConfigmap(t, ctx, ns,
"my-cm-test-properties", cmData)
+ err := CreatePlainTextConfigmap(t, ctx, ns,
"my-cm-test-properties", cmData)
+ g.Expect(err).To(BeNil())
g.Expect(KamelRunWithID(t, ctx, operatorID, ns,
"./files/property-route.groovy", "-p",
"configmap:my-cm-test-properties").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ctx, ns,
"property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
@@ -97,7 +99,8 @@ func TestRunConfigExamples(t *testing.T) {
t.Run("Property from Secret", func(t *testing.T) {
var secData = make(map[string]string)
secData["my.message"] = "my-secret-property-value"
- CreatePlainTextSecret(t, ctx, ns,
"my-sec-test-property", secData)
+ err := CreatePlainTextSecret(t, ctx, ns,
"my-sec-test-property", secData)
+ g.Expect(err).To(BeNil())
g.Expect(KamelRunWithID(t, ctx, operatorID, ns,
"./files/property-route.groovy", "-p",
"secret:my-sec-test-property").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ctx, ns,
"property-route"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
@@ -109,7 +112,8 @@ func TestRunConfigExamples(t *testing.T) {
t.Run("Property from Secret as property file", func(t
*testing.T) {
var secData = make(map[string]string)
secData["my.properties"] =
"my.message=my-secret-property-entry"
- CreatePlainTextSecret(t, ctx, ns,
"my-sec-test-properties", secData)
+ err := CreatePlainTextSecret(t, ctx, ns,
"my-sec-test-properties", secData)
+ g.Expect(err).To(BeNil())
g.Expect(KamelRunWithID(t, ctx, operatorID, ns,
"./files/property-route.groovy", "--name", "property-route-secret", "-p",
"secret:my-sec-test-properties").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ctx, ns,
"property-route-secret"), TestTimeoutLong).Should(Equal(corev1.PodRunning))
@@ -120,7 +124,8 @@ func TestRunConfigExamples(t *testing.T) {
t.Run("Proper
(camel) branch main-properties deleted (was 25efc2f756d)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main-properties in repository https://gitbox.apache.org/repos/asf/camel.git was 25efc2f756d CAMEL-20663: camel-main - Reading properties file should support mixed case and dash vs no-dash style all combinations The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch camel-4.4.x updated: CAMEL-20663: camel-main - Reading properties file should support mixed case and dash vs no-dash style all combinations (#13779)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.4.x by this push:
new c5aa8e5566f CAMEL-20663: camel-main - Reading properties file should
support mixed case and dash vs no-dash style all combinations (#13779)
c5aa8e5566f is described below
commit c5aa8e5566f0e4d2723703fdec8223c5cd64da0a
Author: Claus Ibsen
AuthorDate: Sat Apr 13 09:35:37 2024 +0200
CAMEL-20663: camel-main - Reading properties file should support mixed case
and dash vs no-dash style all combinations (#13779)
---
.../org/apache/camel/main/BaseMainSupport.java | 39 +++--
.../main/MainSupervisingRouteControllerTest.java | 40 ++
.../src/test/resources/route-controller.properties | 24 +
3 files changed, 84 insertions(+), 19 deletions(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index e01c21dc446..9e9f29ba83d 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -107,6 +107,7 @@ import static
org.apache.camel.main.MainHelper.setPropertiesOnTarget;
import static org.apache.camel.main.MainHelper.validateOptionAndValue;
import static org.apache.camel.util.LocationHelper.locationSummary;
import static org.apache.camel.util.StringHelper.matches;
+import static org.apache.camel.util.StringHelper.startsWithIgnoreCase;
/**
* Base class for main implementations to allow bootstrapping Camel in
standalone mode.
@@ -994,115 +995,115 @@ public abstract class BaseMainSupport extends
BaseService {
OrderedLocationProperties routeControllerProperties = new
OrderedLocationProperties();
for (String key : prop.stringPropertyNames()) {
String loc = prop.getLocation(key);
-if (key.startsWith("camel.context.")) {
+if (startsWithIgnoreCase(key, "camel.context.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(14);
validateOptionAndValue(key, option, value);
contextProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.resilience4j.")) {
+} else if (startsWithIgnoreCase(key, "camel.resilience4j.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(19);
validateOptionAndValue(key, option, value);
resilience4jProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.faulttolerance.")) {
+} else if (startsWithIgnoreCase(key, "camel.faulttolerance.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(21);
validateOptionAndValue(key, option, value);
faultToleranceProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.rest.")) {
+} else if (startsWithIgnoreCase(key, "camel.rest.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(11);
validateOptionAndValue(key, option, value);
restProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.vault.")) {
+} else if (startsWithIgnoreCase(key, "camel.vault.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(12);
validateOptionAndValue(key, option, value);
vaultProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.threadpool.")) {
+} else if (startsWithIgnoreCase(key, "camel.threadpool.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(17);
validateOptionAndValue(key, option, value);
threadPoolProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.health.")) {
+} else if (startsWithIgnoreCase(key, "camel.health.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(13);
validateOptionAndValue(key, option, value);
healthProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.lra.")) {
+} else
(camel) branch main updated: CAMEL-20663: camel-main - Reading properties file should support mixed case and dash vs no-dash style all combinations (#13779)
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 50b2fc5a198 CAMEL-20663: camel-main - Reading properties file should
support mixed case and dash vs no-dash style all combinations (#13779)
50b2fc5a198 is described below
commit 50b2fc5a19844ca1de95095db645876fa893fdb3
Author: Claus Ibsen
AuthorDate: Sat Apr 13 09:35:37 2024 +0200
CAMEL-20663: camel-main - Reading properties file should support mixed case
and dash vs no-dash style all combinations (#13779)
---
.../org/apache/camel/main/BaseMainSupport.java | 41 +++---
.../main/MainSupervisingRouteControllerTest.java | 40 +
.../src/test/resources/route-controller.properties | 24 +
3 files changed, 85 insertions(+), 20 deletions(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index 810b445b657..74b4ca1a78b 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -110,6 +110,7 @@ import static
org.apache.camel.main.MainHelper.setPropertiesOnTarget;
import static org.apache.camel.main.MainHelper.validateOptionAndValue;
import static org.apache.camel.util.LocationHelper.locationSummary;
import static org.apache.camel.util.StringHelper.matches;
+import static org.apache.camel.util.StringHelper.startsWithIgnoreCase;
/**
* Base class for main implementations to allow bootstrapping Camel in
standalone mode.
@@ -986,121 +987,121 @@ public abstract class BaseMainSupport extends
BaseService {
OrderedLocationProperties routeControllerProperties = new
OrderedLocationProperties();
for (String key : prop.stringPropertyNames()) {
String loc = prop.getLocation(key);
-if (key.startsWith("camel.context.")) {
+if (startsWithIgnoreCase(key, "camel.context.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(14);
validateOptionAndValue(key, option, value);
contextProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.resilience4j.")) {
+} else if (startsWithIgnoreCase(key, "camel.resilience4j.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(19);
validateOptionAndValue(key, option, value);
resilience4jProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.faulttolerance.")) {
+} else if (startsWithIgnoreCase(key, "camel.faulttolerance.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(21);
validateOptionAndValue(key, option, value);
faultToleranceProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.rest.")) {
+} else if (startsWithIgnoreCase(key, "camel.rest.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(11);
validateOptionAndValue(key, option, value);
restProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.vault.")) {
+} else if (startsWithIgnoreCase(key, "camel.vault.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(12);
validateOptionAndValue(key, option, value);
vaultProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.threadpool.")) {
+} else if (startsWithIgnoreCase(key, "camel.threadpool.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(17);
validateOptionAndValue(key, option, value);
threadPoolProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.health.")) {
+} else if (startsWithIgnoreCase(key, "camel.health.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(13);
validateOptionAndValue(key, option, value);
healthProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.lra.")) {
+} else if (startsWit
Re: [PR] CAMEL-20663: camel-main - Reading properties file should support mixe… [camel]
davsclaus merged PR #13779: URL: https://github.com/apache/camel/pull/13779 -- 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
Re: [PR] CAMEL-20663: camel-main - Reading properties file should support mixe… [camel]
github-actions[bot] commented on PR #13779: URL: https://github.com/apache/camel/pull/13779#issuecomment-205387 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- 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
[PR] CAMEL-20663: camel-main - Reading properties file should support mixe… [camel]
davsclaus opened a new pull request, #13779: URL: https://github.com/apache/camel/pull/13779 …d case and dash vs no-dash style all combinations # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- 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-properties created (now 25efc2f756d)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main-properties in repository https://gitbox.apache.org/repos/asf/camel.git at 25efc2f756d CAMEL-20663: camel-main - Reading properties file should support mixed case and dash vs no-dash style all combinations This branch includes the following new commits: new 25efc2f756d CAMEL-20663: camel-main - Reading properties file should support mixed case and dash vs no-dash style all combinations The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) 01/01: CAMEL-20663: camel-main - Reading properties file should support mixed case and dash vs no-dash style all combinations
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main-properties
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 25efc2f756d31967db9b5a6d73799dc484d5084f
Author: Claus Ibsen
AuthorDate: Sat Apr 13 09:22:35 2024 +0200
CAMEL-20663: camel-main - Reading properties file should support mixed case
and dash vs no-dash style all combinations
---
.../org/apache/camel/main/BaseMainSupport.java | 41 +++---
.../main/MainSupervisingRouteControllerTest.java | 40 +
.../src/test/resources/route-controller.properties | 24 +
3 files changed, 85 insertions(+), 20 deletions(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index 810b445b657..74b4ca1a78b 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -110,6 +110,7 @@ import static
org.apache.camel.main.MainHelper.setPropertiesOnTarget;
import static org.apache.camel.main.MainHelper.validateOptionAndValue;
import static org.apache.camel.util.LocationHelper.locationSummary;
import static org.apache.camel.util.StringHelper.matches;
+import static org.apache.camel.util.StringHelper.startsWithIgnoreCase;
/**
* Base class for main implementations to allow bootstrapping Camel in
standalone mode.
@@ -986,121 +987,121 @@ public abstract class BaseMainSupport extends
BaseService {
OrderedLocationProperties routeControllerProperties = new
OrderedLocationProperties();
for (String key : prop.stringPropertyNames()) {
String loc = prop.getLocation(key);
-if (key.startsWith("camel.context.")) {
+if (startsWithIgnoreCase(key, "camel.context.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(14);
validateOptionAndValue(key, option, value);
contextProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.resilience4j.")) {
+} else if (startsWithIgnoreCase(key, "camel.resilience4j.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(19);
validateOptionAndValue(key, option, value);
resilience4jProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.faulttolerance.")) {
+} else if (startsWithIgnoreCase(key, "camel.faulttolerance.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(21);
validateOptionAndValue(key, option, value);
faultToleranceProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.rest.")) {
+} else if (startsWithIgnoreCase(key, "camel.rest.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(11);
validateOptionAndValue(key, option, value);
restProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.vault.")) {
+} else if (startsWithIgnoreCase(key, "camel.vault.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(12);
validateOptionAndValue(key, option, value);
vaultProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.threadpool.")) {
+} else if (startsWithIgnoreCase(key, "camel.threadpool.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(17);
validateOptionAndValue(key, option, value);
threadPoolProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.health.")) {
+} else if (startsWithIgnoreCase(key, "camel.health.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(13);
validateOptionAndValue(key, option, value);
healthProperties.put(loc, optionKey(option), value);
-} else if (key.startsWith("camel.lra.")) {
+} else if (startsWithIgnoreCase(key, "camel.lra.")) {
// grab the value
String value = prop.getProperty(key);
String option = key.substring(10);
validateOptionAndValue(key, option, value);
