[camel] branch regen_bot updated (f87e146db57 -> 26e426885c4)
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 f87e146db57 Upgrade guide for 3.19 add c196c51b141 Upgrade AWS SDK v2 to version 2.17.245 add 26e426885c4 Sync deps No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[GitHub] [camel-quarkus] svkcemk opened a new pull request, #3953: Increase test coverage (file/http) for camel-quarkus-validator extens…
svkcemk opened a new pull request, #3953: URL: https://github.com/apache/camel-quarkus/pull/3953 …ion. -- 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] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1203612354 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 2786571033-832-bec53c0d-d04f-4c5a-8fd5-8e74d999770e * Camel Quarkus Commit: 787891eda779195b9ca41ccf0d5f8a267521a732 * Quarkus Main Commit: cf4974d5ec4317ad036f832ad263bbfc6a6467ca * Link to build: https://github.com/apache/camel-quarkus/actions/runs/2786571033 -- 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 doc-update-path-sample.java created (now 3fd03f860)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch doc-update-path-sample.java in repository https://gitbox.apache.org/repos/asf/camel-k.git at 3fd03f860 Update the path of the file Sample.java This branch includes the following new commits: new 3fd03f860 Update the path of the file Sample.java 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-k] 01/01: Update the path of the file Sample.java
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch doc-update-path-sample.java in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 3fd03f86013813675e37bd7d53ba793e4603629b Author: Nicolas Filotto AuthorDate: Wed Aug 3 10:10:46 2022 +0200 Update the path of the file Sample.java --- docs/modules/ROOT/pages/running/dev-mode.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/running/dev-mode.adoc b/docs/modules/ROOT/pages/running/dev-mode.adoc index 7f266f730..fc6f32af5 100644 --- a/docs/modules/ROOT/pages/running/dev-mode.adoc +++ b/docs/modules/ROOT/pages/running/dev-mode.adoc @@ -10,7 +10,7 @@ Dev mode is just a helper to let you be quicker during development. To enable dev mode, just add the `--dev` flag when running the integration: ``` -kamel run examples/Sample.java --dev +kamel run examples/languages/Sample.java --dev ``` The `--dev` flag deploys immediately the integration and shows the integration logs in the console. You can then change the code and see @@ -21,7 +21,7 @@ The console follows automatically all redeploys of the integration. Here's an example of the output: ``` -$ kamel run examples/Sample.java --dev +$ kamel run examples/languages/Sample.java --dev integration "sample" created integration "sample" in phase Initialization integration "sample" in phase Building Kit
[GitHub] [camel-k] essobedo opened a new pull request, #3504: Update the path of the file Sample.java
essobedo opened a new pull request, #3504: URL: https://github.com/apache/camel-k/pull/3504 ## Motivation Since 1.3.x the file Sample.java has been moved, the doc should be changed consequently. ## Modifications: * Use the directory `examples/languages/` instead of simply `examples/` -- 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 typo-in-local.adoc created (now 0ed28bedb)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch typo-in-local.adoc in repository https://gitbox.apache.org/repos/asf/camel-k.git at 0ed28bedb Fix typo in local.adoc This branch includes the following new commits: new 0ed28bedb Fix typo in local.adoc 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-k] 01/01: Fix typo in local.adoc
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch typo-in-local.adoc in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 0ed28bedb2ef5fd7bb295e00a2783ffc3ff346fc Author: Nicolas Filotto AuthorDate: Wed Aug 3 10:38:03 2022 +0200 Fix typo in local.adoc --- docs/modules/ROOT/pages/running/local.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/running/local.adoc b/docs/modules/ROOT/pages/running/local.adoc index 0cc1ea34a..899fc835e 100644 --- a/docs/modules/ROOT/pages/running/local.adoc +++ b/docs/modules/ROOT/pages/running/local.adoc @@ -67,7 +67,7 @@ To package an integration, use `kamel kit create` to create an `IntegrationKit` [[running-locally-build-integration]] === Building an integration -To build an integration image locally, you at lease need to specify an image name with the `--image` option in addition to the integration files you want to build. +To build an integration image locally, you at least need to specify an image name with the `--image` option in addition to the integration files you want to build. [source,console]
[GitHub] [camel-k] essobedo merged pull request #3504: Update the path of the file Sample.java
essobedo merged PR #3504: URL: https://github.com/apache/camel-k/pull/3504 -- 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] 01/01: Merge pull request #3504 from apache/doc-update-path-sample.java
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit bc34e9ea0523b8849957eec9e5b26442ed872d71 Merge: 801cdad67 3fd03f860 Author: Nicolas Filotto AuthorDate: Wed Aug 3 10:40:09 2022 +0200 Merge pull request #3504 from apache/doc-update-path-sample.java Update the path of the file Sample.java docs/modules/ROOT/pages/running/dev-mode.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[camel-k] branch main updated (801cdad67 -> bc34e9ea0)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 801cdad67 add params resources and securityContext to README.md add 3fd03f860 Update the path of the file Sample.java new bc34e9ea0 Merge pull request #3504 from apache/doc-update-path-sample.java 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. Summary of changes: docs/modules/ROOT/pages/running/dev-mode.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[GitHub] [camel-k] essobedo merged pull request #3505: Fix typo in local.adoc
essobedo merged PR #3505: URL: https://github.com/apache/camel-k/pull/3505 -- 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 typo in local.adoc (#3505)
This is an automated email from the ASF dual-hosted git repository. nfilotto 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 f6dd27022 Fix typo in local.adoc (#3505) f6dd27022 is described below commit f6dd27022dd2c9e4ecd7e72a5310b46beac99ead Author: Nicolas Filotto AuthorDate: Wed Aug 3 10:40:32 2022 +0200 Fix typo in local.adoc (#3505) --- docs/modules/ROOT/pages/running/local.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/running/local.adoc b/docs/modules/ROOT/pages/running/local.adoc index 0cc1ea34a..899fc835e 100644 --- a/docs/modules/ROOT/pages/running/local.adoc +++ b/docs/modules/ROOT/pages/running/local.adoc @@ -67,7 +67,7 @@ To package an integration, use `kamel kit create` to create an `IntegrationKit` [[running-locally-build-integration]] === Building an integration -To build an integration image locally, you at lease need to specify an image name with the `--image` option in addition to the integration files you want to build. +To build an integration image locally, you at least need to specify an image name with the `--image` option in addition to the integration files you want to build. [source,console]
[GitHub] [camel-quarkus] zhfeng commented on a diff in pull request #3953: Increase test coverage (file/http) for camel-quarkus-validator extens…
zhfeng commented on code in PR #3953:
URL: https://github.com/apache/camel-quarkus/pull/3953#discussion_r936408330
##
integration-tests/validator/src/main/java/org/apache/camel/quarkus/component/validator/it/ValidatorResource.java:
##
@@ -32,11 +32,28 @@ public class ValidatorResource {
@Inject
ProducerTemplate producerTemplate;
-@Path("/xml")
+@Path("/classpath")
@POST
@Consumes(MediaType.APPLICATION_XML)
@Produces(MediaType.TEXT_PLAIN)
-public String processOrder(String statement) {
-return producerTemplate.requestBody("direct:start", statement,
String.class);
+public String processOrderInXmlFromClassPath(String statement) {
+return producerTemplate.requestBody("direct:classpath", statement,
String.class);
}
+
+@Path("/filesystem")
+@POST
+@Consumes(MediaType.APPLICATION_XML)
+@Produces(MediaType.TEXT_PLAIN)
+public String processOrderInXmlFromFileSystem(String statement) {
+return producerTemplate.requestBody("direct:filesystem", statement,
String.class);
+}
+
+@Path("/http")
+@POST
+@Consumes(MediaType.APPLICATION_XML)
+@Produces(MediaType.TEXT_PLAIN)
+public String processOrderInXmlFromHTTP(String statement) {
+return producerTemplate.requestBody("direct:http", statement,
String.class);
+}
Review Comment:
This test is working in the native mode?
--
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] zhfeng commented on issue #3951: Add a test in camel-quarkus-integration-test-jms-artemis-client with quarkus-pooled-jms
zhfeng commented on issue #3951:
URL: https://github.com/apache/camel-quarkus/issues/3951#issuecomment-1203679009
`testJmsTopic` is failing with
```
2022-08-03 12:14:01,792 ERROR
[org.apa.cam.com.jms.DefaultJmsMessageListenerContainer] (Camel (camel-1)
thread #15 - JmsConsumer[test]) Could not refresh JMS Connection for
destination 'test' - retrying using FixedBackOff{interval=5000,
currentAttempts=1, maxAttempts=unlimited}. Cause: setClientID can only be
called directly after the connection is created
```
The test route look like
```java
// Topic routes
fromF("%s:topic:test?clientId=123&durableSubscriptionName=camel-quarkus",
componentScheme)
.to("mock:topicResultA");
fromF("%s:topic:test?clientId=456&durableSubscriptionName=camel-quarkus",
componentScheme)
.to("mock:topicResultB");
```
It seems `setClientId` is invokded on the `reused` connection from the pool.
I just check the [JMS
spec](https://docs.oracle.com/javaee/7/api/javax/jms/Connection.html?is-external=true#setClientID-java.lang.String-)
and find
>If a client sets the client identifier explicitly, it must do so
immediately after it creates the connection and before any other action on the
connection is taken. After this point, setting the client identifier is a
programming error that should throw an IllegalStateException.
So when using the JMS pooling, we can not use `clientId`. Is there anything
I missed or misunderstand the spec? @jamesnetherton
--
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] svkcemk commented on a diff in pull request #3953: Increase test coverage (file/http) for camel-quarkus-validator extens…
svkcemk commented on code in PR #3953:
URL: https://github.com/apache/camel-quarkus/pull/3953#discussion_r936430928
##
integration-tests/validator/src/main/java/org/apache/camel/quarkus/component/validator/it/ValidatorResource.java:
##
@@ -32,11 +32,28 @@ public class ValidatorResource {
@Inject
ProducerTemplate producerTemplate;
-@Path("/xml")
+@Path("/classpath")
@POST
@Consumes(MediaType.APPLICATION_XML)
@Produces(MediaType.TEXT_PLAIN)
-public String processOrder(String statement) {
-return producerTemplate.requestBody("direct:start", statement,
String.class);
+public String processOrderInXmlFromClassPath(String statement) {
+return producerTemplate.requestBody("direct:classpath", statement,
String.class);
}
+
+@Path("/filesystem")
+@POST
+@Consumes(MediaType.APPLICATION_XML)
+@Produces(MediaType.TEXT_PLAIN)
+public String processOrderInXmlFromFileSystem(String statement) {
+return producerTemplate.requestBody("direct:filesystem", statement,
String.class);
+}
+
+@Path("/http")
+@POST
+@Consumes(MediaType.APPLICATION_XML)
+@Produces(MediaType.TEXT_PLAIN)
+public String processOrderInXmlFromHTTP(String statement) {
+return producerTemplate.requestBody("direct:http", statement,
String.class);
+}
Review Comment:
@zhfeng yes I tested with `mvn clean install -Pnative` as well and not
seeing any failures on native mode. Thanks!
--
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] svkcemk commented on a diff in pull request #3953: Increase test coverage (file/http) for camel-quarkus-validator extens…
svkcemk commented on code in PR #3953:
URL: https://github.com/apache/camel-quarkus/pull/3953#discussion_r936435943
##
integration-tests/validator/src/main/java/org/apache/camel/quarkus/component/validator/it/ValidatorResource.java:
##
@@ -32,11 +32,28 @@ public class ValidatorResource {
@Inject
ProducerTemplate producerTemplate;
-@Path("/xml")
+@Path("/classpath")
@POST
@Consumes(MediaType.APPLICATION_XML)
@Produces(MediaType.TEXT_PLAIN)
-public String processOrder(String statement) {
-return producerTemplate.requestBody("direct:start", statement,
String.class);
+public String processOrderInXmlFromClassPath(String statement) {
+return producerTemplate.requestBody("direct:classpath", statement,
String.class);
}
+
+@Path("/filesystem")
+@POST
+@Consumes(MediaType.APPLICATION_XML)
+@Produces(MediaType.TEXT_PLAIN)
+public String processOrderInXmlFromFileSystem(String statement) {
+return producerTemplate.requestBody("direct:filesystem", statement,
String.class);
+}
+
+@Path("/http")
+@POST
+@Consumes(MediaType.APPLICATION_XML)
+@Produces(MediaType.TEXT_PLAIN)
+public String processOrderInXmlFromHTTP(String statement) {
+return producerTemplate.requestBody("direct:http", statement,
String.class);
+}
Review Comment:
Sorry my mistake you are right the http one is failing I can see that now,
thanks for pointing out.
--
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] svkcemk commented on a diff in pull request #3953: Increase test coverage (file/http) for camel-quarkus-validator extens…
svkcemk commented on code in PR #3953:
URL: https://github.com/apache/camel-quarkus/pull/3953#discussion_r936451639
##
integration-tests/validator/src/main/java/org/apache/camel/quarkus/component/validator/it/ValidatorResource.java:
##
@@ -32,11 +32,28 @@ public class ValidatorResource {
@Inject
ProducerTemplate producerTemplate;
-@Path("/xml")
+@Path("/classpath")
@POST
@Consumes(MediaType.APPLICATION_XML)
@Produces(MediaType.TEXT_PLAIN)
-public String processOrder(String statement) {
-return producerTemplate.requestBody("direct:start", statement,
String.class);
+public String processOrderInXmlFromClassPath(String statement) {
+return producerTemplate.requestBody("direct:classpath", statement,
String.class);
}
+
+@Path("/filesystem")
+@POST
+@Consumes(MediaType.APPLICATION_XML)
+@Produces(MediaType.TEXT_PLAIN)
+public String processOrderInXmlFromFileSystem(String statement) {
+return producerTemplate.requestBody("direct:filesystem", statement,
String.class);
+}
+
+@Path("/http")
+@POST
+@Consumes(MediaType.APPLICATION_XML)
+@Produces(MediaType.TEXT_PLAIN)
+public String processOrderInXmlFromHTTP(String statement) {
+return producerTemplate.requestBody("direct:http", statement,
String.class);
+}
Review Comment:
Added `quarkus.ssl.native=true` for https endpoint, now tests are working in
native mode as well, thanks @zhfeng
--
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] zhfeng commented on pull request #3953: Increase test coverage (file/http) for camel-quarkus-validator extens…
zhfeng commented on PR #3953: URL: https://github.com/apache/camel-quarkus/pull/3953#issuecomment-1203724269 Thanks @svkcemk for your contribution! -- 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-18339: Java DSL (joor) - Allow compiled classes to be loadable from anywhere in Camel
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 87fc5e2eeffbe2b91d7e355b48f5d58fb9ca45d8
Author: Claus Ibsen
AuthorDate: Wed Aug 3 11:39:19 2022 +0200
CAMEL-18339: Java DSL (joor) - Allow compiled classes to be loadable from
anywhere in Camel
---
.../ROOT/pages/camel-3x-upgrade-guide-3_19.adoc| 4 +++
.../modules/ROOT/pages/camel-jbang.adoc| 32 --
2 files changed, 4 insertions(+), 32 deletions(-)
diff --git
a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
index 35543c2a795..ed5cc083f3a 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_19.adoc
@@ -5,3 +5,7 @@ from Camel 3.x to 3.y. For example if you are upgrading Camel
3.0 to 3.2, then y
from both 3.0 to 3.1 and 3.1 to 3.2.
== Upgrading Camel 3.18 to 3.19
+
+=== camel-api
+
+Added `addClassLoader` method to `org.apache.camel.spi.ClassResolver`.
diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
index 207a4c72d32..08cb83cb8be 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
@@ -545,38 +545,6 @@ There is basic support for including regular Java source
files together with Cam
and let Camel JBang runtime compile the Java source. This means you can
include smaller utility
classes, POJOs, Camel Processors and whatnot that the application needs.
-If any of these beans must be used/shared in the Camel application then they
must be shared via bean ids,
-and not via classloading.
-
-Given a bean as below:
-
-[source,java]
-
-@org.apache.camel.BindToRegistry("helloBean")
-public class HelloBean {
-
-public String greeting() {
-return "Hello World";
-}
-}
-
-
-Notice how the class is annotated with `@BindToRegistry`, to assign the bean
an id, which
-we can use to call the bean from Camel routes such as:
-
-TIP: Instead of using `@BindToRegistry` you can also use Spring or Quarkus
annotations (see further below).
-
-[source,yaml]
-
-- from:
-uri: "timer:yaml"
-parameters:
- period: "1000"
-steps:
- - bean: "helloBean"
- - log: "${body}"
-
-
IMPORTANT: The Java source files cannot use package names. This may change in
the future.
=== Dependency Injection in Java classes
[camel] branch main updated (26e426885c4 -> 87fc5e2eeff)
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 26e426885c4 Sync deps
new 09549a6719a CAMEL-18339: Java DSL (joor) - Allow compiled classes to
be loadable from anywhere in Camel
new 87fc5e2eeff CAMEL-18339: Java DSL (joor) - Allow compiled classes to
be loadable from anywhere in Camel
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/camel/spi/ClassResolver.java | 7 +
.../camel/impl/engine/DefaultClassResolver.java| 30 +++-
.../ROOT/pages/camel-3x-upgrade-guide-3_19.adoc| 4 +++
.../modules/ROOT/pages/camel-jbang.adoc| 32 --
...ayClassLoader.java => JavaJoorClassLoader.java} | 28 ++-
.../dsl/java/joor/JavaRoutesBuilderLoader.java | 14 ++
6 files changed, 63 insertions(+), 52 deletions(-)
copy
dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/{ByteArrayClassLoader.java
=> JavaJoorClassLoader.java} (60%)
[camel] 01/02: CAMEL-18339: Java DSL (joor) - Allow compiled classes to be loadable from anywhere in Camel
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 09549a6719a5d3fc4054e5d09e03c62fcbac
Author: Claus Ibsen
AuthorDate: Wed Aug 3 11:31:14 2022 +0200
CAMEL-18339: Java DSL (joor) - Allow compiled classes to be loadable from
anywhere in Camel
---
.../java/org/apache/camel/spi/ClassResolver.java | 7
.../camel/impl/engine/DefaultClassResolver.java| 30 +++
.../camel/dsl/java/joor/JavaJoorClassLoader.java | 45 ++
.../dsl/java/joor/JavaRoutesBuilderLoader.java | 14 +++
4 files changed, 89 insertions(+), 7 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/ClassResolver.java
b/core/camel-api/src/main/java/org/apache/camel/spi/ClassResolver.java
index c00ac92ebf6..f7748d7eb3e 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/ClassResolver.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/ClassResolver.java
@@ -26,6 +26,13 @@ import java.util.Enumeration;
*/
public interface ClassResolver {
+/**
+ * Adds a custom class loader to use.
+ *
+ * @param classLoader a custom class loader
+ */
+void addClassLoader(ClassLoader classLoader);
+
/**
* Resolves the given class by its name
*
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java
index eb7a032fdbc..14f4cc89ff5 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java
@@ -19,6 +19,8 @@ package org.apache.camel.impl.engine;
import java.io.InputStream;
import java.net.URL;
import java.util.Enumeration;
+import java.util.LinkedHashSet;
+import java.util.Set;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
@@ -31,6 +33,7 @@ import org.apache.camel.util.ObjectHelper;
*/
public class DefaultClassResolver implements ClassResolver, CamelContextAware {
+private Set classLoaders;
private CamelContext camelContext;
public DefaultClassResolver() {
@@ -50,9 +53,27 @@ public class DefaultClassResolver implements ClassResolver,
CamelContextAware {
return camelContext;
}
+@Override
+public void addClassLoader(ClassLoader classLoader) {
+if (classLoaders == null) {
+classLoaders = new LinkedHashSet<>();
+}
+classLoaders.add(classLoader);
+}
+
@Override
public Class resolveClass(String name) {
-Class answer = loadClass(name,
DefaultClassResolver.class.getClassLoader());
+Class answer;
+if (classLoaders != null) {
+for (ClassLoader loader : classLoaders) {
+answer = loadClass(name, loader);
+if (answer != null) {
+return answer;
+}
+}
+}
+
+answer = loadClass(name, DefaultClassResolver.class.getClassLoader());
if (answer == null && getApplicationContextClassLoader() != null) {
// fallback and use application context class loader
answer = loadClass(name, getApplicationContextClassLoader());
@@ -62,12 +83,7 @@ public class DefaultClassResolver implements ClassResolver,
CamelContextAware {
@Override
public Class resolveClass(String name, Class type) {
-Class answer = CastUtils.cast(loadClass(name,
DefaultClassResolver.class.getClassLoader()));
-if (answer == null && getApplicationContextClassLoader() != null) {
-// fallback and use application context class loader
-answer = CastUtils.cast(loadClass(name,
getApplicationContextClassLoader()));
-}
-return answer;
+return CastUtils.cast(resolveClass(name), type);
}
@Override
diff --git
a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
new file mode 100644
index 000..d9b8f630778
--- /dev/null
+++
b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
@@ -0,0 +1,45 @@
+/*
+ * 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
[camel] branch camel-3.18.x updated: CAMEL-18339: Java DSL (joor) - Allow compiled classes to be loadable from anywhere in Camel
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new b4272fc0671 CAMEL-18339: Java DSL (joor) - Allow compiled classes to
be loadable from anywhere in Camel
b4272fc0671 is described below
commit b4272fc0671df191f1aa93dd0cfdd70433a6e0db
Author: Claus Ibsen
AuthorDate: Wed Aug 3 11:31:14 2022 +0200
CAMEL-18339: Java DSL (joor) - Allow compiled classes to be loadable from
anywhere in Camel
---
.../java/org/apache/camel/spi/ClassResolver.java | 7
.../camel/impl/engine/DefaultClassResolver.java| 30 +++
.../camel/dsl/java/joor/JavaJoorClassLoader.java | 45 ++
.../dsl/java/joor/JavaRoutesBuilderLoader.java | 14 +++
4 files changed, 89 insertions(+), 7 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/ClassResolver.java
b/core/camel-api/src/main/java/org/apache/camel/spi/ClassResolver.java
index c00ac92ebf6..f7748d7eb3e 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/ClassResolver.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/ClassResolver.java
@@ -26,6 +26,13 @@ import java.util.Enumeration;
*/
public interface ClassResolver {
+/**
+ * Adds a custom class loader to use.
+ *
+ * @param classLoader a custom class loader
+ */
+void addClassLoader(ClassLoader classLoader);
+
/**
* Resolves the given class by its name
*
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java
index eb7a032fdbc..14f4cc89ff5 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultClassResolver.java
@@ -19,6 +19,8 @@ package org.apache.camel.impl.engine;
import java.io.InputStream;
import java.net.URL;
import java.util.Enumeration;
+import java.util.LinkedHashSet;
+import java.util.Set;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
@@ -31,6 +33,7 @@ import org.apache.camel.util.ObjectHelper;
*/
public class DefaultClassResolver implements ClassResolver, CamelContextAware {
+private Set classLoaders;
private CamelContext camelContext;
public DefaultClassResolver() {
@@ -50,9 +53,27 @@ public class DefaultClassResolver implements ClassResolver,
CamelContextAware {
return camelContext;
}
+@Override
+public void addClassLoader(ClassLoader classLoader) {
+if (classLoaders == null) {
+classLoaders = new LinkedHashSet<>();
+}
+classLoaders.add(classLoader);
+}
+
@Override
public Class resolveClass(String name) {
-Class answer = loadClass(name,
DefaultClassResolver.class.getClassLoader());
+Class answer;
+if (classLoaders != null) {
+for (ClassLoader loader : classLoaders) {
+answer = loadClass(name, loader);
+if (answer != null) {
+return answer;
+}
+}
+}
+
+answer = loadClass(name, DefaultClassResolver.class.getClassLoader());
if (answer == null && getApplicationContextClassLoader() != null) {
// fallback and use application context class loader
answer = loadClass(name, getApplicationContextClassLoader());
@@ -62,12 +83,7 @@ public class DefaultClassResolver implements ClassResolver,
CamelContextAware {
@Override
public Class resolveClass(String name, Class type) {
-Class answer = CastUtils.cast(loadClass(name,
DefaultClassResolver.class.getClassLoader()));
-if (answer == null && getApplicationContextClassLoader() != null) {
-// fallback and use application context class loader
-answer = CastUtils.cast(loadClass(name,
getApplicationContextClassLoader()));
-}
-return answer;
+return CastUtils.cast(resolveClass(name), type);
}
@Override
diff --git
a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
new file mode 100644
index 000..d9b8f630778
--- /dev/null
+++
b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
@@ -0,0 +1,45 @@
+/*
+ * 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
[camel] branch camel-3.18.x updated: CAMEL-18339: Java DSL (joor) - Allow compiled classes to be loadable from anywhere in Camel
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new b04d45c59ef CAMEL-18339: Java DSL (joor) - Allow compiled classes to
be loadable from anywhere in Camel
b04d45c59ef is described below
commit b04d45c59efa51c64fc078a1a162de81bee9958c
Author: Claus Ibsen
AuthorDate: Wed Aug 3 11:39:19 2022 +0200
CAMEL-18339: Java DSL (joor) - Allow compiled classes to be loadable from
anywhere in Camel
---
.../modules/ROOT/pages/camel-jbang.adoc| 32 --
1 file changed, 32 deletions(-)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
index 07ff06c5810..7eaee14fc45 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
@@ -531,38 +531,6 @@ There is basic support for including regular Java source
files together with Cam
and let Camel JBang runtime compile the Java source. This means you can
include smaller utility
classes, POJOs, Camel Processors and whatnot that the application needs.
-If any of these beans must be used/shared in the Camel application then they
must be shared via bean ids,
-and not via classloading.
-
-Given a bean as below:
-
-[source,java]
-
-@org.apache.camel.BindToRegistry("helloBean")
-public class HelloBean {
-
-public String greeting() {
-return "Hello World";
-}
-}
-
-
-Notice how the class is annotated with `@BindToRegistry`, to assign the bean
an id, which
-we can use to call the bean from Camel routes such as:
-
-TIP: Instead of using `@BindToRegistry` you can also use Spring or Quarkus
annotations (see further below).
-
-[source,yaml]
-
-- from:
-uri: "timer:yaml"
-parameters:
- period: "1000"
-steps:
- - bean: "helloBean"
- - log: "${body}"
-
-
IMPORTANT: The Java source files cannot use package names. This may change in
the future.
=== Dependency Injection in Java classes
[camel-k] 01/01: Fix the file path in run command
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch fix-file-path-in-configuration.adoc
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 70a46215c27418d9872c7527e90cc17ae812296c
Author: Nicolas Filotto
AuthorDate: Wed Aug 3 12:08:33 2022 +0200
Fix the file path in run command
---
docs/modules/ROOT/pages/configuration/configuration.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/modules/ROOT/pages/configuration/configuration.adoc
b/docs/modules/ROOT/pages/configuration/configuration.adoc
index 2a5aa6e43..febf7ef1a 100644
--- a/docs/modules/ROOT/pages/configuration/configuration.adoc
+++ b/docs/modules/ROOT/pages/configuration/configuration.adoc
@@ -17,7 +17,7 @@ from('timer:props?period=1000')
In order to give a value to the `my.message` property you can pass it using
the command line:
```
-kamel run --property my.message="Hello World" examples/props.js
+kamel run --property my.message="Hello World" props.groovy
```
-For more details and advanced use cases, see the
xref:configuration/runtime-properties.adoc[runtime properties] section.
\ No newline at end of file
+For more details and advanced use cases, see the
xref:configuration/runtime-properties.adoc[runtime properties] section.
[camel-k] branch fix-file-path-in-configuration.adoc created (now 70a46215c)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch fix-file-path-in-configuration.adoc in repository https://gitbox.apache.org/repos/asf/camel-k.git at 70a46215c Fix the file path in run command This branch includes the following new commits: new 70a46215c Fix the file path in run command The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] branch camel-3.18.x updated: CAMEL-18338: camel-mail - Fix NPE in camel-mail consumer
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new ac927a57f68 CAMEL-18338: camel-mail - Fix NPE in camel-mail consumer
ac927a57f68 is described below
commit ac927a57f687c62b8caee8f0476a2db663dea59b
Author: Claus Ibsen
AuthorDate: Wed Aug 3 12:12:19 2022 +0200
CAMEL-18338: camel-mail - Fix NPE in camel-mail consumer
---
.../org/apache/camel/component/mail/MailConsumer.java | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
index 3c41fdb9bbd..82617223d2b 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
@@ -156,6 +156,7 @@ public class MailConsumer extends
ScheduledBatchPollingConsumer {
LOG.debug(msg, e);
}
disconnect();
+return 0; // return since we cannot poll mail messages, but will
re-connect on next poll.
}
try {
@@ -176,12 +177,12 @@ public class MailConsumer extends
ScheduledBatchPollingConsumer {
} finally {
// need to ensure we release resources, but only if closeFolder or
disconnect = true
if (getEndpoint().getConfiguration().isCloseFolder() ||
getEndpoint().getConfiguration().isDisconnect()) {
-if (LOG.isDebugEnabled()) {
-LOG.debug("Close mailbox folder {} from {}",
folder.getName(),
-
getEndpoint().getConfiguration().getMailStoreLogInformation());
-}
try {
-if (folder.isOpen()) {
+if (folder != null && folder.isOpen()) {
+if (LOG.isDebugEnabled()) {
+LOG.debug("Close mailbox folder {} from {}",
folder.getName(),
+
getEndpoint().getConfiguration().getMailStoreLogInformation());
+}
folder.close(true);
}
} catch (Exception e) {
@@ -205,7 +206,9 @@ public class MailConsumer extends
ScheduledBatchPollingConsumer {
LOG.debug("Disconnecting from {}",
getEndpoint().getConfiguration().getMailStoreLogInformation());
}
try {
-store.close();
+if (store != null) {
+store.close();
+}
} catch (Exception e) {
LOG.debug("Could not disconnect from {}. This exception is
ignored.",
getEndpoint().getConfiguration().getMailStoreLogInformation(), e);
[camel] branch main updated: CAMEL-18338: camel-mail - Fix NPE in camel-mail consumer
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 58a3b430853 CAMEL-18338: camel-mail - Fix NPE in camel-mail consumer
58a3b430853 is described below
commit 58a3b430853fb0acc3a094aefcc4ecbf10cf5c5a
Author: Claus Ibsen
AuthorDate: Wed Aug 3 12:12:19 2022 +0200
CAMEL-18338: camel-mail - Fix NPE in camel-mail consumer
---
.../org/apache/camel/component/mail/MailConsumer.java | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
index 3c41fdb9bbd..82617223d2b 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConsumer.java
@@ -156,6 +156,7 @@ public class MailConsumer extends
ScheduledBatchPollingConsumer {
LOG.debug(msg, e);
}
disconnect();
+return 0; // return since we cannot poll mail messages, but will
re-connect on next poll.
}
try {
@@ -176,12 +177,12 @@ public class MailConsumer extends
ScheduledBatchPollingConsumer {
} finally {
// need to ensure we release resources, but only if closeFolder or
disconnect = true
if (getEndpoint().getConfiguration().isCloseFolder() ||
getEndpoint().getConfiguration().isDisconnect()) {
-if (LOG.isDebugEnabled()) {
-LOG.debug("Close mailbox folder {} from {}",
folder.getName(),
-
getEndpoint().getConfiguration().getMailStoreLogInformation());
-}
try {
-if (folder.isOpen()) {
+if (folder != null && folder.isOpen()) {
+if (LOG.isDebugEnabled()) {
+LOG.debug("Close mailbox folder {} from {}",
folder.getName(),
+
getEndpoint().getConfiguration().getMailStoreLogInformation());
+}
folder.close(true);
}
} catch (Exception e) {
@@ -205,7 +206,9 @@ public class MailConsumer extends
ScheduledBatchPollingConsumer {
LOG.debug("Disconnecting from {}",
getEndpoint().getConfiguration().getMailStoreLogInformation());
}
try {
-store.close();
+if (store != null) {
+store.close();
+}
} catch (Exception e) {
LOG.debug("Could not disconnect from {}. This exception is
ignored.",
getEndpoint().getConfiguration().getMailStoreLogInformation(), e);
[GitHub] [camel-k] astefanutti commented on a diff in pull request #3480: fix: camel-k ignores changes to traits configured using annotations
astefanutti commented on code in PR #3480:
URL: https://github.com/apache/camel-k/pull/3480#discussion_r936453260
##
e2e/global/common/kamelet_binding_with_image_test.go:
##
@@ -0,0 +1,120 @@
+//go:build integration
+// +build integration
+
+// To enable compilation of this file in Goland, go to "Settings -> Go ->
Vendoring & Build Tags -> Custom Tags" and add "integration"
+
+/*
+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 common
+
+import (
+ "github.com/onsi/gomega/gstruct"
+ "testing"
+
+ . "github.com/apache/camel-k/e2e/support"
+ . "github.com/onsi/gomega"
+
+ corev1 "k8s.io/api/core/v1"
+
+ "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+)
+
+func TestBindingWithImage(t *testing.T) {
+ WithNewTestNamespace(t, func(ns string) {
+ operatorID := "camel-k-binding-image"
+ bindingID := "with-image-binding"
+
+ Expect(KamelInstallWithID(operatorID,
ns).Execute()).To(Succeed())
+
+ from := corev1.ObjectReference{
+ Kind: "Kamelet",
+ Name: "my-own-timer-source",
+ APIVersion: v1alpha1.SchemeGroupVersion.String(),
+ }
+
+ to := corev1.ObjectReference{
+ Kind: "Kamelet",
+ Name: "my-own-log-sink",
+ APIVersion: v1alpha1.SchemeGroupVersion.String(),
+ }
+
+ emptyMap := map[string]string{}
+
+ annotations1 := map[string]string{
+ "trait.camel.apache.org/container.image":
"docker.io/jmalloc/echo-server:0.3.2",
+ "trait.camel.apache.org/jvm.enabled": "false",
+ "trait.camel.apache.org/kamelets.enabled": "false",
+ "trait.camel.apache.org/dependencies.enabled": "false",
+ "test": "1",
+ }
+ annotations2 := map[string]string{
+ "trait.camel.apache.org/container.image":
"docker.io/jmalloc/echo-server:0.3.3",
+ "trait.camel.apache.org/jvm.enabled": "false",
+ "trait.camel.apache.org/kamelets.enabled": "false",
+ "trait.camel.apache.org/dependencies.enabled": "false",
+ "test": "2",
+ }
+
+ t.Run("run with initial image", func(t *testing.T) {
+ expectedImage :=
annotations1["trait.camel.apache.org/container.image"]
+
+ RegisterTestingT(t)
+
+ Expect(BindKameletTo(ns, bindingID, annotations1, from,
to, emptyMap, emptyMap)()).
+ To(Succeed())
+ Eventually(IntegrationGeneration(ns, bindingID)).
+ Should(gstruct.PointTo(BeNumerically("==", 1)))
+ Eventually(IntegrationAnnotations(ns, bindingID)).
+ Should(HaveKeyWithValue("test", "1"))
+ Eventually(IntegrationAnnotations(ns, bindingID)).
+
Should(HaveKeyWithValue("trait.camel.apache.org/container.image",
expectedImage))
+ Eventually(IntegrationStatusImage(ns, bindingID)).
+ Should(Equal(expectedImage))
+
+ Eventually(IntegrationPodPhase(ns, bindingID),
TestTimeoutLong).
+ Should(Equal(corev1.PodRunning))
+ Eventually(IntegrationPodImage(ns, bindingID)).
+ Should(Equal(expectedImage))
+ })
+
+ t.Run("run with new image", func(t *testing.T) {
+ expectedImage :=
annotations2["trait.camel.apache.org/container.image"]
+
+ RegisterTestingT(t)
+
+ Expect(BindKameletTo(ns, bindingID, annotations2, from,
to, emptyMap, emptyMap)()).
+ To(Succeed())
+ Eventually(IntegrationGeneration(ns, bindingID)).
+ Should(gstruct.PointTo(B
[GitHub] [camel-k] lburgazzoli commented on a diff in pull request #3480: fix: camel-k ignores changes to traits configured using annotations
lburgazzoli commented on code in PR #3480:
URL: https://github.com/apache/camel-k/pull/3480#discussion_r936503003
##
pkg/trait/util.go:
##
@@ -29,17 +29,36 @@ import (
user "github.com/mitchellh/go-homedir"
"github.com/pkg/errors"
"github.com/scylladb/go-set/strset"
-
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/metadata"
"github.com/apache/camel-k/pkg/util"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/property"
)
+type Unstructured map[string]map[string]interface{}
Review Comment:
what about just Options ? just because GoLand keep telling me that Trait is
implicit by the package name :)
--
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] 01/01: Some various improvements
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch some-improvements-build-time-properties.adoc
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit ecb85e31d4adf64bf9e063b9935ec1d3471d7512
Author: Nicolas Filotto
AuthorDate: Wed Aug 3 12:31:54 2022 +0200
Some various improvements
* Remove the dev mode flag from the command as it is not required and
brings some noice
* Fix the file name in the command
* Reformulate for clarity
---
docs/modules/ROOT/pages/configuration/build-time-properties.adoc | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/modules/ROOT/pages/configuration/build-time-properties.adoc
b/docs/modules/ROOT/pages/configuration/build-time-properties.adoc
index b1ab7b130..713c3f182 100644
--- a/docs/modules/ROOT/pages/configuration/build-time-properties.adoc
+++ b/docs/modules/ROOT/pages/configuration/build-time-properties.adoc
@@ -18,7 +18,7 @@ from('timer:build-property')
In order to give a value to the `quarkus.application.name` property you can
pass it using the command line with the `--build-property` flag:
-kamel run --build-property=quarkus.application.name=my-super-application
build-property-route.groovy --dev
+kamel run --build-property=quarkus.application.name=my-super-application
build-property-route.groovy
You can provide more than one single `build-property` at once by just adding
the flag repeatedly (ie, `--build-property=prop1=val1
--build-property=prop2=val2 ...`)
@@ -26,7 +26,7 @@ You can provide more than one single `build-property` at once
by just adding the
[[build-time-props-file]]
== Property File
-Repeating the property flag when you have many *build time configuration* may
be cumbersome. Usually you deal with property files instead. You will be able
to use the _file_ syntax available for `--build-property` flag. Here, as an
example you have a property files with 2 `Quarkus` properties:
+Repeating the `--build-property` flag when you have many *build time
configuration* may be cumbersome. Usually you deal with property files instead.
You will be able to use the _file_ syntax available for `--build-property`
flag. Here, as an example you have a property file with 2 `Quarkus` properties:
[source,properties]
.quarkus.properties
@@ -45,7 +45,7 @@ from('timer:build-property')
The `quarkus.banner.enabled` is configured to show the banner during the
`Integration` startup. Let's use `--build-property` flag in conjunction with
file:
-kamel run --build-property=file:quarkus.properties
build-property-file-route.groovy --dev
+kamel run --build-property=file:quarkus.properties build-property-route.groovy
The property file is parsed and its properties configured on the
`Integration`. As soon as the application starts, you will see the log with the
expected configuration.
@@ -58,4 +58,4 @@ If you have a property repeated more than once, the general
rule is that the las
[[build-time-runtime-conf]]
== Run time properties
-If you're looking for *runtime properties configuration* you can look at the
xref:configuration/runtime-properties.adoc[runtime properties] section.
\ No newline at end of file
+If you're looking for *runtime properties configuration* you can look at the
xref:configuration/runtime-properties.adoc[runtime properties] section.
[camel-k] branch some-improvements-build-time-properties.adoc created (now ecb85e31d)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch some-improvements-build-time-properties.adoc in repository https://gitbox.apache.org/repos/asf/camel-k.git at ecb85e31d Some various improvements This branch includes the following new commits: new ecb85e31d Some various improvements 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.
[GitHub] [camel-k] astefanutti commented on a diff in pull request #3480: fix: camel-k ignores changes to traits configured using annotations
astefanutti commented on code in PR #3480:
URL: https://github.com/apache/camel-k/pull/3480#discussion_r936504046
##
pkg/trait/util.go:
##
@@ -29,17 +29,36 @@ import (
user "github.com/mitchellh/go-homedir"
"github.com/pkg/errors"
"github.com/scylladb/go-set/strset"
-
+ metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+ "github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
"github.com/apache/camel-k/pkg/client"
"github.com/apache/camel-k/pkg/metadata"
"github.com/apache/camel-k/pkg/util"
"github.com/apache/camel-k/pkg/util/camel"
"github.com/apache/camel-k/pkg/util/property"
)
+type Unstructured map[string]map[string]interface{}
Review Comment:
Right, `Options` came also to my mind, so that sounds perfect to me :)
--
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] essobedo opened a new pull request, #3507: Some various improvements
essobedo opened a new pull request, #3507: URL: https://github.com/apache/camel-k/pull/3507 * Remove the dev mode flag from the command as it is not required and brings some noice * Fix the file name in the command * Reformulate for clarity -- 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 merged pull request #3952: Add more details to the Jackson ObjectMapper usage section
ppalaga merged PR #3952: URL: https://github.com/apache/camel-quarkus/pull/3952 -- 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] branch main updated: Add more details to the Jackson ObjectMapper usage section
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new f4fcdc7075 Add more details to the Jackson ObjectMapper usage section
f4fcdc7075 is described below
commit f4fcdc70759c1f188656713f531d764f0d703bcc
Author: Peter Palaga
AuthorDate: Tue Aug 2 18:01:57 2022 +0200
Add more details to the Jackson ObjectMapper usage section
---
.../ROOT/pages/reference/extensions/jackson.adoc | 48 +-
extensions/jackson/runtime/src/main/doc/usage.adoc | 48 +-
2 files changed, 76 insertions(+), 20 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/jackson.adoc
b/docs/modules/ROOT/pages/reference/extensions/jackson.adoc
index c3a171043a..0c1a158adf 100644
--- a/docs/modules/ROOT/pages/reference/extensions/jackson.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/jackson.adoc
@@ -56,9 +56,19 @@ You can pass a custom `ObjectMapper` instance to
`JacksonDataFormat` as follows.
[source,java]
-ObjectMapper mapper = new ObjectMapper();
-JacksonDataFormat dataFormat = new JacksonDataFormat();
-dataFormat.setObjectMapper(mapper);
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jackson.JacksonDataFormat;
+
+public class Routes extends RouteBuilder {
+public void configure() {
+ObjectMapper mapper = new ObjectMapper();
+JacksonDataFormat dataFormat = new JacksonDataFormat();
+dataFormat.setObjectMapper(mapper);
+// Use the dataFormat instance in a route definition
+from("direct:my-direct").marshal(dataFormat)
+}
+}
Using the Quarkus Jackson `ObjectMapper` with `JacksonDataFormat`
@@ -67,18 +77,28 @@ The Quarkus Jackson extension exposes an `ObjectMapper` CDI
bean which can be di
[source,java]
-ObjectMapper mapper = new ObjectMapper();
-JacksonDataFormat dataFormat = new JacksonDataFormat();
-// Make JacksonDataFormat discover the Quarkus Jackson `ObjectMapper` from the
Camel registry
-dataFormat.setAutoDiscoverObjectMapper(true);
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jackson.JacksonDataFormat;
+
+public class Routes extends RouteBuilder {
+public void configure() {
+JacksonDataFormat dataFormat = new JacksonDataFormat();
+// Make JacksonDataFormat discover the Quarkus Jackson `ObjectMapper`
from the Camel registry
+dataFormat.setAutoDiscoverObjectMapper(true);
+// Use the dataFormat instance in a route definition
+from("direct:my-direct").marshal(dataFormat)
+}
+}
If you are using the JSON binding mode in the Camel REST DSL and want to use
the Quarkus Jackson `ObjectMapper`, it can be achieved as follows.
[source,java]
+import org.apache.camel.builder.RouteBuilder;
+
@ApplicationScoped
-public class Routes extends RouteBuilder() {
+public class Routes extends RouteBuilder {
public void configure() {
restConfiguration().dataFormatProperty("autoDiscoverObjectMapper",
"true");
// REST definition follows...
@@ -90,6 +110,9 @@ You can perform customizations on the Quarkus `ObjectMapper`
with a `ObjectMappe
[source,java]
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.quarkus.jackson.ObjectMapperCustomizer;
+
@Singleton
public class RegisterCustomModuleCustomizer implements ObjectMapperCustomizer {
public void customize(ObjectMapper mapper) {
@@ -102,15 +125,20 @@ It's also possible to `@Inject` the Quarkus
`ObjectMapper` and pass it to the `J
[source,java]
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jackson.JacksonDataFormat;
+
@ApplicationScoped
-public class Routes extends RouteBuilder() {
+public class Routes extends RouteBuilder {
@Inject
ObjectMapper mapper;
public void configure() {
JacksonDataFormat dataFormat = new JacksonDataFormat();
dataFormat.setObjectMapper(mapper);
-// Routes definition follows...
+// Use the dataFormat instance in a route definition
+from("direct:my-direct").marshal(dataFormat)
}
}
diff --git a/extensions/jackson/runtime/src/main/doc/usage.adoc
b/extensions/jackson/runtime/src/main/doc/usage.adoc
index 58b8061415..a2228710af 100644
--- a/extensions/jackson/runtime/src/main/doc/usage.adoc
+++ b/extensions/jackson/runtime/src/main/doc/usage.adoc
@@ -13,9 +13,19 @@ You can pass a custom `ObjectMapper` instance to
`JacksonDataFormat` as follows.
[source,java]
-ObjectMapper mapper = new ObjectMapper();
-JacksonDataFormat dataFormat = new JacksonDataFormat();
-dataFormat.setObjectMapper(mapper);
+import com.fasterxml.jackson.dat
[camel] branch regen_bot updated (26e426885c4 -> 451b0655674)
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 26e426885c4 Sync deps
add 09549a6719a CAMEL-18339: Java DSL (joor) - Allow compiled classes to
be loadable from anywhere in Camel
add 87fc5e2eeff CAMEL-18339: Java DSL (joor) - Allow compiled classes to
be loadable from anywhere in Camel
add 451b0655674 Regen for commit 87fc5e2eeffbe2b91d7e355b48f5d58fb9ca45d8
No new revisions were added by this update.
Summary of changes:
.../java/org/apache/camel/spi/ClassResolver.java | 7 +
.../camel/impl/engine/DefaultClassResolver.java| 30 +++-
.../ROOT/pages/camel-3x-upgrade-guide-3_19.adoc| 4 +++
.../modules/ROOT/pages/camel-jbang.adoc| 32 --
...ayClassLoader.java => JavaJoorClassLoader.java} | 29 +++-
.../dsl/java/joor/JavaRoutesBuilderLoader.java | 14 ++
6 files changed, 64 insertions(+), 52 deletions(-)
copy
dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/{ByteArrayClassLoader.java
=> JavaJoorClassLoader.java} (60%)
[GitHub] [camel] github-actions[bot] opened a new pull request, #8100: Generated sources regen
github-actions[bot] opened a new pull request, #8100: URL: https://github.com/apache/camel/pull/8100 Regen bot :robot: found some uncommitted 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 #8100: Generated sources regen
davsclaus merged PR #8100: URL: https://github.com/apache/camel/pull/8100 -- 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 87fc5e2eeffbe2b91d7e355b48f5d58fb9ca45d8 (#8100)
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 c91782b328c Regen for commit 87fc5e2eeffbe2b91d7e355b48f5d58fb9ca45d8
(#8100)
c91782b328c is described below
commit c91782b328c30341accad8e7b50dec3a5ed318c8
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Aug 3 12:56:10 2022 +0200
Regen for commit 87fc5e2eeffbe2b91d7e355b48f5d58fb9ca45d8 (#8100)
Signed-off-by: GitHub
Co-authored-by: davsclaus
---
.../java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
index d9b8f630778..7010ec22c03 100644
---
a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
+++
b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
@@ -16,12 +16,12 @@
*/
package org.apache.camel.dsl.java.joor;
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.CompilePostProcessor;
-
import java.util.HashMap;
import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.CompilePostProcessor;
+
public class JavaJoorClassLoader extends ClassLoader implements
CompilePostProcessor {
private final Map> classes = new HashMap<>();
@@ -36,7 +36,8 @@ public class JavaJoorClassLoader extends ClassLoader
implements CompilePostProce
}
@Override
-public void postCompile(CamelContext camelContext, String name, Class
clazz, byte[] byteCode, Object instance) throws Exception {
+public void postCompile(CamelContext camelContext, String name, Class
clazz, byte[] byteCode, Object instance)
+throws Exception {
if (name != null && clazz != null) {
classes.put(name, clazz);
}
[camel] branch camel-3.18.x updated: Regen for commit 87fc5e2eeffbe2b91d7e355b48f5d58fb9ca45d8 (#8100)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new 5aec60378aa Regen for commit 87fc5e2eeffbe2b91d7e355b48f5d58fb9ca45d8
(#8100)
5aec60378aa is described below
commit 5aec60378aa16f1f194be87a73d3c5d74ed4e2f1
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Aug 3 12:56:10 2022 +0200
Regen for commit 87fc5e2eeffbe2b91d7e355b48f5d58fb9ca45d8 (#8100)
Signed-off-by: GitHub
Co-authored-by: davsclaus
---
.../java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
index d9b8f630778..7010ec22c03 100644
---
a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
+++
b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
@@ -16,12 +16,12 @@
*/
package org.apache.camel.dsl.java.joor;
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.CompilePostProcessor;
-
import java.util.HashMap;
import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.CompilePostProcessor;
+
public class JavaJoorClassLoader extends ClassLoader implements
CompilePostProcessor {
private final Map> classes = new HashMap<>();
@@ -36,7 +36,8 @@ public class JavaJoorClassLoader extends ClassLoader
implements CompilePostProce
}
@Override
-public void postCompile(CamelContext camelContext, String name, Class
clazz, byte[] byteCode, Object instance) throws Exception {
+public void postCompile(CamelContext camelContext, String name, Class
clazz, byte[] byteCode, Object instance)
+throws Exception {
if (name != null && clazz != null) {
classes.put(name, clazz);
}
[GitHub] [camel] github-actions[bot] opened a new pull request, #8101: Generated sources regen
github-actions[bot] opened a new pull request, #8101: URL: https://github.com/apache/camel/pull/8101 Regen bot :robot: found some uncommitted 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
[camel] branch regen_bot updated (451b0655674 -> 258a048abb2)
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 451b0655674 Regen for commit 87fc5e2eeffbe2b91d7e355b48f5d58fb9ca45d8 add 58a3b430853 CAMEL-18338: camel-mail - Fix NPE in camel-mail consumer add 258a048abb2 Regen for commit 58a3b430853fb0acc3a094aefcc4ecbf10cf5c5a 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 (451b0655674) \ N -- N -- N refs/heads/regen_bot (258a048abb2) 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/component/mail/MailConsumer.java | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-)
[GitHub] [camel] oscerd merged pull request #8101: Generated sources regen
oscerd merged PR #8101: URL: https://github.com/apache/camel/pull/8101 -- 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/01: Regen for commit 87fc5e2eeffbe2b91d7e355b48f5d58fb9ca45d8 (#8100)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c91782b328c30341accad8e7b50dec3a5ed318c8
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Aug 3 12:56:10 2022 +0200
Regen for commit 87fc5e2eeffbe2b91d7e355b48f5d58fb9ca45d8 (#8100)
Signed-off-by: GitHub
Co-authored-by: davsclaus
---
.../java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
index d9b8f630778..7010ec22c03 100644
---
a/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
+++
b/dsl/camel-java-joor-dsl/src/main/java/org/apache/camel/dsl/java/joor/JavaJoorClassLoader.java
@@ -16,12 +16,12 @@
*/
package org.apache.camel.dsl.java.joor;
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.CompilePostProcessor;
-
import java.util.HashMap;
import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.spi.CompilePostProcessor;
+
public class JavaJoorClassLoader extends ClassLoader implements
CompilePostProcessor {
private final Map> classes = new HashMap<>();
@@ -36,7 +36,8 @@ public class JavaJoorClassLoader extends ClassLoader
implements CompilePostProce
}
@Override
-public void postCompile(CamelContext camelContext, String name, Class
clazz, byte[] byteCode, Object instance) throws Exception {
+public void postCompile(CamelContext camelContext, String name, Class
clazz, byte[] byteCode, Object instance)
+throws Exception {
if (name != null && clazz != null) {
classes.put(name, clazz);
}
[camel] branch main created (now c91782b328c)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git at c91782b328c Regen for commit 87fc5e2eeffbe2b91d7e355b48f5d58fb9ca45d8 (#8100) This branch includes the following new commits: new c91782b328c Regen for commit 87fc5e2eeffbe2b91d7e355b48f5d58fb9ca45d8 (#8100) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] branch main updated: camel-jbang - Hot reload of beans in yaml-dsl
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 06deb217e76 camel-jbang - Hot reload of beans in yaml-dsl
06deb217e76 is described below
commit 06deb217e76fc2f5dce7f7b6ad0568ceb168acbb
Author: Claus Ibsen
AuthorDate: Wed Aug 3 13:14:55 2022 +0200
camel-jbang - Hot reload of beans in yaml-dsl
---
.../org/apache/camel/dsl/yaml/deserializers/BeansDeserializer.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeansDeserializer.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeansDeserializer.java
index 7432d2f38e7..c29a6fc66d7 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeansDeserializer.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeansDeserializer.java
@@ -60,8 +60,11 @@ public class BeansDeserializer extends
YamlDeserializerSupport implements Constr
@Override
public void configure(CamelContext camelContext) {
try {
+// to support hot reloading of beans then we need to
unbind old existing first
+String name = bean.getName();
+camelContext.getRegistry().unbind(name);
camelContext.getRegistry().bind(
-bean.getName(),
+name,
bean.newInstance(camelContext));
} catch (Exception e) {
throw new RuntimeException(e);
[camel] branch camel-3.18.x updated: camel-jbang - Hot reload of beans in yaml-dsl
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new 23b02f9e497 camel-jbang - Hot reload of beans in yaml-dsl
23b02f9e497 is described below
commit 23b02f9e4974dfd0d4f32728de8d06a2fd8b33d6
Author: Claus Ibsen
AuthorDate: Wed Aug 3 13:14:55 2022 +0200
camel-jbang - Hot reload of beans in yaml-dsl
---
.../org/apache/camel/dsl/yaml/deserializers/BeansDeserializer.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeansDeserializer.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeansDeserializer.java
index 7432d2f38e7..c29a6fc66d7 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeansDeserializer.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/main/java/org/apache/camel/dsl/yaml/deserializers/BeansDeserializer.java
@@ -60,8 +60,11 @@ public class BeansDeserializer extends
YamlDeserializerSupport implements Constr
@Override
public void configure(CamelContext camelContext) {
try {
+// to support hot reloading of beans then we need to
unbind old existing first
+String name = bean.getName();
+camelContext.getRegistry().unbind(name);
camelContext.getRegistry().bind(
-bean.getName(),
+name,
bean.newInstance(camelContext));
} catch (Exception e) {
throw new RuntimeException(e);
[GitHub] [camel-quarkus] jamesnetherton opened a new pull request, #3955: Fix intermittent native mode failures of JacksonJsonTest
jamesnetherton opened a new pull request, #3955: URL: https://github.com/apache/camel-quarkus/pull/3955 Otherwise the JSON key ordering is non-deterministic, thus making assertions on the JSON string fail. -- 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] lburgazzoli commented on pull request #3480: fix: camel-k ignores changes to traits configured using annotations
lburgazzoli commented on PR #3480: URL: https://github.com/apache/camel-k/pull/3480#issuecomment-1203846381 > Few comments, otherwise LGTM 👍🏼. Suggestions have been implemented, I guess the overall logging stuff may need to be improved -- 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 (258a048abb2 -> c91782b328c)
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 258a048abb2 Regen for commit 58a3b430853fb0acc3a094aefcc4ecbf10cf5c5a add c91782b328c Regen for commit 87fc5e2eeffbe2b91d7e355b48f5d58fb9ca45d8 (#8100) 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 (258a048abb2) \ N -- N -- N refs/heads/regen_bot (c91782b328c) 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:
[GitHub] [camel] apupier opened a new pull request, #8102: CAMEL-18341 - Upgrade from Codehaus Groovy 3.0.12 to Apache Groovy 4.0.4
apupier opened a new pull request, #8102: URL: https://github.com/apache/camel/pull/8102 Note that groupid of Maven artifact has been modified but not old package names. Thus some package named org.apache.groovy.* have been created. it requires to upgrade Spock to a Milestone version. -- 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] commented on pull request #8102: CAMEL-18341 - Upgrade from Codehaus Groovy 3.0.12 to Apache Groovy 4.0.4
github-actions[bot] commented on PR #8102: URL: https://github.com/apache/camel/pull/8102#issuecomment-1203854232 :warning: This PR changes Camel components and will be tested automatically. -- 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 (c91782b328c -> 06deb217e76)
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 c91782b328c Regen for commit 87fc5e2eeffbe2b91d7e355b48f5d58fb9ca45d8 (#8100) add 06deb217e76 camel-jbang - Hot reload of beans in yaml-dsl No new revisions were added by this update. Summary of changes: .../org/apache/camel/dsl/yaml/deserializers/BeansDeserializer.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-)
[GitHub] [camel-quarkus] zhfeng merged pull request #3953: Increase test coverage (file/http) for camel-quarkus-validator extens…
zhfeng merged PR #3953: URL: https://github.com/apache/camel-quarkus/pull/3953 -- 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] branch main updated: Increase test coverage (file/http) for camel-quarkus-validator extens… (#3953)
This is an automated email from the ASF dual-hosted git repository.
zhfeng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 0ca78b930c Increase test coverage (file/http) for
camel-quarkus-validator extens… (#3953)
0ca78b930c is described below
commit 0ca78b930c66c23018c96106ab0a87e52956e6b4
Author: souvik ghosh
AuthorDate: Wed Aug 3 17:39:37 2022 +0530
Increase test coverage (file/http) for camel-quarkus-validator extens…
(#3953)
* Increase test coverage (file/http) for camel-quarkus-validator extension.
* Add ssl option for https endpoint.
---
.../component/validator/it/ValidatorResource.java | 23 +++--
.../validator/it/ValidatorRouteBuilder.java| 9 +++-
.../src/main/resources/application.properties | 3 +-
.../component/validator/it/ValidatorTest.java | 57 --
4 files changed, 83 insertions(+), 9 deletions(-)
diff --git
a/integration-tests/validator/src/main/java/org/apache/camel/quarkus/component/validator/it/ValidatorResource.java
b/integration-tests/validator/src/main/java/org/apache/camel/quarkus/component/validator/it/ValidatorResource.java
index 4546700906..b8b979cfdb 100644
---
a/integration-tests/validator/src/main/java/org/apache/camel/quarkus/component/validator/it/ValidatorResource.java
+++
b/integration-tests/validator/src/main/java/org/apache/camel/quarkus/component/validator/it/ValidatorResource.java
@@ -32,11 +32,28 @@ public class ValidatorResource {
@Inject
ProducerTemplate producerTemplate;
-@Path("/xml")
+@Path("/classpath")
@POST
@Consumes(MediaType.APPLICATION_XML)
@Produces(MediaType.TEXT_PLAIN)
-public String processOrder(String statement) {
-return producerTemplate.requestBody("direct:start", statement,
String.class);
+public String processOrderInXmlFromClassPath(String statement) {
+return producerTemplate.requestBody("direct:classpath", statement,
String.class);
}
+
+@Path("/filesystem")
+@POST
+@Consumes(MediaType.APPLICATION_XML)
+@Produces(MediaType.TEXT_PLAIN)
+public String processOrderInXmlFromFileSystem(String statement) {
+return producerTemplate.requestBody("direct:filesystem", statement,
String.class);
+}
+
+@Path("/http")
+@POST
+@Consumes(MediaType.APPLICATION_XML)
+@Produces(MediaType.TEXT_PLAIN)
+public String processOrderInXmlFromHTTP(String statement) {
+return producerTemplate.requestBody("direct:http", statement,
String.class);
+}
+
}
diff --git
a/integration-tests/validator/src/main/java/org/apache/camel/quarkus/component/validator/it/ValidatorRouteBuilder.java
b/integration-tests/validator/src/main/java/org/apache/camel/quarkus/component/validator/it/ValidatorRouteBuilder.java
index 2644276bf4..ea64124729 100644
---
a/integration-tests/validator/src/main/java/org/apache/camel/quarkus/component/validator/it/ValidatorRouteBuilder.java
+++
b/integration-tests/validator/src/main/java/org/apache/camel/quarkus/component/validator/it/ValidatorRouteBuilder.java
@@ -21,7 +21,14 @@ import org.apache.camel.builder.RouteBuilder;
public class ValidatorRouteBuilder extends RouteBuilder {
@Override
public void configure() {
-from("direct:start")
+from("direct:classpath")
.to("validator:message.xsd");
+
+from("direct:filesystem")
+.to("validator:file:src/main/resources/message.xsd");
+
+from("direct:http")
+
.toD("validator:https://raw.githubusercontent.com/apache/camel-quarkus/main/integration-tests/validator/src/main/resources/message.xsd";);
+
}
}
diff --git
a/integration-tests/validator/src/main/resources/application.properties
b/integration-tests/validator/src/main/resources/application.properties
index e9ac8a66ba..68644f628d 100644
--- a/integration-tests/validator/src/main/resources/application.properties
+++ b/integration-tests/validator/src/main/resources/application.properties
@@ -15,4 +15,5 @@
## limitations under the License.
## ---
-quarkus.native.additional-build-args
=-H:ResourceConfigurationFiles=resources-config.json
\ No newline at end of file
+quarkus.native.additional-build-args
=-H:ResourceConfigurationFiles=resources-config.json
+quarkus.ssl.native=true
\ No newline at end of file
diff --git
a/integration-tests/validator/src/test/java/org/apache/camel/quarkus/component/validator/it/ValidatorTest.java
b/integration-tests/validator/src/test/java/org/apache/camel/quarkus/component/validator/it/ValidatorTest.java
index cef3012dd1..f5fadcb64e 100644
---
a/integration-tests/validator/src/test/java/org/apache/camel/quarkus/component/validator/it/ValidatorTest.java
+++
b/integration-tests/validator/src/test/java/org/apache/camel/quarkus/co
[camel] branch camel-3.18.x updated: Upgrade to johnzon 1.2.18
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.18.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.18.x by this push: new 9d9ca964017 Upgrade to johnzon 1.2.18 9d9ca964017 is described below commit 9d9ca964017a16201ec3c236dec9710f7ee03f73 Author: Claus Ibsen AuthorDate: Wed Aug 3 14:14:00 2022 +0200 Upgrade to johnzon 1.2.18 --- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 8fcbfb80306..d04aee44d12 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -334,7 +334,7 @@ 5.2.4 2.14.1 2.10.11 -1.2.17 +1.2.18 0.1.7 0.9.14 3.16.8 diff --git a/parent/pom.xml b/parent/pom.xml index d82dd25e842..f7657d1af7f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -324,7 +324,7 @@ 0.9.14 3.16.8 0.9.14 -1.2.17 +1.2.18 0.6.4 0.1.11 2.3.11
[camel] branch main updated: Upgrade to johnzon 1.2.18
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 b90a02f52c5 Upgrade to johnzon 1.2.18 b90a02f52c5 is described below commit b90a02f52c5485249d624bc7a7106bb242b42d1c Author: Claus Ibsen AuthorDate: Wed Aug 3 14:14:00 2022 +0200 Upgrade to johnzon 1.2.18 --- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index de4111a592c..07c100f638d 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -334,7 +334,7 @@ 5.2.4 2.15.5 2.10.11 -1.2.17 +1.2.18 0.1.7 0.9.14 3.16.8 diff --git a/parent/pom.xml b/parent/pom.xml index 5fa8851373e..6cf76248dfd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -324,7 +324,7 @@ 0.9.14 3.16.8 0.9.14 -1.2.17 +1.2.18 0.6.4 0.1.11 2.3.11
[GitHub] [camel-spring-boot] apupier opened a new pull request, #604: CAMEL-18341 - Upgrade from Codehaus Groovy 3.0.12 to Apache Groovy 4.0.4
apupier opened a new pull request, #604: URL: https://github.com/apache/camel-spring-boot/pull/604 Currently have this build error: ``` [ERROR] Failed to execute goal org.apache.camel.springboot:camel-spring-boot-generator-maven-plugin:3.19.0-SNAPSHOT:generate-dependencies-bom (default) on project camel-spring-boot-dependencies-generator: Found 4 conflicts between the current managed dependencies and the external BOMS: [ERROR] - org.codehaus.groovy:groovy-ant:jar [ERROR] - org.codehaus.groovy:groovy-jsr223:jar [ERROR] - org.codehaus.groovy:groovy-xml:jar [ERROR] - org.codehaus.groovy:groovy:jar [ERROR] -> [Help 1] ``` I do not find other references in this project. Can it be that it needs to be updated in apache/camel project first? But it will break the build if we start merging the apache/camel and not apache/camel-spring-boot . Wondering how I can test locally with new version of apache/camel, run in offlien mode locally after build of apache/camel? (even if I would have expected that it picked the latest locally built) Or is it a real problem in another project? -- 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] davsclaus closed issue #3503: Passing namespace info for CXF Endpoint in Camel-K YAML DSL
davsclaus closed issue #3503: Passing namespace info for CXF Endpoint in Camel-K YAML DSL URL: https://github.com/apache/camel-k/issues/3503 -- 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-spring-boot] apupier commented on pull request #604: CAMEL-18341 - Upgrade from Codehaus Groovy 3.0.12 to Apache Groovy 4.0.4
apupier commented on PR #604: URL: https://github.com/apache/camel-spring-boot/pull/604#issuecomment-1203882621 (the failur eon the Pull request buidl seems not related to this Pull request) -- 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, #3956: CAMEL-18341 - Upgrade from Codehaus Groovy 3.0.12 to Apache Groovy 4.0.4
apupier opened a new pull request, #3956: URL: https://github.com/apache/camel-quarkus/pull/3956 might worth merging at same time than https://github.com/apache/camel/pull/8102 -- 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 diff in pull request #3953: Increase test coverage (file/http) for camel-quarkus-validator extens…
ppalaga commented on code in PR #3953:
URL: https://github.com/apache/camel-quarkus/pull/3953#discussion_r936617797
##
integration-tests/validator/src/main/resources/application.properties:
##
@@ -15,4 +15,5 @@
## limitations under the License.
## ---
-quarkus.native.additional-build-args
=-H:ResourceConfigurationFiles=resources-config.json
\ No newline at end of file
+quarkus.native.additional-build-args
=-H:ResourceConfigurationFiles=resources-config.json
+quarkus.ssl.native=true
Review Comment:
I see that this is needed for accessing the GitHub https URL. But I wonder
how should we help end users to get around this. Maybe we should just document
it in `usage.adoc`, something like
```
If you are accessing XSD resources via HTTPS (e.g.
`from(...).to("validator:https://acme.org/foo/schema.xsd";)`) than you need to
add `quarkus.ssl.native = true` to your `application.properties`.
```
Hardcoding SSL support (like we do in some other extensions) seems to be an
overkill in this case, IMO. I guess users will mostly use classpath resources.
WDYT @jamesnetherton?
##
integration-tests/validator/src/main/resources/application.properties:
##
@@ -15,4 +15,5 @@
## limitations under the License.
## ---
-quarkus.native.additional-build-args
=-H:ResourceConfigurationFiles=resources-config.json
\ No newline at end of file
+quarkus.native.additional-build-args
=-H:ResourceConfigurationFiles=resources-config.json
Review Comment:
I see that this is an old code, but we could perhaps use this occasion to
change it towards Quarkus way of doing things:
```suggestion
quarkus.native.resources.includes = *.xsd
```
##
integration-tests/validator/src/main/java/org/apache/camel/quarkus/component/validator/it/ValidatorRouteBuilder.java:
##
@@ -21,7 +21,14 @@
public class ValidatorRouteBuilder extends RouteBuilder {
@Override
public void configure() {
-from("direct:start")
+from("direct:classpath")
.to("validator:message.xsd");
+
+from("direct:filesystem")
+.to("validator:file:src/main/resources/message.xsd");
+
+from("direct:http")
+
.toD("validator:https://raw.githubusercontent.com/apache/camel-quarkus/main/integration-tests/validator/src/main/resources/message.xsd";);
Review Comment:
This might be risky for several reasons:
* If we change message.xsd in the future, the tests in older branches may
start failing
* GitHub might be inaccessible in some environments
* GitHub's availability will impact the reliability of this test
I'd vote for serving message.xsd from an ad hoc WireMock server. There are
plenty of examples in the source tree.
##
integration-tests/validator/src/test/java/org/apache/camel/quarkus/component/validator/it/ValidatorTest.java:
##
@@ -25,26 +25,75 @@
class ValidatorTest {
@Test
-public void validXML() {
+public void validXMLFromClassPath() {
RestAssured.given()
.contentType(ContentType.XML)
.body("MyFirstnameMyLastname")
-.post("/validator/xml")
+.post("/validator/classpath")
.then()
.statusCode(200);
}
Review Comment:
I'd vote for having one parameterized test for the valid case and one for
invalid case. The params being `"classpath", "filesystem", "http"`. Just grep
for `@ParameterizedTest` in the source tree to see some examples.
Less code is perhaps easier to maintain.
##
integration-tests/validator/src/main/java/org/apache/camel/quarkus/component/validator/it/ValidatorResource.java:
##
@@ -32,11 +32,28 @@ public class ValidatorResource {
@Inject
ProducerTemplate producerTemplate;
-@Path("/xml")
+@Path("/classpath")
@POST
@Consumes(MediaType.APPLICATION_XML)
@Produces(MediaType.TEXT_PLAIN)
-public String processOrder(String statement) {
-return producerTemplate.requestBody("direct:start", statement,
String.class);
+public String processOrderInXmlFromClassPath(String statement) {
+return producerTemplate.requestBody("direct:classpath", statement,
String.class);
}
+
+@Path("/filesystem")
+@POST
+@Consumes(MediaType.APPLICATION_XML)
+@Produces(MediaType.TEXT_PLAIN)
+public String processOrderInXmlFromFileSystem(String statement) {
+return producerTemplate.requestBody("direct:filesystem", statement,
String.class);
+}
+
+@Path("/http")
+@POST
+@Consumes(MediaType.APPLICATION_XML)
+@Produces(MediaType.TEXT_PLAIN)
+public String processOrderInXmlFromHTTP(String statement) {
+return producerTemplate.requestBody("direct:http", statement,
S
[GitHub] [camel-karaf] apupier opened a new pull request, #177: CAMEL-18341 - Upgrade from Codehaus Groovy 3.0.12 to Apache Groovy 4.0.4
apupier opened a new pull request, #177: URL: https://github.com/apache/camel-karaf/pull/177 might worth merging at same time than https://github.com/apache/camel/pull/8102 wondering if we car about Karaf? The Groovy version wasn't previously upgraded. -- 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] lburgazzoli opened a new pull request, #3508: makefile
lburgazzoli opened a new pull request, #3508: URL: https://github.com/apache/camel-k/pull/3508 - chore: add gitignore directove for platform specific build - fix: force the creation of the build/_maven_output to prevent image building from failing **Release Note** ```release-note NONE ``` -- 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: Upgrade jsonb specs
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 c5a536a35ddd2fda8534efd4f7836fb298771351
Author: Claus Ibsen
AuthorDate: Wed Aug 3 14:44:13 2022 +0200
Upgrade jsonb specs
---
camel-dependencies/pom.xml | 4 ++--
components/camel-jsonb/pom.xml | 2 --
parent/pom.xml | 4 ++--
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 07c100f638d..9a9ec3bb841 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -211,8 +211,8 @@
1.1.1
1.0-alpha-2
1.0-alpha-1
-1.1
-1.0
+1.5
+1.4
1.1.1
1.1.3
1.0.4
diff --git a/components/camel-jsonb/pom.xml b/components/camel-jsonb/pom.xml
index 3c9049658d7..c40778d1c21 100644
--- a/components/camel-jsonb/pom.xml
+++ b/components/camel-jsonb/pom.xml
@@ -40,13 +40,11 @@
org.apache.geronimo.specs
geronimo-json_1.1_spec
${geronimo-json-spec-version}
-compile
org.apache.geronimo.specs
geronimo-jsonb_1.0_spec
${geronimo-jsonb-spec-version}
-compile
diff --git a/parent/pom.xml b/parent/pom.xml
index 6cf76248dfd..438f6e5c7d8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -194,8 +194,8 @@
1.1.1
1.0-alpha-2
1.0-alpha-1
-1.1
-1.0
+1.5
+1.4
1.1.1
1.1.3
1.13.1
[camel-karaf] branch main updated: Upgrade jsonb specs
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-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 76c91fbb Upgrade jsonb specs
76c91fbb is described below
commit 76c91fbb3d54fe97d2d1994302ee57a66613ca41
Author: Claus Ibsen
AuthorDate: Wed Aug 3 14:58:42 2022 +0200
Upgrade jsonb specs
---
platforms/karaf/features/src/main/resources/features.xml | 11 +++
pom.xml | 4 ++--
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 1acfa4ae..19ec7758 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1292,16 +1292,19 @@
wrap:mvn:com.github.jasminb/jsonapi-converter/${jasminb-jsonapi-version}
mvn:org.apache.camel/camel-jsonapi/${project.version}
-
+
camel-core
-mvn:org.ow2.asm/asm-commons/${asm-version}
-mvn:org.ow2.asm/asm-tree/${asm-version}
-mvn:org.ow2.asm/asm/${asm-version}
+mvn:org.ow2.asm/asm/${asm.bundle.version}
+mvn:org.ow2.asm/asm-analysis/${asm.bundle.version}
+mvn:org.ow2.asm/asm-commons/${asm.bundle.version}
+mvn:org.ow2.asm/asm-tree/${asm.bundle.version}
+mvn:org.ow2.asm/asm-util/${asm.bundle.version}
mvn:org.apache.aries/org.apache.aries.util/${aries-util-version}
mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${aries-spifly-version}
wrap:mvn:org.apache.johnzon/johnzon-core/${johnzon-version}
wrap:mvn:org.apache.johnzon/johnzon-mapper/${johnzon-version}
wrap:mvn:org.apache.johnzon/johnzon-jsonb/${johnzon-version}
+mvn:org.apache.geronimo.specs/geronimo-annotation_1.3_spec/1.3
mvn:org.apache.geronimo.specs/geronimo-json_1.1_spec/${geronimo-json-spec-version}
mvn:org.apache.geronimo.specs/geronimo-jsonb_1.0_spec/${geronimo-jsonb-spec-version}
mvn:org.apache.camel/camel-jsonb/${project.version}
diff --git a/pom.xml b/pom.xml
index 433790db..b0dc87e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,8 +118,8 @@
0.8.3
2.1.0
5.0.4
-1.3.0
-8.0.1
+1.3.5
+9.3
1.0.0-final_1
5.2.4_2
1.11-8_1
[camel] 02/02: Upgrade jsonb specs
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 89fcbc9d6f6a6e902a6b6534550fac0fe4452747 Author: Claus Ibsen AuthorDate: Wed Aug 3 14:59:05 2022 +0200 Upgrade jsonb specs --- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 9a9ec3bb841..6e5d5dfc86b 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -46,7 +46,7 @@ 1.3.2 1.10.3 1.1.12 -1.3.4 +1.3.5 1.1.3 1.0.0.CR3 1.6.0.Final diff --git a/parent/pom.xml b/parent/pom.xml index 438f6e5c7d8..2d41914fc5e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -63,7 +63,7 @@ 1.3.2 1.10.3 1.1.12 -1.3.4 +1.3.5 1.1.3 1.0.0.CR3 1.6.0.Final
[GitHub] [camel-k] essobedo merged pull request #3507: Some various improvements
essobedo merged PR #3507: URL: https://github.com/apache/camel-k/pull/3507 -- 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 (b90a02f52c5 -> 89fcbc9d6f6)
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 b90a02f52c5 Upgrade to johnzon 1.2.18 new c5a536a35dd Upgrade jsonb specs new 89fcbc9d6f6 Upgrade jsonb specs 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: camel-dependencies/pom.xml | 6 +++--- components/camel-jsonb/pom.xml | 2 -- parent/pom.xml | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-)
[camel-k] branch main updated (f6dd27022 -> 41c8b88b7)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from f6dd27022 Fix typo in local.adoc (#3505) add 41c8b88b7 Some various improvements (#3507) No new revisions were added by this update. Summary of changes: docs/modules/ROOT/pages/configuration/build-time-properties.adoc | 8 1 file changed, 4 insertions(+), 4 deletions(-)
[camel] branch regen_bot updated (06deb217e76 -> b90a02f52c5)
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 06deb217e76 camel-jbang - Hot reload of beans in yaml-dsl add b90a02f52c5 Upgrade to johnzon 1.2.18 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel-k] 01/01: Some various improvements in dependencies.adoc
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch various-imp-in-dependencies.adoc in repository https://gitbox.apache.org/repos/asf/camel-k.git commit b0eacdd6c1949b528b18d909c22501da2f82ab77 Author: Nicolas Filotto AuthorDate: Wed Aug 3 15:00:32 2022 +0200 Some various improvements in dependencies.adoc --- docs/modules/ROOT/pages/configuration/dependencies.adoc | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/modules/ROOT/pages/configuration/dependencies.adoc b/docs/modules/ROOT/pages/configuration/dependencies.adoc index af90097a6..40062af3b 100644 --- a/docs/modules/ROOT/pages/configuration/dependencies.adoc +++ b/docs/modules/ROOT/pages/configuration/dependencies.adoc @@ -15,12 +15,12 @@ This dependency resolution mechanism is transparent to the user, that will just Automatic resolution is also a nice feature in xref:running/dev-mode.adoc[dev mode], because you are allowed to add all components you need *without exiting the dev loop*. -NOTE: Camel K won't be able to automatically the dependencies when your routes specify dynamic URIs. +NOTE: Camel K won't be able to resolve automatically the dependencies when your routes specify dynamic URIs. [[dependencies-explicit]] == Add explicit dependencies -You can explicitly add dependency using the `-d` flag of the `kamel run` command. This is useful when you need to use dependencies that are not included in the Camel catalog or when the URI of your routes cannot be automatically discovered (see Dynamic URIs). For example: +You can explicitly add dependency using the `-d` flag (short name of the flag `--dependency`) of the `kamel run` command. This is useful when you need to use dependencies that are not included in the Camel catalog or when the URI of your routes cannot be automatically discovered (see Dynamic URIs). For example: ``` kamel run -d mvn:com.google.guava:guava:26.0-jre -d camel:http Integration.java @@ -51,7 +51,7 @@ Note that if your dependencies belong to a private repository, this repository n kamel run -d file://path/to/integration-dep.jar Integration.java ``` -The contents `integration-dep.jar` will then be accessible in your integration for you to use. +The content of `integration-dep.jar` will then be accessible in your integration for you to use. You can also specify data files to be mounted in the running container: @@ -84,12 +84,12 @@ gitee:user/repo/version azure:user/repo/version ``` -The `version` can be omitted when you are willing to use the `main` branch. Otherwise it will represent the branch or tag used in the project repo. You can have a look at the https://github.com/apache/camel-k/tree/main/examples/jitpack[Camel K Jitpack example] to have a complete experience about how to include a dependency with this mechanism. +The `version` can be omitted when you are willing to use the `main` branch. Otherwise it will represent the branch or tag used in the project repo. [[dependencies-dynamic]] == Dynamic URIs -Unfortunately, Camel K won't be able to always discover all your dependencies. When you are creating an URI dynamically, then you will also need to instruct Camel K on which is the expected component to load (via `-d` parameter). An example is illustrated in the following code snippet: +Unfortunately, Camel K won't be able to always discover all your dependencies. When you are creating an URI dynamically, then you will also need to instruct Camel K which component to load (via `-d` parameter). An example is illustrated in the following code snippet: [source,java] .DynamicURI.java
[camel-k] branch various-imp-in-dependencies.adoc created (now b0eacdd6c)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch various-imp-in-dependencies.adoc in repository https://gitbox.apache.org/repos/asf/camel-k.git at b0eacdd6c Some various improvements in dependencies.adoc This branch includes the following new commits: new b0eacdd6c Some various improvements in dependencies.adoc 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.
[GitHub] [camel-k] essobedo opened a new pull request, #3509: Some various improvements in dependencies.adoc
essobedo opened a new pull request, #3509: URL: https://github.com/apache/camel-k/pull/3509 * Adds the missing word * Indicates the complete name of the dependency flag * Removes the sentence about the example of jitpack as it doesn't exist anymore * Reformulates unclear sentences -- 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 camel-kamelet-yaml-dsl created (now 1b9e49af107)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch camel-kamelet-yaml-dsl in repository https://gitbox.apache.org/repos/asf/camel.git at 1b9e49af107 Camel-Jbang Export Command: Add Camel-Quarkus-Yaml-DSL in case of Camel-Kamelets usage This branch includes the following new commits: new 1b9e49af107 Camel-Jbang Export Command: Add Camel-Quarkus-Yaml-DSL in case of Camel-Kamelets usage 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.
[GitHub] [camel] oscerd opened a new pull request, #8103: Camel-Jbang Export Command: Add Camel-Quarkus-Yaml-DSL in case of Cam…
oscerd opened a new pull request, #8103: URL: https://github.com/apache/camel/pull/8103 …el-Kamelets usage cc @davsclaus -- 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/01: Camel-Jbang Export Command: Add Camel-Quarkus-Yaml-DSL in case of Camel-Kamelets usage
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-kamelet-yaml-dsl
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1b9e49af107283ce895e842b530495f95852af2b
Author: Andrea Cosentino
AuthorDate: Wed Aug 3 15:03:06 2022 +0200
Camel-Jbang Export Command: Add Camel-Quarkus-Yaml-DSL in case of
Camel-Kamelets usage
---
.../org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
index 025e6e706f2..236fef44c5e 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
@@ -221,6 +221,12 @@ class ExportQuarkus extends Export {
sb.append("
").append(v).append("\n");
}
sb.append("\n");
+if (aid.equalsIgnoreCase("camel-kamelets")) {
+sb.append("\n");
+sb.append("
").append("org.apache.camel.quarkus").append("\n");
+sb.append("
").append("camel-quarkus-yaml-dsl").append("\n");
+sb.append("\n");
+}
}
context = context.replaceFirst("\\{\\{ \\.CamelDependencies }}",
sb.toString());
@@ -290,7 +296,7 @@ class ExportQuarkus extends Export {
// re-create answer with the classloader that loaded
quarkus to be able to load resources in this catalog
Class clazz2
=
main.getCamelContext().getClassResolver().resolveClass(DEFAULT_CAMEL_CATALOG,
-CamelCatalog.class);
+CamelCatalog.class);
answer =
main.getCamelContext().getInjector().newInstance(clazz2);
answer.setRuntimeProvider(provider);
// use classloader that loaded quarkus provider to
ensure we can load its resources
[GitHub] [camel-spring-boot] davsclaus commented on pull request #604: CAMEL-18341 - Upgrade from Codehaus Groovy 3.0.12 to Apache Groovy 4.0.4
davsclaus commented on PR #604: URL: https://github.com/apache/camel-spring-boot/pull/604#issuecomment-1203924105 There is some "weird" code somewhere in camel-spring-boot that aligns camel dependency versions vs spring boot versions and then fail if something is not aligned. So it seems that spring boot groovy is on 3.x and when you upgrade to 4.x they dont match. -- 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-spring-boot] apupier commented on pull request #604: CAMEL-18341 - Upgrade from Codehaus Groovy 3.0.12 to Apache Groovy 4.0.4
apupier commented on PR #604: URL: https://github.com/apache/camel-spring-boot/pull/604#issuecomment-1203929147  So would mean that Spring Boot would need to upgrade to groovy 4.x before we can upgrade in Camel? -- 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-jbang - Export should include camel-yaml-dsl if using kamelets, eg if you use Java routes with kamelets then yaml-dsl was missing before. Thanks to Andrea for report
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 34743298ad4 camel-jbang - Export should include camel-yaml-dsl if
using kamelets, eg if you use Java routes with kamelets then yaml-dsl was
missing before. Thanks to Andrea for reporting this.
34743298ad4 is described below
commit 34743298ad4fe64d9307baf2ec9297c78de04d84
Author: Claus Ibsen
AuthorDate: Wed Aug 3 15:10:53 2022 +0200
camel-jbang - Export should include camel-yaml-dsl if using kamelets, eg if
you use Java routes with kamelets then yaml-dsl was missing before. Thanks to
Andrea for reporting this.
---
.../apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index fbea0d9650a..bf0e11c1cb9 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -163,13 +163,19 @@ abstract class ExportBaseCommand extends CamelCommand {
answer.add(v);
}
if (v != null && v.contains("org.apache.camel:camel-kamelet"))
{
-// include kamelet catalog if we use kamelets
+// include yaml-dsl and kamelet catalog if we use kamelets
+answer.add("camel:yaml-dsl");
answer.add("org.apache.camel.kamelets:camel-kamelets:" +
kameletsVersion);
}
} else if (line.startsWith("camel.jbang.dependencies=")) {
String deps = StringHelper.after(line,
"camel.jbang.dependencies=");
for (String d : deps.split(",")) {
answer.add(d.trim());
+if (d.contains("org.apache.camel:camel-kamelet")) {
+// include yaml-dsl and kamelet catalog if we use
kamelets
+answer.add("camel:yaml-dsl");
+answer.add("org.apache.camel.kamelets:camel-kamelets:"
+ kameletsVersion);
+}
}
} else if (line.startsWith("camel.main.routesIncludePattern=")) {
String routes = StringHelper.after(line,
"camel.main.routesIncludePattern=");
[GitHub] [camel-spring-boot] apupier commented on pull request #604: CAMEL-18341 - Upgrade from Codehaus Groovy 3.0.12 to Apache Groovy 4.0.4
apupier commented on PR #604: URL: https://github.com/apache/camel-spring-boot/pull/604#issuecomment-1203931978 sounds they did it for Spring 3.x https://github.com/spring-projects/spring-boot/issues/31631 -- 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 #8103: Camel-Jbang Export Command: Add Camel-Quarkus-Yaml-DSL in case of Cam…
davsclaus commented on PR #8103: URL: https://github.com/apache/camel/pull/8103#issuecomment-1203932207 Yeah this is a great fix but its limited to quarkus only. I found a way to make it generic https://github.com/apache/camel/commit/34743298ad4fe64d9307baf2ec9297c78de04d84 -- 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] oscerd commented on pull request #8103: Camel-Jbang Export Command: Add Camel-Quarkus-Yaml-DSL in case of Cam…
oscerd commented on PR #8103: URL: https://github.com/apache/camel/pull/8103#issuecomment-1203935039 Great -- 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] oscerd closed pull request #8103: Camel-Jbang Export Command: Add Camel-Quarkus-Yaml-DSL in case of Cam…
oscerd closed pull request #8103: Camel-Jbang Export Command: Add Camel-Quarkus-Yaml-DSL in case of Cam… URL: https://github.com/apache/camel/pull/8103 -- 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 imp-in-runtime-properties.adoc created (now d0169e33c)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch imp-in-runtime-properties.adoc in repository https://gitbox.apache.org/repos/asf/camel-k.git at d0169e33c Some improvements in runtime-properties.adoc This branch includes the following new commits: new d0169e33c Some improvements in runtime-properties.adoc 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-k] 01/01: Some improvements in runtime-properties.adoc
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch imp-in-runtime-properties.adoc
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit d0169e33c14de627c69447c0953521134e6ff045
Author: Nicolas Filotto
AuthorDate: Wed Aug 3 15:14:28 2022 +0200
Some improvements in runtime-properties.adoc
---
docs/modules/ROOT/pages/configuration/runtime-properties.adoc | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/modules/ROOT/pages/configuration/runtime-properties.adoc
b/docs/modules/ROOT/pages/configuration/runtime-properties.adoc
index 69b7d338d..c65b5efb2 100644
--- a/docs/modules/ROOT/pages/configuration/runtime-properties.adoc
+++ b/docs/modules/ROOT/pages/configuration/runtime-properties.adoc
@@ -18,7 +18,7 @@ from('timer:property')
The simplest way to replace that variable with a real value is to use the
`--property` flag (also shortcut by `-p`):
-kamel run -p my.message=test-property property-route.groovy --dev
+kamel run -p my.message=test-property property-route.groovy
At runtime, that variable will be substituted by the value you've provided.
You can provide more than one single `property` at once by just adding the flag
repeatedly (ie, `--property prop1=val1 --property prop2=val2 ...`)
@@ -36,7 +36,7 @@ from('timer:property?period={{triggerPeriod}}')
The simplest way to replace that variable with a real value is to use the
`--property` flag (also shortcut by `-p`):
-kamel run -p my.message=test-property -p triggerPeriod=3000
property-route.groovy --dev
+kamel run -p my.message=test-property -p triggerPeriod=3000
property-route.groovy
[[runtime-props-file]]
@@ -52,7 +52,7 @@ my.key.2=world
[source,groovy]
-.build-property-route.groovy
+.property-route.groovy
from('timer:property-file')
.routeId('property-file')
@@ -62,7 +62,7 @@ from('timer:property-file')
You'll need to provide a `property` _file_ flag when launching the application:
-// kamel run --property file:my.properties property-file-route.groovy --dev
+kamel run --property file:my.properties property-route.groovy
The property file is parsed and its properties configured on the
`Integration`. As soon as the application starts, you will see the log with the
expected configuration.
[GitHub] [camel-k] essobedo opened a new pull request, #3510: Some improvements in runtime-properties.adoc
essobedo opened a new pull request, #3510: URL: https://github.com/apache/camel-k/pull/3510 * Remove the dev mode flag from the command as it is not required and brings some noice * Fix the file name in the command -- 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 camel-3.18.x updated: camel-jbang - Export should include camel-yaml-dsl if using kamelets, eg if you use Java routes with kamelets then yaml-dsl was missing before. Thanks to Andrea fo
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.18.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.18.x by this push:
new 93f5a807780 camel-jbang - Export should include camel-yaml-dsl if
using kamelets, eg if you use Java routes with kamelets then yaml-dsl was
missing before. Thanks to Andrea for reporting this.
93f5a807780 is described below
commit 93f5a807780f963f28f1b05d58a0d77308bd079d
Author: Claus Ibsen
AuthorDate: Wed Aug 3 15:10:53 2022 +0200
camel-jbang - Export should include camel-yaml-dsl if using kamelets, eg if
you use Java routes with kamelets then yaml-dsl was missing before. Thanks to
Andrea for reporting this.
---
.../apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index 7936c970f98..128405b1966 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -163,13 +163,19 @@ abstract class ExportBaseCommand extends CamelCommand {
answer.add(v);
}
if (v != null && v.contains("org.apache.camel:camel-kamelet"))
{
-// include kamelet catalog if we use kamelets
+// include yaml-dsl and kamelet catalog if we use kamelets
+answer.add("camel:yaml-dsl");
answer.add("org.apache.camel.kamelets:camel-kamelets:" +
kameletsVersion);
}
} else if (line.startsWith("camel.jbang.dependencies=")) {
String deps = StringHelper.after(line,
"camel.jbang.dependencies=");
for (String d : deps.split(",")) {
answer.add(d.trim());
+if (d.contains("org.apache.camel:camel-kamelet")) {
+// include yaml-dsl and kamelet catalog if we use
kamelets
+answer.add("camel:yaml-dsl");
+answer.add("org.apache.camel.kamelets:camel-kamelets:"
+ kameletsVersion);
+}
}
} else if (line.startsWith("camel.main.routesIncludePattern=")) {
String routes = StringHelper.after(line,
"camel.main.routesIncludePattern=");
[GitHub] [camel-spring-boot] davsclaus commented on pull request #604: CAMEL-18341 - Upgrade from Codehaus Groovy 3.0.12 to Apache Groovy 4.0.4
davsclaus commented on PR #604: URL: https://github.com/apache/camel-spring-boot/pull/604#issuecomment-1203941648 Yes we need both quarkus and spring boot to upgrade to groovy 4 -- 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] christophd commented on pull request #3508: makefile
christophd commented on PR #3508: URL: https://github.com/apache/camel-k/pull/3508#issuecomment-1203948322 creating the `build/_maven_ouptut` directory should be part of `maven-overlay` (https://github.com/apache/camel-k/blob/main/script/Makefile#L381) which is actually called as part of `make images`. So I really wonder why this did not work for you -- 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-spring-boot] apupier commented on pull request #604: CAMEL-18341 - Upgrade from Codehaus Groovy 3.0.12 to Apache Groovy 4.0.4
apupier commented on PR #604: URL: https://github.com/apache/camel-spring-boot/pull/604#issuecomment-1203951186 reported https://github.com/quarkusio/quarkus/issues/27111 for Quarkus -- 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] essobedo merged pull request #3510: Some improvements in runtime-properties.adoc
essobedo merged PR #3510: URL: https://github.com/apache/camel-k/pull/3510 -- 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: Some improvements in runtime-properties.adoc (#3510)
This is an automated email from the ASF dual-hosted git repository.
nfilotto 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 da519c515 Some improvements in runtime-properties.adoc (#3510)
da519c515 is described below
commit da519c5159e68910a73403b6800745cbae89aa88
Author: Nicolas Filotto
AuthorDate: Wed Aug 3 15:39:55 2022 +0200
Some improvements in runtime-properties.adoc (#3510)
* Remove the dev mode flag from the command as it is not required and
brings some noice
* Fix the file name in the command
---
docs/modules/ROOT/pages/configuration/runtime-properties.adoc | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/modules/ROOT/pages/configuration/runtime-properties.adoc
b/docs/modules/ROOT/pages/configuration/runtime-properties.adoc
index 69b7d338d..c65b5efb2 100644
--- a/docs/modules/ROOT/pages/configuration/runtime-properties.adoc
+++ b/docs/modules/ROOT/pages/configuration/runtime-properties.adoc
@@ -18,7 +18,7 @@ from('timer:property')
The simplest way to replace that variable with a real value is to use the
`--property` flag (also shortcut by `-p`):
-kamel run -p my.message=test-property property-route.groovy --dev
+kamel run -p my.message=test-property property-route.groovy
At runtime, that variable will be substituted by the value you've provided.
You can provide more than one single `property` at once by just adding the flag
repeatedly (ie, `--property prop1=val1 --property prop2=val2 ...`)
@@ -36,7 +36,7 @@ from('timer:property?period={{triggerPeriod}}')
The simplest way to replace that variable with a real value is to use the
`--property` flag (also shortcut by `-p`):
-kamel run -p my.message=test-property -p triggerPeriod=3000
property-route.groovy --dev
+kamel run -p my.message=test-property -p triggerPeriod=3000
property-route.groovy
[[runtime-props-file]]
@@ -52,7 +52,7 @@ my.key.2=world
[source,groovy]
-.build-property-route.groovy
+.property-route.groovy
from('timer:property-file')
.routeId('property-file')
@@ -62,7 +62,7 @@ from('timer:property-file')
You'll need to provide a `property` _file_ flag when launching the application:
-// kamel run --property file:my.properties property-file-route.groovy --dev
+kamel run --property file:my.properties property-route.groovy
The property file is parsed and its properties configured on the
`Integration`. As soon as the application starts, you will see the log with the
expected configuration.
[GitHub] [camel] klease merged pull request #8015: CAMEL-18275: Address issue of completions not being run in SEDA pipeline
klease merged PR #8015: URL: https://github.com/apache/camel/pull/8015 -- 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-18275: Address issue of completions not being run in SEDA pipeline (#8015)
This is an automated email from the ASF dual-hosted git repository.
klease 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 fd98cd3d50d CAMEL-18275: Address issue of completions not being run in
SEDA pipeline (#8015)
fd98cd3d50d is described below
commit fd98cd3d50d1c72f79457ef50d96a27ec8e5e5be
Author: klease <38634989+kle...@users.noreply.github.com>
AuthorDate: Wed Aug 3 15:40:18 2022 +0200
CAMEL-18275: Address issue of completions not being run in SEDA pipeline
(#8015)
When synchronizations are handed over, add a method to allow some
housekeeping
to be performed. In the
OnCompletionProcessor.OnCompletionSynchronizationAfterConsumer
this method stores the routeId on the Exchange.
---
.../apache/camel/spi/SynchronizationVetoable.java| 9 +
.../apache/camel/impl/engine/DefaultUnitOfWork.java | 7 ++-
.../camel/processor/OnCompletionProcessor.java | 20
.../apache/camel/support/SynchronizationAdapter.java | 5 +
4 files changed, 40 insertions(+), 1 deletion(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/SynchronizationVetoable.java
b/core/camel-api/src/main/java/org/apache/camel/spi/SynchronizationVetoable.java
index 167ae544037..87270e87d3c 100644
---
a/core/camel-api/src/main/java/org/apache/camel/spi/SynchronizationVetoable.java
+++
b/core/camel-api/src/main/java/org/apache/camel/spi/SynchronizationVetoable.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.spi;
+import org.apache.camel.Exchange;
+
/**
* A vetoable {@link org.apache.camel.spi.Synchronization}.
*
@@ -40,4 +42,11 @@ public interface SynchronizationVetoable extends
Synchronization {
* @return true to allow handover, false to deny.
*/
boolean allowHandover();
+
+/**
+ * A method to perform optional housekeeping when a Synchronization is
being handed over.
+ *
+ * @param target The Exchange to which the synchronizations are being
transferred.
+ */
+void beforeHandover(Exchange target);
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
index fa8c5c75f19..9580c258a6f 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
@@ -210,14 +210,19 @@ public class DefaultUnitOfWork implements UnitOfWork {
Synchronization synchronization = it.next();
boolean handover = true;
+SynchronizationVetoable veto = null;
if (synchronization instanceof SynchronizationVetoable) {
-SynchronizationVetoable veto = (SynchronizationVetoable)
synchronization;
+veto = (SynchronizationVetoable) synchronization;
handover = veto.allowHandover();
}
if (handover && (filter == null || filter.test(synchronization))) {
log.trace("Handover synchronization {} to: {}",
synchronization, target);
target.adapt(ExtendedExchange.class).addOnCompletion(synchronization);
+// Allow the synchronization to do housekeeping before transfer
+if (veto != null) {
+veto.beforeHandover(target);
+}
// remove it if its handed over
it.remove();
} else {
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
index 8261aa451ec..8607957db2e 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/OnCompletionProcessor.java
@@ -368,6 +368,26 @@ public class OnCompletionProcessor extends
AsyncProcessorSupport implements Trac
return "onFailureOnly";
}
}
+
+@Override
+public void beforeHandover(Exchange target) {
+// The onAfterRoute method will not be called after the handover
+// To ensure that completions are called, remember the route IDs
here.
+// Assumption: the fromRouteId on the target Exchange is the route
+// which owns the completion
+LOG.debug("beforeHandover from Route {}", target.getFromRouteId());
+final String exchangeRouteId = target.getFromRouteId();
+if (routeScoped && exchangeRouteId != null &&
exchangeRouteId.equals(routeId)) {
+List routeIds =
target.getProperty(ExchangePropertyKey.ON_COMPLETION_ROUTE_IDS, List.class);
+
[GitHub] [camel-k] christophd commented on pull request #3508: makefile
christophd commented on PR #3508: URL: https://github.com/apache/camel-k/pull/3508#issuecomment-1203970014 sorry I overlooked the detail that it is `_maven_output` instead of `_maven_overlay` -- 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 commented on pull request #3956: CAMEL-18341 - Upgrade from Codehaus Groovy 3.0.12 to Apache Groovy 4.0.4
apupier commented on PR #3956: URL: https://github.com/apache/camel-quarkus/pull/3956#issuecomment-1203987911 I do not understand why it complains about uncommited files. ``` Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: poms/bom/src/main/generated/flattened-full-pom.xml modified: poms/bom/src/main/generated/flattened-reduced-pom.xml modified: poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml ``` the mentioned files have a lot of modifications. i tried to run the build locally again and I do not have other 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 regen_bot updated (b90a02f52c5 -> 89fcbc9d6f6)
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 b90a02f52c5 Upgrade to johnzon 1.2.18 add c5a536a35dd Upgrade jsonb specs add 89fcbc9d6f6 Upgrade jsonb specs No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 6 +++--- components/camel-jsonb/pom.xml | 2 -- parent/pom.xml | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-)
[GitHub] [camel-k] lburgazzoli opened a new pull request, #3511: re-deployment strategies
lburgazzoli opened a new pull request, #3511: URL: https://github.com/apache/camel-k/pull/3511 **Release Note** ```release-note NONE ``` -- 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
