(camel-website) branch main updated: Fix docs for website build
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-website.git The following commit(s) were added to refs/heads/main by this push: new d56e8814 Fix docs for website build d56e8814 is described below commit d56e88143a22c4e939de0fef394706caf8b589fe Author: Claus Ibsen AuthorDate: Wed Apr 17 21:42:41 2024 +0200 Fix docs for website build --- content/blog/2023/07/camel-k-2-0/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/blog/2023/07/camel-k-2-0/index.md b/content/blog/2023/07/camel-k-2-0/index.md index 7fe683c6..3757310a 100644 --- a/content/blog/2023/07/camel-k-2-0/index.md +++ b/content/blog/2023/07/camel-k-2-0/index.md @@ -35,7 +35,7 @@ WARNING: make sure not to downgrade to Camel K version 1 once you have upgraded The old `v1alpha1.KameletBinding` will still be supported in this release in order to give you the time to make the needed change and move all your KameletBindings to [`v1.Pipe`](/camel-k/next/apis/camel-k.html#_camel_apache_org_v1_Pipe). Try to give priority to this operation because the `v1alpha1` is now deprecated and will be removed within the next versions of Camel K. -There is no other important concern about the compatibility with the previous Camel K version. You can follow the [documentation provided for Camel K upgrade](/camel-k/next/contributing/upgrade.html) as usual. +There is no other important concern about the compatibility with the previous Camel K version. We suggest to take the opportunity of this major upgrade to detect any usage of deprecated parameters in the [Camel K API](/camel-k/next/apis/camel-k.html) and do the switch accordingly.
(camel) branch main updated: Fix docs for website build
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 eafdb804f01 Fix docs for website build
eafdb804f01 is described below
commit eafdb804f01fab1109a3079df3ff9b235181b03c
Author: Claus Ibsen
AuthorDate: Wed Apr 17 19:40:51 2024 +0200
Fix docs for website build
---
components/camel-kafka/src/main/docs/kafka-component.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-kafka/src/main/docs/kafka-component.adoc
b/components/camel-kafka/src/main/docs/kafka-component.adoc
index f48a4f5e9bd..ae166242489 100644
--- a/components/camel-kafka/src/main/docs/kafka-component.adoc
+++ b/components/camel-kafka/src/main/docs/kafka-component.adoc
@@ -506,7 +506,7 @@ The size of the batch is controlled by the option
`maxPollRecords`.
To avoid blocking for too long, waiting for the whole set of records to fill
the batch, it is possible to use the `pollTimeoutMs` option to set a timeout
for the polling. In this case, the batch may contain less messages than set in
the `maxPollRecords`.
- Automatic Commits
+=== Automatic Commits
By default, Camel uses automatic commits when using batch processing. In this
case, Camel automatically commits the records after they have been successfully
processed by the application.
@@ -535,7 +535,7 @@ public void configure() {
}
-= Handling Errors with Automatic Commits
+ Handling Errors with Automatic Commits
When using automatic commits, Camel will not commit records if there is a
failure in processing. Because of this, there is a risk that records could be
reprocessed multiple times.
(camel-k) branch main updated: Fix docs for website build
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-k.git The following commit(s) were added to refs/heads/main by this push: new 5dbafc998 Fix docs for website build 5dbafc998 is described below commit 5dbafc998e133544f9eebbe4a4e26524e101f1fc Author: Claus Ibsen AuthorDate: Wed Apr 17 19:40:04 2024 +0200 Fix docs for website build --- docs/modules/ROOT/pages/installation/upgrade.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/ROOT/pages/installation/upgrade.adoc b/docs/modules/ROOT/pages/installation/upgrade.adoc index a601385b3..a04ed6448 100644 --- a/docs/modules/ROOT/pages/installation/upgrade.adoc +++ b/docs/modules/ROOT/pages/installation/upgrade.adoc @@ -13,7 +13,7 @@ kamel install --force --olm=false This operation will install all the required configuration for the new operator version, replacing the previous one. Mind that the `Integration` resources running won't be affected, so they will keep running with the default runtime details provided in the previous operator version. [[helms-crds]] -=== CRD Upgrades (Helm upgrade) +== CRD Upgrades (Helm upgrade) Generally, when upgrading a patch or a minor version, we may introduce slight non-breaking compatibility changes in CRDs. These changes should be onboarded with the installation procedure you're using (CLI, OLM). However, you may want to control the upgrade of CRDs (for instance, upgrading in Helm, which, does not support CRDs upgrade out of the box). In this case, before doing the upgrade, you'll need to manually upgrade the CRDs, in order to use the new parameters expected by the new o [...]
(camel) branch main updated: camel-jbang - Upgrade to Q 3.9.3
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 4cb2db483ce camel-jbang - Upgrade to Q 3.9.3
4cb2db483ce is described below
commit 4cb2db483cefe9cc41f2de3546128cce50318122
Author: Claus Ibsen
AuthorDate: Wed Apr 17 19:11:36 2024 +0200
camel-jbang - Upgrade to Q 3.9.3
---
.../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 2 +-
.../camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java | 2 +-
2 files changed, 2 insertions(+), 2 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 6b4c072ef22..efe1c8c5108 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -163,7 +163,7 @@ abstract class ExportBaseCommand extends CamelCommand {
protected String quarkusArtifactId;
@CommandLine.Option(names = { "--quarkus-version" }, description =
"Quarkus Platform version",
-defaultValue = "3.9.2")
+defaultValue = "3.9.3")
protected String quarkusVersion;
@CommandLine.Option(names = { "--maven-wrapper" }, defaultValue = "true",
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
index e10a07a7586..762b3da6f1d 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
@@ -49,7 +49,7 @@ public abstract class CatalogBaseCommand extends CamelCommand
{
String runtime;
@CommandLine.Option(names = { "--quarkus-version" }, description =
"Quarkus Platform version",
-defaultValue = "3.9.2")
+defaultValue = "3.9.3")
String quarkusVersion;
@CommandLine.Option(names = { "--repos" },
(camel) branch main updated: camel-jbang - Fix potential NPE in debug
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 e77784d952a camel-jbang - Fix potential NPE in debug
e77784d952a is described below
commit e77784d952a31c17ed4a658615c1d16c17f196d6
Author: Claus Ibsen
AuthorDate: Wed Apr 17 16:53:18 2024 +0200
camel-jbang - Fix potential NPE in debug
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
index b3ca7ab43b4..4a76e5251c1 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
@@ -478,8 +478,10 @@ public class Debug extends Run {
List panel = new ArrayList<>();
if (!row.code.isEmpty()) {
String loc = StringHelper.beforeLast(row.location, ":",
row.location);
-if (loc.length() < 72) {
+if (loc != null && loc.length() < 72) {
loc = loc + " ".repeat(72 - loc.length());
+} else {
+loc = "";
}
panel.add(Panel.withCode("Source: " + loc).andHistory("History"));
panel.add(Panel.withCode("-".repeat(80))
(camel) branch camel-4.4.x updated: CAMEL-20388: Restore the old cookieStore Strategy (#13838)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.4.x by this push:
new 2f1fc98430a CAMEL-20388: Restore the old cookieStore Strategy (#13838)
2f1fc98430a is described below
commit 2f1fc98430a43d7a8cce91e31e4d9614ce3f87a7
Author: Federico Mariani <34543311+cro...@users.noreply.github.com>
AuthorDate: Wed Apr 17 14:28:57 2024 +0200
CAMEL-20388: Restore the old cookieStore Strategy (#13838)
---
.../internal/streaming/SubscriptionHelper.java | 46 --
1 file changed, 34 insertions(+), 12 deletions(-)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index a4d750568af..d0dd17aafdf 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -16,21 +16,19 @@
*/
package org.apache.camel.component.salesforce.internal.streaming;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.io.IOException;
+import java.net.CookieManager;
+import java.net.CookiePolicy;
+import java.net.CookieStore;
+import java.net.URI;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Stream;
import org.apache.camel.CamelException;
-import org.apache.camel.component.salesforce.SalesforceComponent;
-import org.apache.camel.component.salesforce.SalesforceEndpoint;
-import org.apache.camel.component.salesforce.SalesforceEndpointConfig;
-import org.apache.camel.component.salesforce.SalesforceHttpClient;
-import org.apache.camel.component.salesforce.StreamingApiConsumer;
+import org.apache.camel.component.salesforce.*;
import org.apache.camel.component.salesforce.api.SalesforceException;
import org.apache.camel.component.salesforce.internal.SalesforceSession;
import org.apache.camel.support.service.ServiceSupport;
@@ -42,15 +40,15 @@ import org.cometd.client.BayeuxClient.State;
import org.cometd.client.http.jetty.JettyHttpClientTransport;
import org.cometd.client.transport.ClientTransport;
import org.eclipse.jetty.client.Request;
+import org.eclipse.jetty.http.HttpCookie;
+import org.eclipse.jetty.http.HttpCookieStore;
import org.eclipse.jetty.http.HttpHeader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.cometd.bayeux.Channel.META_CONNECT;
-import static org.cometd.bayeux.Channel.META_HANDSHAKE;
-import static org.cometd.bayeux.Channel.META_SUBSCRIBE;
+import static org.cometd.bayeux.Channel.*;
import static org.cometd.bayeux.Message.ERROR_FIELD;
import static org.cometd.bayeux.Message.SUBSCRIPTION_FIELD;
@@ -393,6 +391,9 @@ public class SubscriptionHelper extends ServiceSupport {
session.login(null);
}
+CookieStore cookieStore = new CookieManager().getCookieStore();
+HttpCookieStore httpCookieStore = new HttpCookieStore.Default();
+
ClientTransport transport = new JettyHttpClientTransport(options,
httpClient) {
@Override
protected void customize(Request request) {
@@ -410,6 +411,27 @@ public class SubscriptionHelper extends ServiceSupport {
String finalAccessToken = new String(accessToken);
request.headers(h -> h.add(HttpHeader.AUTHORIZATION, "OAuth "
+ finalAccessToken));
}
+
+@Override
+protected void storeCookies(URI uri, Map>
cookies) {
+try {
+CookieManager cookieManager = new
CookieManager(cookieStore, CookiePolicy.ACCEPT_ALL);
+cookieManager.put(uri, cookies);
+
+for (java.net.HttpCookie httpCookie :
cookieManager.getCookieStore().getCookies()) {
+httpCookieStore.add(uri, HttpCookie.from(httpCookie));
+}
+} catch (IOException x) {
+if (LOG.isDebugEnabled()) {
+LOG.debug("Could not parse cookies", x);
+}
+}
+}
+
+@Override
+protected HttpCookieStore getHttpCookieStore() {
+
(camel) branch main updated: CAMEL-20388: Restore the old cookieStore Strategy (#13837)
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 b70721d0c9a CAMEL-20388: Restore the old cookieStore Strategy (#13837)
b70721d0c9a is described below
commit b70721d0c9a1c22d30cd2e1c30787d35405972f7
Author: Federico Mariani <34543311+cro...@users.noreply.github.com>
AuthorDate: Wed Apr 17 14:27:58 2024 +0200
CAMEL-20388: Restore the old cookieStore Strategy (#13837)
---
.../internal/streaming/SubscriptionHelper.java | 46 --
1 file changed, 34 insertions(+), 12 deletions(-)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index a4d750568af..d0dd17aafdf 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -16,21 +16,19 @@
*/
package org.apache.camel.component.salesforce.internal.streaming;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.io.IOException;
+import java.net.CookieManager;
+import java.net.CookiePolicy;
+import java.net.CookieStore;
+import java.net.URI;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import java.util.stream.Stream;
import org.apache.camel.CamelException;
-import org.apache.camel.component.salesforce.SalesforceComponent;
-import org.apache.camel.component.salesforce.SalesforceEndpoint;
-import org.apache.camel.component.salesforce.SalesforceEndpointConfig;
-import org.apache.camel.component.salesforce.SalesforceHttpClient;
-import org.apache.camel.component.salesforce.StreamingApiConsumer;
+import org.apache.camel.component.salesforce.*;
import org.apache.camel.component.salesforce.api.SalesforceException;
import org.apache.camel.component.salesforce.internal.SalesforceSession;
import org.apache.camel.support.service.ServiceSupport;
@@ -42,15 +40,15 @@ import org.cometd.client.BayeuxClient.State;
import org.cometd.client.http.jetty.JettyHttpClientTransport;
import org.cometd.client.transport.ClientTransport;
import org.eclipse.jetty.client.Request;
+import org.eclipse.jetty.http.HttpCookie;
+import org.eclipse.jetty.http.HttpCookieStore;
import org.eclipse.jetty.http.HttpHeader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.cometd.bayeux.Channel.META_CONNECT;
-import static org.cometd.bayeux.Channel.META_HANDSHAKE;
-import static org.cometd.bayeux.Channel.META_SUBSCRIBE;
+import static org.cometd.bayeux.Channel.*;
import static org.cometd.bayeux.Message.ERROR_FIELD;
import static org.cometd.bayeux.Message.SUBSCRIPTION_FIELD;
@@ -393,6 +391,9 @@ public class SubscriptionHelper extends ServiceSupport {
session.login(null);
}
+CookieStore cookieStore = new CookieManager().getCookieStore();
+HttpCookieStore httpCookieStore = new HttpCookieStore.Default();
+
ClientTransport transport = new JettyHttpClientTransport(options,
httpClient) {
@Override
protected void customize(Request request) {
@@ -410,6 +411,27 @@ public class SubscriptionHelper extends ServiceSupport {
String finalAccessToken = new String(accessToken);
request.headers(h -> h.add(HttpHeader.AUTHORIZATION, "OAuth "
+ finalAccessToken));
}
+
+@Override
+protected void storeCookies(URI uri, Map>
cookies) {
+try {
+CookieManager cookieManager = new
CookieManager(cookieStore, CookiePolicy.ACCEPT_ALL);
+cookieManager.put(uri, cookies);
+
+for (java.net.HttpCookie httpCookie :
cookieManager.getCookieStore().getCookies()) {
+httpCookieStore.add(uri, HttpCookie.from(httpCookie));
+}
+} catch (IOException x) {
+if (LOG.isDebugEnabled()) {
+LOG.debug("Could not parse cookies", x);
+}
+}
+}
+
+@Override
+protected HttpCookieStore getHttpCookieStore() {
+
(camel) branch xfix deleted (was 4d08489183e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch xfix in repository https://gitbox.apache.org/repos/asf/camel.git was 4d08489183e Regen The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: Xfix (#13841)
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 07a96ad9da9 Xfix (#13841)
07a96ad9da9 is described below
commit 07a96ad9da9d96ca09ceff1e7aaff808357f6a89
Author: Claus Ibsen
AuthorDate: Wed Apr 17 14:27:11 2024 +0200
Xfix (#13841)
* CAMEL-20667: Add ref error handler to model. camel-yaml-dsl: Avoid two
kinds of error handler in the schema model.
* Fix unit test as the xml dumper may have changed recently
* Regen
---
.../apache/camel/catalog/models/errorHandler.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 33
.../org/apache/camel/model/errorHandler.json | 2 +-
.../apache/camel/model/ErrorHandlerDefinition.java | 2 +
.../camel/util/DumpModelAsXmlNamespaceTest.java| 14 +++-
.../java/org/apache/camel/xml/in/ModelParser.java | 1 +
.../java/org/apache/camel/xml/out/ModelWriter.java | 1 +
.../org/apache/camel/yaml/out/ModelWriter.java | 1 +
.../dsl/yaml/deserializers/ModelDeserializers.java | 6 ++
.../dsl/yaml/deserializers/CustomResolver.java | 7 +-
.../ErrorHandlerBuilderDeserializer.java | 96 --
.../deserializers/ErrorHandlerDeserializer.java| 79 +-
.../deserializers/RouteDefinitionDeserializer.java | 6 +-
.../generated/resources/schema/camelYamlDsl.json | 92 +++--
14 files changed, 134 insertions(+), 208 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
index 704a871df5e..7e09113bd16 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
@@ -13,7 +13,7 @@
},
"properties": {
"id": { "index": 0, "kind": "attribute", "displayName": "Id", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" },
-"errorHandlerType": { "index": 1, "kind": "element", "displayName": "Error
Handler Type", "required": true, "type": "object", "javaType":
"org.apache.camel.ErrorHandlerFactory", "oneOf": [ "deadLetterChannel",
"defaultErrorHandler", "jtaTransactionErrorHandler", "noErrorHandler",
"springTransactionErrorHandler" ], "deprecated": false, "autowired": false,
"secret": false, "description": "The specific error handler in use." }
+"errorHandlerType": { "index": 1, "kind": "element", "displayName": "Error
Handler Type", "required": true, "type": "object", "javaType":
"org.apache.camel.ErrorHandlerFactory", "oneOf": [ "deadLetterChannel",
"defaultErrorHandler", "jtaTransactionErrorHandler", "noErrorHandler",
"refErrorHandler", "springTransactionErrorHandler" ], "deprecated": false,
"autowired": false, "secret": false, "description": "The specific error handler
in use." }
},
"exchangeProperties": {
"CamelExceptionCaught": { "index": 0, "kind": "exchangeProperty",
"displayName": "Exception Caught", "label": "producer", "required": false,
"javaType": "java.lang.Exception", "deprecated": false, "autowired": false,
"secret": false, "description": "Stores the caught exception due to a
processing error of the current Exchange" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index b31aac91b34..cd9cd0a406f 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -5497,6 +5497,7 @@ Whether to auto startup components when enricher is
starting up. Default value:
(camel) branch yaml-eh deleted (was 94b34f921eb)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch yaml-eh in repository https://gitbox.apache.org/repos/asf/camel.git was 94b34f921eb CAMEL-20667: Add ref error handler to model. camel-yaml-dsl: Avoid two kinds of error handler in the schema model. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch xfix updated (f7a391ec845 -> 4d08489183e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch xfix in repository https://gitbox.apache.org/repos/asf/camel.git from f7a391ec845 Fix unit test as the xml dumper may have changed recently add 4d08489183e Regen No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/schemas/camel-spring.xsd | 33 +++--- 1 file changed, 17 insertions(+), 16 deletions(-)
(camel) 01/01: Fix unit test as the xml dumper may have changed recently
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch xfix
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f7a391ec845121592532388a2c41f406d7f9f78e
Author: Claus Ibsen
AuthorDate: Wed Apr 17 13:26:56 2024 +0200
Fix unit test as the xml dumper may have changed recently
---
.../org/apache/camel/util/DumpModelAsXmlNamespaceTest.java | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlNamespaceTest.java
b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlNamespaceTest.java
index a5a72c9f259..6ff68ae0b63 100644
---
a/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlNamespaceTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlNamespaceTest.java
@@ -43,13 +43,19 @@ public class DumpModelAsXmlNamespaceTest extends
ContextTestSupport {
NodeList nl = dom.getElementsByTagName("xpath");
assertEquals(2, nl.getLength());
-Element n1 = (Element) nl.item(0);
-String attributeFoo = n1.getAttribute("xmlns:foo");
+String attributeFoo =
dom.getDocumentElement().getAttribute("xmlns:foo");
+if (attributeFoo.isEmpty()) {
+Element n1 = (Element) nl.item(0);
+attributeFoo = n1.getAttribute("xmlns:foo");
+}
assertNotNull(attributeFoo);
assertEquals(URL_FOO, attributeFoo);
-Element n2 = (Element) nl.item(1);
-String attributeBar = n2.getAttribute("xmlns:bar");
+String attributeBar =
dom.getDocumentElement().getAttribute("xmlns:bar");
+if (attributeBar.isEmpty()) {
+Element n1 = (Element) nl.item(0);
+attributeBar = n1.getAttribute("xmlns:bar");
+}
assertNotNull(attributeBar);
assertEquals(URL_BAR, attributeBar);
}
(camel) branch xfix created (now f7a391ec845)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch xfix in repository https://gitbox.apache.org/repos/asf/camel.git at f7a391ec845 Fix unit test as the xml dumper may have changed recently This branch includes the following new commits: new f7a391ec845 Fix unit test as the xml dumper may have changed recently The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) 01/01: CAMEL-20667: Add ref error handler to model. camel-yaml-dsl: Avoid two kinds of error handler in the schema model.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch yaml-eh
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 94b34f921eb38d1d2e598ded999ae5b99ba7022c
Author: Claus Ibsen
AuthorDate: Wed Apr 17 13:25:50 2024 +0200
CAMEL-20667: Add ref error handler to model. camel-yaml-dsl: Avoid two
kinds of error handler in the schema model.
---
.../apache/camel/catalog/models/errorHandler.json | 2 +-
.../org/apache/camel/model/errorHandler.json | 2 +-
.../apache/camel/model/ErrorHandlerDefinition.java | 2 +
.../java/org/apache/camel/xml/in/ModelParser.java | 1 +
.../java/org/apache/camel/xml/out/ModelWriter.java | 1 +
.../org/apache/camel/yaml/out/ModelWriter.java | 1 +
.../dsl/yaml/deserializers/ModelDeserializers.java | 6 ++
.../dsl/yaml/deserializers/CustomResolver.java | 7 +-
.../ErrorHandlerBuilderDeserializer.java | 96 --
.../deserializers/ErrorHandlerDeserializer.java| 79 +-
.../deserializers/RouteDefinitionDeserializer.java | 6 +-
.../generated/resources/schema/camelYamlDsl.json | 92 +++--
12 files changed, 107 insertions(+), 188 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
index 704a871df5e..7e09113bd16 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/errorHandler.json
@@ -13,7 +13,7 @@
},
"properties": {
"id": { "index": 0, "kind": "attribute", "displayName": "Id", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" },
-"errorHandlerType": { "index": 1, "kind": "element", "displayName": "Error
Handler Type", "required": true, "type": "object", "javaType":
"org.apache.camel.ErrorHandlerFactory", "oneOf": [ "deadLetterChannel",
"defaultErrorHandler", "jtaTransactionErrorHandler", "noErrorHandler",
"springTransactionErrorHandler" ], "deprecated": false, "autowired": false,
"secret": false, "description": "The specific error handler in use." }
+"errorHandlerType": { "index": 1, "kind": "element", "displayName": "Error
Handler Type", "required": true, "type": "object", "javaType":
"org.apache.camel.ErrorHandlerFactory", "oneOf": [ "deadLetterChannel",
"defaultErrorHandler", "jtaTransactionErrorHandler", "noErrorHandler",
"refErrorHandler", "springTransactionErrorHandler" ], "deprecated": false,
"autowired": false, "secret": false, "description": "The specific error handler
in use." }
},
"exchangeProperties": {
"CamelExceptionCaught": { "index": 0, "kind": "exchangeProperty",
"displayName": "Exception Caught", "label": "producer", "required": false,
"javaType": "java.lang.Exception", "deprecated": false, "autowired": false,
"secret": false, "description": "Stores the caught exception due to a
processing error of the current Exchange" },
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/errorHandler.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/errorHandler.json
index 704a871df5e..7e09113bd16 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/errorHandler.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/errorHandler.json
@@ -13,7 +13,7 @@
},
"properties": {
"id": { "index": 0, "kind": "attribute", "displayName": "Id", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "The id of this node" },
-"errorHandlerType": { "index"
(camel) branch yaml-eh created (now 94b34f921eb)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch yaml-eh in repository https://gitbox.apache.org/repos/asf/camel.git at 94b34f921eb CAMEL-20667: Add ref error handler to model. camel-yaml-dsl: Avoid two kinds of error handler in the schema model. This branch includes the following new commits: new 94b34f921eb CAMEL-20667: Add ref error handler to model. camel-yaml-dsl: Avoid two kinds of error handler in the schema model. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) branch main updated: Bump org.apache.commons:commons-text from 1.11.0 to 1.12.0 (#13831)
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 553d47830a1 Bump org.apache.commons:commons-text from 1.11.0 to 1.12.0 (#13831) 553d47830a1 is described below commit 553d47830a1359e7ac19ac446ce029b061d82a70 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Apr 17 11:27:55 2024 +0200 Bump org.apache.commons:commons-text from 1.11.0 to 1.12.0 (#13831) Bumps org.apache.commons:commons-text from 1.11.0 to 1.12.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-text dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index d5fc50c92d4..1ee4eec27bd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -116,7 +116,7 @@ 3.6.1 3.10.0 2.12.0 -1.11.0 +1.12.0 1.8.0 1.1.2 1.3.1
(camel) branch main updated (10f0f3803c5 -> b36d61a203d)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 10f0f3803c5 Bump org.graalvm.js:js-language from 24.0.0 to 24.0.1 (#13827) add b36d61a203d Bump com.google.apis:google-api-services-sheets (#13833) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (9837c406c4f -> a7804508f12)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 9837c406c4f [CAMEL-20675] camel-spring-boot: move cluster service implementations to dedicated starters add a7804508f12 CAMEL-20672: camel-jbang run with --source-dir should preload application.properties No new revisions were added by this update. Summary of changes: .../org/apache/camel/main/ProfileConfigurer.java | 20 .../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 5 ++ .../apache/camel/dsl/jbang/core/commands/Run.java | 55 +- 3 files changed, 48 insertions(+), 32 deletions(-)
(camel) branch main updated: Bump org.apache.maven.plugins:maven-plugin-plugin from 3.11.0 to 3.12.0 (#13832)
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 f971cab7875 Bump org.apache.maven.plugins:maven-plugin-plugin from 3.11.0 to 3.12.0 (#13832) f971cab7875 is described below commit f971cab78752c426af4f37a5b7a03f9ad49d5801 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Apr 17 11:28:45 2024 +0200 Bump org.apache.maven.plugins:maven-plugin-plugin from 3.11.0 to 3.12.0 (#13832) Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.11.0 to 3.12.0. - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.11.0...maven-plugin-tools-3.12.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-plugin-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 1ee4eec27bd..377ee2dc016 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -337,7 +337,7 @@ 9.0.10 3.4.0 3.6.3 -3.11.0 +3.12.0 3.9.0 3.3.0
(camel) branch main updated (cc0b758e562 -> 10f0f3803c5)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from cc0b758e562 (chores) ci: avoid skipping core tests add 10f0f3803c5 Bump org.graalvm.js:js-language from 24.0.0 to 24.0.1 (#13827) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated: 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 979d6f0beff Regen
979d6f0beff is described below
commit 979d6f0beff63551d3d4bc30fef689d44e51c6ef
Author: Claus Ibsen
AuthorDate: Wed Apr 17 09:16:05 2024 +0200
Regen
---
core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
index 9f0de97dac8..ad29dad2a23 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java
@@ -180,7 +180,7 @@ public final class SensitiveUtils {
+ "|\\Qverificationcode\\E"
+
"|\\Qwebhookverifytoken\\E"
+
"|\\Qzookeeperpassword\\E"
-// SENSITIVE-PATTERN: END
+// SENSITIVE-PATTERN: END
;
private SensitiveUtils() {
(camel) branch camel-4.4.x updated: CAMEL-20669: camel-jbang - Fix export with metrics=true and also include camel-micromemeter-prometheus for camel-main runtime.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.4.x by this push:
new 87418897c6d CAMEL-20669: camel-jbang - Fix export with metrics=true
and also include camel-micromemeter-prometheus for camel-main runtime.
87418897c6d is described below
commit 87418897c6d13b5b11de892dcc5c4ddfff844cc0
Author: Claus Ibsen
AuthorDate: Wed Apr 17 08:53:19 2024 +0200
CAMEL-20669: camel-jbang - Fix export with metrics=true and also include
camel-micromemeter-prometheus for camel-main runtime.
---
.../component/micrometer/prometheus/MicrometerPrometheus.java| 3 ++-
.../apache/camel/dsl/jbang/core/commands/ExportCamelMain.java| 9 +
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git
a/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
b/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
index 63289d4b668..cf34aad5e25 100644
---
a/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
+++
b/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
@@ -58,6 +58,7 @@ import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.Registry;
import org.apache.camel.spi.annotations.JdkService;
+import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.SimpleEventNotifierSupport;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.IOHelper;
@@ -320,7 +321,7 @@ public class MicrometerPrometheus extends ServiceSupport
implements CamelMetrics
super.doStart();
server = camelContext.hasService(MainHttpServer.class);
-router = VertxPlatformHttpRouter.lookup(camelContext);
+router = CamelContextHelper.lookup(camelContext,
"platform-http-router", VertxPlatformHttpRouter.class);
platformHttpComponent = camelContext.getComponent("platform-http",
PlatformHttpComponent.class);
if (server != null && server.isMetricsEnabled() && router != null &&
platformHttpComponent != null) {
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 c12f14dbf51..5915e91f2c5 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
@@ -300,6 +300,15 @@ class ExportCamelMain extends Export {
protected Set resolveDependencies(File settings, File profile)
throws Exception {
Set answer = super.resolveDependencies(settings, profile);
+if (profile != null && profile.exists()) {
+Properties prop = new CamelCaseOrderedProperties();
+RuntimeUtil.loadProperties(prop, profile);
+// if metrics is defined then include camel-micrometer-prometheus
for camel-main runtime
+if (prop.getProperty("camel.metrics.enabled") != null ||
prop.getProperty("camel.server.metricsEnabled") != null) {
+answer.add("mvn:org.apache.camel:camel-micrometer-prometheus");
+}
+}
+
// remove out of the box dependencies
answer.removeIf(s -> s.contains("camel-core"));
answer.removeIf(s -> s.contains("camel-main"));
(camel) branch main updated: CAMEL-20669: camel-jbang - Fix export with metrics=true and also include camel-micromemeter-prometheus for camel-main runtime.
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 64442b3e55f CAMEL-20669: camel-jbang - Fix export with metrics=true
and also include camel-micromemeter-prometheus for camel-main runtime.
64442b3e55f is described below
commit 64442b3e55f24d6adca8c7037b2c8a0eb0f17aa1
Author: Claus Ibsen
AuthorDate: Wed Apr 17 08:53:19 2024 +0200
CAMEL-20669: camel-jbang - Fix export with metrics=true and also include
camel-micromemeter-prometheus for camel-main runtime.
---
.../component/micrometer/prometheus/MicrometerPrometheus.java| 3 ++-
.../apache/camel/dsl/jbang/core/commands/ExportCamelMain.java| 9 +
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git
a/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
b/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
index f90f90fccec..3adf0b9fc16 100644
---
a/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
+++
b/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
@@ -58,6 +58,7 @@ import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.Registry;
import org.apache.camel.spi.annotations.JdkService;
+import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.SimpleEventNotifierSupport;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.IOHelper;
@@ -345,7 +346,7 @@ public class MicrometerPrometheus extends ServiceSupport
implements CamelMetrics
super.doStart();
server = camelContext.hasService(MainHttpServer.class);
-router = VertxPlatformHttpRouter.lookup(camelContext);
+router = CamelContextHelper.lookup(camelContext,
"platform-http-router", VertxPlatformHttpRouter.class);
platformHttpComponent = camelContext.getComponent("platform-http",
PlatformHttpComponent.class);
if (server != null && server.isMetricsEnabled() && router != null &&
platformHttpComponent != null) {
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 6e5fdd58e10..c45e3e7a653 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
@@ -302,6 +302,15 @@ class ExportCamelMain extends Export {
protected Set resolveDependencies(File settings, File profile)
throws Exception {
Set answer = super.resolveDependencies(settings, profile);
+if (profile != null && profile.exists()) {
+Properties prop = new CamelCaseOrderedProperties();
+RuntimeUtil.loadProperties(prop, profile);
+// if metrics is defined then include camel-micrometer-prometheus
for camel-main runtime
+if (prop.getProperty("camel.metrics.enabled") != null ||
prop.getProperty("camel.server.metricsEnabled") != null) {
+answer.add("mvn:org.apache.camel:camel-micrometer-prometheus");
+}
+}
+
// remove out of the box dependencies
answer.removeIf(s -> s.contains("camel-core"));
answer.removeIf(s -> s.contains("camel-main"));
(camel) branch export-metrics deleted (was 5707f764705)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch export-metrics in repository https://gitbox.apache.org/repos/asf/camel.git was 5707f764705 CAMEL-20669: camel-jbang - Fix export with metrics=true and also include camel-micromemeter-prometheus for camel-main runtime. 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: CAMEL-20669: camel-jbang - Fix export with metrics=true and also include camel-micromemeter-prometheus for camel-main runtime.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch export-metrics
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5707f764705d0e5f032713a81585ba17ebdb978b
Author: Claus Ibsen
AuthorDate: Wed Apr 17 08:53:19 2024 +0200
CAMEL-20669: camel-jbang - Fix export with metrics=true and also include
camel-micromemeter-prometheus for camel-main runtime.
---
.../component/micrometer/prometheus/MicrometerPrometheus.java| 3 ++-
.../apache/camel/dsl/jbang/core/commands/ExportCamelMain.java| 9 +
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git
a/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
b/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
index f90f90fccec..3adf0b9fc16 100644
---
a/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
+++
b/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java
@@ -58,6 +58,7 @@ import org.apache.camel.spi.ManagementStrategy;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.Registry;
import org.apache.camel.spi.annotations.JdkService;
+import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.SimpleEventNotifierSupport;
import org.apache.camel.support.service.ServiceSupport;
import org.apache.camel.util.IOHelper;
@@ -345,7 +346,7 @@ public class MicrometerPrometheus extends ServiceSupport
implements CamelMetrics
super.doStart();
server = camelContext.hasService(MainHttpServer.class);
-router = VertxPlatformHttpRouter.lookup(camelContext);
+router = CamelContextHelper.lookup(camelContext,
"platform-http-router", VertxPlatformHttpRouter.class);
platformHttpComponent = camelContext.getComponent("platform-http",
PlatformHttpComponent.class);
if (server != null && server.isMetricsEnabled() && router != null &&
platformHttpComponent != null) {
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 6e5fdd58e10..c45e3e7a653 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
@@ -302,6 +302,15 @@ class ExportCamelMain extends Export {
protected Set resolveDependencies(File settings, File profile)
throws Exception {
Set answer = super.resolveDependencies(settings, profile);
+if (profile != null && profile.exists()) {
+Properties prop = new CamelCaseOrderedProperties();
+RuntimeUtil.loadProperties(prop, profile);
+// if metrics is defined then include camel-micrometer-prometheus
for camel-main runtime
+if (prop.getProperty("camel.metrics.enabled") != null ||
prop.getProperty("camel.server.metricsEnabled") != null) {
+answer.add("mvn:org.apache.camel:camel-micrometer-prometheus");
+}
+}
+
// remove out of the box dependencies
answer.removeIf(s -> s.contains("camel-core"));
answer.removeIf(s -> s.contains("camel-main"));
(camel) branch export-metrics created (now 5707f764705)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch export-metrics in repository https://gitbox.apache.org/repos/asf/camel.git at 5707f764705 CAMEL-20669: camel-jbang - Fix export with metrics=true and also include camel-micromemeter-prometheus for camel-main runtime. This branch includes the following new commits: new 5707f764705 CAMEL-20669: camel-jbang - Fix export with metrics=true and also include camel-micromemeter-prometheus for camel-main runtime. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) branch main updated: 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 7a9cf4781c7 Regen
7a9cf4781c7 is described below
commit 7a9cf4781c7f351d721c43ac387117c6b4146614
Author: Claus Ibsen
AuthorDate: Wed Apr 17 06:36:49 2024 +0200
Regen
---
.../google/sheets/GoogleSheetsComponentConfigurer.java | 14 +++---
.../google/sheets/GoogleSheetsEndpointConfigurer.java | 7 +++
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git
a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsComponentConfigurer.java
b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsComponentConfigurer.java
index d212da704ce..92dd7ffbd3b 100644
---
a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsComponentConfigurer.java
+++
b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsComponentConfigurer.java
@@ -26,7 +26,7 @@ public class GoogleSheetsComponentConfigurer extends
PropertyConfigurerSupport i
map.put("ClientId", java.lang.String.class);
map.put("Configuration",
org.apache.camel.component.google.sheets.GoogleSheetsConfiguration.class);
map.put("Delegate", java.lang.String.class);
-map.put("Scopes", java.util.Collection.class);
+map.put("Scopes", java.lang.String.class);
map.put("BridgeErrorHandler", boolean.class);
map.put("SplitResult", boolean.class);
map.put("LazyStartProducer", boolean.class);
@@ -70,7 +70,7 @@ public class GoogleSheetsComponentConfigurer extends
PropertyConfigurerSupport i
case "lazyStartProducer":
target.setLazyStartProducer(property(camelContext, boolean.class, value));
return true;
case "refreshtoken":
case "refreshToken":
getOrCreateConfiguration(target).setRefreshToken(property(camelContext,
java.lang.String.class, value)); return true;
-case "scopes":
getOrCreateConfiguration(target).setScopes(property(camelContext,
java.util.Collection.class, value)); return true;
+case "scopes":
getOrCreateConfiguration(target).setScopes(property(camelContext,
java.lang.String.class, value)); return true;
case "serviceaccountkey":
case "serviceAccountKey":
getOrCreateConfiguration(target).setServiceAccountKey(property(camelContext,
java.lang.String.class, value)); return true;
case "splitresult":
@@ -107,7 +107,7 @@ public class GoogleSheetsComponentConfigurer extends
PropertyConfigurerSupport i
case "lazyStartProducer": return boolean.class;
case "refreshtoken":
case "refreshToken": return java.lang.String.class;
-case "scopes": return java.util.Collection.class;
+case "scopes": return java.lang.String.class;
case "serviceaccountkey":
case "serviceAccountKey": return java.lang.String.class;
case "splitresult":
@@ -148,13 +148,5 @@ public class GoogleSheetsComponentConfigurer extends
PropertyConfigurerSupport i
default: return null;
}
}
-
-@Override
-public Object getCollectionValueType(Object target, String name, boolean
ignoreCase) {
-switch (ignoreCase ? name.toLowerCase() : name) {
-case "scopes": return java.lang.String.class;
-default: return null;
-}
-}
}
diff --git
a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointConfigurer.java
b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointConfigurer.java
index 8a17eaad5f3..93fff184213 100644
---
a/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointConfigurer.java
+++
b/components/camel-google/camel-google-sheets/src/generated/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpointConfigurer.java
@@ -28,7 +28,7 @@ public class GoogleSheetsEndpointConfigurer extends
PropertyConfigurerSupport im
map.put("ClientId", java.lang.String.class);
map.put("Delegate", java.lang.String.class);
map.put("InBody", java.lang.String.class);
-map.put("Scopes", java.util.Collection.class);
+map.put("Scopes", java.lang.String.class);
map
(camel) branch gs deleted (was 33790197f91)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch gs in repository https://gitbox.apache.org/repos/asf/camel.git was 33790197f91 CAMEL-20678: camel-google-sheets - Error setting scopes parameter The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: CAMEL-20678: camel-google-sheets - Error setting scopes parameter (#13817)
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 5a4421ab9f9 CAMEL-20678: camel-google-sheets - Error setting scopes
parameter (#13817)
5a4421ab9f9 is described below
commit 5a4421ab9f9dff2b083e676a07e12063d3376a4a
Author: Claus Ibsen
AuthorDate: Tue Apr 16 12:11:26 2024 +0200
CAMEL-20678: camel-google-sheets - Error setting scopes parameter (#13817)
* CAMEL-20678: camel-google-sheets - Error setting scopes parameter
* CAMEL-20678: camel-google-sheets - Error setting scopes parameter
---
.../camel/catalog/components/google-sheets.json| 4 +-
.../sheets/GoogleSheetsComponentConfigurer.java| 14 +
.../GoogleSheetsConfigurationConfigurer.java | 14 +
.../sheets/GoogleSheetsEndpointConfigurer.java | 7 +--
...preadsheetsEndpointConfigurationConfigurer.java | 14 +
...heetsValuesEndpointConfigurationConfigurer.java | 14 +
.../component/google/sheets/google-sheets.json | 4 +-
.../google/sheets/GoogleSheetsComponent.java | 4 +-
.../google/sheets/GoogleSheetsConfiguration.java | 18 --
.../sheets/GoogleSheetsVerifierExtension.java | 2 +-
.../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 5 ++
.../dsl/GoogleSheetsComponentBuilderFactory.java | 10 ++-
.../dsl/GoogleSheetsEndpointBuilderFactory.java| 72 ++
.../camel/kotlin/components/GoogleSheetsUriDsl.kt | 3 +-
14 files changed, 53 insertions(+), 132 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
index bbb761c4227..357cd079ac0 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
@@ -29,7 +29,7 @@
"clientId": { "index": 1, "kind": "property", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.google.sheets.GoogleSheetsConfiguration",
"configurationField": "configuration", "description": "Client ID of the sheets
application" },
"configuration": { "index": 2, "kind": "property", "displayName":
"Configuration", "group": "common", "label": "", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.google.sheets.GoogleSheetsConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use the shared configuration" },
"delegate": { "index": 3, "kind": "property", "displayName": "Delegate",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.google.sheets.GoogleSheetsConfiguration",
"configurationField": "configuration", "description": "Delegate for wide-domain
service account" },
-"scopes": { "index": 4, "kind": "property", "displayName": "Scopes",
"group": "common", "label": "", "required": false, "type": "array", "javaType":
"java.util.Collection", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.google.sheets.GoogleSheetsConfiguration",
"configurationField": "configuration", "description": "Specifies the level of
permissions you want a sheets application to have to a user account. [...]
+"scopes": { "index": 4, "kind": "property", "displayName": "Scopes",
"group": "common", "label": "", "required&q
(camel) branch gs updated (42ccb38827b -> 33790197f91)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch gs in repository https://gitbox.apache.org/repos/asf/camel.git from 42ccb38827b CAMEL-20678: camel-google-sheets - Error setting scopes parameter add 33790197f91 CAMEL-20678: camel-google-sheets - Error setting scopes parameter No new revisions were added by this update. Summary of changes: .../kotlin/org/apache/camel/kotlin/components/GoogleSheetsUriDsl.kt| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
(camel) branch gs created (now 42ccb38827b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch gs in repository https://gitbox.apache.org/repos/asf/camel.git at 42ccb38827b CAMEL-20678: camel-google-sheets - Error setting scopes parameter This branch includes the following new commits: new 42ccb38827b CAMEL-20678: camel-google-sheets - Error setting scopes parameter The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) 01/01: CAMEL-20678: camel-google-sheets - Error setting scopes parameter
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch gs
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 42ccb38827bdb70fa45f3778ec368f12fb49f392
Author: Claus Ibsen
AuthorDate: Tue Apr 16 11:05:11 2024 +0200
CAMEL-20678: camel-google-sheets - Error setting scopes parameter
---
.../camel/catalog/components/google-sheets.json| 4 +-
.../sheets/GoogleSheetsComponentConfigurer.java| 14 +
.../GoogleSheetsConfigurationConfigurer.java | 14 +
.../sheets/GoogleSheetsEndpointConfigurer.java | 7 +--
...preadsheetsEndpointConfigurationConfigurer.java | 14 +
...heetsValuesEndpointConfigurationConfigurer.java | 14 +
.../component/google/sheets/google-sheets.json | 4 +-
.../google/sheets/GoogleSheetsComponent.java | 4 +-
.../google/sheets/GoogleSheetsConfiguration.java | 18 --
.../sheets/GoogleSheetsVerifierExtension.java | 2 +-
.../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 5 ++
.../dsl/GoogleSheetsComponentBuilderFactory.java | 10 ++-
.../dsl/GoogleSheetsEndpointBuilderFactory.java| 72 ++
13 files changed, 51 insertions(+), 131 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
index bbb761c4227..357cd079ac0 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-sheets.json
@@ -29,7 +29,7 @@
"clientId": { "index": 1, "kind": "property", "displayName": "Client Id",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.google.sheets.GoogleSheetsConfiguration",
"configurationField": "configuration", "description": "Client ID of the sheets
application" },
"configuration": { "index": 2, "kind": "property", "displayName":
"Configuration", "group": "common", "label": "", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.google.sheets.GoogleSheetsConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use the shared configuration" },
"delegate": { "index": 3, "kind": "property", "displayName": "Delegate",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.google.sheets.GoogleSheetsConfiguration",
"configurationField": "configuration", "description": "Delegate for wide-domain
service account" },
-"scopes": { "index": 4, "kind": "property", "displayName": "Scopes",
"group": "common", "label": "", "required": false, "type": "array", "javaType":
"java.util.Collection", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.google.sheets.GoogleSheetsConfiguration",
"configurationField": "configuration", "description": "Specifies the level of
permissions you want a sheets application to have to a user account. [...]
+"scopes": { "index": 4, "kind": "property", "displayName": "Scopes",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.google.sheets.GoogleSheetsConfiguration",
"configurationField": "configuration", "description": "Specifies the level of
permi
(camel) branch main updated: Bump commons-io:commons-io from 2.15.1 to 2.16.1 (#13806)
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 0a4ba0624d0 Bump commons-io:commons-io from 2.15.1 to 2.16.1 (#13806) 0a4ba0624d0 is described below commit 0a4ba0624d0d272989af2762cada972541c53f29 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Apr 16 10:56:19 2024 +0200 Bump commons-io:commons-io from 2.15.1 to 2.16.1 (#13806) Bumps commons-io:commons-io from 2.15.1 to 2.16.1. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 518fe9ff01f..bcdc4256b84 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -109,7 +109,7 @@ 1.4 2.12.0 1.4.0 -2.15.1 +2.16.1 2.6 3.14.0 1.3.0
(camel) branch main updated: Bump org.snmp4j:snmp4j from 3.7.8 to 3.8.0 (#13814)
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 29a688a1926 Bump org.snmp4j:snmp4j from 3.7.8 to 3.8.0 (#13814) 29a688a1926 is described below commit 29a688a1926abbefd97e921b0edbfabc84aa2b7c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Apr 16 10:42:19 2024 +0200 Bump org.snmp4j:snmp4j from 3.7.8 to 3.8.0 (#13814) Bumps org.snmp4j:snmp4j from 3.7.8 to 3.8.0. --- updated-dependencies: - dependency-name: org.snmp4j:snmp4j dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 3685547a9e8..518fe9ff01f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -439,7 +439,7 @@ 0.13.0 2.2 2.7 -3.7.8 +3.8.0 1.9.5_1 2.3-groovy-4.0 5.1.1
(camel) branch main updated: Bump org.atmosphere:atmosphere-runtime from 3.0.5 to 3.0.8 (#13807)
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 7d3782b0826 Bump org.atmosphere:atmosphere-runtime from 3.0.5 to 3.0.8 (#13807) 7d3782b0826 is described below commit 7d3782b0826d083580711dac320cd4d3660ce001 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Apr 16 09:45:09 2024 +0200 Bump org.atmosphere:atmosphere-runtime from 3.0.5 to 3.0.8 (#13807) Bumps [org.atmosphere:atmosphere-runtime](https://github.com/Atmosphere/atmosphere) from 3.0.5 to 3.0.8. - [Commits](https://github.com/Atmosphere/atmosphere/compare/atmosphere-project-3.0.5...atmosphere-project-3.0.8) --- updated-dependencies: - dependency-name: org.atmosphere:atmosphere-runtime dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 08f49bbfadb..71f46f70261 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -70,7 +70,7 @@ 3.25.3 3.39.0 5.0.0 -3.0.5 +3.0.8 1.11.3 1.11.3 1.11.3
(camel) branch main updated: Bump jooq-version from 3.19.6 to 3.19.7 (#13803)
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 e944a217c45 Bump jooq-version from 3.19.6 to 3.19.7 (#13803) e944a217c45 is described below commit e944a217c4542051d4f22b72090c16d49ca3cbb3 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Apr 16 09:44:14 2024 +0200 Bump jooq-version from 3.19.6 to 3.19.7 (#13803) Bumps `jooq-version` from 3.19.6 to 3.19.7. Updates `org.jooq:jooq` from 3.19.6 to 3.19.7 Updates `org.jooq:jooq-codegen-maven` from 3.19.6 to 3.19.7 --- updated-dependencies: - dependency-name: org.jooq:jooq dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jooq:jooq-codegen-maven dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index d6f7e784ec6..08f49bbfadb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -287,7 +287,7 @@ 2.0.2 0.1.8 0.9.15 -3.19.6 +3.19.7 0.9.15 0.9.3 2.0.1
(camel) branch main updated (30b82ca378f -> 69570858eea)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 30b82ca378f Bump io.github.classgraph:classgraph from 4.8.168 to 4.8.170 (#13808) add 69570858eea Bump org.codehaus.mojo:jaxb2-maven-plugin from 3.1.0 to 3.2.0 (#13812) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (1d7d6d3eb83 -> 7a1392594db)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 1d7d6d3eb83 (chores) camel-core: removed unused code add 7a1392594db Bump org.apache.maven.plugins:maven-jar-plugin from 3.3.0 to 3.4.0 (#13801) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (5f083561f31 -> 0bd55529c13)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 5f083561f31 Upgrade debezium 2.6.1 (#13796) add 0bd55529c13 Bump logback-version from 1.5.3 to 1.5.5 (#13797) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (a54b948369c -> 24811e3978c)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from a54b948369c Bump org.opensearch.client:opensearch-java from 2.9.1 to 2.10.0 (#13799) add 24811e3978c Bump io.camunda:zeebe-client-java from 8.4.5 to 8.5.0 (#13800) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated: Upgrade debezium 2.6.1 (#13796)
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 5f083561f31 Upgrade debezium 2.6.1 (#13796) 5f083561f31 is described below commit 5f083561f31f5b8e5816b0b14ae87a739a005d9a Author: Claus Ibsen AuthorDate: Tue Apr 16 09:41:57 2024 +0200 Upgrade debezium 2.6.1 (#13796) --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index f607eeb510b..cc179988f2f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -129,7 +129,7 @@ 4.0.1 4.0.1 2.5.2-jakarta4 -2.6.0.Final +2.6.1.Final 8.0.33 10.16.1.1 2.17
(camel) branch deb261 deleted (was 776302fe697)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch deb261 in repository https://gitbox.apache.org/repos/asf/camel.git was 776302fe697 Upgrade debezium 2.6.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: Bump langchain4j.version from 0.29.0 to 0.29.1 (#13805)
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 4d98de6b72c Bump langchain4j.version from 0.29.0 to 0.29.1 (#13805) 4d98de6b72c is described below commit 4d98de6b72c5916e820f4cc2e36afdb2a5f423ae Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Apr 16 09:47:11 2024 +0200 Bump langchain4j.version from 0.29.0 to 0.29.1 (#13805) Bumps `langchain4j.version` from 0.29.0 to 0.29.1. Updates `dev.langchain4j:langchain4j` from 0.29.0 to 0.29.1 - [Release notes](https://github.com/langchain4j/langchain4j/releases) - [Commits](https://github.com/langchain4j/langchain4j/compare/0.29.0...0.29.1) Updates `dev.langchain4j:langchain4j-ollama` from 0.29.0 to 0.29.1 - [Release notes](https://github.com/langchain4j/langchain4j/releases) - [Commits](https://github.com/langchain4j/langchain4j/compare/0.29.0...0.29.1) Updates `dev.langchain4j:langchain4j-core` from 0.29.0 to 0.29.1 - [Release notes](https://github.com/langchain4j/langchain4j/releases) - [Commits](https://github.com/langchain4j/langchain4j/compare/0.29.0...0.29.1) Updates `dev.langchain4j:langchain4j-embeddings` from 0.29.0 to 0.29.1 - [Release notes](https://github.com/langchain4j/langchain4j-embeddings/releases) - [Commits](https://github.com/langchain4j/langchain4j-embeddings/compare/0.29.0...0.29.1) Updates `dev.langchain4j:langchain4j-embeddings-all-minilm-l6-v2` from 0.29.0 to 0.29.1 - [Release notes](https://github.com/langchain4j/langchain4j-embeddings/releases) - [Commits](https://github.com/langchain4j/langchain4j-embeddings/compare/0.29.0...0.29.1) --- updated-dependencies: - dependency-name: dev.langchain4j:langchain4j dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: dev.langchain4j:langchain4j-ollama dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: dev.langchain4j:langchain4j-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: dev.langchain4j:langchain4j-embeddings dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: dev.langchain4j:langchain4j-embeddings-all-minilm-l6-v2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index cb7e98529ea..6e49e0793a5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -316,7 +316,7 @@ 1.16.0 6.12.0 1.17.0 -0.29.0 +0.29.1 1.8 0.12 0.12
(camel) branch main updated (69570858eea -> 7a870527d65)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 69570858eea Bump org.codehaus.mojo:jaxb2-maven-plugin from 3.1.0 to 3.2.0 (#13812) add 7a870527d65 Bump org.apache.hadoop:hadoop-client from 3.3.6 to 3.4.0 (#13810) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (7d3782b0826 -> 30b82ca378f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 7d3782b0826 Bump org.atmosphere:atmosphere-runtime from 3.0.5 to 3.0.8 (#13807) add 30b82ca378f Bump io.github.classgraph:classgraph from 4.8.168 to 4.8.170 (#13808) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (0bd55529c13 -> a54b948369c)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 0bd55529c13 Bump logback-version from 1.5.3 to 1.5.5 (#13797) add a54b948369c Bump org.opensearch.client:opensearch-java from 2.9.1 to 2.10.0 (#13799) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch deb261 created (now 776302fe697)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch deb261 in repository https://gitbox.apache.org/repos/asf/camel.git at 776302fe697 Upgrade debezium 2.6.1 This branch includes the following new commits: new 776302fe697 Upgrade debezium 2.6.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) 01/01: Upgrade debezium 2.6.1
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch deb261 in repository https://gitbox.apache.org/repos/asf/camel.git commit 776302fe697835a1d282cbbdeca44e720cac1d59 Author: Claus Ibsen AuthorDate: Tue Apr 16 06:33:38 2024 +0200 Upgrade debezium 2.6.1 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index f607eeb510b..cc179988f2f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -129,7 +129,7 @@ 4.0.1 4.0.1 2.5.2-jakarta4 -2.6.0.Final +2.6.1.Final 8.0.33 10.16.1.1 2.17
(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 efbdf6aec49 Regen
efbdf6aec49 is described below
commit efbdf6aec4960d075cc898a24a63d6b87ecfae1d
Author: Claus Ibsen
AuthorDate: Tue Apr 16 06:32:27 2024 +0200
Regen
---
.../resources/org/apache/camel/springboot/catalog/components/snmp.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/snmp.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/snmp.json
index ac27562eb2c..eeb0cd7e5e7 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/snmp.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/snmp.json
@@ -41,7 +41,7 @@
"snmpVersion": { "index": 8, "kind": "parameter", "displayName": "Snmp
Version", "group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "enum": [ "0", "1", "3" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 0, "description": "Sets the snmp
version for the request. The value 0 means SNMPv1, 1 means SNMPv2c, and the
value 3 means SNMPv3" },
"timeout": { "index": 9, "kind": "parameter", "displayName": "Timeout",
"group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 1500, "description": "Sets the timeout value for the request in
millis." },
"type": { "index": 10, "kind": "parameter", "displayName": "Type",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.snmp.SnmpActionType", "enum": [ "TRAP",
"POLL", "GET_NEXT" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Which operation to perform such as poll, trap, etc." },
-"delay": { "index": 11, "kind": "parameter", "displayName": "Delay",
"group": "consumer", "label": "consumer", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "6", "description": "Sets update rate in
seconds" },
+"delay": { "index": 11, "kind": "parameter", "displayName": "Delay",
"group": "consumer", "label": "consumer", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "6", "description": "Milliseconds before
the next poll." },
"sendEmptyMessageWhenIdle": { "index": 12, "kind": "parameter",
"displayName": "Send Empty Message When Idle", "group": "consumer", "label":
"consumer", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "If the polling consumer did not poll any files, you can
enable this option to send an empty message (no body) instead." },
"treeList": { "index": 13, "kind": "parameter", "displayName": "Tree
List", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Sets the flag whether
the scoped PDU will be displayed as the list if it has child elements in its
tree" },
"bridgeErrorHandler": { "index": 14, "kind": "parameter", "displayName":
"Bridge Error Handler", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions (if possible) occurred
while the Camel consumer is trying to pickup incoming [...]
(camel) branch camel-4.0.x updated: Update HazelcastSedaConsumer.java (#13795)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.0.x by this push:
new 977f7c6b128 Update HazelcastSedaConsumer.java (#13795)
977f7c6b128 is described below
commit 977f7c6b128b286c4cf796ad96cd59093f0cb461
Author: Krasimir Zhelev
AuthorDate: Tue Apr 16 06:24:08 2024 +0200
Update HazelcastSedaConsumer.java (#13795)
CAMEL-20677: If "transacted" is enabled, the transaction never gets
committed if body is null. This leads to "Camel Exception cause:
java.lang.IllegalStateException: Nested transactions are not allowed!".
---
.../apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java | 4
1 file changed, 4 insertions(+)
diff --git
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
index a4528c5445c..4d1c68a8d93 100644
---
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
+++
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
@@ -127,6 +127,10 @@ public class HazelcastSedaConsumer extends DefaultConsumer
implements Runnable {
transactionCtx.rollbackTransaction();
}
}
+} else {
+if (transactionCtx != null) {
+transactionCtx.commitTransaction();
+}
}
} catch (InterruptedException e) {
if (LOG.isDebugEnabled()) {
(camel) branch camel-3.21.x updated: Update HazelcastSedaConsumer.java (#13795)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.21.x by this push:
new 97842a936e6 Update HazelcastSedaConsumer.java (#13795)
97842a936e6 is described below
commit 97842a936e6ee089ae8d54b61b1dda50bf10d500
Author: Krasimir Zhelev
AuthorDate: Tue Apr 16 06:24:08 2024 +0200
Update HazelcastSedaConsumer.java (#13795)
CAMEL-20677: If "transacted" is enabled, the transaction never gets
committed if body is null. This leads to "Camel Exception cause:
java.lang.IllegalStateException: Nested transactions are not allowed!".
---
.../apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java | 4
1 file changed, 4 insertions(+)
diff --git
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
index c58db47f288..fb51107c244 100644
---
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
+++
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
@@ -127,6 +127,10 @@ public class HazelcastSedaConsumer extends DefaultConsumer
implements Runnable {
transactionCtx.rollbackTransaction();
}
}
+} else {
+if (transactionCtx != null) {
+transactionCtx.commitTransaction();
+}
}
} catch (InterruptedException e) {
if (LOG.isDebugEnabled()) {
(camel) branch camel-3.22.x updated: Update HazelcastSedaConsumer.java (#13795)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.22.x by this push:
new a43e85e1f66 Update HazelcastSedaConsumer.java (#13795)
a43e85e1f66 is described below
commit a43e85e1f66a270796f991f3719ed113240937e9
Author: Krasimir Zhelev
AuthorDate: Tue Apr 16 06:24:08 2024 +0200
Update HazelcastSedaConsumer.java (#13795)
CAMEL-20677: If "transacted" is enabled, the transaction never gets
committed if body is null. This leads to "Camel Exception cause:
java.lang.IllegalStateException: Nested transactions are not allowed!".
---
.../apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java | 4
1 file changed, 4 insertions(+)
diff --git
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
index c58db47f288..fb51107c244 100644
---
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
+++
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
@@ -127,6 +127,10 @@ public class HazelcastSedaConsumer extends DefaultConsumer
implements Runnable {
transactionCtx.rollbackTransaction();
}
}
+} else {
+if (transactionCtx != null) {
+transactionCtx.commitTransaction();
+}
}
} catch (InterruptedException e) {
if (LOG.isDebugEnabled()) {
(camel) branch camel-4.4.x updated: Update HazelcastSedaConsumer.java (#13795)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.4.x by this push:
new 30529fb4572 Update HazelcastSedaConsumer.java (#13795)
30529fb4572 is described below
commit 30529fb4572ae4a1dc47dc991f2abbcd5120d71e
Author: Krasimir Zhelev
AuthorDate: Tue Apr 16 06:24:08 2024 +0200
Update HazelcastSedaConsumer.java (#13795)
CAMEL-20677: If "transacted" is enabled, the transaction never gets
committed if body is null. This leads to "Camel Exception cause:
java.lang.IllegalStateException: Nested transactions are not allowed!".
---
.../apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java | 4
1 file changed, 4 insertions(+)
diff --git
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
index f8eed4ef240..ff7ac6648a0 100644
---
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
+++
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
@@ -127,6 +127,10 @@ public class HazelcastSedaConsumer extends DefaultConsumer
implements Runnable {
transactionCtx.rollbackTransaction();
}
}
+} else {
+if (transactionCtx != null) {
+transactionCtx.commitTransaction();
+}
}
} catch (InterruptedException e) {
if (LOG.isDebugEnabled()) {
(camel) branch main updated: Update HazelcastSedaConsumer.java (#13795)
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 ddb6c6bf7ed Update HazelcastSedaConsumer.java (#13795)
ddb6c6bf7ed is described below
commit ddb6c6bf7ed563091a4a9245d4ed3751467fabba
Author: Krasimir Zhelev
AuthorDate: Tue Apr 16 06:24:08 2024 +0200
Update HazelcastSedaConsumer.java (#13795)
CAMEL-20677: If "transacted" is enabled, the transaction never gets
committed if body is null. This leads to "Camel Exception cause:
java.lang.IllegalStateException: Nested transactions are not allowed!".
---
.../apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java | 4
1 file changed, 4 insertions(+)
diff --git
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
index f8eed4ef240..ff7ac6648a0 100644
---
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
+++
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/seda/HazelcastSedaConsumer.java
@@ -127,6 +127,10 @@ public class HazelcastSedaConsumer extends DefaultConsumer
implements Runnable {
transactionCtx.rollbackTransaction();
}
}
+} else {
+if (transactionCtx != null) {
+transactionCtx.commitTransaction();
+}
}
} catch (InterruptedException e) {
if (LOG.isDebugEnabled()) {
(camel) branch main updated: Upgrade kubernetes client 6.12.0 and remove unused version (#13793)
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 3d9e3a3980d Upgrade kubernetes client 6.12.0 and remove unused version (#13793) 3d9e3a3980d is described below commit 3d9e3a3980d9f43c381bed4cc2366cc20b758d8a Author: Claus Ibsen AuthorDate: Mon Apr 15 15:09:31 2024 +0200 Upgrade kubernetes client 6.12.0 and remove unused version (#13793) --- parent/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index f6849b1eb69..f607eeb510b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -314,8 +314,7 @@ 3.7.0 1.9.23 1.16.0 -6.11.0 -6.9.2 +6.12.0 1.17.0 0.29.0 1.8
(camel) branch kc deleted (was 582cc0122a8)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch kc in repository https://gitbox.apache.org/repos/asf/camel.git was 582cc0122a8 Upgrade kubernetes client 6.12.0 and remove unused version 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: Upgrade kubernetes client 6.12.0 and remove unused version
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch kc in repository https://gitbox.apache.org/repos/asf/camel.git commit 582cc0122a895a0f4f278b159de091c3c363f95d Author: Claus Ibsen AuthorDate: Mon Apr 15 14:47:51 2024 +0200 Upgrade kubernetes client 6.12.0 and remove unused version --- parent/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index f6849b1eb69..f607eeb510b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -314,8 +314,7 @@ 3.7.0 1.9.23 1.16.0 -6.11.0 -6.9.2 +6.12.0 1.17.0 0.29.0 1.8
(camel) branch kc created (now 582cc0122a8)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch kc in repository https://gitbox.apache.org/repos/asf/camel.git at 582cc0122a8 Upgrade kubernetes client 6.12.0 and remove unused version This branch includes the following new commits: new 582cc0122a8 Upgrade kubernetes client 6.12.0 and remove unused version The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) branch bcastle deleted (was 458bd1208a3)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch bcastle in repository https://gitbox.apache.org/repos/asf/camel.git was 458bd1208a3 CAMEL-20661: Upgrade to bouncy castle 1.78 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: CAMEL-20661: Upgrade to bouncy castle 1.78 (#13792)
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 0ff41a5070c CAMEL-20661: Upgrade to bouncy castle 1.78 (#13792)
0ff41a5070c is described below
commit 0ff41a5070c8546c8545e10f5cf36c5a4a6a7c1f
Author: Claus Ibsen
AuthorDate: Mon Apr 15 14:11:24 2024 +0200
CAMEL-20661: Upgrade to bouncy castle 1.78 (#13792)
---
components/camel-crypto/pom.xml | 5 +
parent/pom.xml | 3 +--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/components/camel-crypto/pom.xml b/components/camel-crypto/pom.xml
index cb0122a668b..96d33fd6fd0 100644
--- a/components/camel-crypto/pom.xml
+++ b/components/camel-crypto/pom.xml
@@ -50,6 +50,11 @@
bcprov-jdk18on
${bouncycastle-version}
+
+org.bouncycastle
+bcutil-jdk18on
+${bouncycastle-version}
+
diff --git a/parent/pom.xml b/parent/pom.xml
index db33607170e..f6849b1eb69 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -80,8 +80,7 @@
1.2.21
12.0.0-beta.19
3.0.0
-
-1.77
+1.78
4.8.0
3.34.0
3.5.0
(camel) branch bcastle created (now 458bd1208a3)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch bcastle in repository https://gitbox.apache.org/repos/asf/camel.git at 458bd1208a3 CAMEL-20661: Upgrade to bouncy castle 1.78 This branch includes the following new commits: new 458bd1208a3 CAMEL-20661: Upgrade to bouncy castle 1.78 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) 01/01: CAMEL-20661: Upgrade to bouncy castle 1.78
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch bcastle
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 458bd1208a3e3bb54a880ed837ae00fef758d42a
Author: Claus Ibsen
AuthorDate: Mon Apr 15 13:46:29 2024 +0200
CAMEL-20661: Upgrade to bouncy castle 1.78
---
components/camel-crypto/pom.xml | 5 +
parent/pom.xml | 3 +--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/components/camel-crypto/pom.xml b/components/camel-crypto/pom.xml
index cb0122a668b..96d33fd6fd0 100644
--- a/components/camel-crypto/pom.xml
+++ b/components/camel-crypto/pom.xml
@@ -50,6 +50,11 @@
bcprov-jdk18on
${bouncycastle-version}
+
+org.bouncycastle
+bcutil-jdk18on
+${bouncycastle-version}
+
diff --git a/parent/pom.xml b/parent/pom.xml
index db33607170e..f6849b1eb69 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -80,8 +80,7 @@
1.2.21
12.0.0-beta.19
3.0.0
-
-1.77
+1.78
4.8.0
3.34.0
3.5.0
(camel) branch camel-4.4.x updated: CAMEL-20676: camel-snmp - Delay cannot be configured (#13791)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.4.x by this push:
new 3272224298a CAMEL-20676: camel-snmp - Delay cannot be configured
(#13791)
3272224298a is described below
commit 3272224298a3053350ddf9b6879e9b70362e4416
Author: Claus Ibsen
AuthorDate: Mon Apr 15 12:41:19 2024 +0200
CAMEL-20676: camel-snmp - Delay cannot be configured (#13791)
---
.../org/apache/camel/catalog/components/snmp.json | 2 +-
.../org/apache/camel/component/snmp/snmp.json | 2 +-
.../org/apache/camel/component/snmp/SnmpEndpoint.java | 19 +++
.../endpoint/dsl/SnmpEndpointBuilderFactory.java | 4 ++--
4 files changed, 7 insertions(+), 20 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
index 203b42b2bc1..ae0c267c122 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
@@ -41,7 +41,7 @@
"snmpVersion": { "index": 8, "kind": "parameter", "displayName": "Snmp
Version", "group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "enum": [ "0", "1", "3" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 0, "description": "Sets the snmp
version for the request. The value 0 means SNMPv1, 1 means SNMPv2c, and the
value 3 means SNMPv3" },
"timeout": { "index": 9, "kind": "parameter", "displayName": "Timeout",
"group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 1500, "description": "Sets the timeout value for the request in
millis." },
"type": { "index": 10, "kind": "parameter", "displayName": "Type",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.snmp.SnmpActionType", "enum": [ "TRAP",
"POLL", "GET_NEXT" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Which operation to perform such as poll, trap, etc." },
-"delay": { "index": 11, "kind": "parameter", "displayName": "Delay",
"group": "consumer", "label": "consumer", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "6", "description": "Sets update rate in
seconds" },
+"delay": { "index": 11, "kind": "parameter", "displayName": "Delay",
"group": "consumer", "label": "consumer", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "6", "description": "Milliseconds before
the next poll." },
"sendEmptyMessageWhenIdle": { "index": 12, "kind": "parameter",
"displayName": "Send Empty Message When Idle", "group": "consumer", "label":
"consumer", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "If the polling consumer did not poll any files, you can
enable this option to send an empty message (no body) instead." },
"treeList": { "index": 13, "kind": "parameter", "displayName": "Tree
Lis
(camel) branch camel-4.0.x updated: CAMEL-20676: camel-snmp - Delay cannot be configured (#13791)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.0.x by this push:
new e335662d80e CAMEL-20676: camel-snmp - Delay cannot be configured
(#13791)
e335662d80e is described below
commit e335662d80e737280181800a98de2d56139802ab
Author: Claus Ibsen
AuthorDate: Mon Apr 15 12:41:19 2024 +0200
CAMEL-20676: camel-snmp - Delay cannot be configured (#13791)
---
.../org/apache/camel/catalog/components/snmp.json | 2 +-
.../org/apache/camel/component/snmp/snmp.json | 2 +-
.../org/apache/camel/component/snmp/SnmpEndpoint.java | 19 +++
.../endpoint/dsl/SnmpEndpointBuilderFactory.java | 4 ++--
4 files changed, 7 insertions(+), 20 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
index 08f6580aaf2..292a68d5f5e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
@@ -40,7 +40,7 @@
"snmpVersion": { "index": 8, "kind": "parameter", "displayName": "Snmp
Version", "group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "enum": [ "0", "1", "3" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 0, "description": "Sets the snmp
version for the request. The value 0 means SNMPv1, 1 means SNMPv2c, and the
value 3 means SNMPv3" },
"timeout": { "index": 9, "kind": "parameter", "displayName": "Timeout",
"group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 1500, "description": "Sets the timeout value for the request in
millis." },
"type": { "index": 10, "kind": "parameter", "displayName": "Type",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.snmp.SnmpActionType", "enum": [ "TRAP",
"POLL", "GET_NEXT" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Which operation to perform such as poll, trap, etc." },
-"delay": { "index": 11, "kind": "parameter", "displayName": "Delay",
"group": "consumer", "label": "consumer", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "6", "description": "Sets update rate in
seconds" },
+"delay": { "index": 11, "kind": "parameter", "displayName": "Delay",
"group": "consumer", "label": "consumer", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "6", "description": "Milliseconds before
the next poll." },
"sendEmptyMessageWhenIdle": { "index": 12, "kind": "parameter",
"displayName": "Send Empty Message When Idle", "group": "consumer", "label":
"consumer", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "If the polling consumer did not poll any files, you can
enable this option to send an empty message (no body) instead." },
"treeList": { "index": 13, "kind": "parameter", "displayName": "Tree
Lis
(camel) branch snmp deleted (was 26098bc9c58)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch snmp in repository https://gitbox.apache.org/repos/asf/camel.git was 26098bc9c58 CAMEL-20676: camel-snmp - Delay cannot be configured The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: CAMEL-20676: camel-snmp - Delay cannot be configured (#13791)
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 c1de3f7da35 CAMEL-20676: camel-snmp - Delay cannot be configured
(#13791)
c1de3f7da35 is described below
commit c1de3f7da35cd0a2e40baac027879e15e2e59af8
Author: Claus Ibsen
AuthorDate: Mon Apr 15 12:41:19 2024 +0200
CAMEL-20676: camel-snmp - Delay cannot be configured (#13791)
---
.../org/apache/camel/catalog/components/snmp.json | 2 +-
.../org/apache/camel/component/snmp/snmp.json | 2 +-
.../org/apache/camel/component/snmp/SnmpEndpoint.java | 19 +++
.../endpoint/dsl/SnmpEndpointBuilderFactory.java | 4 ++--
.../org/apache/camel/kotlin/components/SnmpUriDsl.kt | 2 +-
5 files changed, 8 insertions(+), 21 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
index a745c19d601..f1f5bfc28a2 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
@@ -41,7 +41,7 @@
"snmpVersion": { "index": 8, "kind": "parameter", "displayName": "Snmp
Version", "group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "enum": [ "0", "1", "3" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 0, "description": "Sets the snmp
version for the request. The value 0 means SNMPv1, 1 means SNMPv2c, and the
value 3 means SNMPv3" },
"timeout": { "index": 9, "kind": "parameter", "displayName": "Timeout",
"group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 1500, "description": "Sets the timeout value for the request in
millis." },
"type": { "index": 10, "kind": "parameter", "displayName": "Type",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.snmp.SnmpActionType", "enum": [ "TRAP",
"POLL", "GET_NEXT" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Which operation to perform such as poll, trap, etc." },
-"delay": { "index": 11, "kind": "parameter", "displayName": "Delay",
"group": "consumer", "label": "consumer", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "6", "description": "Sets update rate in
seconds" },
+"delay": { "index": 11, "kind": "parameter", "displayName": "Delay",
"group": "consumer", "label": "consumer", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "6", "description": "Milliseconds before
the next poll." },
"sendEmptyMessageWhenIdle": { "index": 12, "kind": "parameter",
"displayName": "Send Empty Message When Idle", "group": "consumer", "label":
"consumer", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "If the polling consumer did not poll any files, you can
enable this option to send an empty message (no body) instead." },
"treeList": { "index": 13, "kind": "pa
(camel) 01/01: CAMEL-20676: camel-snmp - Delay cannot be configured
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch snmp
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 26098bc9c58ad118ce41ae196f7b1045e033d64c
Author: Claus Ibsen
AuthorDate: Mon Apr 15 12:06:05 2024 +0200
CAMEL-20676: camel-snmp - Delay cannot be configured
---
.../org/apache/camel/catalog/components/snmp.json | 2 +-
.../org/apache/camel/component/snmp/snmp.json | 2 +-
.../org/apache/camel/component/snmp/SnmpEndpoint.java | 19 +++
.../endpoint/dsl/SnmpEndpointBuilderFactory.java | 4 ++--
.../org/apache/camel/kotlin/components/SnmpUriDsl.kt | 2 +-
5 files changed, 8 insertions(+), 21 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
index a745c19d601..f1f5bfc28a2 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/snmp.json
@@ -41,7 +41,7 @@
"snmpVersion": { "index": 8, "kind": "parameter", "displayName": "Snmp
Version", "group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "enum": [ "0", "1", "3" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": 0, "description": "Sets the snmp
version for the request. The value 0 means SNMPv1, 1 means SNMPv2c, and the
value 3 means SNMPv3" },
"timeout": { "index": 9, "kind": "parameter", "displayName": "Timeout",
"group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 1500, "description": "Sets the timeout value for the request in
millis." },
"type": { "index": 10, "kind": "parameter", "displayName": "Type",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.snmp.SnmpActionType", "enum": [ "TRAP",
"POLL", "GET_NEXT" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Which operation to perform such as poll, trap, etc." },
-"delay": { "index": 11, "kind": "parameter", "displayName": "Delay",
"group": "consumer", "label": "consumer", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "6", "description": "Sets update rate in
seconds" },
+"delay": { "index": 11, "kind": "parameter", "displayName": "Delay",
"group": "consumer", "label": "consumer", "required": false, "type":
"duration", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "6", "description": "Milliseconds before
the next poll." },
"sendEmptyMessageWhenIdle": { "index": 12, "kind": "parameter",
"displayName": "Send Empty Message When Idle", "group": "consumer", "label":
"consumer", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "If the polling consumer did not poll any files, you can
enable this option to send an empty message (no body) instead." },
"treeList": { "index": 13, "kind": "parameter", "displayName": "Tree
List", "group": "consumer", "label": "consumer", "required": false, "type":
(camel) branch snmp created (now 26098bc9c58)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch snmp in repository https://gitbox.apache.org/repos/asf/camel.git at 26098bc9c58 CAMEL-20676: camel-snmp - Delay cannot be configured This branch includes the following new commits: new 26098bc9c58 CAMEL-20676: camel-snmp - Delay cannot be configured The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) branch main updated: CAMEL-20674: camel-xml-io - Allow parser to santize uris from XML that may be set by end user using multi line which causes uri to be with whitespace noise.
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 7e058efd3fb CAMEL-20674: camel-xml-io - Allow parser to santize uris
from XML that may be set by end user using multi line which causes uri to be
with whitespace noise.
7e058efd3fb is described below
commit 7e058efd3fbd9c40c1641eda66c6f217f8540e6f
Author: Claus Ibsen
AuthorDate: Mon Apr 15 11:54:25 2024 +0200
CAMEL-20674: camel-xml-io - Allow parser to santize uris from XML that may
be set by end user using multi line which causes uri to be with whitespace
noise.
---
.../java/org/apache/camel/xml/in/ModelParser.java | 18 +-
.../main/java/org/apache/camel/xml/in/BaseParser.java | 4
.../maven/packaging/ModelXmlParserGeneratorMojo.java | 7 ++-
3 files changed, 19 insertions(+), 10 deletions(-)
diff --git
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
index 8b16a1acddd..1c430a68830 100644
---
a/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
+++
b/core/camel-xml-io/src/generated/java/org/apache/camel/xml/in/ModelParser.java
@@ -479,7 +479,7 @@ public class ModelParser extends BaseParser {
protected FromDefinition doParseFromDefinition() throws IOException,
XmlPullParserException {
return doParse(new FromDefinition(), (def, key, val) -> {
switch (key) {
-case "uri": def.setUri(val); break;
+case "uri": def.setUri(sanitizeUri(val)); break;
case "variableReceive": def.setVariableReceive(val); break;
default: return
optionalIdentifiedDefinitionAttributeHandler().accept(def, key, val);
}
@@ -536,7 +536,7 @@ public class ModelParser extends BaseParser {
protected InterceptFromDefinition doParseInterceptFromDefinition() throws
IOException, XmlPullParserException {
return doParse(new InterceptFromDefinition(), (def, key, val) -> {
if ("uri".equals(key)) {
-def.setUri(val);
+def.setUri(sanitizeUri(val));
return true;
}
return processorDefinitionAttributeHandler().accept(def, key, val);
@@ -547,7 +547,7 @@ public class ModelParser extends BaseParser {
switch (key) {
case "afterUri": def.setAfterUri(val); break;
case "skipSendToOriginalEndpoint":
def.setSkipSendToOriginalEndpoint(val); break;
-case "uri": def.setUri(val); break;
+case "uri": def.setUri(sanitizeUri(val)); break;
default: return
processorDefinitionAttributeHandler().accept(def, key, val);
}
return true;
@@ -1564,7 +1564,7 @@ public class ModelParser extends BaseParser {
protected AttributeHandler
sendDefinitionAttributeHandler() {
return (def, key, val) -> {
if ("uri".equals(key)) {
-def.setUri(val);
+def.setUri(sanitizeUri(val));
return true;
}
return processorDefinitionAttributeHandler().accept(def, key, val);
@@ -1578,7 +1578,7 @@ public class ModelParser extends BaseParser {
case "cacheSize": def.setCacheSize(val); break;
case "ignoreInvalidEndpoint":
def.setIgnoreInvalidEndpoint(val); break;
case "pattern": def.setPattern(val); break;
-case "uri": def.setUri(val); break;
+case "uri": def.setUri(sanitizeUri(val)); break;
case "variableReceive": def.setVariableReceive(val); break;
case "variableSend": def.setVariableSend(val); break;
default: return
processorDefinitionAttributeHandler().accept(def, key, val);
@@ -1985,7 +1985,7 @@ public class ModelParser extends BaseParser {
case "serviceChooserRef": def.setServiceChooserRef(val); break;
case "serviceDiscoveryRef": def.setServiceDiscoveryRef(val);
break;
case "serviceFilterRef": def.setServiceFilterRef(val); break;
-case "uri": def.setUri(val); break;
+case "uri": def.setUri(sanitizeUri(val)); break;
default: return identifiedTypeAttributeHandler().accept(def,
key, val);
}
return true;
@@ -2039,7 +2039,7 @@ public class ModelParser extends BaseParser {
case "serviceChooserRef": def.setServiceChooserRef(val); break;
(camel) branch main updated: CAMEL-20673: camel-core - Add type converter for string to TimeUnit (#13790)
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 3ae0f70ad05 CAMEL-20673: camel-core - Add type converter for string to
TimeUnit (#13790)
3ae0f70ad05 is described below
commit 3ae0f70ad05ef8022e81474a8c2a5d174e579728
Author: Claus Ibsen
AuthorDate: Mon Apr 15 11:54:45 2024 +0200
CAMEL-20673: camel-core - Add type converter for string to TimeUnit (#13790)
---
.../converter/CamelBaseBulkConverterLoader.java| 11 +++-
.../apache/camel/converter/DateTimeConverter.java | 16 +++
.../impl/converter/CoreTypeConverterRegistry.java | 18 +
.../camel/impl/converter/EnumTypeConverter.java| 31 +-
.../camel/converter/DateTimeConverterTest.java | 7 +
5 files changed, 64 insertions(+), 19 deletions(-)
diff --git
a/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
b/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
index d28d0c8abf9..0a03a566c99 100644
---
a/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
+++
b/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
@@ -43,7 +43,7 @@ public final class CamelBaseBulkConverterLoader implements
TypeConverterLoader,
@Override
public int size() {
-return 121;
+return 122;
}
@Override
@@ -490,6 +490,10 @@ public final class CamelBaseBulkConverterLoader implements
TypeConverterLoader,
if (value instanceof java.lang.String) {
return
org.apache.camel.converter.DateTimeConverter.toTimeZone((java.lang.String)
value);
}
+} else if (to == java.util.concurrent.TimeUnit.class) {
+if (value instanceof java.lang.String) {
+return
org.apache.camel.converter.DateTimeConverter.toTimeUnit((java.lang.String)
value);
+}
} else if (to == org.apache.camel.Processor.class) {
if (value instanceof org.apache.camel.Expression) {
return
org.apache.camel.converter.CamelConverter.toProcessor((org.apache.camel.Expression)
value);
@@ -624,6 +628,7 @@ public final class CamelBaseBulkConverterLoader implements
TypeConverterLoader,
registry.addConverter(new
TypeConvertible<>(java.util.Collection.class, java.util.Set.class), this);
registry.addConverter(new TypeConvertible<>(java.util.Map.class,
java.util.Set.class), this);
registry.addConverter(new TypeConvertible<>(java.lang.String.class,
java.util.TimeZone.class), this);
+registry.addConverter(new TypeConvertible<>(java.lang.String.class,
java.util.concurrent.TimeUnit.class), this);
registry.addConverter(new
TypeConvertible<>(org.apache.camel.Expression.class,
org.apache.camel.Processor.class), this);
registry.addConverter(new
TypeConvertible<>(org.apache.camel.Predicate.class,
org.apache.camel.Processor.class), this);
registry.addConverter(new TypeConvertible<>(java.lang.String.class,
org.apache.camel.spi.Resource.class), this);
@@ -1028,6 +1033,10 @@ public final class CamelBaseBulkConverterLoader
implements TypeConverterLoader,
if (from == java.lang.String.class) {
return this;
}
+} else if (to == java.util.concurrent.TimeUnit.class) {
+if (from == java.lang.String.class) {
+return this;
+}
} else if (to == org.apache.camel.Processor.class) {
if (from == org.apache.camel.Expression.class) {
return this;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/converter/DateTimeConverter.java
b/core/camel-base/src/main/java/org/apache/camel/converter/DateTimeConverter.java
index 230a44ebc96..b1714a9d17a 100644
---
a/core/camel-base/src/main/java/org/apache/camel/converter/DateTimeConverter.java
+++
b/core/camel-base/src/main/java/org/apache/camel/converter/DateTimeConverter.java
@@ -17,7 +17,9 @@
package org.apache.camel.converter;
import java.util.Date;
+import java.util.Locale;
import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
import org.apache.camel.Converter;
@@ -47,4 +49,18 @@ public final class DateTimeConverter {
public static Long toLong(Date date) {
return date.getTime();
}
+
+@Converter(order = 4)
+public static TimeUnit toTimeUnit(String unit) {
+String match = unit.toUpperCase(Locale.ROOT).trim();
+return switch (match) {
+case "DAYS" -> TimeUnit.DAYS;
+case "HOURS" -> TimeUnit.HOURS;
+case "MINUTES" -> TimeUnit.MINUTES;
(camel) branch tu deleted (was dc63cc8f707)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch tu in repository https://gitbox.apache.org/repos/asf/camel.git was dc63cc8f707 CAMEL-20673: camel-core - Add type converter for string to TimeUnit The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: camel-jbang - Upgrade to hawtio 4.0.0 (#13789)
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 33629b77447 camel-jbang - Upgrade to hawtio 4.0.0 (#13789)
33629b77447 is described below
commit 33629b7744721efe13a2c863873e6df7f75e751c
Author: Tadayoshi Sato
AuthorDate: Mon Apr 15 18:10:53 2024 +0900
camel-jbang - Upgrade to hawtio 4.0.0 (#13789)
---
.../java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
index 0bf3bc46b31..6ee4da393f7 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
@@ -37,8 +37,8 @@ public class Hawtio extends CamelCommand {
String name;
@CommandLine.Option(names = { "--version" },
-description = "Version of the Hawtio web console",
defaultValue = "4.0.0-RC2")
-String version = "4.0.0-RC2";
+description = "Version of the Hawtio web console",
defaultValue = "4.0.0")
+String version = "4.0.0";
// use port as 8080 is too commonly used
@CommandLine.Option(names = { "--port" },
(camel) branch tu created (now dc63cc8f707)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch tu in repository https://gitbox.apache.org/repos/asf/camel.git at dc63cc8f707 CAMEL-20673: camel-core - Add type converter for string to TimeUnit This branch includes the following new commits: new dc63cc8f707 CAMEL-20673: camel-core - Add type converter for string to TimeUnit The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) 01/01: CAMEL-20673: camel-core - Add type converter for string to TimeUnit
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch tu
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dc63cc8f707107c36c7ea4c4db6b3fcb477b5cd8
Author: Claus Ibsen
AuthorDate: Mon Apr 15 11:09:33 2024 +0200
CAMEL-20673: camel-core - Add type converter for string to TimeUnit
---
.../converter/CamelBaseBulkConverterLoader.java| 11 +++-
.../apache/camel/converter/DateTimeConverter.java | 16 +++
.../impl/converter/CoreTypeConverterRegistry.java | 18 +
.../camel/impl/converter/EnumTypeConverter.java| 31 +-
.../camel/converter/DateTimeConverterTest.java | 7 +
5 files changed, 64 insertions(+), 19 deletions(-)
diff --git
a/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
b/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
index d28d0c8abf9..0a03a566c99 100644
---
a/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
+++
b/core/camel-base/src/generated/java/org/apache/camel/converter/CamelBaseBulkConverterLoader.java
@@ -43,7 +43,7 @@ public final class CamelBaseBulkConverterLoader implements
TypeConverterLoader,
@Override
public int size() {
-return 121;
+return 122;
}
@Override
@@ -490,6 +490,10 @@ public final class CamelBaseBulkConverterLoader implements
TypeConverterLoader,
if (value instanceof java.lang.String) {
return
org.apache.camel.converter.DateTimeConverter.toTimeZone((java.lang.String)
value);
}
+} else if (to == java.util.concurrent.TimeUnit.class) {
+if (value instanceof java.lang.String) {
+return
org.apache.camel.converter.DateTimeConverter.toTimeUnit((java.lang.String)
value);
+}
} else if (to == org.apache.camel.Processor.class) {
if (value instanceof org.apache.camel.Expression) {
return
org.apache.camel.converter.CamelConverter.toProcessor((org.apache.camel.Expression)
value);
@@ -624,6 +628,7 @@ public final class CamelBaseBulkConverterLoader implements
TypeConverterLoader,
registry.addConverter(new
TypeConvertible<>(java.util.Collection.class, java.util.Set.class), this);
registry.addConverter(new TypeConvertible<>(java.util.Map.class,
java.util.Set.class), this);
registry.addConverter(new TypeConvertible<>(java.lang.String.class,
java.util.TimeZone.class), this);
+registry.addConverter(new TypeConvertible<>(java.lang.String.class,
java.util.concurrent.TimeUnit.class), this);
registry.addConverter(new
TypeConvertible<>(org.apache.camel.Expression.class,
org.apache.camel.Processor.class), this);
registry.addConverter(new
TypeConvertible<>(org.apache.camel.Predicate.class,
org.apache.camel.Processor.class), this);
registry.addConverter(new TypeConvertible<>(java.lang.String.class,
org.apache.camel.spi.Resource.class), this);
@@ -1028,6 +1033,10 @@ public final class CamelBaseBulkConverterLoader
implements TypeConverterLoader,
if (from == java.lang.String.class) {
return this;
}
+} else if (to == java.util.concurrent.TimeUnit.class) {
+if (from == java.lang.String.class) {
+return this;
+}
} else if (to == org.apache.camel.Processor.class) {
if (from == org.apache.camel.Expression.class) {
return this;
diff --git
a/core/camel-base/src/main/java/org/apache/camel/converter/DateTimeConverter.java
b/core/camel-base/src/main/java/org/apache/camel/converter/DateTimeConverter.java
index 230a44ebc96..b1714a9d17a 100644
---
a/core/camel-base/src/main/java/org/apache/camel/converter/DateTimeConverter.java
+++
b/core/camel-base/src/main/java/org/apache/camel/converter/DateTimeConverter.java
@@ -17,7 +17,9 @@
package org.apache.camel.converter;
import java.util.Date;
+import java.util.Locale;
import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
import org.apache.camel.Converter;
@@ -47,4 +49,18 @@ public final class DateTimeConverter {
public static Long toLong(Date date) {
return date.getTime();
}
+
+@Converter(order = 4)
+public static TimeUnit toTimeUnit(String unit) {
+String match = unit.toUpperCase(Locale.ROOT).trim();
+return switch (match) {
+case "DAYS" -> TimeUnit.DAYS;
+case "HOURS" -> TimeUnit.HOURS;
+case "MINUTES" -> TimeUnit.MINUTES;
+case "SECONDS" -> TimeUnit.SECONDS;
+case "MILLISECONDS" -> TimeUnit.MILLISECONDS;
+case "NANOSECONDS" -> TimeUnit.NANOSECONDS;
+
(camel) branch main updated (a86185ceb17 -> c0f7e38dbf1)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from a86185ceb17 Bump slf4j-version from 2.0.12 to 2.0.13 (#13787) add c0f7e38dbf1 Bump huaweicloud-sdk-version from 3.1.90 to 3.1.91 (#13788) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated: Bump groovy-version from 4.0.20 to 4.0.21 (#13786)
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 43e539facf2 Bump groovy-version from 4.0.20 to 4.0.21 (#13786) 43e539facf2 is described below commit 43e539facf236943d0529590505639f687938ec0 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Apr 15 10:23:49 2024 +0200 Bump groovy-version from 4.0.20 to 4.0.21 (#13786) Bumps `groovy-version` from 4.0.20 to 4.0.21. Updates `org.apache.groovy:groovy` from 4.0.20 to 4.0.21 - [Commits](https://github.com/apache/groovy/commits) Updates `org.apache.groovy:groovy-ant` from 4.0.20 to 4.0.21 - [Commits](https://github.com/apache/groovy/commits) Updates `org.apache.groovy:groovy-test-junit5` from 4.0.20 to 4.0.21 - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.apache.groovy:groovy dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.groovy:groovy-ant dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.apache.groovy:groovy-test-junit5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 22db738ebc1..a5e0b96f180 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -197,7 +197,7 @@ 21.5 2.0.1 2.4.4 -4.0.20 +4.0.21 1.63.0 1.23.0
(camel) branch main updated: Bump slf4j-version from 2.0.12 to 2.0.13 (#13787)
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 a86185ceb17 Bump slf4j-version from 2.0.12 to 2.0.13 (#13787) a86185ceb17 is described below commit a86185ceb17cc0fb5f9549b313a506a112d5b0b7 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Apr 15 10:23:58 2024 +0200 Bump slf4j-version from 2.0.12 to 2.0.13 (#13787) Bumps `slf4j-version` from 2.0.12 to 2.0.13. Updates `org.slf4j:jcl-over-slf4j` from 2.0.12 to 2.0.13 Updates `org.slf4j:jul-to-slf4j` from 2.0.12 to 2.0.13 --- updated-dependencies: - dependency-name: org.slf4j:jcl-over-slf4j dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.slf4j:jul-to-slf4j dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index a5e0b96f180..41b7f5ed365 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -433,7 +433,7 @@ 2.0.0 1.39.0 2.0.12 -2.0.12 +2.0.13 4.3.5 3.6.0 4.1.0
(camel) branch main updated: Bump aws-java-sdk2-version from 2.25.30 to 2.25.31 (#13785)
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 9de51e13b36 Bump aws-java-sdk2-version from 2.25.30 to 2.25.31 (#13785) 9de51e13b36 is described below commit 9de51e13b36d53c63e8c93cbb7b75b9b7613091b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Apr 15 09:43:13 2024 +0200 Bump aws-java-sdk2-version from 2.25.30 to 2.25.31 (#13785) Bumps `aws-java-sdk2-version` from 2.25.30 to 2.25.31. Updates `software.amazon.awssdk:sqs` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:kinesis` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:s3` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:sns` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:cloudwatch` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:ec2` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:eventbridge` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:iam` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:kms` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:lambda` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:secretsmanager` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:sts` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:dynamodb` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:config` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:apache-client` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:athena` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:bedrock` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:bedrockruntime` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:bedrockagent` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:bedrockagentruntime` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:cloudtrail` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:ecs` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:eks` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:netty-nio-client` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:firehose` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:kafka` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:mq` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:redshiftdata` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:ses` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:sfn` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:timestreamquery` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:timestreamwrite` from 2.25.30 to 2.25.31 Updates `software.amazon.awssdk:translate` from 2.25.30 to 2.25.31 --- updated-dependencies: - dependency-name: software.amazon.awssdk:sqs dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:kinesis dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:s3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sns dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:cloudwatch dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:ec2 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:eventbridge dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:iam dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:kms dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:lambda dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:secretsmanager dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sts dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:dynamodb dependency-type: direct:production update-type: version-update:semver
(camel) branch camel-3.21.x updated: CAMEL-20388: camel-salesforce - Invoke client.disconnect() when receiving connection failure message (#13725)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.21.x by this push:
new d7f67d3cb3c CAMEL-20388: camel-salesforce - Invoke client.disconnect()
when receiving connection failure message (#13725)
d7f67d3cb3c is described below
commit d7f67d3cb3c69cbc8746c88adb7131568ba9d1a0
Author: Zheng Feng
AuthorDate: Mon Apr 15 15:35:49 2024 +0800
CAMEL-20388: camel-salesforce - Invoke client.disconnect() when receiving
connection failure message (#13725)
---
.../component/salesforce/internal/streaming/SubscriptionHelper.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index 51441670ef5..d45602b12cb 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -162,6 +162,7 @@ public class SubscriptionHelper extends ServiceSupport {
LOG.warn("Connect failure: {}", message);
connectError = (String) message.get(ERROR_FIELD);
connectException = getFailure(message);
+client.disconnect();
if (connectError != null &&
connectError.equals(AUTHENTICATION_INVALID)) {
LOG.debug("connectError: {}", connectError);
(camel) branch camel-3.22.x updated: CAMEL-20388: camel-salesforce - Invoke client.disconnect() when receiving connection failure message (#13725)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.22.x by this push:
new a2e0cde5ec3 CAMEL-20388: camel-salesforce - Invoke client.disconnect()
when receiving connection failure message (#13725)
a2e0cde5ec3 is described below
commit a2e0cde5ec363a2da9a08e8e363db650a6fa37e2
Author: Zheng Feng
AuthorDate: Mon Apr 15 15:35:49 2024 +0800
CAMEL-20388: camel-salesforce - Invoke client.disconnect() when receiving
connection failure message (#13725)
---
.../component/salesforce/internal/streaming/SubscriptionHelper.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index 51441670ef5..d45602b12cb 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -162,6 +162,7 @@ public class SubscriptionHelper extends ServiceSupport {
LOG.warn("Connect failure: {}", message);
connectError = (String) message.get(ERROR_FIELD);
connectException = getFailure(message);
+client.disconnect();
if (connectError != null &&
connectError.equals(AUTHENTICATION_INVALID)) {
LOG.debug("connectError: {}", connectError);
(camel) branch camel-4.0.x updated: CAMEL-20388: camel-salesforce - Invoke client.disconnect() when receiving connection failure message (#13725)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.0.x by this push:
new e1331f8d7fc CAMEL-20388: camel-salesforce - Invoke client.disconnect()
when receiving connection failure message (#13725)
e1331f8d7fc is described below
commit e1331f8d7fc716dfb003955ebc2b3c3f1f392658
Author: Zheng Feng
AuthorDate: Mon Apr 15 15:35:49 2024 +0800
CAMEL-20388: camel-salesforce - Invoke client.disconnect() when receiving
connection failure message (#13725)
---
.../component/salesforce/internal/streaming/SubscriptionHelper.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index 57f3ff6298f..4440f7eaf1a 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -163,6 +163,7 @@ public class SubscriptionHelper extends ServiceSupport {
LOG.warn("Connect failure: {}", message);
connectError = (String) message.get(ERROR_FIELD);
connectException = getFailure(message);
+client.disconnect();
if (connectError != null &&
connectError.equals(AUTHENTICATION_INVALID)) {
LOG.debug("connectError: {}", connectError);
(camel) branch camel-4.4.x updated: CAMEL-20388: camel-salesforce - Invoke client.disconnect() when receiving connection failure message (#13725)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.4.x by this push:
new 2e478886532 CAMEL-20388: camel-salesforce - Invoke client.disconnect()
when receiving connection failure message (#13725)
2e478886532 is described below
commit 2e478886532424f93229da43540f8ed0ca169232
Author: Zheng Feng
AuthorDate: Mon Apr 15 15:35:49 2024 +0800
CAMEL-20388: camel-salesforce - Invoke client.disconnect() when receiving
connection failure message (#13725)
---
.../component/salesforce/internal/streaming/SubscriptionHelper.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index 4bdae77bc1e..a4d750568af 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -165,6 +165,7 @@ public class SubscriptionHelper extends ServiceSupport {
LOG.warn("Connect failure: {}", message);
connectError = (String) message.get(ERROR_FIELD);
connectException = getFailure(message);
+client.disconnect();
if (connectError != null &&
connectError.equals(AUTHENTICATION_INVALID)) {
LOG.debug("connectError: {}", connectError);
(camel) branch main updated (0d6586f9fcd -> 51b93e90c17)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 0d6586f9fcd Bump org.eclipse.parsson:parsson from 1.1.5 to 1.1.6 (#13783) add 51b93e90c17 CAMEL-20388: camel-salesforce - Invoke client.disconnect() when receiving connection failure message (#13725) No new revisions were added by this update. Summary of changes: .../component/salesforce/internal/streaming/SubscriptionHelper.java | 1 + 1 file changed, 1 insertion(+)
(camel) branch main updated (2773d95a9e9 -> 0d6586f9fcd)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 2773d95a9e9 CAMEL-20521: camel-amqp - AMQP publisher application is losing messages with local JMS transaction enabled (#13403) add 0d6586f9fcd Bump org.eclipse.parsson:parsson from 1.1.5 to 1.1.6 (#13783) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch camel-3.21.x updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.21.x by this push:
new 6ba9ca1996b Regen
6ba9ca1996b is described below
commit 6ba9ca1996b21aee160d8448f94393b8a7e657f7
Author: Claus Ibsen
AuthorDate: Mon Apr 15 09:28:45 2024 +0200
Regen
---
camel-dependencies/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index dee4872b74a..21b181b4b6d 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -128,7 +128,7 @@
1.15
3.2.2
4.4
-1.21
+1.26.0
1.9
2.8.0
1.8
@@ -521,12 +521,12 @@
5.5.19
2.4.1
2.4.8
-5.8.8
+5.8.11
2.3.3
${spring5-version}
[5,6)
3.1.8
-5.3.31
+5.3.34
1.5
3.14.9
1.17.2
(camel) branch camel-3.21.x updated: CAMEL-20521: Upgrade spring with jms/amqp fixes
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.21.x by this push:
new 020c65e43df CAMEL-20521: Upgrade spring with jms/amqp fixes
020c65e43df is described below
commit 020c65e43df8c8c201d34bf3635210c132173a65
Author: Claus Ibsen
AuthorDate: Mon Apr 15 08:49:44 2024 +0200
CAMEL-20521: Upgrade spring with jms/amqp fixes
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index ad91d1ca1b8..742a5c6484f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -512,9 +512,9 @@
2.3.3
[5,6)
${spring5-version}
-5.3.31
+5.3.34
2.4.8
-5.8.8
+5.8.11
3.1.8
1.5
3.14.9
(camel) 02/02: CAMEL-20521: Upgrade spring with jms/amqp fixes
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a2f8be8eb708a282dc21db1ce9b0b7e3717ec23b
Author: Claus Ibsen
AuthorDate: Mon Apr 15 08:49:44 2024 +0200
CAMEL-20521: Upgrade spring with jms/amqp fixes
---
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index ea99ef90ced..f420a2bcfdd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -514,9 +514,9 @@
2.3.3
[5,6)
${spring5-version}
-5.3.31
+5.3.34
2.4.8
-5.8.8
+5.8.11
3.1.8
1.5
3.14.9
(camel) branch camel-3.22.x updated (20d1ec27ecd -> a2f8be8eb70)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-3.22.x in repository https://gitbox.apache.org/repos/asf/camel.git from 20d1ec27ecd Upgrade Commons-compress to version 1.26.0 new 3429c57d879 Regen new a2f8be8eb70 CAMEL-20521: Upgrade spring with jms/amqp fixes The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
(camel) 01/02: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.22.x in repository https://gitbox.apache.org/repos/asf/camel.git commit 3429c57d87919089dc114edcfb783e7693ccf344 Author: Claus Ibsen AuthorDate: Mon Apr 15 08:48:30 2024 +0200 Regen --- camel-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 5a566084eb3..7b386db96e3 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -128,7 +128,7 @@ 1.15 3.2.2 4.4 -1.21 +1.26.0 1.9 2.8.0 1.8
(camel-spring-boot) branch camel-spring-boot-4.0.x updated: Regen
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-spring-boot-4.0.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/camel-spring-boot-4.0.x by this push: new e41e3accb61 Regen e41e3accb61 is described below commit e41e3accb6105a1a3cb877f15d3a70cdfd345fb0 Author: Claus Ibsen AuthorDate: Mon Apr 15 07:40:23 2024 +0200 Regen --- pom.xml| 2 +- tooling/camel-spring-boot-dependencies/pom.xml | 8 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index f359d5a1f61..10f558b3c16 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -3.1.8 +3.1.10 4.0.5-SNAPSHOT diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 0edd6bf94d5..359fb0bec18 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -200,22 +200,22 @@ io.micrometer micrometer-commons -1.11.8 +1.11.10 io.micrometer micrometer-observation -1.11.8 +1.11.10 io.micrometer micrometer-registry-jmx -1.11.8 +1.11.10 io.micrometer micrometer-tracing -1.1.9 +1.1.11 org.apache.avro
(camel) branch camel-4.0.x updated: CAMEL-20521: Upgrade spring with jms/amqp fixes
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-4.0.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-4.0.x by this push: new 3e43cad8f71 CAMEL-20521: Upgrade spring with jms/amqp fixes 3e43cad8f71 is described below commit 3e43cad8f717ed28741788b384b2cab8c7dc19d5 Author: Claus Ibsen AuthorDate: Mon Apr 15 07:30:33 2024 +0200 CAMEL-20521: Upgrade spring with jms/amqp fixes --- parent/pom.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 26b95b14183..f7aa66e456f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -335,8 +335,8 @@ 3.5.2 3.4.0 4.2.21 -1.11.8 -1.1.9 +1.11.10 +1.1.11 3.0.3 4.0.2 2.2.3 @@ -397,8 +397,8 @@ 2.3.2 2.3.1 1.0.4 -3.5.13 -1.1.14 +3.5.15 +1.1.17 3.23.2 2.1.0 5.3.1 @@ -428,9 +428,9 @@ 3.1.2 3.1.2 3.0.4 -6.0.16 +6.0.18 3.0.10 -6.1.6 +6.1.8 4.0.10 1.5 3.14.9
(camel-spring-boot) branch camel-spring-boot-4.4.x updated: Upgrade to spring boot 3.2.4
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-spring-boot-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/camel-spring-boot-4.4.x by
this push:
new fb928dec06e Upgrade to spring boot 3.2.4
fb928dec06e is described below
commit fb928dec06e70a76a65305110365f3a8ca66fd19
Author: Claus Ibsen
AuthorDate: Mon Apr 15 07:07:11 2024 +0200
Upgrade to spring boot 3.2.4
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index dfcf6d2a026..f31396ec85c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,7 @@
false
-3.2.3
+3.2.4
4.4.2-SNAPSHOT
@@ -118,7 +118,7 @@
1.0.2.Final
1.7.0.Alpha10
1.11.0
-4.0.13
+4.0.21
22.3.2
4.0.0
2.3.0
@@ -129,7 +129,7 @@
2.2.0
${maven-surefire-plugin-version}
2.1.10
- 2.7.10
+2.7.10
(camel-spring-boot) branch camel-spring-boot-4.4.x updated (38cdb0af1e3 -> 53599342a47)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-spring-boot-4.4.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from 38cdb0af1e3 Target Camel 4.4.2-SNAPSHOT for development new 3255706f125 Bump for next version new 53599342a47 Regen The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../springboot/catalog/components/activemq.json| 2 +- .../camel/springboot/catalog/components/amqp.json | 2 +- .../springboot/catalog/components/arangodb.json| 2 +- .../camel/springboot/catalog/components/as2.json | 2 +- .../springboot/catalog/components/asterisk.json| 2 +- .../catalog/components/atmosphere-websocket.json | 2 +- .../camel/springboot/catalog/components/atom.json | 2 +- .../camel/springboot/catalog/components/avro.json | 2 +- .../catalog/components/aws-cloudtrail.json | 2 +- .../springboot/catalog/components/aws-config.json | 2 +- .../catalog/components/aws-secrets-manager.json| 2 +- .../springboot/catalog/components/aws2-athena.json | 2 +- .../springboot/catalog/components/aws2-cw.json | 2 +- .../springboot/catalog/components/aws2-ddb.json| 2 +- .../catalog/components/aws2-ddbstream.json | 2 +- .../springboot/catalog/components/aws2-ec2.json| 2 +- .../springboot/catalog/components/aws2-ecs.json| 2 +- .../springboot/catalog/components/aws2-eks.json| 2 +- .../catalog/components/aws2-eventbridge.json | 2 +- .../springboot/catalog/components/aws2-iam.json| 2 +- .../catalog/components/aws2-kinesis-firehose.json | 2 +- .../catalog/components/aws2-kinesis.json | 2 +- .../springboot/catalog/components/aws2-kms.json| 2 +- .../springboot/catalog/components/aws2-lambda.json | 2 +- .../springboot/catalog/components/aws2-mq.json | 2 +- .../springboot/catalog/components/aws2-msk.json| 2 +- .../catalog/components/aws2-redshift-data.json | 2 +- .../springboot/catalog/components/aws2-s3.json | 2 +- .../springboot/catalog/components/aws2-ses.json| 2 +- .../springboot/catalog/components/aws2-sns.json| 2 +- .../springboot/catalog/components/aws2-sqs.json| 2 +- .../catalog/components/aws2-step-functions.json| 2 +- .../springboot/catalog/components/aws2-sts.json| 2 +- .../catalog/components/aws2-timestream.json| 2 +- .../catalog/components/aws2-translate.json | 2 +- .../catalog/components/azure-cosmosdb.json | 2 +- .../catalog/components/azure-eventhubs.json| 2 +- .../springboot/catalog/components/azure-files.json | 2 +- .../catalog/components/azure-key-vault.json| 2 +- .../catalog/components/azure-servicebus.json | 102 +-- .../catalog/components/azure-storage-blob.json | 2 +- .../catalog/components/azure-storage-datalake.json | 2 +- .../catalog/components/azure-storage-queue.json| 2 +- .../catalog/components/bean-validator.json | 2 +- .../camel/springboot/catalog/components/bean.json | 2 +- .../springboot/catalog/components/bonita.json | 2 +- .../camel/springboot/catalog/components/box.json | 2 +- .../springboot/catalog/components/braintree.json | 2 +- .../springboot/catalog/components/browse.json | 2 +- .../catalog/components/caffeine-cache.json | 2 +- .../catalog/components/caffeine-loadcache.json | 2 +- .../springboot/catalog/components/chatscript.json | 2 +- .../camel/springboot/catalog/components/chunk.json | 2 +- .../camel/springboot/catalog/components/class.json | 2 +- .../springboot/catalog/components/cm-sms.json | 2 +- .../springboot/catalog/components/coap+tcp.json| 2 +- .../camel/springboot/catalog/components/coap.json | 2 +- .../springboot/catalog/components/coaps+tcp.json | 2 +- .../camel/springboot/catalog/components/coaps.json | 2 +- .../springboot/catalog/components/cometd.json | 2 +- .../springboot/catalog/components/cometds.json | 2 +- .../springboot/catalog/components/consul.json | 2 +- .../springboot/catalog/components/controlbus.json | 2 +- .../springboot/catalog/components/couchbase.json | 2 +- .../springboot/catalog/components/couchdb.json | 2 +- .../camel/springboot/catalog/components/cql.json | 2 +- .../camel/springboot/catalog/components/cron.json | 2 +- .../springboot/catalog/components/crypto.json | 2 +- .../camel/springboot/catalog/components/cxf.json | 2 +- .../camel/springboot/catalog/components/cxfrs.json | 2 +- .../springboot/catalog/components/dataformat.json | 2 +- .../catalog/components/dataset-test.
(camel) 02/02: Fix compile
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-4.4.x in repository https://gitbox.apache.org/repos/asf/camel.git commit 6f9d0cf169134b94465608e7882c62cae1e5d4a6 Author: Claus Ibsen AuthorDate: Mon Apr 15 06:54:26 2024 +0200 Fix compile --- .../java/org/apache/camel/main/MainSupervisingRouteControllerTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java b/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java index d6153769360..2e958980b33 100644 --- a/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java +++ b/core/camel-main/src/test/java/org/apache/camel/main/MainSupervisingRouteControllerTest.java @@ -31,6 +31,7 @@ import org.apache.camel.spi.SupervisingRouteController; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue;
(camel) branch camel-4.4.x updated (c5aa8e5566f -> 6f9d0cf1691)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-4.4.x in repository https://gitbox.apache.org/repos/asf/camel.git from c5aa8e5566f CAMEL-20663: camel-main - Reading properties file should support mixed case and dash vs no-dash style all combinations (#13779) new 3ee961433c7 CAMEL-20521: Upgrade spring with jms/amqp fixes new 6f9d0cf1691 Fix compile The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../camel/main/MainSupervisingRouteControllerTest.java | 1 + parent/pom.xml | 14 +++--- 2 files changed, 8 insertions(+), 7 deletions(-)
(camel) 01/02: CAMEL-20521: Upgrade spring with jms/amqp fixes
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-4.4.x in repository https://gitbox.apache.org/repos/asf/camel.git commit 3ee961433c7810d6e07e06ad3deff848a5171313 Author: Claus Ibsen AuthorDate: Mon Apr 15 06:52:46 2024 +0200 CAMEL-20521: Upgrade spring with jms/amqp fixes --- parent/pom.xml | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 268fb22a310..b5150506faf 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -338,8 +338,8 @@ 3.5.2 3.4.0 4.2.25 -1.12.3 -1.2.3 +1.12.5 +1.2.5 3.1 4.0.2 2.2.3 @@ -401,8 +401,8 @@ 2.3.2 2.3.1 1.0.4 -3.6.3 -1.1.16 +3.6.5 +1.1.18 3.26.0 2.2.0 5.4.0 @@ -430,11 +430,11 @@ 2.3-groovy-4.0 5.1.1 3.2.2 -3.2.1 +3.2.3 3.1.1 -6.1.4 +6.1.6 3.1.1 -6.2.2 +6.2.3 4.0.10 1.5 3.14.9
(camel) branch main updated: CAMEL-20521: camel-amqp - AMQP publisher application is losing messages with local JMS transaction enabled (#13403)
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 2773d95a9e9 CAMEL-20521: camel-amqp - AMQP publisher application is
losing messages with local JMS transaction enabled (#13403)
2773d95a9e9 is described below
commit 2773d95a9e99e9840018638beb333b59a91c2806
Author: Luigi De Masi <5583341+luigidem...@users.noreply.github.com>
AuthorDate: Sun Apr 14 18:47:37 2024 +0200
CAMEL-20521: camel-amqp - AMQP publisher application is losing messages
with local JMS transaction enabled (#13403)
---
.../camel/component/jms/JmsConfiguration.java | 22 +-
.../component/jms/RestartBrokerBeforeCommitIT.java | 263 +
.../infra/artemis/services/ArtemisContainer.java | 14 +-
.../services/RestartAwareArtemisContainer.java | 31 +++
4 files changed, 322 insertions(+), 8 deletions(-)
diff --git
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
index 7abd8cd67a7..f32d6f9025e 100644
---
a/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
+++
b/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsConfiguration.java
@@ -621,17 +621,23 @@ public class JmsConfiguration implements Cloneable {
if (message != null && callback != null) {
callback.sent(session, message, destination);
}
-// Check commit - avoid commit call within a JTA transaction.
-if (session.getTransacted() &&
isSessionLocallyTransacted(session)) {
-// Transacted session created by this template -> commit.
-JmsUtils.commitIfNecessary(session);
-}
+
+commitIfNecessary(session);
+
} finally {
JmsUtils.closeMessageProducer(producer);
}
return null;
}
+protected void commitIfNecessary(Session session) throws JMSException {
+// Check commit - avoid commit call within a JTA transaction.
+if (session.getTransacted() &&
isSessionLocallyTransacted(session)) {
+// Transacted session created by this template -> commit.
+JmsUtils.commitIfNecessary(session);
+}
+}
+
/**
* Override so we can support preserving the Qos settings that have
been set on the message.
*/
@@ -728,7 +734,7 @@ public class JmsConfiguration implements Cloneable {
}
ConnectionFactory factory = getOrCreateTemplateConnectionFactory();
-JmsTemplate template = new CamelJmsTemplate(this, factory);
+JmsTemplate template = createCamelJmsTemplate(factory);
template.setPubSubDomain(pubSubDomain);
if (destinationResolver != null) {
@@ -784,6 +790,10 @@ public class JmsConfiguration implements Cloneable {
return template;
}
+protected CamelJmsTemplate createCamelJmsTemplate(ConnectionFactory
connectionFactory) {
+return new CamelJmsTemplate(this, connectionFactory);
+}
+
public AbstractMessageListenerContainer
createMessageListenerContainer(JmsEndpoint endpoint) {
AbstractMessageListenerContainer container =
chooseMessageListenerContainerImplementation(endpoint);
configureMessageListenerContainer(container, endpoint);
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/RestartBrokerBeforeCommitIT.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/RestartBrokerBeforeCommitIT.java
new file mode 100644
index 000..4ad18c7a881
--- /dev/null
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/RestartBrokerBeforeCommitIT.java
@@ -0,0 +1,263 @@
+/*
+ * 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.jms;
+
+import java.io.IOException;
+
(camel) branch route-eh-xml deleted (was 17c78a96eb4)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch route-eh-xml in repository https://gitbox.apache.org/repos/asf/camel.git was 17c78a96eb4 CAMEL-20665: YAML DSL Inconsistency - StreamCaching vs streamCache. Also mark some DSL in Java DSL as deprecated to make the DSLs consistent so Java DSL does not have special options. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: Align DSL for Java, XML and YAML for error handler and stream caching (#13780)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 9de62afad05 Align DSL for Java, XML and YAML for error handler and
stream caching (#13780)
9de62afad05 is described below
commit 9de62afad05220f6fd413bbbc71c5c3ae2a66daf
Author: Claus Ibsen
AuthorDate: Sat Apr 13 12:41:44 2024 +0200
Align DSL for Java, XML and YAML for error handler and stream caching
(#13780)
* CAMEL-20666: Add errorHandler on route for EIP model (XML and YAML DSL)
to be consistent.
* CAMEL-20665: YAML DSL Inconsistency - StreamCaching vs streamCache. Also
mark some DSL in Java DSL as deprecated to make the DSLs consistent so Java DSL
does not have special options.
* CAMEL-20665: YAML DSL Inconsistency - StreamCaching vs streamCache. Also
mark some DSL in Java DSL as deprecated to make the DSLs consistent so Java DSL
does not have special options.
---
.../org/apache/camel/catalog/models/route.json | 9 +--
.../apache/camel/catalog/schemas/camel-spring.xsd | 1 +
.../camel/spring/config/ErrorHandlerRouteTest.java | 58 +
.../camel/spring/config/errorHandlerRoute.xml | 41
.../java/org/apache/camel/impl/DefaultModel.java | 2 +-
.../META-INF/org/apache/camel/model/route.json | 9 +--
.../org/apache/camel/model/RouteDefinition.java| 74 +-
.../camel/model/RouteTemplateDefinition.java | 1 +
.../java/org/apache/camel/xml/in/ModelParser.java | 1 +
.../java/org/apache/camel/xml/out/ModelWriter.java | 1 +
.../test/resources/routeInlinedErrorHandler.xml| 32 ++
.../org/apache/camel/yaml/out/ModelWriter.java | 1 +
.../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 30 -
.../modules/ROOT/pages/error-handler.adoc | 20 +-
.../deserializers/RouteDefinitionDeserializer.java | 11 +++-
.../generated/resources/schema/camelYamlDsl.json | 2 +-
.../apache/camel/dsl/yaml/PipeLoaderTest.groovy| 2 +-
.../apache/camel/dsl/yaml/RouteTemplateTest.groovy | 2 +-
.../org/apache/camel/dsl/yaml/RoutesTest.groovy| 6 +-
.../kamelets/route-timer-source.kamelet.yaml | 2 +-
.../camel/maven/packaging/SchemaGeneratorMojo.java | 8 +++
21 files changed, 292 insertions(+), 21 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/route.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/route.json
index 8c9a21bbb1c..0451e8ceeb8 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/route.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/route.json
@@ -29,9 +29,10 @@
"shutdownRoute": { "index": 14, "kind": "attribute", "displayName":
"Shutdown Route", "label": "advanced", "required": false, "type": "enum",
"javaType": "org.apache.camel.ShutdownRoute", "enum": [ "Default", "Defer" ],
"deprecated": false, "autowired": false, "secret": false, "description": "To
control how to shutdown the route." },
"shutdownRunningTask": { "index": 15, "kind": "attribute", "displayName":
"Shutdown Running Task", "label": "advanced", "required": false, "type":
"enum", "javaType": "org.apache.camel.ShutdownRunningTask", "enum": [
"CompleteCurrentTaskOnly", "CompleteAllTasks" ], "deprecated": false,
"autowired": false, "secret": false, "description": "To control how to shut
down the route." },
"precondition": { "index": 16, "kind": "attribute", "displayName":
"Precondition", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The predicate of the precondition in simple
language to evaluate in order to determine if this route should be included or
not." },
-"inputType": { "index": 17, "kind": "element", "displayName": "Input
Type", "label": "advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.model.InputTypeDefinition", "deprecated": false, "aut
(camel) branch route-eh-xml updated (88813a5bd0b -> 17c78a96eb4)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch route-eh-xml in repository https://gitbox.apache.org/repos/asf/camel.git from 88813a5bd0b CAMEL-20665: YAML DSL Inconsistency - StreamCaching vs streamCache. Also mark some DSL in Java DSL as deprecated to make the DSLs consistent so Java DSL does not have special options. add 17c78a96eb4 CAMEL-20665: YAML DSL Inconsistency - StreamCaching vs streamCache. Also mark some DSL in Java DSL as deprecated to make the DSLs consistent so Java DSL does not have special options. No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/model/RouteDefinition.java | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-)
