[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-1304724094 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 3402616909-927-2f002118-14ad-458b-8b1e-a57c3239156f * Camel Quarkus Commit: 06516123baef6ecee202ac19a84719c09c05ab21 * Quarkus Main Commit: 37338d3d106e294dc82126d8dc3449112ea54b1d * Link to build: https://github.com/apache/camel-quarkus/actions/runs/3402616909 -- 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-karaf] branch automatic-periodic-sync updated (faba0030 -> 36b6b74c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-karaf.git from faba0030 Regen add 36b6b74c Regen No new revisions were added by this update. Summary of changes: .../resources/org/apache/camel/catalog/karaf/components/controlbus.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel-spring-boot] branch automatic-periodic-sync updated (dad0bb9832e -> 7d510d121a8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from dad0bb9832e [create-pull-request] automated change add 7d510d121a8 Regen No new revisions were added by this update. Summary of changes: .../camel/springboot/catalog/components/controlbus.json| 2 +- .../camel/springboot/catalog/components/vertx-http.json| 1 + .../camel-vertx-http-starter/src/main/docs/vertx-http.json | 6 ++ .../http/springboot/VertxHttpComponentConfiguration.java | 14 ++ .../vertx/http/springboot/VertxHttpComponentConverter.java | 2 ++ 5 files changed, 24 insertions(+), 1 deletion(-)
[camel] branch regen_bot_3.14.x updated (d0c1670430d -> e930575e85f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git omit d0c1670430d Regen for commit 14a14d8798889a29868f1c09ff3e2a4b12a6b800 add e930575e85f Regen for commit 14a14d8798889a29868f1c09ff3e2a4b12a6b800 (#8674) 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 (d0c1670430d) \ N -- N -- N refs/heads/regen_bot_3.14.x (e930575e85f) 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:
[camel] branch regen_bot updated (0b54db231d2 -> 893e749ab81)
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 0b54db231d2 camel-jbang - Add command to output dependency tree. add 893e749ab81 CAMEL-18676: camel-jbang: does not add camel-openapi-java component when required No new revisions were added by this update. Summary of changes: .../DependencyDownloaderClassResolver.java | 33 +- .../camel-main-known-dependencies.properties | 1 + 2 files changed, 33 insertions(+), 1 deletion(-)
[GitHub] [camel] github-actions[bot] commented on pull request #8661: [CAMEL-18646] Provide custom configuration
github-actions[bot] commented on PR #8661: URL: https://github.com/apache/camel/pull/8661#issuecomment-1304649926 ### Components tested: | Total | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | --- | | 1 | 1 | 0 | 1 | -- 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 #8661: [CAMEL-18646] Provide custom configuration
github-actions[bot] commented on PR #8661: URL: https://github.com/apache/camel/pull/8661#issuecomment-1304647711 ### Components tested: | Total | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | --- | | 10 | 10 | 1 | 10 | -- 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 (db3925713e8 -> 0b54db231d2)
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 db3925713e8 camel-jbang - Add command to output dependency tree. add 0b54db231d2 camel-jbang - Add command to output dependency tree. No new revisions were added by this update. Summary of changes: docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
[camel] branch regen_bot updated (1587657e25f -> db3925713e8)
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 1587657e25f CAMEL-18690: camel-jbang - export package name with special symbols add db3925713e8 camel-jbang - Add command to output dependency tree. No new revisions were added by this update. Summary of changes: .../modules/ROOT/pages/camel-jbang.adoc| 112 +++ .../dsl/jbang/core/commands/CamelJBangMain.java| 1 + .../dsl/jbang/core/commands/DependencyTree.java| 214 + .../camel/dsl/jbang/core/commands/Export.java | 34 +++- .../dsl/jbang/core/commands/ExportBaseCommand.java | 4 + .../dsl/jbang/core/commands/ExportCamelMain.java | 14 +- .../dsl/jbang/core/commands/ExportQuarkus.java | 14 +- .../dsl/jbang/core/commands/ExportSpringBoot.java | 14 +- 8 files changed, 388 insertions(+), 19 deletions(-) create mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyTree.java
[GitHub] [camel] github-actions[bot] commented on pull request #8661: [CAMEL-18646] Provide custom configuration
github-actions[bot] commented on PR #8661: URL: https://github.com/apache/camel/pull/8661#issuecomment-1304646280 ### Components tested: | Total | Tested | Failed :x: | Passed :white_check_mark: | | --- | --- | --- | --- | | 1 | 1 | 0 | 1 | -- 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 #8674: Generated sources regen
davsclaus merged PR #8674: URL: https://github.com/apache/camel/pull/8674 -- 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-18676: camel-jbang: does not add camel-openapi-java component when required
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 422688d15e2 CAMEL-18676: camel-jbang: does not add camel-openapi-java
component when required
422688d15e2 is described below
commit 422688d15e26da2592cbc461cbb864f5c63ea3d8
Author: Claus Ibsen
AuthorDate: Sat Nov 5 22:31:48 2022 +0100
CAMEL-18676: camel-jbang: does not add camel-openapi-java component when
required
---
.../DependencyDownloaderClassResolver.java | 33 +-
.../camel-main-known-dependencies.properties | 1 +
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderClassResolver.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderClassResolver.java
index fb5a9473802..0e662c0e181 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderClassResolver.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderClassResolver.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.main.download;
+import java.io.InputStream;
+
import org.apache.camel.CamelContext;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.util.ObjectHelper;
@@ -32,6 +34,35 @@ public final class DependencyDownloaderClassResolver extends
DefaultClassResolve
this.knownDependenciesResolver = knownDependenciesResolver;
}
+@Override
+public InputStream loadResourceAsStream(String uri) {
+InputStream answer = null;
+try {
+answer = super.loadResourceAsStream(uri);
+} catch (Exception e) {
+// uri cannot be loaded, likely need maven GAV
+}
+
+if (answer == null) {
+// okay maybe the class is from a known GAV that we can download
first and then load the class
+MavenGav gav = knownDependenciesResolver.mavenGavForClass(uri);
+if (gav != null) {
+if (!downloader.alreadyOnClasspath(gav.getGroupId(),
gav.getArtifactId(),
+gav.getVersion())) {
+downloader.downloadDependency(gav.getGroupId(),
gav.getArtifactId(),
+gav.getVersion());
+}
+try {
+answer = super.loadResourceAsStream(uri);
+} catch (Exception e) {
+// ignore
+}
+}
+}
+
+return answer;
+}
+
@Override
protected Class loadClass(String name, ClassLoader loader) {
Class answer = null;
@@ -53,7 +84,7 @@ public final class DependencyDownloaderClassResolver extends
DefaultClassResolve
try {
answer = ObjectHelper.loadClass(name, loader);
} catch (Exception e) {
-// class cannot be loaded, likely need maven GAV
+// ignore
}
}
}
diff --git
a/dsl/camel-kamelet-main/src/main/resources/camel-main-known-dependencies.properties
b/dsl/camel-kamelet-main/src/main/resources/camel-main-known-dependencies.properties
index 3928529973b..7341846d26a 100644
---
a/dsl/camel-kamelet-main/src/main/resources/camel-main-known-dependencies.properties
+++
b/dsl/camel-kamelet-main/src/main/resources/camel-main-known-dependencies.properties
@@ -25,3 +25,4 @@ org.apache.qpid.jms.JmsConnectionFactory =
org.apache.qpid:qpid-jms-client:1.0.0
org.postgresql.Driver = org.postgresql:postgresql:42.4.0
org.apache.camel.component.cxf.jaxws.CxfEndpoint = camel:cxf-soap
org.apache.camel.component.cxf.jaxrs.CxfRsEndpoint = camel:cxf-rest
+META-INF/services/org/apache/camel/restapi/openapi = camel:openapi-java
\ No newline at end of file
[camel] branch main updated: CAMEL-18676: camel-jbang: does not add camel-openapi-java component when required
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 893e749ab81 CAMEL-18676: camel-jbang: does not add camel-openapi-java
component when required
893e749ab81 is described below
commit 893e749ab81f69c1bac2bf5b82caf3279829c8f0
Author: Claus Ibsen
AuthorDate: Sat Nov 5 22:31:48 2022 +0100
CAMEL-18676: camel-jbang: does not add camel-openapi-java component when
required
---
.../DependencyDownloaderClassResolver.java | 33 +-
.../camel-main-known-dependencies.properties | 1 +
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderClassResolver.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderClassResolver.java
index fb5a9473802..0e662c0e181 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderClassResolver.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderClassResolver.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.main.download;
+import java.io.InputStream;
+
import org.apache.camel.CamelContext;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.util.ObjectHelper;
@@ -32,6 +34,35 @@ public final class DependencyDownloaderClassResolver extends
DefaultClassResolve
this.knownDependenciesResolver = knownDependenciesResolver;
}
+@Override
+public InputStream loadResourceAsStream(String uri) {
+InputStream answer = null;
+try {
+answer = super.loadResourceAsStream(uri);
+} catch (Exception e) {
+// uri cannot be loaded, likely need maven GAV
+}
+
+if (answer == null) {
+// okay maybe the class is from a known GAV that we can download
first and then load the class
+MavenGav gav = knownDependenciesResolver.mavenGavForClass(uri);
+if (gav != null) {
+if (!downloader.alreadyOnClasspath(gav.getGroupId(),
gav.getArtifactId(),
+gav.getVersion())) {
+downloader.downloadDependency(gav.getGroupId(),
gav.getArtifactId(),
+gav.getVersion());
+}
+try {
+answer = super.loadResourceAsStream(uri);
+} catch (Exception e) {
+// ignore
+}
+}
+}
+
+return answer;
+}
+
@Override
protected Class loadClass(String name, ClassLoader loader) {
Class answer = null;
@@ -53,7 +84,7 @@ public final class DependencyDownloaderClassResolver extends
DefaultClassResolve
try {
answer = ObjectHelper.loadClass(name, loader);
} catch (Exception e) {
-// class cannot be loaded, likely need maven GAV
+// ignore
}
}
}
diff --git
a/dsl/camel-kamelet-main/src/main/resources/camel-main-known-dependencies.properties
b/dsl/camel-kamelet-main/src/main/resources/camel-main-known-dependencies.properties
index 3623a69da45..37e6b499cb4 100644
---
a/dsl/camel-kamelet-main/src/main/resources/camel-main-known-dependencies.properties
+++
b/dsl/camel-kamelet-main/src/main/resources/camel-main-known-dependencies.properties
@@ -25,3 +25,4 @@ org.apache.qpid.jms.JmsConnectionFactory =
org.apache.qpid:qpid-jms-client:1.7.0
org.postgresql.Driver = org.postgresql:postgresql:42.5.0
org.apache.camel.component.cxf.jaxws.CxfEndpoint = camel:cxf-soap
org.apache.camel.component.cxf.jaxrs.CxfRsEndpoint = camel:cxf-rest
+META-INF/services/org/apache/camel/restapi/openapi = camel:openapi-java
\ No newline at end of file
[camel] branch main updated: camel-jbang - Add command to output dependency tree.
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 0b54db231d2 camel-jbang - Add command to output dependency tree. 0b54db231d2 is described below commit 0b54db231d285005368ed4ccdb048aef697c0b01 Author: Claus Ibsen AuthorDate: Sat Nov 5 21:56:59 2022 +0100 camel-jbang - Add command to output dependency tree. --- docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index ca443c4aae9..04a89cb9e30 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -1309,8 +1309,7 @@ The dependency output by default is _vanilla_ Apache Camel with the camel-main a [source,bash] -camel dependency-tree ✘ INT -org.apache.camel:camel-main:3.20.0 +camel dependency-tree org.apache.camel:camel-dsl-modeline:3.20.0 org.apache.camel:camel-health:3.20.0 org.apache.camel:camel-kamelet:3.20.0
[GitHub] [camel-karavan] zetfactor commented on issue #513: java.lang.NullPointerException at org.apache.camel.karavan.service.GitService.getGitConfig(GitService.java:82)
zetfactor commented on issue #513: URL: https://github.com/apache/camel-karavan/issues/513#issuecomment-1304639942 Thanks for the feedback, I changed my environment to Minikube, and followed the deployment instructions, and that null issue is now resolved. -- 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-karavan] zetfactor closed issue #513: java.lang.NullPointerException at org.apache.camel.karavan.service.GitService.getGitConfig(GitService.java:82)
zetfactor closed issue #513: java.lang.NullPointerException at org.apache.camel.karavan.service.GitService.getGitConfig(GitService.java:82) URL: https://github.com/apache/camel-karavan/issues/513 -- 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 - Add command to output dependency tree.
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 db3925713e8 camel-jbang - Add command to output dependency tree. db3925713e8 is described below commit db3925713e858408a4cb4a5ae9f126adb57ad0e9 Author: Claus Ibsen AuthorDate: Sat Nov 5 21:50:29 2022 +0100 camel-jbang - Add command to output dependency tree. --- .../modules/ROOT/pages/camel-jbang.adoc| 112 +++ .../dsl/jbang/core/commands/CamelJBangMain.java| 1 + .../dsl/jbang/core/commands/DependencyTree.java| 214 + .../camel/dsl/jbang/core/commands/Export.java | 34 +++- .../dsl/jbang/core/commands/ExportBaseCommand.java | 4 + .../dsl/jbang/core/commands/ExportCamelMain.java | 14 +- .../dsl/jbang/core/commands/ExportQuarkus.java | 14 +- .../dsl/jbang/core/commands/ExportSpringBoot.java | 14 +- 8 files changed, 388 insertions(+), 19 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index 24892eb42d0..ca443c4aae9 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -1294,6 +1294,118 @@ This make it quick to implement a Camel route for a given operation. See the https://github.com/apache/camel-kamelets-examples/tree/main/jbang/open-api[open-api example] for more details. +== Gathering list of dependencies + +When working with Camel JBang then dependencies are automatically resolved. This means that +you do not have to use a build system like Maven or Gradle to add every Camel components +as a dependency. + +However, you may want to know what dependencies are required to run the Camel integration. +To see this, you can use the `dependency-tree` command. The command output does not output a detailed +tree, such as `mvn dependencies:tree`, as the output is intended to list which Camel components, +and other JARs needed (when using Kamelets). + +The dependency output by default is _vanilla_ Apache Camel with the camel-main as runtime, as shown below: + +[source,bash] + +camel dependency-tree ✘ INT +org.apache.camel:camel-main:3.20.0 +org.apache.camel:camel-dsl-modeline:3.20.0 +org.apache.camel:camel-health:3.20.0 +org.apache.camel:camel-kamelet:3.20.0 +org.apache.camel:camel-log:3.20.0 +org.apache.camel:camel-rest:3.20.0 +org.apache.camel:camel-stream:3.20.0 +org.apache.camel:camel-timer:3.20.0 +org.apache.camel:camel-yaml-dsl:3.20.0 +org.apache.camel.kamelets:camel-kamelets-utils:0.9.3 +org.apache.camel.kamelets:camel-kamelets:0.9.3 + + +The output is by default a line per maven dependency in GAV format (_groupId:artifactId:version_). + +You can also specify the output should be in _Maven format_ as shown: + +[source,bash] + +camel dependency-tree --output=maven + +org.apache.camel +camel-main +3.20.0 + + +org.apache.camel +camel-dsl-modeline +3.20.0 + + +org.apache.camel +camel-health +3.20.0 + + +org.apache.camel +camel-kamelet +3.20.0 + + +org.apache.camel +camel-log +3.20.0 + + +org.apache.camel +camel-rest +3.20.0 + + +org.apache.camel +camel-stream +3.20.0 + + +org.apache.camel +camel-timer +3.20.0 + + +org.apache.camel +camel-yaml-dsl +3.20.0 + + +org.apache.camel.kamelets +camel-kamelets-utils +0.9.3 + + +org.apache.camel.kamelets +camel-kamelets +0.9.3 + + + +You can also choose the target runtime as either _quarkus_ or _spring-boot_ as shown: + +[source,bash] + +camel dependency-tree --runtime=spring-boot +org.springframework.boot:spring-boot-starter-actuator:2.7.5 +org.springframework.boot:spring-boot-starter-web:2.7.5 +org.apache.camel.springboot:camel-spring-boot-engine-starter:3.20.0 +org.apache.camel.springboot:camel-dsl-modeline-starter:3.20.0 +org.apache.camel.springboot:camel-kamelet-starter:3.20.0 +org.apache.camel.springboot:camel-log-starter:3.20.0 +org.apache.camel.springboot:camel-rest-starter:3.20.0 +org.apache.camel.springboot:camel-stream-starter:3.20.0 +org.apache.camel.springboot:camel-timer-starter:3.20.0 +org.apache.camel.springboot:camel-yaml-dsl-starter:3.20 +org.apache.camel.kamelets:camel-kamelets-utils:0.9.3 +org.apache.camel.kamelets:camel-kamelets:0.9.3 + + == Creating Projects You can _export_ your Camel JBang integration to a traditional Java based project such as Spring Boot or Quarkus. diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
[GitHub] [camel] gilvansfilho commented on a diff in pull request #8661: [CAMEL-18646] Provide custom configuration
gilvansfilho commented on code in PR #8661:
URL: https://github.com/apache/camel/pull/8661#discussion_r1014725153
##
components/camel-git/src/main/java/org/apache/camel/component/RepositoryFactory.java:
##
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.camel.component.git.GitEndpoint;
+import org.apache.camel.util.ObjectHelper;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
+import org.eclipse.jgit.util.SystemReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class RepositoryFactory {
+
+private static final Logger LOG =
LoggerFactory.getLogger(RepositoryFactory.class);
+private static final SystemReader DEFAULT_INSTANCE;
+
+static {
+DEFAULT_INSTANCE = SystemReader.getInstance();
+}
+
+private RepositoryFactory() {
+}
+
+public static Repository of(GitEndpoint endpoint) throws IOException {
+if (ObjectHelper.isNotEmpty(endpoint.getGitConfigFile())) {
+return fromPathToConfigFile(endpoint, endpoint.getGitConfigFile());
+}
+return getRepository(endpoint, DEFAULT_INSTANCE);
+}
+
+private static Repository fromPathToConfigFile(GitEndpoint endpoint,
String pathToConfigFile) throws IOException {
+if (ObjectHelper.isEmpty(pathToConfigFile)) {
+throw new IllegalArgumentException("Path to git config file must
be supplied");
+}
+File gitConfigFile;
+if (pathToConfigFile.startsWith("/")) { //load from system
+gitConfigFile = new File(pathToConfigFile);
+} else { //load from resources
+gitConfigFile = new
File(endpoint.getClass().getClassLoader().getResource(pathToConfigFile).getFile());
+}
+return getRepository(endpoint, new
CustomConfigSystemReader(gitConfigFile));
+}
+
+private static Repository getRepository(GitEndpoint endpoint, SystemReader
instance) throws IOException {
+FileRepositoryBuilder builder = new FileRepositoryBuilder();
+try {
+SystemReader.setInstance(instance);
+// scan environment GIT_* variables
+return builder.setGitDir(new File(endpoint.getLocalPath(),
".git")).readEnvironment()
+.findGitDir() // scan up the file system tree
+.build();
+} catch (IOException e) {
+LOG.error("There was an error, cannot open {} repository",
endpoint.getLocalPath());
+throw e;
Review Comment:
Done.
##
components/camel-git/src/main/java/org/apache/camel/component/RepositoryFactory.java:
##
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.camel.component.git.GitEndpoint;
+import org.apache.camel.util.ObjectHelper;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
+import org.eclipse.jgit.util.SystemReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public abstract class RepositoryFactory {
+
+private static final Logger LOG =
LoggerFactory.getLogger(RepositoryFactory.class);
+private static final SystemReader DEFAULT_INSTANCE;
+
+
[GitHub] [camel] gilvansfilho commented on a diff in pull request #8661: [CAMEL-18646] Provide custom configuration
gilvansfilho commented on code in PR #8661:
URL: https://github.com/apache/camel/pull/8661#discussion_r1014725125
##
components/camel-git/src/main/docs/git-component.adoc:
##
@@ -83,5 +83,17 @@ from("git:///tmp/testRepo?type=commit")
.to()
---
+== Custom config file
+By default camel-git will load .gitconfig file from user home folder. You
Review Comment:
Done.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Error while running github feature from .asf.yaml in camel-website-pub!
An error occurred while running github feature in .asf.yaml!:
422 {"message": "Validation Failed", "errors": [{"message": "Sorry, you need to
allow at least one merge strategy. (no_merge_method)", "resource":
"Repository", "field": "merge_commit_allowed", "code": "invalid"}],
"documentation_url":
"https://docs.github.com/rest/reference/repos#update-a-repository"}
[camel-website-pub] branch asf-site updated (56481b4a7e -> d13a698e09)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website-pub.git discard 56481b4a7e Website updated to 1f2bc1fb8e07162088e1bebe29025204cbf1e9ee discard f541e71a72 Website updated to 325e929157412b27394080f4d4dba3d821476ddf new f607369a3a Website updated to 325e929157412b27394080f4d4dba3d821476ddf new d13a698e09 Website updated to ddb0bda8e1fc412198fe401e4461f19851f6ae49 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 (56481b4a7e) \ N -- N -- N refs/heads/asf-site (d13a698e09) 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. 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: .htaccess |90 +- .well-known/security.txt | 2 +- blog/2022/10/RELEASE-3.18.3/index.html | 2 +- .../11/RELEASE-3.14.6}/featured.jpeg | Bin ...c68bd9be1_625206_800x0_resize_q95_gaussian.jpeg | Bin blog/2022/11/RELEASE-3.14.6/index.html | 1 + blog/index.html| 2 +- blog/index.xml |15 +- blog/page/10/index.html| 2 +- blog/page/11/index.html| 2 +- blog/page/12/index.html| 2 +- blog/page/13/index.html| 2 +- blog/page/14/index.html| 2 +- blog/page/15/index.html| 2 +- blog/page/16/index.html| 2 +- blog/page/17/index.html| 2 +- blog/page/18/index.html| 2 +- blog/page/19/index.html| 2 +- blog/page/2/index.html | 2 +- blog/page/20/index.html| 2 +- blog/page/21/index.html| 2 +- blog/page/22/index.html| 2 +- blog/page/23/index.html| 2 +- blog/page/24/index.html| 2 +- blog/page/25/index.html| 2 +- blog/page/26/index.html| 2 +- blog/page/27/index.html| 2 +- blog/page/28/index.html| 2 +- blog/page/29/index.html| 2 +- blog/page/3/index.html | 2 +- blog/page/30/index.html| 2 +- blog/page/31/index.html| 2 +- blog/page/32/index.html| 2 +- blog/page/33/index.html| 2 +- blog/page/34/index.html| 2 +- blog/page/35/index.html| 2 +- blog/page/36/index.html| 2 +- blog/page/37/index.html| 2 +- blog/page/38/index.html| 2 +- blog/page/39/index.html| 2 +- blog/page/4/index.html | 2 +- blog/page/40/index.html| 2 +- blog/page/41/index.html| 2 +- blog/page/42/index.html| 2 +- blog/page/43/index.html| 2 +- blog/page/44/index.html| 2 +- blog/page/45/index.html| 2 +- blog/page/46/index.html| 2 +- blog/page/47/index.html| 2 +- blog/page/48/index.html| 2 +- blog/page/49/index.html| 2 +- blog/page/5/index.html | 2 +- blog/page/50/index.html| 2 +- blog/page/51/index.html| 2 +- blog/page/52/index.html| 2 +- blog/page/53/index.html| 2 +-
Error while running github feature from .asf.yaml in camel-website-pub!
An error occurred while running github feature in .asf.yaml!:
422 {"message": "Validation Failed", "errors": [{"message": "Sorry, you need to
allow at least one merge strategy. (no_merge_method)", "resource":
"Repository", "field": "merge_commit_allowed", "code": "invalid"}],
"documentation_url":
"https://docs.github.com/rest/reference/repos#update-a-repository"}
[camel-website-pub] branch asf-site updated (f89dc0d0e6 -> 56481b4a7e)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website-pub.git discard f89dc0d0e6 Website updated to 44cbe9266eba83c31bf5a5f29eb9e52744e15bdf discard b58042367e Website updated to 325e929157412b27394080f4d4dba3d821476ddf new f541e71a72 Website updated to 325e929157412b27394080f4d4dba3d821476ddf new 56481b4a7e Website updated to 1f2bc1fb8e07162088e1bebe29025204cbf1e9ee 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 (f89dc0d0e6) \ N -- N -- N refs/heads/asf-site (56481b4a7e) 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. 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: .htaccess | 116 +- .well-known/security.txt | 2 +- camel-k/1.10.x/apis/camel-k.html | 2 +- camel-kafka-connector/0.11.x/index.html| 2 +- camel-kafka-connector/1.0.x/index.html | 2 +- camel-kafka-connector/3.18.x/index.html| 2 +- camel-kafka-connector/3.18.x/reference/index.html | 2 +- camel-kafka-connector/next/index.html | 2 +- camel-kamelets/0.9.x/avro-deserialize-action.html | 2 +- camel-kamelets/0.9.x/avro-serialize-action.html| 2 +- camel-kamelets/0.9.x/aws-ddb-sink.html | 2 +- camel-kamelets/0.9.x/extract-field-action.html | 2 +- camel-kamelets/0.9.x/hoist-field-action.html | 2 +- camel-kamelets/0.9.x/insert-field-action.html | 2 +- camel-kamelets/0.9.x/json-deserialize-action.html | 2 +- camel-kamelets/0.9.x/json-serialize-action.html| 2 +- .../0.9.x/kafka-manual-commit-action.html | 2 +- camel-kamelets/0.9.x/kafka-source.html | 2 +- camel-kamelets/0.9.x/kafka-ssl-source.html | 2 +- camel-kamelets/0.9.x/mask-field-action.html| 2 +- .../0.9.x/message-timestamp-router-action.html | 2 +- .../0.9.x/openai-classification-action.html| 2 +- .../0.9.x/protobuf-deserialize-action.html | 2 +- .../0.9.x/protobuf-serialize-action.html | 2 +- camel-kamelets/0.9.x/regex-router-action.html | 2 +- camel-kamelets/0.9.x/replace-field-action.html | 2 +- camel-kamelets/0.9.x/timestamp-router-action.html | 2 +- camel-kamelets/0.9.x/value-to-key-action.html | 2 +- camel-quarkus/2.10.x/index.html| 2 +- camel-quarkus/2.11.x/index.html| 2 +- camel-quarkus/2.12.x/index.html| 2 +- camel-quarkus/2.13.x/index.html| 2 +- camel-quarkus/2.7.x/index.html | 2 +- camel-quarkus/2.8.x/index.html | 2 +- camel-quarkus/2.9.x/index.html | 2 +- camel-quarkus/next/index.html | 2 +- .../next/reference/extensions/opentelemetry.html | 2 +- .../next/user-guide/dependency-management.html | 2 +- camel-quarkus/next/user-guide/first-steps.html | 2 +- components/3.18.x/dataset-component.html | 2 +- components/next/activemq-component.html| 2 +- components/next/amqp-component.html| 2 +- components/next/arangodb-component.html| 2 +- components/next/as2-component.html | 2 +- components/next/asterisk-component.html| 2 +- components/next/atlasmap-component.html| 2 +- components/next/atmos-component.html | 2 +- .../next/atmosphere-websocket-component.html | 2 +- components/next/atom-component.html| 2 +- components/next/avro-component.html| 2 +- components/next/aws-cloudtrail-component.html | 2 +- components/next/aws-secrets-manager-component.html | 2 +- components/next/aws-summary.html | 2 +- components/next/aws2-athena-component.html | 2 +- components/next/aws2-cw-component.html | 2 +- components/next/aws2-ddb-component.html| 2 +-
[GitHub] [camel] github-actions[bot] opened a new pull request, #8674: Generated sources regen
github-actions[bot] opened a new pull request, #8674: URL: https://github.com/apache/camel/pull/8674 Regen bot :robot: found some uncommited changes after running build on :camel: camel-3.14.x. Please do not delete `regen_bot_3.14.x` 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_3.14.x updated (6df097e52d1 -> d0c1670430d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git from 6df097e52d1 CAMEL-18255: Address memory leak caused by scheduling MDC.afterProcess. (#7987) (#8643) add 5eed26f12d3 [maven-release-plugin] prepare release camel-3.14.6 add 20cf99a0d66 [maven-release-plugin] prepare for next development iteration add 14a14d87988 Merge branch 'release/3.14.6' into camel-3.14.x add d0c1670430d Regen for commit 14a14d8798889a29868f1c09ff3e2a4b12a6b800 No new revisions were added by this update. Summary of changes: apache-camel/pom.xml | 2 +- archetypes/camel-archetype-api-component/pom.xml | 2 +- archetypes/camel-archetype-cdi/pom.xml | 2 +- archetypes/camel-archetype-component/pom.xml | 2 +- archetypes/camel-archetype-dataformat/pom.xml | 2 +- archetypes/camel-archetype-endpointdsl/pom.xml | 2 +- archetypes/camel-archetype-java/pom.xml| 2 +- archetypes/camel-archetype-main/pom.xml| 2 +- archetypes/camel-archetype-spring/pom.xml | 2 +- archetypes/pom.xml | 2 +- bom/camel-bom/pom.xml | 2 +- bom/pom.xml| 2 +- buildingtools/pom.xml | 2 +- camel-dependencies/pom.xml | 2 +- catalog/camel-catalog-lucene/pom.xml | 2 +- catalog/camel-catalog-maven/pom.xml| 2 +- catalog/camel-catalog/pom.xml | 2 +- .../camel/catalog/archetypes/archetype-catalog.xml | 16 +- .../apache/camel/catalog/components/activemq.json | 2 +- .../apache/camel/catalog/components/ahc-ws.json| 2 +- .../apache/camel/catalog/components/ahc-wss.json | 2 +- .../org/apache/camel/catalog/components/ahc.json | 2 +- .../org/apache/camel/catalog/components/amqp.json | 2 +- .../apache/camel/catalog/components/arangodb.json | 2 +- .../org/apache/camel/catalog/components/as2.json | 2 +- .../apache/camel/catalog/components/asterisk.json | 2 +- .../apache/camel/catalog/components/atlasmap.json | 2 +- .../org/apache/camel/catalog/components/atmos.json | 2 +- .../catalog/components/atmosphere-websocket.json | 2 +- .../org/apache/camel/catalog/components/atom.json | 2 +- .../camel/catalog/components/atomix-map.json | 2 +- .../camel/catalog/components/atomix-messaging.json | 2 +- .../camel/catalog/components/atomix-multimap.json | 2 +- .../camel/catalog/components/atomix-queue.json | 2 +- .../camel/catalog/components/atomix-set.json | 2 +- .../camel/catalog/components/atomix-value.json | 2 +- .../org/apache/camel/catalog/components/avro.json | 2 +- .../catalog/components/aws-secrets-manager.json| 2 +- .../camel/catalog/components/aws2-athena.json | 2 +- .../apache/camel/catalog/components/aws2-cw.json | 2 +- .../apache/camel/catalog/components/aws2-ddb.json | 2 +- .../camel/catalog/components/aws2-ddbstream.json | 2 +- .../apache/camel/catalog/components/aws2-ec2.json | 2 +- .../apache/camel/catalog/components/aws2-ecs.json | 2 +- .../apache/camel/catalog/components/aws2-eks.json | 2 +- .../camel/catalog/components/aws2-eventbridge.json | 2 +- .../apache/camel/catalog/components/aws2-iam.json | 2 +- .../catalog/components/aws2-kinesis-firehose.json | 2 +- .../camel/catalog/components/aws2-kinesis.json | 2 +- .../apache/camel/catalog/components/aws2-kms.json | 2 +- .../camel/catalog/components/aws2-lambda.json | 2 +- .../apache/camel/catalog/components/aws2-mq.json | 2 +- .../apache/camel/catalog/components/aws2-msk.json | 2 +- .../apache/camel/catalog/components/aws2-s3.json | 2 +- .../apache/camel/catalog/components/aws2-ses.json | 2 +- .../apache/camel/catalog/components/aws2-sns.json | 2 +- .../apache/camel/catalog/components/aws2-sqs.json | 2 +- .../apache/camel/catalog/components/aws2-sts.json | 2 +- .../camel/catalog/components/aws2-translate.json | 2 +- .../camel/catalog/components/azure-cosmosdb.json | 2 +- .../camel/catalog/components/azure-eventhubs.json | 2 +- .../camel/catalog/components/azure-servicebus.json | 2 +- .../catalog/components/azure-storage-blob.json | 2 +- .../catalog/components/azure-storage-datalake.json | 2 +- .../catalog/components/azure-storage-queue.json| 2 +- .../camel/catalog/components/bean-validator.json | 2 +- .../org/apache/camel/catalog/components/bean.json | 2 +- .../apache/camel/catalog/components/beanstalk.json | 2 +- .../apache/camel/catalog/components/bonita.json| 2 +- .../org/apache/camel/catalog/components/box.json | 2 +- .../apache/camel/catalog/components/braintree.json | 2 +-
[camel-website] branch regen_bot updated (1f2bc1fb -> ddb0bda8)
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-website.git
from 1f2bc1fb Add XML schemas for Camel 3.14.6
add ddb0bda8 Add blog entry and release notes for Camel 3.14.6
No new revisions were added by this update.
Summary of changes:
.../11/RELEASE-3.14.6}/featured.jpeg | Bin
.../{08/RELEASE-3.14.5 => 11/RELEASE-3.14.6}/index.md | 10 +-
content/releases/release-3.14.6.md | 17 +
3 files changed, 22 insertions(+), 5 deletions(-)
copy content/blog/{2021/05/RELEASE-3.10.0 =>
2022/11/RELEASE-3.14.6}/featured.jpeg (100%)
copy content/blog/2022/{08/RELEASE-3.14.5 => 11/RELEASE-3.14.6}/index.md (68%)
create mode 100644 content/releases/release-3.14.6.md
[camel-website] branch main updated: Add blog entry and release notes for Camel 3.14.6
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/main by this push: new ddb0bda8 Add blog entry and release notes for Camel 3.14.6 ddb0bda8 is described below commit ddb0bda8e1fc412198fe401e4461f19851f6ae49 Author: Gregor Zurowski AuthorDate: Sat Nov 5 19:52:25 2022 +0100 Add blog entry and release notes for Camel 3.14.6 --- content/blog/2022/11/RELEASE-3.14.6/featured.jpeg | Bin 0 -> 625206 bytes content/blog/2022/11/RELEASE-3.14.6/index.md | 18 ++ content/releases/release-3.14.6.md| 17 + 3 files changed, 35 insertions(+) diff --git a/content/blog/2022/11/RELEASE-3.14.6/featured.jpeg b/content/blog/2022/11/RELEASE-3.14.6/featured.jpeg new file mode 100644 index ..36c23a02 Binary files /dev/null and b/content/blog/2022/11/RELEASE-3.14.6/featured.jpeg differ diff --git a/content/blog/2022/11/RELEASE-3.14.6/index.md b/content/blog/2022/11/RELEASE-3.14.6/index.md new file mode 100644 index ..05b9938f --- /dev/null +++ b/content/blog/2022/11/RELEASE-3.14.6/index.md @@ -0,0 +1,18 @@ +--- +title: "RELEASE 3.14.6" +date: 2022-11-05 +draft: false +authors: [gzurowski] +categories: ["Releases"] +preview: "The Camel community announces the immediate availability of the new Camel 3.14.6 LTS release" +--- + + +The Camel community announces the immediate availability of Camel 3.14.6 (LTS), a new patch release with 13 improvements and fixes. + +The artifacts are published and ready for you to download from the Central Maven repository. For more details please take a look at the [release notes](/releases/release-3.14.6/). + +Many thanks to all who made this release possible. + +On behalf of the Camel PMC, +Gregor Zurowski diff --git a/content/releases/release-3.14.6.md b/content/releases/release-3.14.6.md new file mode 100644 index ..e282dc6c --- /dev/null +++ b/content/releases/release-3.14.6.md @@ -0,0 +1,17 @@ +--- +date: 2022-11-05 +eol: 2023-12-16 +draft: false +type: release-note +version: 3.14.6 +title: "Release 3.14.6" +preview: "New LTS release 3.14.6" +apiBreaking: "" +knownIssues: "" +jiraVersionId: 12352211 +category: camel +kind: lts +jdk: [8,11] +--- + +This release is the new Camel 3.14.6 LTS patch release.
[camel-website] branch regen_bot updated (44cbe926 -> 1f2bc1fb)
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-website.git
from 44cbe926 Add blog entry and release notes for Camel 3.18.3
add 1f2bc1fb Add XML schemas for Camel 3.14.6
No new revisions were added by this update.
Summary of changes:
.../blueprint/{camel-blueprint-3.14.4.xsd => camel-blueprint-3.14.6.xsd} | 0
.../cxf/{camel-cxf-3.0.0-M2-spring.xsd => camel-cxf-3.14.6-spring.xsd}| 0
...amel-spring-security-3.0.0-M2.xsd => camel-spring-security-3.14.6.xsd} | 0
.../{camel-spring-xml-3.14.5.xsd => camel-spring-xml-3.14.6.xsd} | 0
...pring-integration-3.0.0-M2.xsd => camel-spring-integration-3.14.6.xsd} | 0
5 files changed, 0 insertions(+), 0 deletions(-)
copy static/schema/blueprint/{camel-blueprint-3.14.4.xsd =>
camel-blueprint-3.14.6.xsd} (100%)
copy static/schema/cxf/{camel-cxf-3.0.0-M2-spring.xsd =>
camel-cxf-3.14.6-spring.xsd} (100%)
copy static/schema/spring-security/{camel-spring-security-3.0.0-M2.xsd =>
camel-spring-security-3.14.6.xsd} (100%)
copy static/schema/spring-xml/{camel-spring-xml-3.14.5.xsd =>
camel-spring-xml-3.14.6.xsd} (100%)
copy static/schema/spring/integration/{camel-spring-integration-3.0.0-M2.xsd
=> camel-spring-integration-3.14.6.xsd} (100%)
[camel-karaf] branch release/3.14.6 deleted (was 23177d5f)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.14.6 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 23177d5f [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-karaf] 01/02: Merge branch 'release/3.14.6' into camel-karaf-3.14.x
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch camel-karaf-3.14.x in repository https://gitbox.apache.org/repos/asf/camel-karaf.git commit c8b46d5d113344f36ea080a7aafc9d00a04ee4a5 Merge: 9f9924f2 23177d5f Author: Gregor Zurowski AuthorDate: Sat Nov 5 18:48:03 2022 + Merge branch 'release/3.14.6' into camel-karaf-3.14.x archetypes/camel-archetype-blueprint/pom.xml | 2 +- archetypes/pom.xml | 2 +- bom/camel-karaf-bom/pom.xml| 2 +- bom/pom.xml| 2 +- catalog/camel-catalog-provider-karaf/pom.xml | 2 +- catalog/pom.xml| 2 +- components/camel-bean-validator-osgi/pom.xml | 2 +- components/camel-blueprint-main/pom.xml| 2 +- components/camel-blueprint/pom.xml | 2 +- components/camel-cmis-osgi/pom.xml | 2 +- components/camel-cxf-blueprint/pom.xml | 2 +- components/camel-cxf-transport-blueprint/pom.xml | 2 +- components/camel-eventadmin/pom.xml| 2 +- components/camel-jcache-osgi/pom.xml | 2 +- components/camel-kura/pom.xml | 2 +- components/camel-osgi-activator/pom.xml| 2 +- components/camel-paxlogging/pom.xml| 2 +- components/camel-servlet-osgi/pom.xml | 2 +- components/camel-test-blueprint/pom.xml| 2 +- components/camel-test-karaf/pom.xml| 2 +- components/camel-zookeeper-master-osgi/pom.xml | 2 +- components/pom.xml | 2 +- core/camel-core-osgi/pom.xml | 2 +- core/pom.xml | 2 +- platforms/commands/commands-core/pom.xml | 2 +- platforms/commands/pom.xml | 2 +- platforms/karaf/commands/pom.xml | 2 +- platforms/karaf/features/pom.xml | 2 +- platforms/karaf/pom.xml| 2 +- platforms/pom.xml | 2 +- pom.xml| 8 tests/camel-blueprint-cxf-test/pom.xml | 2 +- tests/camel-blueprint-test/pom.xml | 2 +- tests/camel-itest-osgi/pom.xml | 2 +- tests/pom.xml | 2 +- tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml | 2 +- tooling/camel-karaf-maven-plugin/pom.xml | 2 +- tooling/pom.xml| 2 +- 38 files changed, 41 insertions(+), 41 deletions(-)
[camel-karaf] 02/02: Target Camel 3.14.7-SNAPSHOT for development
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch camel-karaf-3.14.x in repository https://gitbox.apache.org/repos/asf/camel-karaf.git commit d5b7872686d9e0fe525b19d7091b29e34d776491 Author: Gregor Zurowski AuthorDate: Sat Nov 5 18:48:44 2022 + Target Camel 3.14.7-SNAPSHOT for development --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 2e152297..697ec242 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies -3.14.6 +3.14.7-SNAPSHOT org.apache.camel.karaf @@ -106,7 +106,7 @@ false -3.14.6 +3.14.7-SNAPSHOT 1.7.0_6 3.5.2_1 @@ -759,7 +759,7 @@ dev -3.14.6 +3.14.7-SNAPSHOT
[camel-karaf] branch camel-karaf-3.14.x updated (9f9924f2 -> d5b78726)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch camel-karaf-3.14.x in repository https://gitbox.apache.org/repos/asf/camel-karaf.git from 9f9924f2 Netty import hell add b2d8af20 Target Camel 3.14.6 for release add 6af71327 [maven-release-plugin] prepare release camel-karaf-3.14.6 add 23177d5f [maven-release-plugin] prepare for next development iteration new c8b46d5d Merge branch 'release/3.14.6' into camel-karaf-3.14.x new d5b78726 Target Camel 3.14.7-SNAPSHOT for development 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: archetypes/camel-archetype-blueprint/pom.xml | 2 +- archetypes/pom.xml | 2 +- bom/camel-karaf-bom/pom.xml| 2 +- bom/pom.xml| 2 +- catalog/camel-catalog-provider-karaf/pom.xml | 2 +- catalog/pom.xml| 2 +- components/camel-bean-validator-osgi/pom.xml | 2 +- components/camel-blueprint-main/pom.xml| 2 +- components/camel-blueprint/pom.xml | 2 +- components/camel-cmis-osgi/pom.xml | 2 +- components/camel-cxf-blueprint/pom.xml | 2 +- components/camel-cxf-transport-blueprint/pom.xml | 2 +- components/camel-eventadmin/pom.xml| 2 +- components/camel-jcache-osgi/pom.xml | 2 +- components/camel-kura/pom.xml | 2 +- components/camel-osgi-activator/pom.xml| 2 +- components/camel-paxlogging/pom.xml| 2 +- components/camel-servlet-osgi/pom.xml | 2 +- components/camel-test-blueprint/pom.xml| 2 +- components/camel-test-karaf/pom.xml| 2 +- components/camel-zookeeper-master-osgi/pom.xml | 2 +- components/pom.xml | 2 +- core/camel-core-osgi/pom.xml | 2 +- core/pom.xml | 2 +- platforms/commands/commands-core/pom.xml | 2 +- platforms/commands/pom.xml | 2 +- platforms/karaf/commands/pom.xml | 2 +- platforms/karaf/features/pom.xml | 2 +- platforms/karaf/pom.xml| 2 +- platforms/pom.xml | 2 +- pom.xml| 8 tests/camel-blueprint-cxf-test/pom.xml | 2 +- tests/camel-blueprint-test/pom.xml | 2 +- tests/camel-itest-osgi/pom.xml | 2 +- tests/pom.xml | 2 +- tooling/camel-catalog-generator-karaf-maven-plugin/pom.xml | 2 +- tooling/camel-karaf-maven-plugin/pom.xml | 2 +- tooling/pom.xml| 2 +- 38 files changed, 41 insertions(+), 41 deletions(-)
[camel-spring-boot] branch release/3.14.6 deleted (was 854b0b9ffa1)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.14.6 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was 854b0b9ffa1 [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-spring-boot] 01/02: Merge branch 'release/3.14.6' into camel-spring-boot-3.14.x
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch camel-spring-boot-3.14.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 80514f0e7ab7bd30f76a36b052507700944cc21f Merge: 7ee3cd7233c 854b0b9ffa1 Author: Gregor Zurowski AuthorDate: Sat Nov 5 18:46:32 2022 + Merge branch 'release/3.14.6' into camel-spring-boot-3.14.x archetypes/camel-archetype-spring-boot/pom.xml | 2 +- archetypes/pom.xml | 2 +- catalog/camel-catalog-provider-springboot/pom.xml | 2 +- catalog/pom.xml| 2 +- components-starter/camel-activemq-starter/pom.xml | 2 +- components-starter/camel-ahc-starter/pom.xml | 2 +- components-starter/camel-ahc-ws-starter/pom.xml| 2 +- components-starter/camel-amqp-starter/pom.xml | 2 +- components-starter/camel-any23-starter/pom.xml | 2 +- components-starter/camel-arangodb-starter/pom.xml | 2 +- components-starter/camel-as2-starter/pom.xml | 2 +- components-starter/camel-asn1-starter/pom.xml | 2 +- components-starter/camel-asterisk-starter/pom.xml | 2 +- components-starter/camel-atlasmap-starter/pom.xml | 2 +- components-starter/camel-atmos-starter/pom.xml | 2 +- .../camel-atmosphere-websocket-starter/pom.xml | 2 +- components-starter/camel-atom-starter/pom.xml | 2 +- components-starter/camel-atomix-starter/pom.xml| 2 +- components-starter/camel-avro-rpc-starter/pom.xml | 2 +- components-starter/camel-avro-starter/pom.xml | 2 +- .../camel-aws-secrets-manager-starter/pom.xml | 2 +- components-starter/camel-aws-xray-starter/pom.xml | 2 +- .../camel-aws2-athena-starter/pom.xml | 2 +- components-starter/camel-aws2-cw-starter/pom.xml | 2 +- components-starter/camel-aws2-ddb-starter/pom.xml | 2 +- components-starter/camel-aws2-ec2-starter/pom.xml | 2 +- components-starter/camel-aws2-ecs-starter/pom.xml | 2 +- components-starter/camel-aws2-eks-starter/pom.xml | 2 +- .../camel-aws2-eventbridge-starter/pom.xml | 2 +- components-starter/camel-aws2-iam-starter/pom.xml | 2 +- .../camel-aws2-kinesis-starter/pom.xml | 2 +- components-starter/camel-aws2-kms-starter/pom.xml | 2 +- .../camel-aws2-lambda-starter/pom.xml | 2 +- components-starter/camel-aws2-mq-starter/pom.xml | 2 +- components-starter/camel-aws2-msk-starter/pom.xml | 2 +- components-starter/camel-aws2-s3-starter/pom.xml | 2 +- components-starter/camel-aws2-ses-starter/pom.xml | 2 +- components-starter/camel-aws2-sns-starter/pom.xml | 2 +- components-starter/camel-aws2-sqs-starter/pom.xml | 2 +- components-starter/camel-aws2-sts-starter/pom.xml | 2 +- .../camel-aws2-translate-starter/pom.xml | 2 +- .../camel-azure-cosmosdb-starter/pom.xml | 2 +- .../camel-azure-eventhubs-starter/pom.xml | 2 +- .../camel-azure-servicebus-starter/pom.xml | 2 +- .../camel-azure-storage-blob-starter/pom.xml | 2 +- .../camel-azure-storage-datalake-starter/pom.xml | 2 +- .../camel-azure-storage-queue-starter/pom.xml | 2 +- components-starter/camel-barcode-starter/pom.xml | 2 +- components-starter/camel-base64-starter/pom.xml| 2 +- components-starter/camel-bean-starter/pom.xml | 2 +- .../camel-bean-validator-starter/pom.xml | 2 +- components-starter/camel-beanio-starter/pom.xml| 2 +- components-starter/camel-beanstalk-starter/pom.xml | 2 +- components-starter/camel-bindy-starter/pom.xml | 2 +- components-starter/camel-bonita-starter/pom.xml| 2 +- components-starter/camel-box-starter/pom.xml | 2 +- components-starter/camel-braintree-starter/pom.xml | 2 +- components-starter/camel-browse-starter/pom.xml| 2 +- .../camel-caffeine-lrucache-starter/pom.xml| 2 +- components-starter/camel-caffeine-starter/pom.xml | 2 +- .../camel-cassandraql-starter/pom.xml | 2 +- components-starter/camel-cbor-starter/pom.xml | 2 +- .../camel-chatscript-starter/pom.xml | 2 +- components-starter/camel-chunk-starter/pom.xml | 2 +- components-starter/camel-cm-sms-starter/pom.xml| 2 +- components-starter/camel-cmis-starter/pom.xml | 2 +- components-starter/camel-coap-starter/pom.xml | 2 +- components-starter/camel-cometd-starter/pom.xml| 2 +- components-starter/camel-consul-starter/pom.xml| 2 +- .../camel-controlbus-starter/pom.xml | 2 +- components-starter/camel-corda-starter/pom.xml | 2 +- components-starter/camel-core-starter/pom.xml | 2 +- components-starter/camel-couchbase-starter/pom.xml | 2 +- components-starter/camel-couchdb-starter/pom.xml | 2 +- components-starter/camel-cron-starter/pom.xml | 2 +-
[camel-spring-boot] 02/02: Target Camel 3.14.7-SNAPSHOT for development
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch camel-spring-boot-3.14.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 339e8d92d2e0a244171a3d6a0c8f0319c93df2c0 Author: Gregor Zurowski AuthorDate: Sat Nov 5 18:47:13 2022 + Target Camel 3.14.7-SNAPSHOT for development --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f1bca35fd71..d7873c79c6d 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies -3.14.6 +3.14.7-SNAPSHOT org.apache.camel.springboot @@ -111,7 +111,7 @@ 2.6.13 -3.14.6 +3.14.7-SNAPSHOT 1.0.2.v20150114 @@ -453,7 +453,7 @@ dev -3.14.6 +3.14.7-SNAPSHOT
[camel-spring-boot] branch camel-spring-boot-3.14.x updated (7ee3cd7233c -> 339e8d92d2e)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch camel-spring-boot-3.14.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from 7ee3cd7233c Regen add 50bd1eeaf89 Target Camel 3.14.6 for release add 8d0ae944b52 [maven-release-plugin] prepare release camel-spring-boot-3.14.6 add 854b0b9ffa1 [maven-release-plugin] prepare for next development iteration new 80514f0e7ab Merge branch 'release/3.14.6' into camel-spring-boot-3.14.x new 339e8d92d2e Target Camel 3.14.7-SNAPSHOT for development 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: archetypes/camel-archetype-spring-boot/pom.xml | 2 +- archetypes/pom.xml | 2 +- catalog/camel-catalog-provider-springboot/pom.xml | 2 +- catalog/pom.xml| 2 +- components-starter/camel-activemq-starter/pom.xml | 2 +- components-starter/camel-ahc-starter/pom.xml | 2 +- components-starter/camel-ahc-ws-starter/pom.xml| 2 +- components-starter/camel-amqp-starter/pom.xml | 2 +- components-starter/camel-any23-starter/pom.xml | 2 +- components-starter/camel-arangodb-starter/pom.xml | 2 +- components-starter/camel-as2-starter/pom.xml | 2 +- components-starter/camel-asn1-starter/pom.xml | 2 +- components-starter/camel-asterisk-starter/pom.xml | 2 +- components-starter/camel-atlasmap-starter/pom.xml | 2 +- components-starter/camel-atmos-starter/pom.xml | 2 +- .../camel-atmosphere-websocket-starter/pom.xml | 2 +- components-starter/camel-atom-starter/pom.xml | 2 +- components-starter/camel-atomix-starter/pom.xml| 2 +- components-starter/camel-avro-rpc-starter/pom.xml | 2 +- components-starter/camel-avro-starter/pom.xml | 2 +- .../camel-aws-secrets-manager-starter/pom.xml | 2 +- components-starter/camel-aws-xray-starter/pom.xml | 2 +- .../camel-aws2-athena-starter/pom.xml | 2 +- components-starter/camel-aws2-cw-starter/pom.xml | 2 +- components-starter/camel-aws2-ddb-starter/pom.xml | 2 +- components-starter/camel-aws2-ec2-starter/pom.xml | 2 +- components-starter/camel-aws2-ecs-starter/pom.xml | 2 +- components-starter/camel-aws2-eks-starter/pom.xml | 2 +- .../camel-aws2-eventbridge-starter/pom.xml | 2 +- components-starter/camel-aws2-iam-starter/pom.xml | 2 +- .../camel-aws2-kinesis-starter/pom.xml | 2 +- components-starter/camel-aws2-kms-starter/pom.xml | 2 +- .../camel-aws2-lambda-starter/pom.xml | 2 +- components-starter/camel-aws2-mq-starter/pom.xml | 2 +- components-starter/camel-aws2-msk-starter/pom.xml | 2 +- components-starter/camel-aws2-s3-starter/pom.xml | 2 +- components-starter/camel-aws2-ses-starter/pom.xml | 2 +- components-starter/camel-aws2-sns-starter/pom.xml | 2 +- components-starter/camel-aws2-sqs-starter/pom.xml | 2 +- components-starter/camel-aws2-sts-starter/pom.xml | 2 +- .../camel-aws2-translate-starter/pom.xml | 2 +- .../camel-azure-cosmosdb-starter/pom.xml | 2 +- .../camel-azure-eventhubs-starter/pom.xml | 2 +- .../camel-azure-servicebus-starter/pom.xml | 2 +- .../camel-azure-storage-blob-starter/pom.xml | 2 +- .../camel-azure-storage-datalake-starter/pom.xml | 2 +- .../camel-azure-storage-queue-starter/pom.xml | 2 +- components-starter/camel-barcode-starter/pom.xml | 2 +- components-starter/camel-base64-starter/pom.xml| 2 +- components-starter/camel-bean-starter/pom.xml | 2 +- .../camel-bean-validator-starter/pom.xml | 2 +- components-starter/camel-beanio-starter/pom.xml| 2 +- components-starter/camel-beanstalk-starter/pom.xml | 2 +- components-starter/camel-bindy-starter/pom.xml | 2 +- components-starter/camel-bonita-starter/pom.xml| 2 +- components-starter/camel-box-starter/pom.xml | 2 +- components-starter/camel-braintree-starter/pom.xml | 2 +- components-starter/camel-browse-starter/pom.xml| 2 +- .../camel-caffeine-lrucache-starter/pom.xml| 2 +- components-starter/camel-caffeine-starter/pom.xml | 2 +- .../camel-cassandraql-starter/pom.xml | 2 +- components-starter/camel-cbor-starter/pom.xml | 2 +- .../camel-chatscript-starter/pom.xml | 2 +- components-starter/camel-chunk-starter/pom.xml | 2 +- components-starter/camel-cm-sms-starter/pom.xml| 2 +- components-starter/camel-cmis-starter/pom.xml | 2 +- components-starter/camel-coap-starter/pom.xml | 2 +- components-starter/camel-cometd-starter/pom.xml| 2
[camel] branch release/3.14.6 deleted (was 20cf99a0d66)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.14.6 in repository https://gitbox.apache.org/repos/asf/camel.git was 20cf99a0d66 [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] 01/01: Merge branch 'release/3.14.6' into camel-3.14.x
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch camel-3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git commit 14a14d8798889a29868f1c09ff3e2a4b12a6b800 Merge: 6df097e52d1 20cf99a0d66 Author: Gregor Zurowski AuthorDate: Sat Nov 5 18:45:27 2022 + Merge branch 'release/3.14.6' into camel-3.14.x apache-camel/pom.xml | 2 +- archetypes/camel-archetype-api-component/pom.xml | 2 +- archetypes/camel-archetype-cdi/pom.xml | 2 +- archetypes/camel-archetype-component/pom.xml | 2 +- archetypes/camel-archetype-dataformat/pom.xml | 2 +- archetypes/camel-archetype-endpointdsl/pom.xml | 2 +- archetypes/camel-archetype-java/pom.xml| 2 +- archetypes/camel-archetype-main/pom.xml| 2 +- archetypes/camel-archetype-spring/pom.xml | 2 +- archetypes/pom.xml | 2 +- bom/camel-bom/pom.xml | 2 +- bom/pom.xml| 2 +- buildingtools/pom.xml | 2 +- camel-dependencies/pom.xml | 23 +++--- catalog/camel-catalog-lucene/pom.xml | 2 +- catalog/camel-catalog-maven/pom.xml| 2 +- catalog/camel-catalog/pom.xml | 2 +- catalog/camel-csimple-maven-plugin/pom.xml | 2 +- catalog/camel-report-maven-plugin/pom.xml | 2 +- catalog/camel-route-parser/pom.xml | 2 +- catalog/dummy-component/pom.xml| 2 +- catalog/pom.xml| 2 +- components/camel-activemq/pom.xml | 2 +- components/camel-ahc-ws/pom.xml| 2 +- components/camel-ahc/pom.xml | 2 +- components/camel-amqp/pom.xml | 2 +- components/camel-any23/pom.xml | 2 +- components/camel-arangodb/pom.xml | 2 +- components/camel-as2/camel-as2-api/pom.xml | 2 +- components/camel-as2/camel-as2-component/pom.xml | 2 +- components/camel-as2/pom.xml | 2 +- components/camel-asn1/pom.xml | 2 +- components/camel-asterisk/pom.xml | 2 +- components/camel-atlasmap/pom.xml | 2 +- components/camel-atmos/pom.xml | 2 +- components/camel-atmosphere-websocket/pom.xml | 2 +- components/camel-atom/pom.xml | 2 +- components/camel-atomix/pom.xml| 2 +- components/camel-attachments/pom.xml | 2 +- .../camel-avro-rpc-component/pom.xml | 2 +- .../camel-avro-rpc/camel-avro-rpc-jetty/pom.xml| 2 +- .../camel-avro-rpc/camel-avro-rpc-spi/pom.xml | 2 +- components/camel-avro-rpc/pom.xml | 2 +- components/camel-avro/pom.xml | 2 +- .../camel-aws/camel-aws-secrets-manager/pom.xml| 2 +- components/camel-aws/camel-aws-xray/pom.xml| 2 +- components/camel-aws/camel-aws2-athena/pom.xml | 2 +- components/camel-aws/camel-aws2-cw/pom.xml | 2 +- components/camel-aws/camel-aws2-ddb/pom.xml| 2 +- components/camel-aws/camel-aws2-ec2/pom.xml| 2 +- components/camel-aws/camel-aws2-ecs/pom.xml| 2 +- components/camel-aws/camel-aws2-eks/pom.xml| 2 +- .../camel-aws/camel-aws2-eventbridge/pom.xml | 2 +- components/camel-aws/camel-aws2-iam/pom.xml| 2 +- components/camel-aws/camel-aws2-kinesis/pom.xml| 2 +- components/camel-aws/camel-aws2-kms/pom.xml| 2 +- components/camel-aws/camel-aws2-lambda/pom.xml | 2 +- components/camel-aws/camel-aws2-mq/pom.xml | 2 +- components/camel-aws/camel-aws2-msk/pom.xml| 2 +- components/camel-aws/camel-aws2-s3/pom.xml | 2 +- components/camel-aws/camel-aws2-ses/pom.xml| 2 +- components/camel-aws/camel-aws2-sns/pom.xml| 2 +- components/camel-aws/camel-aws2-sqs/pom.xml| 2 +- components/camel-aws/camel-aws2-sts/pom.xml| 2 +- components/camel-aws/camel-aws2-translate/pom.xml | 2 +- components/camel-aws/pom.xml | 2 +- .../camel-azure/camel-azure-cosmosdb/pom.xml | 2 +- .../camel-azure/camel-azure-eventhubs/pom.xml | 2 +- .../camel-azure/camel-azure-servicebus/pom.xml | 2 +- .../camel-azure/camel-azure-storage-blob/pom.xml | 2 +- .../camel-azure-storage-datalake/pom.xml | 2 +- .../camel-azure/camel-azure-storage-queue/pom.xml | 2 +- components/camel-azure/pom.xml | 2 +- components/camel-barcode/pom.xml | 2 +- components/camel-base64/pom.xml| 2 +- components/camel-bean-validator/pom.xml| 2 +- components/camel-bean/pom.xml
[camel] branch camel-3.14.x updated (6df097e52d1 -> 14a14d87988)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch camel-3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git from 6df097e52d1 CAMEL-18255: Address memory leak caused by scheduling MDC.afterProcess. (#7987) (#8643) add 5eed26f12d3 [maven-release-plugin] prepare release camel-3.14.6 add 20cf99a0d66 [maven-release-plugin] prepare for next development iteration new 14a14d87988 Merge branch 'release/3.14.6' into camel-3.14.x 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: apache-camel/pom.xml | 2 +- archetypes/camel-archetype-api-component/pom.xml | 2 +- archetypes/camel-archetype-cdi/pom.xml | 2 +- archetypes/camel-archetype-component/pom.xml | 2 +- archetypes/camel-archetype-dataformat/pom.xml | 2 +- archetypes/camel-archetype-endpointdsl/pom.xml | 2 +- archetypes/camel-archetype-java/pom.xml| 2 +- archetypes/camel-archetype-main/pom.xml| 2 +- archetypes/camel-archetype-spring/pom.xml | 2 +- archetypes/pom.xml | 2 +- bom/camel-bom/pom.xml | 2 +- bom/pom.xml| 2 +- buildingtools/pom.xml | 2 +- camel-dependencies/pom.xml | 23 +++--- catalog/camel-catalog-lucene/pom.xml | 2 +- catalog/camel-catalog-maven/pom.xml| 2 +- catalog/camel-catalog/pom.xml | 2 +- catalog/camel-csimple-maven-plugin/pom.xml | 2 +- catalog/camel-report-maven-plugin/pom.xml | 2 +- catalog/camel-route-parser/pom.xml | 2 +- catalog/dummy-component/pom.xml| 2 +- catalog/pom.xml| 2 +- components/camel-activemq/pom.xml | 2 +- components/camel-ahc-ws/pom.xml| 2 +- components/camel-ahc/pom.xml | 2 +- components/camel-amqp/pom.xml | 2 +- components/camel-any23/pom.xml | 2 +- components/camel-arangodb/pom.xml | 2 +- components/camel-as2/camel-as2-api/pom.xml | 2 +- components/camel-as2/camel-as2-component/pom.xml | 2 +- components/camel-as2/pom.xml | 2 +- components/camel-asn1/pom.xml | 2 +- components/camel-asterisk/pom.xml | 2 +- components/camel-atlasmap/pom.xml | 2 +- components/camel-atmos/pom.xml | 2 +- components/camel-atmosphere-websocket/pom.xml | 2 +- components/camel-atom/pom.xml | 2 +- components/camel-atomix/pom.xml| 2 +- components/camel-attachments/pom.xml | 2 +- .../camel-avro-rpc-component/pom.xml | 2 +- .../camel-avro-rpc/camel-avro-rpc-jetty/pom.xml| 2 +- .../camel-avro-rpc/camel-avro-rpc-spi/pom.xml | 2 +- components/camel-avro-rpc/pom.xml | 2 +- components/camel-avro/pom.xml | 2 +- .../camel-aws/camel-aws-secrets-manager/pom.xml| 2 +- components/camel-aws/camel-aws-xray/pom.xml| 2 +- components/camel-aws/camel-aws2-athena/pom.xml | 2 +- components/camel-aws/camel-aws2-cw/pom.xml | 2 +- components/camel-aws/camel-aws2-ddb/pom.xml| 2 +- components/camel-aws/camel-aws2-ec2/pom.xml| 2 +- components/camel-aws/camel-aws2-ecs/pom.xml| 2 +- components/camel-aws/camel-aws2-eks/pom.xml| 2 +- .../camel-aws/camel-aws2-eventbridge/pom.xml | 2 +- components/camel-aws/camel-aws2-iam/pom.xml| 2 +- components/camel-aws/camel-aws2-kinesis/pom.xml| 2 +- components/camel-aws/camel-aws2-kms/pom.xml| 2 +- components/camel-aws/camel-aws2-lambda/pom.xml | 2 +- components/camel-aws/camel-aws2-mq/pom.xml | 2 +- components/camel-aws/camel-aws2-msk/pom.xml| 2 +- components/camel-aws/camel-aws2-s3/pom.xml | 2 +- components/camel-aws/camel-aws2-ses/pom.xml| 2 +- components/camel-aws/camel-aws2-sns/pom.xml| 2 +- components/camel-aws/camel-aws2-sqs/pom.xml| 2 +- components/camel-aws/camel-aws2-sts/pom.xml| 2 +- components/camel-aws/camel-aws2-translate/pom.xml | 2 +- components/camel-aws/pom.xml | 2 +- .../camel-azure/camel-azure-cosmosdb/pom.xml | 2 +- .../camel-azure/camel-azure-eventhubs/pom.xml | 2 +- .../camel-azure/camel-azure-servicebus/pom.xml | 2 +- .../camel-azure/camel-azure-storage-blob/pom.xml | 2 +-
svn commit: r57809 - /release/camel/apache-camel/3.14.5/
Author: gzurowski Date: Sat Nov 5 18:37:14 2022 New Revision: 57809 Log: Removed the old release Removed: release/camel/apache-camel/3.14.5/
svn commit: r57808 - in /release/camel/apache-camel/3.14.6: apache-camel-3.14.6-src.zip apache-camel-3.14.6-src.zip.asc apache-camel-3.14.6-src.zip.sha512 apache-camel-3.14.6.pom apache-camel-3.14.6.p
Author: gzurowski Date: Sat Nov 5 18:35:54 2022 New Revision: 57808 Log: Apache Camel 3.14.6 released artifacts. Added: release/camel/apache-camel/3.14.6/apache-camel-3.14.6-src.zip (with props) release/camel/apache-camel/3.14.6/apache-camel-3.14.6-src.zip.asc release/camel/apache-camel/3.14.6/apache-camel-3.14.6-src.zip.sha512 release/camel/apache-camel/3.14.6/apache-camel-3.14.6.pom release/camel/apache-camel/3.14.6/apache-camel-3.14.6.pom.asc release/camel/apache-camel/3.14.6/apache-camel-3.14.6.pom.sha512 Added: release/camel/apache-camel/3.14.6/apache-camel-3.14.6-src.zip == Binary file - no diff available. Propchange: release/camel/apache-camel/3.14.6/apache-camel-3.14.6-src.zip -- svn:mime-type = application/octet-stream Added: release/camel/apache-camel/3.14.6/apache-camel-3.14.6-src.zip.asc == --- release/camel/apache-camel/3.14.6/apache-camel-3.14.6-src.zip.asc (added) +++ release/camel/apache-camel/3.14.6/apache-camel-3.14.6-src.zip.asc Sat Nov 5 18:35:54 2022 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEYOzvJGEf6DJxT4aqnVvv+llCwEkFAmNfwqAACgkQnVvv+llC +wElykBAApXCdPtF+ZwfiMyZV8V+e5oYNUU17hRGj8cMd71K3ESd3viGOJ28F03WM +5O5uGOF4Xr7zpieTT3z2z/3Oc9nzn0dl9xoz+N3qroFZmaN1rO1OLqJ1bNzSBC6f +2t3xPr281S5EwLLa3ceTYFafZ4EKznLgSyomDLegVtUAQuRxs9/WX838XYkhkEhF +np2zXESyBJhqBiVZTMKJl8HFB6HSf61XA4PNkU1G38t63Ou4k0qdEt4ZoCQUOTu9 +WBMIVYZWAsp+StMK3PFHYC/dy1TucQ03Tt9yMzrEY3Ipj5wm+/GIcjD1AEdbvJWQ +4KX7OPqs2tqwwDFUqRtuTEITb+LMpJPivxEROkTPtwkZ5DacmVgo0ljSFLjnqRYe +/veXo0tgFSp2uGl4AeNL3ys8JckDgTJOuFUG/Urfe50Bw4BNIhlwX5hU6ESTgiLt +QTW7ArZNohWYdc6TwMRYSUjF9UmUmzpl0JSXtk3PB1heBlGMHQTGX6YiRUelCJEH +qIp0lzvf1m5g+iUnGohjlF6p7rsMo1vpe00Hf/peIo26OjLD4FN+UjyVkfMll0c/ +RMA0SRv0AC0MxTQJEdKb/jIaUqoervgo9jJNw73nlqxT3LZsAnl/hE6Ci9aFYuzJ +YauspLrVKHicGYYsjb2yH7IdtXgAW/4PZYyhadf9EromEdtQ65o= +=CeDd +-END PGP SIGNATURE- Added: release/camel/apache-camel/3.14.6/apache-camel-3.14.6-src.zip.sha512 == --- release/camel/apache-camel/3.14.6/apache-camel-3.14.6-src.zip.sha512 (added) +++ release/camel/apache-camel/3.14.6/apache-camel-3.14.6-src.zip.sha512 Sat Nov 5 18:35:54 2022 @@ -0,0 +1 @@ +8f3b593f4d979b3cdc03e4cbc671ae76704163f0eb19a40aa2f9ba73c3673f8d47ab297c69966370b829dd34a3e1374217758a190a4ef03a3b82f0d18db0cd92 apache-camel-3.14.6-src.zip Added: release/camel/apache-camel/3.14.6/apache-camel-3.14.6.pom == --- release/camel/apache-camel/3.14.6/apache-camel-3.14.6.pom (added) +++ release/camel/apache-camel/3.14.6/apache-camel-3.14.6.pom Sat Nov 5 18:35:54 2022 @@ -0,0 +1,288 @@ + + +http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd; xmlns="http://maven.apache.org/POM/4.0.0; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;> + 4.0.0 + +org.apache.camel +camel-parent +3.14.6 +../parent + + org.apache.camel + apache-camel + 3.14.6 + pom + Camel :: Assembly + Apache Camel Assembly + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + +false +true +gnu +true + + + + org.apache.camel + camel-api + 3.14.6 + compile + + + org.apache.camel + camel-util + 3.14.6 + compile + + + org.apache.camel + camel-management-api + 3.14.6 + compile + + + org.apache.camel + camel-management + 3.14.6 + compile + + + org.apache.camel + camel-base + 3.14.6 + compile + + + org.apache.camel + camel-base-engine + 3.14.6 + compile + + + org.apache.camel + camel-support + 3.14.6 + compile + + + org.apache.camel + camel-core + 3.14.6 + compile + + + org.apache.camel + camel-core-engine + 3.14.6 + compile + + + org.apache.camel + camel-core-model + 3.14.6 + compile + + + org.apache.camel + camel-core-processor + 3.14.6 + compile + + + org.apache.camel + camel-core-reifier + 3.14.6 + compile + + + org.apache.camel + camel-core-languages + 3.14.6 + compile + + + org.apache.camel + camel-core-xml + 3.14.6 + compile + + + org.apache.camel + camel-core-catalog + 3.14.6 + compile + + + org.apache.camel + camel-cloud + 3.14.6 + compile + + + org.apache.camel + camel-cluster + 3.14.6 + compile + + +
svn commit: r57807 - /release/camel/apache-camel/3.14.6/
Author: gzurowski Date: Sat Nov 5 18:34:47 2022 New Revision: 57807 Log: Apache Camel 3.14.6 release distro placeholder. Added: release/camel/apache-camel/3.14.6/
[camel] branch regen_bot updated (e3dd702d492 -> 1587657e25f)
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 e3dd702d492 Polished add 1587657e25f CAMEL-18690: camel-jbang - export package name with special symbols No new revisions were added by this update. Summary of changes: .../camel/dsl/jbang/core/commands/ExportBaseCommand.java| 13 + .../camel/dsl/jbang/core/commands/ExportCamelMain.java | 2 +- .../apache/camel/dsl/jbang/core/commands/ExportQuarkus.java | 2 +- .../camel/dsl/jbang/core/commands/ExportSpringBoot.java | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-)
[GitHub] [camel] davsclaus commented on pull request #8673: CAMEL-18549 backport of Dynamic Router EIP component to 3.14.x
davsclaus commented on PR #8673: URL: https://github.com/apache/camel/pull/8673#issuecomment-1304559830 Yeah dev mailing list, zulip chat, or a JIRA. Usually a conversations starts with the former, and then when more concrete end up as a JIRA -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] Steve973 commented on pull request #8673: CAMEL-18549 backport of Dynamic Router EIP component to 3.14.x
Steve973 commented on PR #8673: URL: https://github.com/apache/camel/pull/8673#issuecomment-1304559490 No worries! It was not a big effort. I only checked out 3.14.x, and pulled the changes from main into that module, and that's it. Only took a minute. A cherry-pick would have been even faster. I have been using this component at work and made it (and, of course, Camel) a central part of all module intercommunication, so I may very well have some useful improvements to add to this. I'll probably need your input for the best ways to do some of it. Is there a preferred discussion space for this, other than a ticket? -- 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 #8673: CAMEL-18549 backport of Dynamic Router EIP component to 3.14.x
davsclaus commented on PR #8673: URL: https://github.com/apache/camel/pull/8673#issuecomment-1304558575 Yeah really sorry for making you do all this effort - I should have looked more careful that this bug in the EIP was not part of that release. We cannot make such a big change into a patch LTS branch and hence have to close this PR. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] Steve973 commented on pull request #8673: CAMEL-18549 backport of Dynamic Router EIP component to 3.14.x
Steve973 commented on PR #8673: URL: https://github.com/apache/camel/pull/8673#issuecomment-1304558212 > Ah okay so the EIP was added in 3.15. And because of that then this should not be backported, sorry for the noise. All right. I only did it because you requested it in the ticket. I was not sure how you and this project handle backports. -- 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 closed pull request #8673: CAMEL-18549 backport of Dynamic Router EIP component to 3.14.x
davsclaus closed pull request #8673: CAMEL-18549 backport of Dynamic Router EIP component to 3.14.x URL: https://github.com/apache/camel/pull/8673 -- 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 #8673: CAMEL-18549 backport of Dynamic Router EIP component to 3.14.x
davsclaus commented on PR #8673: URL: https://github.com/apache/camel/pull/8673#issuecomment-1304557708 Ah okay so the EIP was added in 3.15. And because of that then this should not be backported, sorry for the noise. Going to close this PR. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.18.x updated: CAMEL-18690: camel-jbang - export package name with special symbols
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 fc5c5e66e61 CAMEL-18690: camel-jbang - export package name with
special symbols
fc5c5e66e61 is described below
commit fc5c5e66e6199a2c6b1ab2626826e4fa1374c441
Author: Claus Ibsen
AuthorDate: Sat Nov 5 15:30:20 2022 +0100
CAMEL-18690: camel-jbang - export package name with special symbols
---
.../camel/dsl/jbang/core/commands/ExportBaseCommand.java| 13 +
.../camel/dsl/jbang/core/commands/ExportCamelMain.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/ExportQuarkus.java | 2 +-
.../camel/dsl/jbang/core/commands/ExportSpringBoot.java | 2 +-
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index bc7351a350f..862c996445f 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
@@ -325,6 +325,19 @@ abstract class ExportBaseCommand extends CamelCommand {
// noop
}
+protected String exportPackageName(String groupId, String artifactId) {
+// for package name it must be in lower-case and alpha/numeric
+String s = groupId + "." + artifactId;
+StringBuilder sb = new StringBuilder();
+for (char ch : s.toCharArray()) {
+if (ch == '.' || Character.isAlphabetic(ch) ||
Character.isDigit(ch)) {
+ch = Character.toLowerCase(ch);
+sb.append(ch);
+}
+}
+return sb.toString();
+}
+
protected void copySettingsAndProfile(
File settings, File profile, File targetDir,
Function customize)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
index e7512cd8b85..37d3f656511 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
@@ -68,7 +68,7 @@ class ExportCamelMain extends Export {
buildDir.mkdirs();
// copy source files
-String packageName = ids[0] + "." + ids[1];
+String packageName = exportPackageName(ids[0], ids[1]);
File srcJavaDir = new File(BUILD_DIR, "src/main/java/" +
packageName.replace('.', '/'));
srcJavaDir.mkdirs();
File srcResourcesDir = new File(BUILD_DIR, "src/main/resources");
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 eaffe07dcb7..946ab483919 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
@@ -88,7 +88,7 @@ class ExportQuarkus extends Export {
buildDir.mkdirs();
// copy source files
-String packageName = ids[0] + "." + ids[1];
+String packageName = exportPackageName(ids[0], ids[1]);
File srcJavaDir = new File(BUILD_DIR, "src/main/java/" +
packageName.replace('.', '/'));
srcJavaDir.mkdirs();
File srcResourcesDir = new File(BUILD_DIR, "src/main/resources");
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index befcdf202fc..732177b8474 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -76,7 +76,7 @@ class ExportSpringBoot extends Export {
buildDir.mkdirs();
// copy source files
-String packageName = ids[0] + "." + ids[1];
+String packageName = exportPackageName(ids[0], ids[1]);
File srcJavaDir = new File(BUILD_DIR, "src/main/java/" +
packageName.replace('.', '/'));
srcJavaDir.mkdirs();
File srcResourcesDir = new File(BUILD_DIR,
[camel] branch main updated: CAMEL-18690: camel-jbang - export package name with special symbols
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 1587657e25f CAMEL-18690: camel-jbang - export package name with
special symbols
1587657e25f is described below
commit 1587657e25f287be82610a09f9b4d72bd7cf4aaf
Author: Claus Ibsen
AuthorDate: Sat Nov 5 15:30:20 2022 +0100
CAMEL-18690: camel-jbang - export package name with special symbols
---
.../camel/dsl/jbang/core/commands/ExportBaseCommand.java| 13 +
.../camel/dsl/jbang/core/commands/ExportCamelMain.java | 2 +-
.../apache/camel/dsl/jbang/core/commands/ExportQuarkus.java | 2 +-
.../camel/dsl/jbang/core/commands/ExportSpringBoot.java | 2 +-
4 files changed, 16 insertions(+), 3 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index c5529ce532c..ac13cdb0c0a 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
@@ -325,6 +325,19 @@ abstract class ExportBaseCommand extends CamelCommand {
// noop
}
+protected String exportPackageName(String groupId, String artifactId) {
+// for package name it must be in lower-case and alpha/numeric
+String s = groupId + "." + artifactId;
+StringBuilder sb = new StringBuilder();
+for (char ch : s.toCharArray()) {
+if (ch == '.' || Character.isAlphabetic(ch) ||
Character.isDigit(ch)) {
+ch = Character.toLowerCase(ch);
+sb.append(ch);
+}
+}
+return sb.toString();
+}
+
protected void copySettingsAndProfile(
File settings, File profile, File targetDir,
Function customize)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
index 769b24b2f69..2a0fc3495ef 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
@@ -70,7 +70,7 @@ class ExportCamelMain extends Export {
buildDir.mkdirs();
// copy source files
-String packageName = ids[0] + "." + ids[1];
+String packageName = exportPackageName(ids[0], ids[1]);
File srcJavaDir = new File(BUILD_DIR, "src/main/java/" +
packageName.replace('.', '/'));
srcJavaDir.mkdirs();
File srcResourcesDir = new File(BUILD_DIR, "src/main/resources");
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 078032b0c15..5c3d94aff34 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
@@ -90,7 +90,7 @@ class ExportQuarkus extends Export {
buildDir.mkdirs();
// copy source files
-String packageName = ids[0] + "." + ids[1];
+String packageName = exportPackageName(ids[0], ids[1]);
File srcJavaDir = new File(BUILD_DIR, "src/main/java/" +
packageName.replace('.', '/'));
srcJavaDir.mkdirs();
File srcResourcesDir = new File(BUILD_DIR, "src/main/resources");
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index 694bd5e5583..c65bbe34f67 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -78,7 +78,7 @@ class ExportSpringBoot extends Export {
buildDir.mkdirs();
// copy source files
-String packageName = ids[0] + "." + ids[1];
+String packageName = exportPackageName(ids[0], ids[1]);
File srcJavaDir = new File(BUILD_DIR, "src/main/java/" +
packageName.replace('.', '/'));
srcJavaDir.mkdirs();
File srcResourcesDir = new File(BUILD_DIR, "src/main/resources");
[GitHub] [camel] Steve973 opened a new pull request, #8673: CAMEL-18549 backport of Dynamic Router EIP component to 3.14.x
Steve973 opened a new pull request, #8673: URL: https://github.com/apache/camel/pull/8673 Trivial pull request that backports the code from CAMEL-18549 to 3.14.x, adding the Dynamic Router EIP code to this earlier 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-quarkus] ppalaga opened a new issue, #4255: XmlTest.aggregate() test fails on the platform
ppalaga opened a new issue, #4255: URL: https://github.com/apache/camel-quarkus/issues/4255 ... because it reads files from the local filesystem. Those files should either be copied from class path to a temp folder or even better should be passed to the route via RESTeasy to avoid the need for camel-file dependency altogether. -- 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.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (40c03c32c15 -> e3dd702d492)
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 40c03c32c15 Regen add e3dd702d492 Polished No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- components/camel-plc4x/pom.xml | 26 +++--- .../camel/component/plc4x/Plc4XEndpoint.java | 14 +++- parent/pom.xml | 2 +- 4 files changed, 18 insertions(+), 26 deletions(-)
[camel] branch regen_bot updated (a9b14bb151f -> 40c03c32c15)
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 a9b14bb151f CAMEL-18663: camel-vertx-http: allow to configure WebClientOptions at component level (#8664) add 771746f8fb1 (chores) camel-plc4x: removed incorrect documentation file (#8666) add 40c03c32c15 Regen No new revisions were added by this update. Summary of changes: components/camel-plc4x/src/main/docs/PLC4X.adoc| 64 -- .../camel-plc4x/src/main/docs/plc4x-component.adoc | 15 + docs/components/modules/others/nav.adoc| 1 - docs/components/modules/others/pages/PLC4X.adoc| 1 - 4 files changed, 15 insertions(+), 66 deletions(-) delete mode 100644 components/camel-plc4x/src/main/docs/PLC4X.adoc delete mode 12 docs/components/modules/others/pages/PLC4X.adoc
[GitHub] [camel-quarkus] ppalaga opened a new issue, #4254: CxfSoapClientTest.wsdlUpToDate() and CxfSoapWssClientTest.wsdlUpToDate() fail on the platform
ppalaga opened a new issue, #4254: URL: https://github.com/apache/camel-quarkus/issues/4254 ... because they both read a file from `target/classes/wsdl` which is available only through class path on the platform. -- 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.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (5f0d8878913 -> a9b14bb151f)
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 5f0d8878913 chore(vertx-http-cleanup): replace deprecated methods (#8665) add a9b14bb151f CAMEL-18663: camel-vertx-http: allow to configure WebClientOptions at component level (#8664) No new revisions were added by this update. Summary of changes: .../camel/catalog/components/vertx-http.json | 1 + .../vertx/http/VertxHttpComponentConfigurer.java | 6 ++ .../camel/component/vertx/http/vertx-http.json | 1 + .../component/vertx/http/VertxHttpComponent.java | 17 + .../vertx/http/VertxHttpCustomWebClientTest.java | 76 ++ .../dsl/VertxHttpComponentBuilderFactory.java | 18 + 6 files changed, 119 insertions(+) create mode 100644 components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpCustomWebClientTest.java
[camel] branch regen_bot updated (f39b4a712fa -> 5f0d8878913)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git discard f39b4a712fa Regen for commit 771746f8fb1c7df8ad21ade947b1f6059a02e2d4 omit 771746f8fb1 (chores) camel-plc4x: removed incorrect documentation file (#8666) omit a9b14bb151f CAMEL-18663: camel-vertx-http: allow to configure WebClientOptions at component level (#8664) This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/regen_bot (5f0d8878913) \ O -- O -- O (f39b4a712fa) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../camel/catalog/components/vertx-http.json | 1 - components/camel-plc4x/src/main/docs/PLC4X.adoc| 64 ++ .../camel-plc4x/src/main/docs/plc4x-component.adoc | 15 - .../vertx/http/VertxHttpComponentConfigurer.java | 6 -- .../camel/component/vertx/http/vertx-http.json | 1 - .../component/vertx/http/VertxHttpComponent.java | 17 - .../vertx/http/VertxHttpCustomWebClientTest.java | 76 -- docs/components/modules/others/nav.adoc| 1 + docs/components/modules/others/pages/PLC4X.adoc| 1 + .../dsl/VertxHttpComponentBuilderFactory.java | 18 - 10 files changed, 66 insertions(+), 134 deletions(-) create mode 100644 components/camel-plc4x/src/main/docs/PLC4X.adoc delete mode 100644 components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpCustomWebClientTest.java create mode 12 docs/components/modules/others/pages/PLC4X.adoc
[GitHub] [camel] github-actions[bot] closed pull request #8672: Generated sources regen
github-actions[bot] closed pull request #8672: Generated sources regen URL: https://github.com/apache/camel/pull/8672 -- 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 (be53c26eea1 -> f39b4a712fa)
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 be53c26eea1 camel-controlbus - Fix list of languages in the endpoint option that was out of sync add 5f0d8878913 chore(vertx-http-cleanup): replace deprecated methods (#8665) add a9b14bb151f CAMEL-18663: camel-vertx-http: allow to configure WebClientOptions at component level (#8664) add 771746f8fb1 (chores) camel-plc4x: removed incorrect documentation file (#8666) add f39b4a712fa Regen for commit 771746f8fb1c7df8ad21ade947b1f6059a02e2d4 No new revisions were added by this update. Summary of changes: .../camel/catalog/components/vertx-http.json | 1 + components/camel-plc4x/src/main/docs/PLC4X.adoc| 64 -- .../camel-plc4x/src/main/docs/plc4x-component.adoc | 15 + .../vertx/http/VertxHttpComponentConfigurer.java | 6 ++ .../camel/component/vertx/http/vertx-http.json | 1 + .../component/vertx/http/VertxHttpComponent.java | 17 + .../component/vertx/http/VertxHttpHelper.java | 3 +- .../vertx/http/VertxHttpCustomWebClientTest.java | 76 ++ .../vertx/http/VertxHttpSendDynamicAwareTest.java | 10 +-- docs/components/modules/others/nav.adoc| 1 - docs/components/modules/others/pages/PLC4X.adoc| 1 - .../dsl/VertxHttpComponentBuilderFactory.java | 18 + 12 files changed, 141 insertions(+), 72 deletions(-) delete mode 100644 components/camel-plc4x/src/main/docs/PLC4X.adoc create mode 100644 components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpCustomWebClientTest.java delete mode 12 docs/components/modules/others/pages/PLC4X.adoc
[GitHub] [camel] github-actions[bot] opened a new pull request, #8672: Generated sources regen
github-actions[bot] opened a new pull request, #8672: URL: https://github.com/apache/camel/pull/8672 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 (785cd13664b -> be53c26eea1)
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 785cd13664b CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own add be53c26eea1 camel-controlbus - Fix list of languages in the endpoint option that was out of sync No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/components/controlbus.json| 2 +- .../org/apache/camel/component/controlbus/controlbus.json | 2 +- .../camel/component/controlbus/ControlBusEndpoint.java | 2 +- .../camel/builder/endpoint/StaticEndpointBuilders.java | 14 -- .../endpoint/dsl/ControlBusEndpointBuilderFactory.java | 14 -- 5 files changed, 19 insertions(+), 15 deletions(-)
[camel-karaf] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 36b6b74c Regen
36b6b74c is described below
commit 36b6b74c78259daecb75568ca5c29c264eabf70f
Author: Claus Ibsen
AuthorDate: Sat Nov 5 11:38:32 2022 +0100
Regen
---
.../resources/org/apache/camel/catalog/karaf/components/controlbus.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/controlbus.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/controlbus.json
index cce68229..e3d33aad 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/controlbus.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/controlbus.json
@@ -27,7 +27,7 @@
},
"properties": {
"command": { "kind": "path", "displayName": "Command", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "enum": [ "route", "language" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description":
"Command can be either route or language" },
-"language": { "kind": "path", "displayName": "Language", "group":
"producer", "label": "", "required": false, "type": "object", "javaType":
"org.apache.camel.spi.Language", "enum": [ "bean", "constant", "el",
"exchangeProperty", "file", "groovy", "header", "jsonpath", "mvel", "ognl",
"ref", "simple", "spel", "sql", "terser", "tokenize", "xpath", "xquery",
"xtokenize" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Allows you to specify the name of a Langu [...]
+"language": { "kind": "path", "displayName": "Language", "group":
"producer", "label": "", "required": false, "type": "object", "javaType":
"org.apache.camel.spi.Language", "enum": [ "bean", "constant", "csimple",
"datasonnet", "exchangeProperty", "file", "groovy", "header", "hl7terser",
"joor", "jq", "jsonpath", "mvel", "ognl", "python", "ref", "simple", "spel",
"tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "autowired":
false, "secret": false, "description": "Al [...]
"action": { "kind": "parameter", "displayName": "Action", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "start", "stop", "fail", "suspend", "resume",
"restart", "status", "stats" ], "deprecated": false, "autowired": false,
"secret": false, "description": "To denote an action that can be either: start,
stop, or status. To either start or stop a route, or to get the status of the
route as output in the message body. You [...]
"async": { "kind": "parameter", "displayName": "Async", "group":
"producer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether to execute the control bus task
asynchronously. Important: If this option is enabled, then any result from the
task is not set on the Exchange. This is only possible if executing tasks
synchronously." },
"loggingLevel": { "kind": "parameter", "displayName": "Logging Level",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG",
"INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "INFO", "description": "Logging level used for
logging when task is done, or if any exceptions occurred during processing the
task." },
[camel] branch main updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new e3dd702d492 Polished
e3dd702d492 is described below
commit e3dd702d4923c67070f37bd3e4f5bb6cfbf97b6c
Author: Claus Ibsen
AuthorDate: Sat Nov 5 11:33:00 2022 +0100
Polished
---
camel-dependencies/pom.xml | 2 +-
components/camel-plc4x/pom.xml | 26 +++---
.../camel/component/plc4x/Plc4XEndpoint.java | 14 +++-
parent/pom.xml | 2 +-
4 files changed, 18 insertions(+), 26 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 0d88165b283..8b71caaac2e 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -451,7 +451,7 @@
42.4.1
0.8.9
4.6.3
-0.10.0
+0.10.0
2.0.7
1.0-alpha-2
0.6.1
diff --git a/components/camel-plc4x/pom.xml b/components/camel-plc4x/pom.xml
index 3369ee6004d..02aaba77fee 100644
--- a/components/camel-plc4x/pom.xml
+++ b/components/camel-plc4x/pom.xml
@@ -42,17 +42,17 @@
org.apache.plc4x
plc4j-api
-${plc4x.version}
+${plc4x-version}
org.apache.plc4x
plc4j-connection-pool
-${plc4x.version}
+${plc4x-version}
org.apache.plc4x
plc4j-scraper
-${plc4x.version}
+${plc4x-version}
com.fasterxml.jackson.core
@@ -65,7 +65,7 @@
org.apache.plc4x
plc4j-driver-ab-eth
-${plc4x.version}
+${plc4x-version}
runtime
@@ -81,55 +81,55 @@
org.apache.plc4x
plc4j-driver-ads
-${plc4x.version}
+${plc4x-version}
runtime
org.apache.plc4x
plc4j-driver-canopen
-${plc4x.version}
+${plc4x-version}
runtime
org.apache.plc4x
plc4j-driver-eip
-${plc4x.version}
+${plc4x-version}
runtime
org.apache.plc4x
plc4j-driver-firmata
-${plc4x.version}
+${plc4x-version}
runtime
org.apache.plc4x
plc4j-driver-knxnetip
-${plc4x.version}
+${plc4x-version}
runtime
org.apache.plc4x
plc4j-driver-modbus
-${plc4x.version}
+${plc4x-version}
runtime
org.apache.plc4x
plc4j-driver-opcua
-${plc4x.version}
+${plc4x-version}
runtime
org.apache.plc4x
plc4j-driver-s7
-${plc4x.version}
+${plc4x-version}
runtime
org.apache.plc4x
plc4j-driver-simulated
-${plc4x.version}
+${plc4x-version}
runtime
diff --git
a/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
b/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
index 2fcb95d44a9..9883ccd4831 100644
---
a/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
+++
b/components/camel-plc4x/src/main/java/org/apache/camel/component/plc4x/Plc4XEndpoint.java
@@ -99,11 +99,6 @@ public class Plc4XEndpoint extends DefaultEndpoint {
return connection;
}
-@Override
-public void setProperties(Object bean, Map parameters) {
-
-}
-
@Override
public Producer createProducer() throws Exception {
//Checking if connection is still up and reconnecting if not
@@ -119,12 +114,9 @@ public class Plc4XEndpoint extends DefaultEndpoint {
if (!connection.isConnected()) {
connection =
plcDriverManager.getConnection(uri.replaceFirst("plc4x:/?/?", ""));
}
-return new Plc4XConsumer(this, processor);
-}
-
-@Override
-public boolean isSingleton() {
-return true;
+Plc4XConsumer consumer = new Plc4XConsumer(this, processor);
+configureConsumer(consumer);
+return consumer;
}
public PlcDriverManager getPlcDriverManager() {
diff --git a/parent/pom.xml b/parent/pom.xml
index 298b9f9b7a9..eb1aec4ed4c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -437,7 +437,7 @@
42.4.1
0.8.9
4.6.3
-0.10.0
+0.10.0
2.0.7
[camel-spring-boot] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 7d510d121a8 Regen
7d510d121a8 is described below
commit 7d510d121a8f1f8e0a718bdacd1802ee7de1a2ce
Author: Claus Ibsen
AuthorDate: Sat Nov 5 11:27:02 2022 +0100
Regen
---
.../camel/springboot/catalog/components/controlbus.json| 2 +-
.../camel/springboot/catalog/components/vertx-http.json| 1 +
.../camel-vertx-http-starter/src/main/docs/vertx-http.json | 6 ++
.../http/springboot/VertxHttpComponentConfiguration.java | 14 ++
.../vertx/http/springboot/VertxHttpComponentConverter.java | 2 ++
5 files changed, 24 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/controlbus.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/controlbus.json
index 37d0ec216e0..e5c94d42181 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/controlbus.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/controlbus.json
@@ -27,7 +27,7 @@
},
"properties": {
"command": { "kind": "path", "displayName": "Command", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "enum": [ "route", "language" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description":
"Command can be either route or language" },
-"language": { "kind": "path", "displayName": "Language", "group":
"producer", "label": "", "required": false, "type": "object", "javaType":
"org.apache.camel.spi.Language", "enum": [ "bean", "constant", "el",
"exchangeProperty", "file", "groovy", "header", "jsonpath", "mvel", "ognl",
"ref", "simple", "spel", "sql", "terser", "tokenize", "xpath", "xquery",
"xtokenize" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Allows you to specify the name of a Langu [...]
+"language": { "kind": "path", "displayName": "Language", "group":
"producer", "label": "", "required": false, "type": "object", "javaType":
"org.apache.camel.spi.Language", "enum": [ "bean", "constant", "csimple",
"datasonnet", "exchangeProperty", "file", "groovy", "header", "hl7terser",
"joor", "jq", "jsonpath", "mvel", "ognl", "python", "ref", "simple", "spel",
"tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "autowired":
false, "secret": false, "description": "Al [...]
"action": { "kind": "parameter", "displayName": "Action", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "start", "stop", "fail", "suspend", "resume",
"restart", "status", "stats" ], "deprecated": false, "autowired": false,
"secret": false, "description": "To denote an action that can be either: start,
stop, or status. To either start or stop a route, or to get the status of the
route as output in the message body. You [...]
"async": { "kind": "parameter", "displayName": "Async", "group":
"producer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether to execute the control bus task
asynchronously. Important: If this option is enabled, then any result from the
task is not set on the Exchange. This is only possible if executing tasks
synchronously." },
"loggingLevel": { "kind": "parameter", "displayName": "Logging Level",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG",
"INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "INFO", "description": "Logging level used for
logging when task is done, or if any exceptions occurred during processing the
task." },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-http.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-http.json
index 245f65a50dd..01be6e279b6 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-http.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-http.json
@@ -29,6 +29,7 @@
"vertx": { "kind": "property", "displayName": "Vertx", "group":
"advanced", "label": "advanced", "required": false, "type": "object",
"javaType":
[camel] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 40c03c32c15 Regen 40c03c32c15 is described below commit 40c03c32c15d84273d233f05c63a122ebbb4405c Author: Claus Ibsen AuthorDate: Sat Nov 5 11:24:48 2022 +0100 Regen --- docs/components/modules/others/nav.adoc | 1 - docs/components/modules/others/pages/PLC4X.adoc | 1 - 2 files changed, 2 deletions(-) diff --git a/docs/components/modules/others/nav.adoc b/docs/components/modules/others/nav.adoc index a059ecbc11f..7563eaa6f6a 100644 --- a/docs/components/modules/others/nav.adoc +++ b/docs/components/modules/others/nav.adoc @@ -5,7 +5,6 @@ ** xref:attachments.adoc[Attachments] ** xref:aws-xray.adoc[AWS XRay] ** xref:caffeine-lrucache.adoc[Caffeine Lrucache] -** xref:PLC4X.adoc[Camel-PLC4X Component] ** xref:cdi.adoc[CDI] ** xref:cdi-jta.adoc[CDI JTA] ** xref:cdi-main.adoc[CDI Main] diff --git a/docs/components/modules/others/pages/PLC4X.adoc b/docs/components/modules/others/pages/PLC4X.adoc deleted file mode 12 index 155f309919a..000 --- a/docs/components/modules/others/pages/PLC4X.adoc +++ /dev/null @@ -1 +0,0 @@ -../../../../../components/camel-plc4x/src/main/docs/PLC4X.adoc \ No newline at end of file
[GitHub] [camel-spring-boot] davsclaus commented on pull request #659: Bump actions/setup-java from 1 to 3
davsclaus commented on PR #659: URL: https://github.com/apache/camel-spring-boot/pull/659#issuecomment-1304468203 @otavioprado @oscerd I wonder if you have seen this kind of PR update on other camel sub projects? And if we can merge this PR -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.18.x updated: CAMEL-18447 Camel-pubsub: AsyncTaskException: Asynchronous task failed with real account (#8667)
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 b2b00a39d28 CAMEL-18447 Camel-pubsub: AsyncTaskException: Asynchronous
task failed with real account (#8667)
b2b00a39d28 is described below
commit b2b00a39d28ca05ccaa99b55fd2641cc8048ee5b
Author: JiriOndrusek
AuthorDate: Sat Nov 5 11:00:22 2022 +0100
CAMEL-18447 Camel-pubsub: AsyncTaskException: Asynchronous task failed with
real account (#8667)
---
.../camel/component/google/pubsub/GooglePubsubConsumer.java| 6 +-
.../component/google/pubsub/consumer/AcknowledgeSync.java | 10 ++
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git
a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
index e639e400e22..ef3dc08a443 100644
---
a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
+++
b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/GooglePubsubConsumer.java
@@ -192,8 +192,12 @@ public class GooglePubsubConsumer extends DefaultConsumer {
}
if (endpoint.getAckMode() !=
GooglePubsubConstants.AckMode.NONE) {
+//existing subscriber can not be propagated,
because it will be closed at the end of this block
+//subscriber will be created at the moment of use
+// (see
https://issues.apache.org/jira/browse/CAMEL-18447)
exchange.adapt(ExtendedExchange.class)
-.addOnCompletion(new
AcknowledgeSync(subscriber, subscriptionName));
+.addOnCompletion(new AcknowledgeSync(
+() ->
endpoint.getComponent().getSubscriberStub(endpoint), subscriptionName));
}
try {
diff --git
a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/consumer/AcknowledgeSync.java
b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/consumer/AcknowledgeSync.java
index df4498607d8..0c2fa0528f3 100644
---
a/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/consumer/AcknowledgeSync.java
+++
b/components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/consumer/AcknowledgeSync.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.google.pubsub.consumer;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.Callable;
import com.google.cloud.pubsub.v1.stub.SubscriberStub;
import com.google.pubsub.v1.AcknowledgeRequest;
@@ -28,11 +29,12 @@ import org.apache.camel.spi.Synchronization;
public class AcknowledgeSync implements Synchronization {
-private final SubscriberStub subscriber;
+//Supplier cannot be used because of thrown exception (Callback used
instead)
+private final Callable subscriberStubSupplier;
private final String subscriptionName;
-public AcknowledgeSync(SubscriberStub subscriber, String subscriptionName)
{
-this.subscriber = subscriber;
+public AcknowledgeSync(Callable subscriberStubSupplier,
String subscriptionName) {
+this.subscriberStubSupplier = subscriberStubSupplier;
this.subscriptionName = subscriptionName;
}
@@ -41,7 +43,7 @@ public class AcknowledgeSync implements Synchronization {
AcknowledgeRequest ackRequest = AcknowledgeRequest.newBuilder()
.addAllAckIds(getAckIdList(exchange))
.setSubscription(subscriptionName).build();
-try {
+try (SubscriberStub subscriber = subscriberStubSupplier.call()) {
subscriber.acknowledgeCallable().call(ackRequest);
} catch (Exception e) {
throw new RuntimeCamelException(e);
[GitHub] [camel] davsclaus merged pull request #8667: CAMEL-18447 Camel-pubsub: AsyncTaskException: Asynchronous task faile…
davsclaus merged PR #8667: URL: https://github.com/apache/camel/pull/8667 -- 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: (chores) camel-plc4x: removed incorrect documentation file (#8666)
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 771746f8fb1 (chores) camel-plc4x: removed incorrect documentation file
(#8666)
771746f8fb1 is described below
commit 771746f8fb1c7df8ad21ade947b1f6059a02e2d4
Author: Otavio Rodolfo Piske
AuthorDate: Sat Nov 5 10:57:57 2022 +0100
(chores) camel-plc4x: removed incorrect documentation file (#8666)
---
components/camel-plc4x/src/main/docs/PLC4X.adoc| 64 --
.../camel-plc4x/src/main/docs/plc4x-component.adoc | 15 +
2 files changed, 15 insertions(+), 64 deletions(-)
diff --git a/components/camel-plc4x/src/main/docs/PLC4X.adoc
b/components/camel-plc4x/src/main/docs/PLC4X.adoc
deleted file mode 100644
index 5e6901d1e48..000
--- a/components/camel-plc4x/src/main/docs/PLC4X.adoc
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// contributor license agreements. See the NOTICE file distributed with
-// this work for additional information regarding copyright ownership.
-// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "License"); you may not use this file except in compliance with
-// the License. You may obtain a copy of the License at
-//
-// https://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.
-//
-
-:icons: font
-
-== Camel-PLC4X Component
-The Camel Component for PLC4X allows you to create routes using the PLC4X API
to read from a PLC device or write to it.
-
-=== Maven dependency
-To use the Camel component, just add following dependency to your project
-
-
- org.apache.plc4x
- plc4j-apache-camel
- {current-last-released-version}
-
-
-
-== Endpoint
-[cols="2"]
-|===
-|Name |Value
-
-|*Tags* | The tags to read as `Map` containing the tagname
associated to its query
-|*Trigger*|(*Consumer*) Query to a trigger. On a rising edge of the trigger,
the tags will be read once
-|*Period* |(*Consumer*) Interval on which the Trigger should be checked
-|*Driver parameters* | Every Parameter unknown to the Component will be passed
to the driver
-|===
-=== URI Format
-
-plc4x:[driver-code]://[IP|host][?parameters]
-
-Note that sometimes you want to add the `Transport` code after the `Driver`
code:
-
-
-plc4x:[driver-code]:[transport-code]://[IP|host][?parameters]
-
-== Consumer
-The consumer supports one-time reading or Triggered Reading. (_Schedulded
Reading using Period only soon_).To read from
-the PLC, use a `Map` containing the Alias and Queries for the
Data you want.
-
-The Body create by the Consumer will be a `Map` containing the
Aliases and there associated value
-read from the PLC.
-
-== Producer
-To write data to the PLC, we also use a `Map`. The difference with the
Producer is that the `Value` of the Map has also to
-be a Map. Also, this `Map` has to be set into the `Body` of the `Message`
-
-The used `Map` would be a `Map` where the
`Map` represent the Query and the
-data we want to write to it.
diff --git a/components/camel-plc4x/src/main/docs/plc4x-component.adoc
b/components/camel-plc4x/src/main/docs/plc4x-component.adoc
index a55f91f0349..b0f4395e84a 100644
--- a/components/camel-plc4x/src/main/docs/plc4x-component.adoc
+++ b/components/camel-plc4x/src/main/docs/plc4x-component.adoc
@@ -58,3 +58,18 @@ Maven users will need to add the following dependency to
their pom.xml.
---
where `$\{camel-version}` must be replaced by the actual version of Camel.
+
+
+== Consumer
+The consumer supports one-time reading or Triggered Reading. (_Schedulded
Reading using Period only soon_).To read from
+the PLC, use a `Map` containing the Alias and Queries for the
Data you want.
+
+The Body create by the Consumer will be a `Map` containing the
Aliases and there associated value
+read from the PLC.
+
+== Producer
+To write data to the PLC, we also use a `Map`. The difference with the
Producer is that the `Value` of the Map has also to
+be a Map. Also, this `Map` has to be set into the `Body` of the `Message`
+
+The used `Map` would be a `Map` where the
`Map` represent the Query and the
+data we want to write to it.
[GitHub] [camel] davsclaus merged pull request #8666: (chores) camel-plc4x: removed reference to spring-boot-starter as it does not yet exist
davsclaus merged PR #8666: URL: https://github.com/apache/camel/pull/8666 -- 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-18663: camel-vertx-http: allow to configure WebClientOptions at component level (#8664)
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 a9b14bb151f CAMEL-18663: camel-vertx-http: allow to configure
WebClientOptions at component level (#8664)
a9b14bb151f is described below
commit a9b14bb151f666d049e4f06b3f8cc0219404d30e
Author: Luca Burgazzoli
AuthorDate: Sat Nov 5 10:57:11 2022 +0100
CAMEL-18663: camel-vertx-http: allow to configure WebClientOptions at
component level (#8664)
---
.../camel/catalog/components/vertx-http.json | 1 +
.../vertx/http/VertxHttpComponentConfigurer.java | 6 ++
.../camel/component/vertx/http/vertx-http.json | 1 +
.../component/vertx/http/VertxHttpComponent.java | 17 +
.../vertx/http/VertxHttpCustomWebClientTest.java | 76 ++
.../dsl/VertxHttpComponentBuilderFactory.java | 18 +
6 files changed, 119 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-http.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-http.json
index a6e420713b7..cc06fbafaf0 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-http.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/vertx-http.json
@@ -29,6 +29,7 @@
"vertx": { "kind": "property", "displayName": "Vertx", "group":
"advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "io.vertx.core.Vertx", "deprecated": false, "autowired": false,
"secret": false, "description": "To use an existing vertx instead of creating a
new instance" },
"vertxHttpBinding": { "kind": "property", "displayName": "Vertx Http
Binding", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "org.apache.camel.component.vertx.http.VertxHttpBinding",
"deprecated": false, "autowired": false, "secret": false, "description": "A
custom VertxHttpBinding which can control how to bind between Vert.x and Camel"
},
"vertxOptions": { "kind": "property", "displayName": "Vertx Options",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "io.vertx.core.VertxOptions", "deprecated": false, "autowired":
false, "secret": false, "description": "To provide a custom set of vertx
options for configuring vertx" },
+"webClientOptions": { "kind": "property", "displayName": "Web Client
Options", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "io.vertx.ext.web.client.WebClientOptions", "deprecated":
false, "autowired": false, "secret": false, "description": "To provide a custom
set of options for configuring vertx web client" },
"headerFilterStrategy": { "kind": "property", "displayName": "Header
Filter Strategy", "group": "filter", "label": "filter", "required": false,
"type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and
from Camel message." },
"proxyHost": { "kind": "property", "displayName": "Proxy Host", "group":
"proxy", "label": "proxy", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The proxy server host address" },
"proxyPassword": { "kind": "property", "displayName": "Proxy Password",
"group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The proxy server password if authentication is
required" },
diff --git
a/components/camel-vertx/camel-vertx-http/src/generated/java/org/apache/camel/component/vertx/http/VertxHttpComponentConfigurer.java
b/components/camel-vertx/camel-vertx-http/src/generated/java/org/apache/camel/component/vertx/http/VertxHttpComponentConfigurer.java
index aa157f2eadc..eb9beb6ad0f 100644
---
a/components/camel-vertx/camel-vertx-http/src/generated/java/org/apache/camel/component/vertx/http/VertxHttpComponentConfigurer.java
+++
b/components/camel-vertx/camel-vertx-http/src/generated/java/org/apache/camel/component/vertx/http/VertxHttpComponentConfigurer.java
@@ -56,6 +56,8 @@ public class VertxHttpComponentConfigurer extends
PropertyConfigurerSupport impl
case "vertxHttpBinding":
target.setVertxHttpBinding(property(camelContext,
org.apache.camel.component.vertx.http.VertxHttpBinding.class, value)); return
true;
case "vertxoptions":
case "vertxOptions": target.setVertxOptions(property(camelContext,
io.vertx.core.VertxOptions.class, value)); return true;
+case
[GitHub] [camel] davsclaus merged pull request #8664: CAMEL-18663: camel-vertx-http: allow to configure WebClientOptions at component level
davsclaus merged PR #8664: URL: https://github.com/apache/camel/pull/8664 -- 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: chore(vertx-http-cleanup): replace deprecated methods (#8665)
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 5f0d8878913 chore(vertx-http-cleanup): replace deprecated methods
(#8665)
5f0d8878913 is described below
commit 5f0d8878913e323e68fba73c4a69a97c06e61bd8
Author: Luca Burgazzoli
AuthorDate: Sat Nov 5 10:56:37 2022 +0100
chore(vertx-http-cleanup): replace deprecated methods (#8665)
---
.../org/apache/camel/component/vertx/http/VertxHttpHelper.java | 3 +--
.../component/vertx/http/VertxHttpSendDynamicAwareTest.java| 10 ++
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git
a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpHelper.java
b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpHelper.java
index 842ca79ddf4..1d003544f36 100644
---
a/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpHelper.java
+++
b/components/camel-vertx/camel-vertx-http/src/main/java/org/apache/camel/component/vertx/http/VertxHttpHelper.java
@@ -27,7 +27,6 @@ import java.net.URISyntaxException;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePropertyKey;
import org.apache.camel.Message;
-import org.apache.camel.http.base.HttpHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
@@ -139,7 +138,7 @@ public final class VertxHttpHelper {
String charset = null;
if (exchange != null) {
String contentType =
exchange.getMessage().getHeader(VertxHttpConstants.CONTENT_TYPE, String.class);
-charset = HttpHelper.getCharsetFromContentType(contentType);
+charset = IOHelper.getCharsetNameFromContentType(contentType);
if (ObjectHelper.isEmpty(charset)) {
charset =
exchange.getProperty(ExchangePropertyKey.CHARSET_NAME, String.class);
}
diff --git
a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpSendDynamicAwareTest.java
b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpSendDynamicAwareTest.java
index 065425d159b..e2a34aba9aa 100644
---
a/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpSendDynamicAwareTest.java
+++
b/components/camel-vertx/camel-vertx-http/src/test/java/org/apache/camel/component/vertx/http/VertxHttpSendDynamicAwareTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.vertx.http;
import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.support.NormalizedUri;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -33,13 +34,14 @@ public class VertxHttpSendDynamicAwareTest extends
VertxHttpTestSupport {
out = fluentTemplate.to("direct:joes").withHeader("drink",
"wine").request(String.class);
assertEquals("Drinking wine", out);
+NormalizedUri uri = NormalizedUri
+.newNormalizedUri("vertx-http://http://localhost:; + getPort()
+ "?throwExceptionOnFailure=false", false);
+
// and there should only be one http endpoint as they are both on same
host
-boolean found = context.getEndpointMap()
-.containsKey("vertx-http://http://localhost:; + getPort() +
"?throwExceptionOnFailure=false");
-assertTrue(found, "Should find static uri");
+assertTrue(context.getEndpointRegistry().containsKey(uri), "Should
find static uri");
// we only have 2xdirect and 2xVERTX-http
-assertEquals(4, context.getEndpointMap().size());
+assertEquals(4, context.getEndpointRegistry().size());
}
@Override
[GitHub] [camel] davsclaus merged pull request #8665: chore(vertx-http-cleanup): replace deprecated methods
davsclaus merged PR #8665: URL: https://github.com/apache/camel/pull/8665 -- 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-controlbus - Fix list of languages in the endpoint option that was out of sync
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 ac297f9a238 camel-controlbus - Fix list of languages in the endpoint
option that was out of sync
ac297f9a238 is described below
commit ac297f9a238328b4a1d3002f6cbfef5159ce6f70
Author: Claus Ibsen
AuthorDate: Sat Nov 5 10:54:43 2022 +0100
camel-controlbus - Fix list of languages in the endpoint option that was
out of sync
---
.../java/org/apache/camel/component/controlbus/ControlBusEndpoint.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
b/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
index c0584ec13e7..a35886d910a 100644
---
a/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
+++
b/components/camel-controlbus/src/main/java/org/apache/camel/component/controlbus/ControlBusEndpoint.java
@@ -44,7 +44,7 @@ public class ControlBusEndpoint extends DefaultEndpoint {
@UriPath(description = "Command can be either route or language", enums =
"route,language")
@Metadata(required = true)
private String command;
-@UriPath(enums =
"bean,constant,el,exchangeProperty,file,groovy,header,jsonpath,mvel,ognl,ref,simple,spel,sql,terser,tokenize,xpath,xquery,xtokenize")
+@UriPath(enums =
"bean,constant,csimple,datasonnet,exchangeProperty,file,groovy,header,hl7terser,joor,jq,jsonpath,mvel,ognl,ref,simple,spel,tokenize,xpath,xquery,xtokenize")
private Language language;
@UriParam
private String routeId;
[camel] branch main updated: camel-controlbus - Fix list of languages in the endpoint option that was out of sync
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 be53c26eea1 camel-controlbus - Fix list of languages in the endpoint
option that was out of sync
be53c26eea1 is described below
commit be53c26eea114773896b2510a633f837d809
Author: Claus Ibsen
AuthorDate: Sat Nov 5 10:53:17 2022 +0100
camel-controlbus - Fix list of languages in the endpoint option that was
out of sync
---
.../org/apache/camel/catalog/components/controlbus.json| 2 +-
.../org/apache/camel/component/controlbus/controlbus.json | 2 +-
.../camel/component/controlbus/ControlBusEndpoint.java | 2 +-
.../camel/builder/endpoint/StaticEndpointBuilders.java | 14 --
.../endpoint/dsl/ControlBusEndpointBuilderFactory.java | 14 --
5 files changed, 19 insertions(+), 15 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/controlbus.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/controlbus.json
index cce68229977..e3d33aad975 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/controlbus.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/controlbus.json
@@ -27,7 +27,7 @@
},
"properties": {
"command": { "kind": "path", "displayName": "Command", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "enum": [ "route", "language" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description":
"Command can be either route or language" },
-"language": { "kind": "path", "displayName": "Language", "group":
"producer", "label": "", "required": false, "type": "object", "javaType":
"org.apache.camel.spi.Language", "enum": [ "bean", "constant", "el",
"exchangeProperty", "file", "groovy", "header", "jsonpath", "mvel", "ognl",
"ref", "simple", "spel", "sql", "terser", "tokenize", "xpath", "xquery",
"xtokenize" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Allows you to specify the name of a Langu [...]
+"language": { "kind": "path", "displayName": "Language", "group":
"producer", "label": "", "required": false, "type": "object", "javaType":
"org.apache.camel.spi.Language", "enum": [ "bean", "constant", "csimple",
"datasonnet", "exchangeProperty", "file", "groovy", "header", "hl7terser",
"joor", "jq", "jsonpath", "mvel", "ognl", "python", "ref", "simple", "spel",
"tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "autowired":
false, "secret": false, "description": "Al [...]
"action": { "kind": "parameter", "displayName": "Action", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "start", "stop", "fail", "suspend", "resume",
"restart", "status", "stats" ], "deprecated": false, "autowired": false,
"secret": false, "description": "To denote an action that can be either: start,
stop, or status. To either start or stop a route, or to get the status of the
route as output in the message body. You [...]
"async": { "kind": "parameter", "displayName": "Async", "group":
"producer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Whether to execute the control bus task
asynchronously. Important: If this option is enabled, then any result from the
task is not set on the Exchange. This is only possible if executing tasks
synchronously." },
"loggingLevel": { "kind": "parameter", "displayName": "Logging Level",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG",
"INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "INFO", "description": "Logging level used for
logging when task is done, or if any exceptions occurred during processing the
task." },
diff --git
a/components/camel-controlbus/src/generated/resources/org/apache/camel/component/controlbus/controlbus.json
b/components/camel-controlbus/src/generated/resources/org/apache/camel/component/controlbus/controlbus.json
index cce68229977..e3d33aad975 100644
---
a/components/camel-controlbus/src/generated/resources/org/apache/camel/component/controlbus/controlbus.json
+++
b/components/camel-controlbus/src/generated/resources/org/apache/camel/component/controlbus/controlbus.json
@@ -27,7 +27,7 @@
},
"properties": {
"command": { "kind": "path", "displayName": "Command", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
[camel] branch regen_bot updated (eb0dadcb7ba -> 785cd13664b)
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 eb0dadcb7ba Regen for commit 04dc07755d97b22d0e22252c84e9625b90c695f6 add 785cd13664b CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own No new revisions were added by this update. Summary of changes: .../user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc | 6 ++ 1 file changed, 6 insertions(+)
[camel] branch regen_bot updated (5e2ce6c7b65 -> eb0dadcb7ba)
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 5e2ce6c7b65 Regen for commit 51f674dadb2cd5605ef03df26d18814e6867de53 add 7f0158b9523 CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own add e17197e9d5d CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own add eb0dadcb7ba Regen for commit 04dc07755d97b22d0e22252c84e9625b90c695f6 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 (5e2ce6c7b65) \ N -- N -- N refs/heads/regen_bot (eb0dadcb7ba) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../apache/camel/coap/CoAPComponentTLSTestBase.java| 18 -- .../apache/camel/coap/CoAPRestComponentTLSTest.java| 7 +++ .../lumberjack/LumberjackComponentGlobalSSLTest.java | 13 + .../lumberjack/LumberjackComponentSSLTest.java | 7 +-- .../camel/component/lumberjack/LumberjackUtil.java | 3 ++- 5 files changed, 39 insertions(+), 9 deletions(-)
[camel] branch main created (now 785cd13664b)
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 785cd13664b CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own This branch includes the following new commits: new e17197e9d5d CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own new eb0dadcb7ba Regen for commit 04dc07755d97b22d0e22252c84e9625b90c695f6 new 785cd13664b CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] 01/03: CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own
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 e17197e9d5de64a86ce4a1432f40c4b9543f8345
Author: Claus Ibsen
AuthorDate: Sat Nov 5 09:49:04 2022 +0100
CAMEL-18665: camel-core: JsseParameters should use the camel provided
resource loader instead of its own
---
.../apache/camel/coap/CoAPComponentTLSTestBase.java| 18 --
.../apache/camel/coap/CoAPRestComponentTLSTest.java| 7 +++
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git
a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
index a4c229ae490..235b54fbd7c 100644
---
a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
+++
b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
@@ -24,6 +24,7 @@ import java.security.PublicKey;
import javax.crypto.KeyGenerator;
+import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
@@ -225,7 +226,7 @@ abstract class CoAPComponentTLSTestBase extends
CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
-registerTLSConfiguration();
+registerTLSConfiguration(context);
return new RouteBuilder() {
@Override
@@ -336,40 +337,48 @@ abstract class CoAPComponentTLSTestBase extends
CamelTestSupport {
};
}
-private void registerTLSConfiguration() throws GeneralSecurityException,
IOException {
+private void registerTLSConfiguration(CamelContext context) throws
GeneralSecurityException, IOException {
KeyStoreParameters serviceKeystoreParameters = new
KeyStoreParameters();
+serviceKeystoreParameters.setCamelContext(context);
serviceKeystoreParameters.setResource("service.jks");
serviceKeystoreParameters.setPassword("security");
KeyStoreParameters selfSignedKeyStoreParameters = new
KeyStoreParameters();
+selfSignedKeyStoreParameters.setCamelContext(context);
selfSignedKeyStoreParameters.setResource("selfsigned.jks");
selfSignedKeyStoreParameters.setPassword("security");
KeyStoreParameters clientKeystoreParameters = new KeyStoreParameters();
+clientKeystoreParameters.setCamelContext(context);
clientKeystoreParameters.setResource("client.jks");
clientKeystoreParameters.setPassword("security");
KeyStoreParameters truststoreParameters = new KeyStoreParameters();
+truststoreParameters.setCamelContext(context);
truststoreParameters.setResource("truststore.jks");
truststoreParameters.setPassword("storepass");
KeyStoreParameters truststoreParameters2 = new KeyStoreParameters();
+truststoreParameters2.setCamelContext(context);
truststoreParameters2.setResource("truststore2.jks");
truststoreParameters2.setPassword("storepass");
SSLContextParameters serviceSSLContextParameters = new
SSLContextParameters();
+serviceSSLContextParameters.setCamelContext(context);
KeyManagersParameters serviceSSLKeyManagers = new
KeyManagersParameters();
serviceSSLKeyManagers.setKeyPassword("security");
serviceSSLKeyManagers.setKeyStore(serviceKeystoreParameters);
serviceSSLContextParameters.setKeyManagers(serviceSSLKeyManagers);
SSLContextParameters selfSignedServiceSSLContextParameters = new
SSLContextParameters();
+selfSignedServiceSSLContextParameters.setCamelContext(context);
KeyManagersParameters selfSignedServiceSSLKeyManagers = new
KeyManagersParameters();
selfSignedServiceSSLKeyManagers.setKeyPassword("security");
selfSignedServiceSSLKeyManagers.setKeyStore(selfSignedKeyStoreParameters);
selfSignedServiceSSLContextParameters.setKeyManagers(selfSignedServiceSSLKeyManagers);
SSLContextParameters clientAuthServiceSSLContextParameters = new
SSLContextParameters();
+clientAuthServiceSSLContextParameters.setCamelContext(context);
KeyManagersParameters clientAuthServiceSSLKeyManagers = new
KeyManagersParameters();
clientAuthServiceSSLKeyManagers.setKeyPassword("security");
clientAuthServiceSSLKeyManagers.setKeyStore(serviceKeystoreParameters);
@@ -382,16 +391,19 @@ abstract class CoAPComponentTLSTestBase extends
CamelTestSupport {
clientAuthServiceSSLContextParameters.setServerParameters(clientAuthSSLContextServerParameters);
SSLContextParameters clientSSLContextParameters = new
SSLContextParameters();
+clientSSLContextParameters.setCamelContext(context);
TrustManagersParameters clientSSLTrustManagers
[camel] 02/03: Regen for commit 04dc07755d97b22d0e22252c84e9625b90c695f6
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 eb0dadcb7ba702103fe3e88f4a975be863504607 Author: davsclaus AuthorDate: Sat Nov 5 08:53:09 2022 + Regen for commit 04dc07755d97b22d0e22252c84e9625b90c695f6 Signed-off-by: GitHub --- .../java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java| 1 - 1 file changed, 1 deletion(-) diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java index d6f81575de5..f4ed76979f2 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java @@ -102,7 +102,6 @@ import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; import org.apache.camel.support.processor.validation.SchemaValidationException; import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test;
[camel] 03/03: CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own
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 785cd13664bf995d250faa988066ad3a80934363 Author: Claus Ibsen AuthorDate: Sat Nov 5 09:57:32 2022 +0100 CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own --- .../user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc | 6 ++ 1 file changed, 6 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc index 0035db7de52..3f3e0351f5b 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc @@ -6,6 +6,12 @@ from both 3.0 to 3.1 and 3.1 to 3.2. == Upgrading Camel 3.19 to 3.20 +=== camel-api + +The `org.apache.camel.support.jsse.SSLContextParameters` is now using `ResourceLoader` from `CamelContext` +to load keystore and other resources in a standard way. Therefore, the `SSLContextParameters` now must have been pre-configured +with a `CamelContext` otherwise an exception is thrown. + === camel-jsonpath There is a new option `unpackArray` that unpacks a single-element Json array, matched by a Jsonpath, into an object. This option is disabled by default (this behaviour was enabled by default in previous Camel versions). There is a new expression `jsonpathUnpack(String text, Class resultType)` that makes use of this new option.
[GitHub] [camel] oscerd merged pull request #8671: Generated sources regen
oscerd merged PR #8671: URL: https://github.com/apache/camel/pull/8671 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] opened a new pull request, #8671: Generated sources regen
github-actions[bot] opened a new pull request, #8671: URL: https://github.com/apache/camel/pull/8671 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-k] Yavnikaa commented on issue #3705: Misleading message when updating an unchanged `Integration`
Yavnikaa commented on issue #3705: URL: https://github.com/apache/camel-k/issues/3705#issuecomment-1304457454 Thanks, working on it! I wanted to know if it is necessary to install maven as well to make it work? -- 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] 03/03: CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own
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 785cd13664bf995d250faa988066ad3a80934363 Author: Claus Ibsen AuthorDate: Sat Nov 5 09:57:32 2022 +0100 CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own --- .../user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc | 6 ++ 1 file changed, 6 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc index 0035db7de52..3f3e0351f5b 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc @@ -6,6 +6,12 @@ from both 3.0 to 3.1 and 3.1 to 3.2. == Upgrading Camel 3.19 to 3.20 +=== camel-api + +The `org.apache.camel.support.jsse.SSLContextParameters` is now using `ResourceLoader` from `CamelContext` +to load keystore and other resources in a standard way. Therefore, the `SSLContextParameters` now must have been pre-configured +with a `CamelContext` otherwise an exception is thrown. + === camel-jsonpath There is a new option `unpackArray` that unpacks a single-element Json array, matched by a Jsonpath, into an object. This option is disabled by default (this behaviour was enabled by default in previous Camel versions). There is a new expression `jsonpathUnpack(String text, Class resultType)` that makes use of this new option.
[camel] branch main created (now 785cd13664b)
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 785cd13664b CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own This branch includes the following new commits: new e17197e9d5d CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own new eb0dadcb7ba Regen for commit 04dc07755d97b22d0e22252c84e9625b90c695f6 new 785cd13664b CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] 02/03: Regen for commit 04dc07755d97b22d0e22252c84e9625b90c695f6
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 eb0dadcb7ba702103fe3e88f4a975be863504607 Author: davsclaus AuthorDate: Sat Nov 5 08:53:09 2022 + Regen for commit 04dc07755d97b22d0e22252c84e9625b90c695f6 Signed-off-by: GitHub --- .../java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java| 1 - 1 file changed, 1 deletion(-) diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java index d6f81575de5..f4ed76979f2 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java @@ -102,7 +102,6 @@ import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; import org.apache.camel.support.processor.validation.SchemaValidationException; import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test;
[camel] 01/03: CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own
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 e17197e9d5de64a86ce4a1432f40c4b9543f8345
Author: Claus Ibsen
AuthorDate: Sat Nov 5 09:49:04 2022 +0100
CAMEL-18665: camel-core: JsseParameters should use the camel provided
resource loader instead of its own
---
.../apache/camel/coap/CoAPComponentTLSTestBase.java| 18 --
.../apache/camel/coap/CoAPRestComponentTLSTest.java| 7 +++
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git
a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
index a4c229ae490..235b54fbd7c 100644
---
a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
+++
b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
@@ -24,6 +24,7 @@ import java.security.PublicKey;
import javax.crypto.KeyGenerator;
+import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
@@ -225,7 +226,7 @@ abstract class CoAPComponentTLSTestBase extends
CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
-registerTLSConfiguration();
+registerTLSConfiguration(context);
return new RouteBuilder() {
@Override
@@ -336,40 +337,48 @@ abstract class CoAPComponentTLSTestBase extends
CamelTestSupport {
};
}
-private void registerTLSConfiguration() throws GeneralSecurityException,
IOException {
+private void registerTLSConfiguration(CamelContext context) throws
GeneralSecurityException, IOException {
KeyStoreParameters serviceKeystoreParameters = new
KeyStoreParameters();
+serviceKeystoreParameters.setCamelContext(context);
serviceKeystoreParameters.setResource("service.jks");
serviceKeystoreParameters.setPassword("security");
KeyStoreParameters selfSignedKeyStoreParameters = new
KeyStoreParameters();
+selfSignedKeyStoreParameters.setCamelContext(context);
selfSignedKeyStoreParameters.setResource("selfsigned.jks");
selfSignedKeyStoreParameters.setPassword("security");
KeyStoreParameters clientKeystoreParameters = new KeyStoreParameters();
+clientKeystoreParameters.setCamelContext(context);
clientKeystoreParameters.setResource("client.jks");
clientKeystoreParameters.setPassword("security");
KeyStoreParameters truststoreParameters = new KeyStoreParameters();
+truststoreParameters.setCamelContext(context);
truststoreParameters.setResource("truststore.jks");
truststoreParameters.setPassword("storepass");
KeyStoreParameters truststoreParameters2 = new KeyStoreParameters();
+truststoreParameters2.setCamelContext(context);
truststoreParameters2.setResource("truststore2.jks");
truststoreParameters2.setPassword("storepass");
SSLContextParameters serviceSSLContextParameters = new
SSLContextParameters();
+serviceSSLContextParameters.setCamelContext(context);
KeyManagersParameters serviceSSLKeyManagers = new
KeyManagersParameters();
serviceSSLKeyManagers.setKeyPassword("security");
serviceSSLKeyManagers.setKeyStore(serviceKeystoreParameters);
serviceSSLContextParameters.setKeyManagers(serviceSSLKeyManagers);
SSLContextParameters selfSignedServiceSSLContextParameters = new
SSLContextParameters();
+selfSignedServiceSSLContextParameters.setCamelContext(context);
KeyManagersParameters selfSignedServiceSSLKeyManagers = new
KeyManagersParameters();
selfSignedServiceSSLKeyManagers.setKeyPassword("security");
selfSignedServiceSSLKeyManagers.setKeyStore(selfSignedKeyStoreParameters);
selfSignedServiceSSLContextParameters.setKeyManagers(selfSignedServiceSSLKeyManagers);
SSLContextParameters clientAuthServiceSSLContextParameters = new
SSLContextParameters();
+clientAuthServiceSSLContextParameters.setCamelContext(context);
KeyManagersParameters clientAuthServiceSSLKeyManagers = new
KeyManagersParameters();
clientAuthServiceSSLKeyManagers.setKeyPassword("security");
clientAuthServiceSSLKeyManagers.setKeyStore(serviceKeystoreParameters);
@@ -382,16 +391,19 @@ abstract class CoAPComponentTLSTestBase extends
CamelTestSupport {
clientAuthServiceSSLContextParameters.setServerParameters(clientAuthSSLContextServerParameters);
SSLContextParameters clientSSLContextParameters = new
SSLContextParameters();
+clientSSLContextParameters.setCamelContext(context);
TrustManagersParameters clientSSLTrustManagers
[GitHub] [camel] oscerd merged pull request #8670: Generated sources regen
oscerd merged PR #8670: URL: https://github.com/apache/camel/pull/8670 -- 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 (ec3263108d2 -> 5e2ce6c7b65)
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 ec3263108d2 Regen for commit 7f0158b9523b8cfd8dd9bb21759988a820744d30 omit 7f0158b9523 CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own add 5e2ce6c7b65 Regen for commit 51f674dadb2cd5605ef03df26d18814e6867de53 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 (ec3263108d2) \ N -- N -- N refs/heads/regen_bot (5e2ce6c7b65) 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: .../lumberjack/LumberjackComponentGlobalSSLTest.java| 13 - .../component/lumberjack/LumberjackComponentSSLTest.java| 7 ++- .../apache/camel/component/lumberjack/LumberjackUtil.java | 3 +-- 3 files changed, 7 insertions(+), 16 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #8670: Generated sources regen
github-actions[bot] opened a new pull request, #8670: URL: https://github.com/apache/camel/pull/8670 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] 03/03: CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own
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 785cd13664bf995d250faa988066ad3a80934363 Author: Claus Ibsen AuthorDate: Sat Nov 5 09:57:32 2022 +0100 CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own --- .../user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc | 6 ++ 1 file changed, 6 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc index 0035db7de52..3f3e0351f5b 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc @@ -6,6 +6,12 @@ from both 3.0 to 3.1 and 3.1 to 3.2. == Upgrading Camel 3.19 to 3.20 +=== camel-api + +The `org.apache.camel.support.jsse.SSLContextParameters` is now using `ResourceLoader` from `CamelContext` +to load keystore and other resources in a standard way. Therefore, the `SSLContextParameters` now must have been pre-configured +with a `CamelContext` otherwise an exception is thrown. + === camel-jsonpath There is a new option `unpackArray` that unpacks a single-element Json array, matched by a Jsonpath, into an object. This option is disabled by default (this behaviour was enabled by default in previous Camel versions). There is a new expression `jsonpathUnpack(String text, Class resultType)` that makes use of this new option.
[camel] branch main created (now 785cd13664b)
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 785cd13664b CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own This branch includes the following new commits: new e17197e9d5d CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own new eb0dadcb7ba Regen for commit 04dc07755d97b22d0e22252c84e9625b90c695f6 new 785cd13664b CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] 01/03: CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own
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 e17197e9d5de64a86ce4a1432f40c4b9543f8345
Author: Claus Ibsen
AuthorDate: Sat Nov 5 09:49:04 2022 +0100
CAMEL-18665: camel-core: JsseParameters should use the camel provided
resource loader instead of its own
---
.../apache/camel/coap/CoAPComponentTLSTestBase.java| 18 --
.../apache/camel/coap/CoAPRestComponentTLSTest.java| 7 +++
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git
a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
index a4c229ae490..235b54fbd7c 100644
---
a/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
+++
b/components/camel-coap/src/test/java/org/apache/camel/coap/CoAPComponentTLSTestBase.java
@@ -24,6 +24,7 @@ import java.security.PublicKey;
import javax.crypto.KeyGenerator;
+import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
@@ -225,7 +226,7 @@ abstract class CoAPComponentTLSTestBase extends
CamelTestSupport {
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
-registerTLSConfiguration();
+registerTLSConfiguration(context);
return new RouteBuilder() {
@Override
@@ -336,40 +337,48 @@ abstract class CoAPComponentTLSTestBase extends
CamelTestSupport {
};
}
-private void registerTLSConfiguration() throws GeneralSecurityException,
IOException {
+private void registerTLSConfiguration(CamelContext context) throws
GeneralSecurityException, IOException {
KeyStoreParameters serviceKeystoreParameters = new
KeyStoreParameters();
+serviceKeystoreParameters.setCamelContext(context);
serviceKeystoreParameters.setResource("service.jks");
serviceKeystoreParameters.setPassword("security");
KeyStoreParameters selfSignedKeyStoreParameters = new
KeyStoreParameters();
+selfSignedKeyStoreParameters.setCamelContext(context);
selfSignedKeyStoreParameters.setResource("selfsigned.jks");
selfSignedKeyStoreParameters.setPassword("security");
KeyStoreParameters clientKeystoreParameters = new KeyStoreParameters();
+clientKeystoreParameters.setCamelContext(context);
clientKeystoreParameters.setResource("client.jks");
clientKeystoreParameters.setPassword("security");
KeyStoreParameters truststoreParameters = new KeyStoreParameters();
+truststoreParameters.setCamelContext(context);
truststoreParameters.setResource("truststore.jks");
truststoreParameters.setPassword("storepass");
KeyStoreParameters truststoreParameters2 = new KeyStoreParameters();
+truststoreParameters2.setCamelContext(context);
truststoreParameters2.setResource("truststore2.jks");
truststoreParameters2.setPassword("storepass");
SSLContextParameters serviceSSLContextParameters = new
SSLContextParameters();
+serviceSSLContextParameters.setCamelContext(context);
KeyManagersParameters serviceSSLKeyManagers = new
KeyManagersParameters();
serviceSSLKeyManagers.setKeyPassword("security");
serviceSSLKeyManagers.setKeyStore(serviceKeystoreParameters);
serviceSSLContextParameters.setKeyManagers(serviceSSLKeyManagers);
SSLContextParameters selfSignedServiceSSLContextParameters = new
SSLContextParameters();
+selfSignedServiceSSLContextParameters.setCamelContext(context);
KeyManagersParameters selfSignedServiceSSLKeyManagers = new
KeyManagersParameters();
selfSignedServiceSSLKeyManagers.setKeyPassword("security");
selfSignedServiceSSLKeyManagers.setKeyStore(selfSignedKeyStoreParameters);
selfSignedServiceSSLContextParameters.setKeyManagers(selfSignedServiceSSLKeyManagers);
SSLContextParameters clientAuthServiceSSLContextParameters = new
SSLContextParameters();
+clientAuthServiceSSLContextParameters.setCamelContext(context);
KeyManagersParameters clientAuthServiceSSLKeyManagers = new
KeyManagersParameters();
clientAuthServiceSSLKeyManagers.setKeyPassword("security");
clientAuthServiceSSLKeyManagers.setKeyStore(serviceKeystoreParameters);
@@ -382,16 +391,19 @@ abstract class CoAPComponentTLSTestBase extends
CamelTestSupport {
clientAuthServiceSSLContextParameters.setServerParameters(clientAuthSSLContextServerParameters);
SSLContextParameters clientSSLContextParameters = new
SSLContextParameters();
+clientSSLContextParameters.setCamelContext(context);
TrustManagersParameters clientSSLTrustManagers
[camel] 02/03: Regen for commit 04dc07755d97b22d0e22252c84e9625b90c695f6
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 eb0dadcb7ba702103fe3e88f4a975be863504607 Author: davsclaus AuthorDate: Sat Nov 5 08:53:09 2022 + Regen for commit 04dc07755d97b22d0e22252c84e9625b90c695f6 Signed-off-by: GitHub --- .../java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java| 1 - 1 file changed, 1 deletion(-) diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java index d6f81575de5..f4ed76979f2 100644 --- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java +++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XmlSignatureTest.java @@ -102,7 +102,6 @@ import org.apache.camel.spi.Registry; import org.apache.camel.support.SimpleRegistry; import org.apache.camel.support.processor.validation.SchemaValidationException; import org.apache.camel.test.junit5.CamelTestSupport; -import org.apache.camel.test.junit5.TestSupport; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test;
[GitHub] [camel] oscerd merged pull request #8669: Generated sources regen
oscerd merged PR #8669: URL: https://github.com/apache/camel/pull/8669 -- 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 (c0acc100fe9 -> ec3263108d2)
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 c0acc100fe9 Regen for commit 04dc07755d97b22d0e22252c84e9625b90c695f6 add 38bdb123785 CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own add 51f674dadb2 CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own add 7f0158b9523 CAMEL-18665: camel-core: JsseParameters should use the camel provided resource loader instead of its own add ec3263108d2 Regen for commit 7f0158b9523b8cfd8dd9bb21759988a820744d30 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 (c0acc100fe9) \ N -- N -- N refs/heads/regen_bot (ec3263108d2) 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: .../lumberjack/LumberjackComponentGlobalSSLTest.java | 13 + .../component/lumberjack/LumberjackComponentSSLTest.java | 7 +-- .../apache/camel/component/lumberjack/LumberjackUtil.java | 3 ++- .../org/apache/camel/component/mail/MailConfiguration.java | 14 +++--- .../java/org/apache/camel/component/mail/MailEndpoint.java | 4 ++-- .../java/org/apache/camel/component/mail/MailProducer.java | 3 ++- .../apache/camel/component/mail/MailEndpointTlsTest.java | 6 +++--- 7 files changed, 30 insertions(+), 20 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #8669: Generated sources regen
github-actions[bot] opened a new pull request, #8669: URL: https://github.com/apache/camel/pull/8669 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
