(camel) branch main updated (0c3a28572a6 -> 8b46596bf00)
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 0c3a28572a6 CAMEL-20847: camel-jbang - Run with jolokia enabled does not work add 8b46596bf00 Add docs No new revisions were added by this update. Summary of changes: .../camel/catalog/others/platform-http-jolokia.json | 2 +- components/camel-platform-http-jolokia/pom.xml | 1 + .../generated/resources/platform-http-jolokia.json | 2 +- .../src/main/docs/platform-http-jolokia.adoc| 21 + .../plugin/DefaultJolokiaPlatformHttpPlugin.java| 5 ++--- docs/components/modules/others/nav.adoc | 1 + .../modules/others/pages/platform-http-jolokia.adoc | 1 + 7 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 components/camel-platform-http-jolokia/src/main/docs/platform-http-jolokia.adoc create mode 12 docs/components/modules/others/pages/platform-http-jolokia.adoc
(camel) branch main updated: CAMEL-20847: camel-jbang - Run with jolokia enabled does not work
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 0c3a28572a6 CAMEL-20847: camel-jbang - Run with jolokia enabled does
not work
0c3a28572a6 is described below
commit 0c3a28572a6932ec36a1014debfdcafea582eb4d
Author: Claus Ibsen
AuthorDate: Thu Jun 6 20:35:33 2024 +0200
CAMEL-20847: camel-jbang - Run with jolokia enabled does not work
---
components/camel-platform-http-jolokia/pom.xml | 12 +++-
.../plugin/DefaultJolokiaPlatformHttpPlugin.java | 72 +++---
2 files changed, 61 insertions(+), 23 deletions(-)
diff --git a/components/camel-platform-http-jolokia/pom.xml
b/components/camel-platform-http-jolokia/pom.xml
index 59ad8e17e43..9826eb2d31d 100644
--- a/components/camel-platform-http-jolokia/pom.xml
+++ b/components/camel-platform-http-jolokia/pom.xml
@@ -56,7 +56,17 @@
org.jolokia
-jolokia-agent-jvm
+jolokia-server-core
+${jolokia-version}
+
+
+org.jolokia
+jolokia-service-serializer
+${jolokia-version}
+
+
+org.jolokia
+jolokia-service-jmx
${jolokia-version}
diff --git
a/components/camel-platform-http-jolokia/src/main/java/org/apache/camel/component/platform/http/plugin/DefaultJolokiaPlatformHttpPlugin.java
b/components/camel-platform-http-jolokia/src/main/java/org/apache/camel/component/platform/http/plugin/DefaultJolokiaPlatformHttpPlugin.java
index 5275ad7f8c4..7ea95eb8623 100644
---
a/components/camel-platform-http-jolokia/src/main/java/org/apache/camel/component/platform/http/plugin/DefaultJolokiaPlatformHttpPlugin.java
+++
b/components/camel-platform-http-jolokia/src/main/java/org/apache/camel/component/platform/http/plugin/DefaultJolokiaPlatformHttpPlugin.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.platform.http.plugin;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
@@ -35,7 +36,9 @@ import io.vertx.ext.web.RoutingContext;
import io.vertx.ext.web.impl.Utils;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.annotations.JdkService;
+import org.apache.camel.support.ObjectHelper;
import org.apache.camel.support.service.ServiceSupport;
+import org.apache.camel.util.ReflectionHelper;
import org.jolokia.server.core.config.ConfigKey;
import org.jolokia.server.core.config.StaticConfiguration;
import org.jolokia.server.core.http.HttpRequestHandler;
@@ -49,8 +52,6 @@ import org.jolokia.server.core.service.api.Restrictor;
import org.jolokia.server.core.util.NetworkUtil;
import org.jolokia.service.jmx.LocalRequestHandler;
import org.jolokia.service.serializer.JolokiaSerializer;
-import org.json.simple.JSONAware;
-import org.json.simple.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -159,34 +160,68 @@ public class DefaultJolokiaPlatformHttpPlugin extends
ServiceSupport implements
}
}
+/**
+ * This method uses reflection to invoke the Jolokia HttpRequestHandler
because its shading
+ * JSon library which at runtime causes NoSuchMethodError due to
JSONObject has been shaded
+ * into a different package.
+ */
private Handler createVertxHandler() {
return routingContext -> {
HttpServerRequest req = routingContext.request();
String remainingPath = Utils.pathOffset(req.path(),
routingContext);
-JSONAware json = null;
+Object json = null;
+int status = 200;
try {
-requestHandler.checkAccess(req.scheme(),
req.remoteAddress().host(), req.remoteAddress().host(),
-getOriginOrReferer(req));
+ObjectHelper.invokeMethodSafe("checkAccess", requestHandler,
req.scheme(), req.remoteAddress().host(),
+req.remoteAddress().host(), getOriginOrReferer(req));
if (req.method() == HttpMethod.GET) {
-json = requestHandler.handleGetRequest(req.uri(),
remainingPath, getParams(req.params()));
+Method m =
ReflectionHelper.findMethod(requestHandler.getClass(), "handleGetRequest",
String.class,
+String.class, Map.class);
+if (m != null) {
+json = ObjectHelper.invokeMethodSafe(m,
requestHandler, req.uri(), remainingPath,
+getParams(req.params()));
+}
} else {
Arguments.require(routingContext.body() != null, "Missing
body");
InputStream inpu
(camel) 02/02: camel-jbang - Upgrade SB
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e5b44a0f1d5368731915b41f84ebe5d0c76b8ac6
Author: Claus Ibsen
AuthorDate: Thu Jun 6 19:37:56 2024 +0200
camel-jbang - Upgrade SB
---
.../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 4 ++--
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 4 ++--
2 files changed, 4 insertions(+), 4 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 122ff937702..04048626157 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
@@ -148,8 +148,8 @@ abstract class ExportBaseCommand extends CamelCommand {
protected String localKameletDir;
@CommandLine.Option(names = { "--spring-boot-version" }, description =
"Spring Boot version",
-defaultValue = "3.2.5")
-protected String springBootVersion = "3.2.5";
+defaultValue = "3.3.0")
+protected String springBootVersion = "3.3.0";
@CommandLine.Option(names = { "--camel-spring-boot-version" }, description
= "Camel version to use with Spring Boot")
protected String camelSpringBootVersion;
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 1585cb190b7..fe3d263510b 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -145,8 +145,8 @@ public class Run extends CamelCommand {
String quarkusVersion = "3.11.1";
@Option(names = { "--spring-boot-version" }, description = "Spring Boot
version",
-defaultValue = "3.2.5")
-String springBootVersion = "3.2.5";
+defaultValue = "3.3.0")
+String springBootVersion = "3.3.0";
@Option(names = { "--profile" }, scope = CommandLine.ScopeType.INHERIT,
defaultValue = "dev",
description = "Profile to run (dev, test, or prod).")
(camel) 01/02: camel-jbang - Upgrade Q
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0ffe9a86befbd98b860300bcb755fe9f057d576f
Author: Claus Ibsen
AuthorDate: Thu Jun 6 19:37:09 2024 +0200
camel-jbang - Upgrade Q
---
.../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 4 ++--
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 4 ++--
.../camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java | 2 +-
.../org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java | 2 +-
4 files changed, 6 insertions(+), 6 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 4256af93ead..122ff937702 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,8 +163,8 @@ abstract class ExportBaseCommand extends CamelCommand {
protected String quarkusArtifactId = "quarkus-bom";
@CommandLine.Option(names = { "--quarkus-version" }, description =
"Quarkus Platform version",
-defaultValue = "3.11.0")
-protected String quarkusVersion = "3.11.0";
+defaultValue = "3.11.1")
+protected String quarkusVersion = "3.11.1";
@CommandLine.Option(names = { "--maven-wrapper" }, defaultValue = "true",
description = "Include Maven Wrapper files in exported
project")
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index a24d9b0b7d8..1585cb190b7 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -141,8 +141,8 @@ public class Run extends CamelCommand {
String kameletsVersion;
@Option(names = { "--quarkus-version" }, description = "Quarkus Platform
version",
-defaultValue = "3.11.0")
-String quarkusVersion = "3.11.0";
+defaultValue = "3.11.1")
+String quarkusVersion = "3.11.1";
@Option(names = { "--spring-boot-version" }, description = "Spring Boot
version",
defaultValue = "3.2.5")
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 14bb324403e..494d067536c 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.11.0")
+defaultValue = "3.11.1")
String quarkusVersion;
@CommandLine.Option(names = { "--quarkus-group-id" }, description =
"Quarkus Platform Maven groupId",
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
index b527120ed9d..d94cec3ed04 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
@@ -64,7 +64,7 @@ public class CatalogDoc extends CamelCommand {
String runtime;
@CommandLine.Option(names = { "--quarkus-version" }, description =
"Quarkus Platform version",
-defaultValue = "3.11.0")
+defaultValue = "3.11.1")
String quarkusVersion;
@CommandLine.Option(names = { "--quarkus-group-id" }, description =
"Quarkus Platform Maven groupId",
(camel) branch main updated (262a8dfaf76 -> e5b44a0f1d5)
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 262a8dfaf76 Upgrade to Jolokia 2.0.3 new 0ffe9a86bef camel-jbang - Upgrade Q new e5b44a0f1d5 camel-jbang - Upgrade SB 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: .../apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 8 .../main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 8 .../camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java | 2 +- .../apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-)
(camel) branch main updated: Upgrade to Jolokia 2.0.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 262a8dfaf76 Upgrade to Jolokia 2.0.3
262a8dfaf76 is described below
commit 262a8dfaf763954395a9b292c8da344ec1b17a7b
Author: Claus Ibsen
AuthorDate: Thu Jun 6 15:58:22 2024 +0200
Upgrade to Jolokia 2.0.3
---
.../platform/http/plugin/DefaultJolokiaPlatformHttpPluginTest.java | 2 +-
parent/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-platform-http-jolokia/src/test/java/org/apache/camel/component/platform/http/plugin/DefaultJolokiaPlatformHttpPluginTest.java
b/components/camel-platform-http-jolokia/src/test/java/org/apache/camel/component/platform/http/plugin/DefaultJolokiaPlatformHttpPluginTest.java
index 4d7c73e8c32..19a9d34e5bf 100644
---
a/components/camel-platform-http-jolokia/src/test/java/org/apache/camel/component/platform/http/plugin/DefaultJolokiaPlatformHttpPluginTest.java
+++
b/components/camel-platform-http-jolokia/src/test/java/org/apache/camel/component/platform/http/plugin/DefaultJolokiaPlatformHttpPluginTest.java
@@ -54,7 +54,7 @@ public class DefaultJolokiaPlatformHttpPluginTest extends
ContextTestSupport {
String type = (String) request.get("type");
assertEquals("version", type);
-assertEquals("2.0.2", agentVersion);
+assertEquals("2.0.3", agentVersion);
}
private PlatformHttpPluginRegistry resolvePlatformHttpPluginRegistry() {
diff --git a/parent/pom.xml b/parent/pom.xml
index a6dc0a5cf03..8444f0cd514 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -285,7 +285,7 @@
5.2.7
0.20.0
2.12.7
-2.0.2
+2.0.3
0.1.8
0.9.15
3.19.9
(camel) branch main updated: camel-jbang - Fix using openapi to ignore not finding mock data in the default camel-mock folder.
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 50439cb9f70 camel-jbang - Fix using openapi to ignore not finding mock
data in the default camel-mock folder.
50439cb9f70 is described below
commit 50439cb9f709c67458a3beef3625b3aea297930b
Author: Claus Ibsen
AuthorDate: Thu Jun 6 15:27:44 2024 +0200
camel-jbang - Fix using openapi to ignore not finding mock data in the
default camel-mock folder.
---
.../component/rest/openapi/DefaultRestOpenapiProcessorStrategy.java| 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/DefaultRestOpenapiProcessorStrategy.java
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/DefaultRestOpenapiProcessorStrategy.java
index e0bff0f9672..3967a6532ae 100644
---
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/DefaultRestOpenapiProcessorStrategy.java
+++
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/DefaultRestOpenapiProcessorStrategy.java
@@ -37,7 +37,6 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.NonManagedService;
import org.apache.camel.Route;
-import org.apache.camel.RuntimeCamelException;
import org.apache.camel.component.platform.http.PlatformHttpComponent;
import org.apache.camel.component.platform.http.spi.PlatformHttpConsumerAware;
import org.apache.camel.spi.PackageScanResourceResolver;
@@ -224,7 +223,7 @@ public class DefaultRestOpenapiProcessorStrategy extends
ServiceSupport
try {
accepted.addAll(resolver.findResources(include));
} catch (Exception e) {
-throw RuntimeCamelException.wrapRuntimeException(e);
+// ignore as folder may not exist
}
}
(camel) branch main updated: CAMEL-20839: camel-jbang - Run with openapi in sub folder does not work
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 e023d8b2e68 CAMEL-20839: camel-jbang - Run with openapi in sub folder
does not work
e023d8b2e68 is described below
commit e023d8b2e68343a4458f5211a8a3f6b2b4e8e4dc
Author: Claus Ibsen
AuthorDate: Thu Jun 6 09:58:06 2024 +0200
CAMEL-20839: camel-jbang - Run with openapi in sub folder does not work
---
.../rest/openapi/RestOpenApiEndpoint.java | 40 ++
.../apache/camel/dsl/jbang/core/commands/Run.java | 2 +-
2 files changed, 19 insertions(+), 23 deletions(-)
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
index dee36ced6a1..019b5aa2987 100644
---
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
+++
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiEndpoint.java
@@ -16,11 +16,9 @@
*/
package org.apache.camel.component.rest.openapi;
-import java.io.File;
+import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
-import java.nio.file.Files;
-import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -71,10 +69,9 @@ import org.apache.camel.spi.UriPath;
import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.DefaultEndpoint;
import org.apache.camel.support.ResourceHelper;
-import org.apache.camel.util.FileUtil;
+import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
-import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -885,24 +882,25 @@ public final class RestOpenApiEndpoint extends
DefaultEndpoint {
final ParseOptions options = new ParseOptions();
options.setResolveFully(true);
-File tmpFileToDelete = null;
+InputStream is = null;
try {
+String location = null;
+String content = null;
Resource resource =
ResourceHelper.resolveMandatoryResource(camelContext, uri);
-//if location can not be used in Swagger API (e.g. in case of
"bean;")
-// the content of the resource has to be copied into a tmp file
for swagger API.
-String locationToSearch;
-if ("bean:".equals(ResourceHelper.getScheme(uri))) {
-Path tmpFile = Files.createTempFile(null, null);
-tmpFileToDelete = tmpFile.toFile();
-tmpFileToDelete.deleteOnExit();
-FileUtils.copyInputStreamToFile(resource.getInputStream(),
tmpFileToDelete);
-locationToSearch = tmpFile.toUri().toString();
+if (resource.getScheme().startsWith("http")) {
+location = resource.getURI().toString();
} else {
-locationToSearch = resource.getURI().toString();
+is = resource.getInputStream();
+if (is != null) {
+content = IOHelper.loadText(is);
+}
+}
+SwaggerParseResult openApi = null;
+if (location != null) {
+openApi = openApiParser.readLocation(location, null, options);
+} else if (content != null) {
+openApi = openApiParser.readContents(content, null, options);
}
-
-final SwaggerParseResult openApi =
openApiParser.readLocation(locationToSearch, null, options);
-
if (openApi != null && openApi.getOpenAPI() != null) {
return openApi.getOpenAPI();
}
@@ -910,9 +908,7 @@ public final class RestOpenApiEndpoint extends
DefaultEndpoint {
throw new IllegalArgumentException(
"The given OpenApi specification cannot be loaded from: "
+ uri, e);
} finally {
-if (tmpFileToDelete != null) {
-FileUtil.deleteFile(tmpFileToDelete);
-}
+IOHelper.close(is);
}
// In theory there should be a message in the parse result, but it has
disappeared...
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 4232c4c80d9..a24d9b0b7d8 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-co
(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 1bfae83eb3d Regen
1bfae83eb3d is described below
commit 1bfae83eb3d88e249e6393187afa86df7d0ae0fa
Author: Claus Ibsen
AuthorDate: Thu Jun 6 07:42:56 2024 +0200
Regen
---
.../springboot/catalog/components/aws2-ec2.json | 2 +-
.../catalog/components/azure-servicebus.json| 8
.../camel/springboot/catalog/components/qdrant.json | 2 +-
.../src/main/docs/azure-servicebus.json | 8
.../ServiceBusComponentConfiguration.java | 21 ++---
.../springboot/ServiceBusComponentConverter.java| 4 ++--
components-starter/camel-qdrant-starter/pom.xml | 8
7 files changed, 22 insertions(+), 31 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json
index 29e764b99c5..afad1511af7 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json
@@ -48,7 +48,7 @@
},
"headers": {
"CamelAwsEC2ImageId": { "index": 0, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "An image ID of the AWS marketplace", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#IMAGE_ID" },
-"CamelAwsEC2InstanceType": { "index": 1, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType":
"software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [
"a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal",
"c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge",
"c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge",
"c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", [...]
+"CamelAwsEC2InstanceType": { "index": 1, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType":
"software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [
"a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal",
"c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge",
"c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge",
"c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", [...]
"CamelAwsEC2Operation": { "index": 2, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The operation we want to perform", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#OPERATION" },
"CamelAwsEC2InstanceMinCount": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The minimum number of instances we want
to run.", "constantN
(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 e5400700468 Regen
e5400700468 is described below
commit e5400700468a2f88b525dda5d597d338f1b911d6
Author: Claus Ibsen
AuthorDate: Thu Jun 6 07:13:50 2024 +0200
Regen
---
.../azure/servicebus/ServiceBusConfiguration.java | 4 +-
.../operations/ServiceBusSenderOperations.java | 3 +-
.../azure/servicebus/ServiceBusConsumerTest.java | 6 +-
.../operations/ServiceBusSenderOperationsTest.java | 4 +-
.../dhis2/api/Dhis2ResourceTablesTestCase.java | 2 +-
.../DynamicRouterRecipientListHelperTest.java | 17 ++-
.../KafkaBreakOnFirstErrorSeekIssueIT.java | 47
.../apache/camel/openapi/RestOpenApiReader.java| 6 +-
.../camel/opentelemetry/OpenTelemetryTracer.java | 3 +-
.../org/apache/camel/component/qdrant/Qdrant.java | 3 +-
.../qdrant/it/QdrantDeleteCollectionIT.java| 2 +-
.../camel/component/smooks/SmooksComponent.java| 6 +-
.../camel/component/smooks/SmooksEndpoint.java | 3 +-
.../camel/component/smooks/SmooksProcessor.java| 24 ++--
.../smooks/converter/ResultConverter.java | 1 -
.../smooks/converter/SourceConverter.java | 4 +-
.../apache/camel/component/smooks/Coordinate.java | 1 -
.../component/smooks/SmooksComponentTest.java | 10 +-
.../component/smooks/SmooksProcessorTest.java | 45
.../test/junit5/CamelContextConfiguration.java | 15 +--
.../camel/test/junit5/CamelContextManager.java | 13 ++-
.../apache/camel/test/junit5/CamelTestSupport.java | 125 +++--
.../test/junit5/LegacyCamelContextManager.java | 12 +-
.../test/junit5/TestExecutionConfiguration.java| 15 +--
.../test/junit5/TransientCamelContextManager.java | 13 ++-
.../test/junit5/util/CamelContextTestHelper.java | 1 -
.../camel/test/patterns/DebugSpringTest.java | 1 -
.../org/apache/camel/spi/EmbeddedHttpService.java | 4 +-
.../camel/spi/RestClientRequestValidator.java | 16 +--
.../impl/engine/DefaultCamelContextExtension.java | 3 +-
.../api/management/mbean/CamelOpenMBeanTypes.java | 3 +-
.../DefaultRestClientRequestValidator.java | 7 +-
.../camel/support/processor/RestBindingAdvice.java | 4 +-
.../core/commands/catalog/CatalogBaseCommand.java | 2 +-
.../jbang/core/commands/catalog/CatalogDoc.java| 4 +-
.../camel/dsl/jbang/core/commands/k/Agent.java | 2 +-
36 files changed, 233 insertions(+), 198 deletions(-)
diff --git
a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java
index a0ddec8bc11..58e4df9ce58 100644
---
a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java
+++
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusConfiguration.java
@@ -151,8 +151,8 @@ public class ServiceBusConfiguration implements Cloneable,
HeaderFilterStrategyA
}
/**
- * Sets the proxy configuration to use for ServiceBusSenderClient. When a
proxy is configured, AMQP_WEB_SOCKETS
- * must be used for the transport type.
+ * Sets the proxy configuration to use for ServiceBusSenderClient. When a
proxy is configured, AMQP_WEB_SOCKETS must
+ * be used for the transport type.
*/
public ProxyOptions getProxyOptions() {
return proxyOptions;
diff --git
a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/operations/ServiceBusSenderOperations.java
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/operations/ServiceBusSenderOperations.java
index 436f8c5fdad..7bf7b025de5 100644
---
a/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/operations/ServiceBusSenderOperations.java
+++
b/components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/operations/ServiceBusSenderOperations.java
@@ -123,6 +123,7 @@ public class ServiceBusSenderOperations {
return StreamSupport.stream(client.scheduleMessages(messages,
scheduledEnqueueTime).spliterator(), false).toList();
}
-return StreamSupport.stream(client.scheduleMessages(messages,
scheduledEnqueueTime, context).spliterator(), false).toList();
+return StreamSupport.stream(client.scheduleMessages(messages,
scheduledEnqueueTime, context).spliterator(), false)
+.toList
(camel) branch main updated (232035f7507 -> 5b692d0b639)
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 232035f7507 Remove GitHub Workflows on main branch (#14378) add 5b692d0b639 chore(deps): Bump net.revelc.code.formatter:formatter-maven-plugin (#14397) 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: Remove GitHub Workflows on main branch (#14378)
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 232035f7507 Remove GitHub Workflows on main branch (#14378)
232035f7507 is described below
commit 232035f7507e431056c015130dc78d12b85cea98
Author: Aurélien Pupier
AuthorDate: Thu Jun 6 07:06:50 2024 +0200
Remove GitHub Workflows on main branch (#14378)
- The main, 3.x and 4.x branches are built on Apache Software Foundation
Jenkins CI.
- The build for main branch was broken for 2 months already on GitHub
Signed-off-by: Aurélien Pupier
---
.github/workflows/push-build-camel-3.yml | 82 -
.github/workflows/push-build-camel-40x.yml | 82 -
.github/workflows/push-build-main.yml | 83 --
3 files changed, 247 deletions(-)
diff --git a/.github/workflows/push-build-camel-3.yml
b/.github/workflows/push-build-camel-3.yml
deleted file mode 100644
index 229f29ea59a..000
--- a/.github/workflows/push-build-camel-3.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# 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.
-#
-
-name: Reformat and Build (Camel 3.x)
-
-on:
- push:
-branches:
- - camel-3.x
-paths-ignore:
- - .github/**/*
- - README.md
- - SECURITY.md
- - Jenkinsfile
- - Jenkinsfile.*
- - NOTICE.txt
-
-permissions: {}
-jobs:
- build:
-if: github.repository == 'apache/camel'
-permissions:
- contents: write # to create branch (peter-evans/create-pull-request)
- pull-requests: write # to create a PR (peter-evans/create-pull-request)
-
-runs-on: ubuntu-latest
-strategy:
- matrix:
-java: [ '11' ]
-steps:
- - uses: actions/checkout@v4
-with:
- persist-credentials: false
- - id: install-mvnd
-uses: ./.github/actions/install-mvnd
- - name: Set up JDK ${{ matrix.java }}
-uses: actions/setup-java@v4
-with:
- distribution: 'temurin'
- java-version: ${{ matrix.java }}
- cache: 'maven'
- - name: mvn formatter and build
-run: ${{ steps.install-mvnd.outputs.mvnd-dir }}/mvnd -l build.log
$MVND_OPTS -Pformat,fastinstall -DskipTests verify
- - name: archive logs
-uses: actions/upload-artifact@v4
-if: always()
-with:
- name: build.log
- path: build.log
- - name: Create Pull Request
-uses: peter-evans/create-pull-request@v6
-with:
- base: camel-3.x
- token: ${{ secrets.GITHUB_TOKEN }}
- commit-message: "Regen for commit ${{ github.sha }}"
- committer: GitHub
- author: ${{ github.actor }} <${{ github.actor
}}@users.noreply.github.com>
- signoff: true
- branch: regen_bot_3x
- title: "Generated sources regen (Camel 3)"
- body: |
-Regen bot :robot: found some uncommitted changes after running
build on :camel: `camel-3` branch.
-Please do not delete `regen_bot` branch after merge/rebase.
- labels: |
-regen
-automated pr
-camel-3
- assignees: oscerd
diff --git a/.github/workflows/push-build-camel-40x.yml
b/.github/workflows/push-build-camel-40x.yml
deleted file mode 100644
index 7e887f4470e..000
--- a/.github/workflows/push-build-camel-40x.yml
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# 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 "
(camel) branch main updated: rest client validator (#14400)
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 68727802289 rest client validator (#14400)
68727802289 is described below
commit 6872780228938c9a7337eb8f5b90b70db2dee3bb
Author: Claus Ibsen
AuthorDate: Wed Jun 5 16:06:12 2024 +0200
rest client validator (#14400)
CAMEL-20832: rest-dsl - Add SPI for plugin client request validator.
Default validator to use existing validation code.
---
.../rest/openapi/RestOpenApiProcessor.java | 3 +-
.../openapi/validator/DefaultRequestValidator.java | 12 ++-
.../camel/spi/RestClientRequestValidator.java | 70
.../DefaultRestClientRequestValidator.java | 103 ++
.../camel/support/processor/RestBindingAdvice.java | 118 -
.../processor/RestBindingAdviceFactory.java| 26 -
6 files changed, 225 insertions(+), 107 deletions(-)
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
index 29b6bd222b4..8304028d1eb 100644
---
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
+++
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
@@ -118,7 +118,6 @@ public class RestOpenApiProcessor extends
DelegateAsyncProcessor implements Came
// binding mode
RestConfiguration config = camelContext.getRestConfiguration();
-RestConfiguration.RestBindingMode bindingMode =
config.getBindingMode();
// map path-parameters from operation to camel headers
HttpHelper.evalPlaceholders(exchange.getMessage().getHeaders(),
uri, rcp.getConsumerPath());
@@ -178,7 +177,7 @@ public class RestOpenApiProcessor extends
DelegateAsyncProcessor implements Came
bc.setBindingMode(mode.name());
bc.setEnableCORS(config.isEnableCORS());
bc.setCorsHeaders(config.getCorsHeaders());
-bc.setClientRequestValidation(config.isClientRequestValidation());
+bc.setClientRequestValidation(config.isClientRequestValidation() ||
endpoint.isClientRequestValidation());
bc.setEnableNoContentResponse(config.isEnableNoContentResponse());
bc.setSkipBindingOnErrorCode(config.isSkipBindingOnErrorCode());
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/validator/DefaultRequestValidator.java
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/validator/DefaultRequestValidator.java
index 7a3474db655..af20dc487bf 100644
---
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/validator/DefaultRequestValidator.java
+++
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/validator/DefaultRequestValidator.java
@@ -84,11 +84,13 @@ public class DefaultRequestValidator implements
RequestValidator {
Object body = message.getBody();
if (body != null) {
String text = MessageHelper.extractBodyAsString(message);
-JsonMapper om = new JsonMapper();
-try {
-om.readTree(text);
-} catch (Exception e) {
-validationErrors.add("Unable to parse JSON");
+if (text != null) {
+JsonMapper om = new JsonMapper();
+try {
+om.readTree(text);
+} catch (Exception e) {
+validationErrors.add("Unable to parse JSON");
+}
}
}
}
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/RestClientRequestValidator.java
b/core/camel-api/src/main/java/org/apache/camel/spi/RestClientRequestValidator.java
new file mode 100644
index 000..a07ed516eeb
--- /dev/null
+++
b/core/camel-api/src/main/java/org/apache/camel/spi/RestClientRequestValidator.java
@@ -0,0 +1,70 @@
+/*
+ * 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 un
(camel) branch vc3 deleted (was bcdf57627d5)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch vc3 in repository https://gitbox.apache.org/repos/asf/camel.git was bcdf57627d5 CAMEL-20832: rest-dsl - Add SPI for plugin client request validator. Default validator to use existing validation code. 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 vc2 deleted (was 365e3104043)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch vc2 in repository https://gitbox.apache.org/repos/asf/camel.git was 365e3104043 CAMEL-20832: rest-dsl - Add SPI for plugin client request validator. Default validator to use existing validation code. 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-20832: rest-dsl - Add SPI for plugin client request validator. Default validator to use existing validation code.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch vc3
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bcdf57627d5406006561af169aa7802b196bd107
Author: Claus Ibsen
AuthorDate: Wed Jun 5 15:13:20 2024 +0200
CAMEL-20832: rest-dsl - Add SPI for plugin client request validator.
Default validator to use existing validation code.
---
.../openapi/validator/DefaultRequestValidator.java | 12 +++-
.../camel/spi/RestClientRequestValidator.java | 2 ++
.../support/processor/RestBindingAdviceFactory.java | 21 +++--
3 files changed, 28 insertions(+), 7 deletions(-)
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/validator/DefaultRequestValidator.java
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/validator/DefaultRequestValidator.java
index 7a3474db655..af20dc487bf 100644
---
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/validator/DefaultRequestValidator.java
+++
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/validator/DefaultRequestValidator.java
@@ -84,11 +84,13 @@ public class DefaultRequestValidator implements
RequestValidator {
Object body = message.getBody();
if (body != null) {
String text = MessageHelper.extractBodyAsString(message);
-JsonMapper om = new JsonMapper();
-try {
-om.readTree(text);
-} catch (Exception e) {
-validationErrors.add("Unable to parse JSON");
+if (text != null) {
+JsonMapper om = new JsonMapper();
+try {
+om.readTree(text);
+} catch (Exception e) {
+validationErrors.add("Unable to parse JSON");
+}
}
}
}
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/RestClientRequestValidator.java
b/core/camel-api/src/main/java/org/apache/camel/spi/RestClientRequestValidator.java
index 3fc9298062c..a07ed516eeb 100644
---
a/core/camel-api/src/main/java/org/apache/camel/spi/RestClientRequestValidator.java
+++
b/core/camel-api/src/main/java/org/apache/camel/spi/RestClientRequestValidator.java
@@ -28,6 +28,8 @@ import org.apache.camel.Exchange;
*/
public interface RestClientRequestValidator {
+String FACTORY = "rest-client-validator-factory";
+
/**
* Validation error
*
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/processor/RestBindingAdviceFactory.java
b/core/camel-support/src/main/java/org/apache/camel/support/processor/RestBindingAdviceFactory.java
index b5b3deea7f6..969f7dc0136 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/processor/RestBindingAdviceFactory.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/processor/RestBindingAdviceFactory.java
@@ -18,15 +18,18 @@ package org.apache.camel.support.processor;
import java.util.HashMap;
import java.util.Map;
+import java.util.Optional;
import org.apache.camel.CamelContext;
import org.apache.camel.spi.BeanIntrospection;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.RestClientRequestValidator;
import org.apache.camel.spi.RestConfiguration;
+import org.apache.camel.support.CamelContextHelper;
import org.apache.camel.support.EndpointHelper;
import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.PropertyBindingSupport;
+import org.apache.camel.support.ResolverHelper;
/**
* Factory to create {@link RestBindingAdvice} from the given configuration.
@@ -117,8 +120,7 @@ public class RestBindingAdviceFactory {
RestClientRequestValidator validator = null;
if (bc.isClientRequestValidation()) {
-// TODO: lookup custom validator and fallback to default
-validator = new DefaultRestClientRequestValidator();
+validator = lookupRestClientRequestValidator(camelContext);
}
return new RestBindingAdvice(
@@ -178,6 +180,21 @@ public class RestBindingAdviceFactory {
setAdditionalConfiguration(camelContext, config, outJson, "json.out.");
}
+protected static RestClientRequestValidator
lookupRestClientRequestValidator(CamelContext camelContext) {
+RestClientRequestValidator answer =
CamelContextHelper.findSingleByType(camelContext,
RestClientRequestValidator.class);
+if (answer == null) {
+// lookup via classpath to find custom factory
+Optional result =
ResolverHelper.resolveService(
+camelContext,
+
camelContext.getCamelContextExtension().getBootstrapFactoryFinder(),
+
(camel) branch vc3 created (now bcdf57627d5)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch vc3 in repository https://gitbox.apache.org/repos/asf/camel.git at bcdf57627d5 CAMEL-20832: rest-dsl - Add SPI for plugin client request validator. Default validator to use existing validation code. This branch includes the following new commits: new bcdf57627d5 CAMEL-20832: rest-dsl - Add SPI for plugin client request validator. Default validator to use existing validation code. 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 vc2 created (now 365e3104043)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch vc2 in repository https://gitbox.apache.org/repos/asf/camel.git at 365e3104043 CAMEL-20832: rest-dsl - Add SPI for plugin client request validator. Default validator to use existing validation code. This branch includes the following new commits: new 365e3104043 CAMEL-20832: rest-dsl - Add SPI for plugin client request validator. Default validator to use existing validation code. 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-20832: rest-dsl - Add SPI for plugin client request validator. Default validator to use existing validation code.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch vc2
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 365e310404377b31d5a69d2175079f99e423d7ef
Author: Claus Ibsen
AuthorDate: Wed Jun 5 14:37:12 2024 +0200
CAMEL-20832: rest-dsl - Add SPI for plugin client request validator.
Default validator to use existing validation code.
---
.../rest/openapi/RestOpenApiProcessor.java | 3 +-
.../camel/spi/RestClientRequestValidator.java | 68
.../DefaultRestClientRequestValidator.java | 103 ++
.../camel/support/processor/RestBindingAdvice.java | 118 -
.../processor/RestBindingAdviceFactory.java| 9 +-
5 files changed, 199 insertions(+), 102 deletions(-)
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
index 29b6bd222b4..8304028d1eb 100644
---
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
+++
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
@@ -118,7 +118,6 @@ public class RestOpenApiProcessor extends
DelegateAsyncProcessor implements Came
// binding mode
RestConfiguration config = camelContext.getRestConfiguration();
-RestConfiguration.RestBindingMode bindingMode =
config.getBindingMode();
// map path-parameters from operation to camel headers
HttpHelper.evalPlaceholders(exchange.getMessage().getHeaders(),
uri, rcp.getConsumerPath());
@@ -178,7 +177,7 @@ public class RestOpenApiProcessor extends
DelegateAsyncProcessor implements Came
bc.setBindingMode(mode.name());
bc.setEnableCORS(config.isEnableCORS());
bc.setCorsHeaders(config.getCorsHeaders());
-bc.setClientRequestValidation(config.isClientRequestValidation());
+bc.setClientRequestValidation(config.isClientRequestValidation() ||
endpoint.isClientRequestValidation());
bc.setEnableNoContentResponse(config.isEnableNoContentResponse());
bc.setSkipBindingOnErrorCode(config.isSkipBindingOnErrorCode());
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/RestClientRequestValidator.java
b/core/camel-api/src/main/java/org/apache/camel/spi/RestClientRequestValidator.java
new file mode 100644
index 000..3fc9298062c
--- /dev/null
+++
b/core/camel-api/src/main/java/org/apache/camel/spi/RestClientRequestValidator.java
@@ -0,0 +1,68 @@
+/*
+ * 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.spi;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.camel.Exchange;
+
+/**
+ * Used for validating incoming client requests with Camel Rest DSL.
+ *
+ * This allows to plugin different validators.
+ */
+public interface RestClientRequestValidator {
+
+/**
+ * Validation error
+ *
+ * @param statusCode to use a specific HTTP status code for this
validation error
+ * @param body to use a specific message body for this validation
error
+ */
+record ValidationError(int statusCode, String body) {
+}
+
+/**
+ * Validation context to use during validation
+ *
+ * @param consumescontent-type this service can consume
+ * @param producescontent-type this service can produce
+ * @param requiredBodywhether the message body is required
+ * @param queryDefaultValues default values for HTTP query parameters
+ * @param queryAllowedValues allowed values for HTTP query parameters
+ * @param requiredQueryParameters names of HTTP query parameters that are
required
+ * @param requiredHeaders names of HTTP headers parameters that
are required
+ */
+record ValidationContext(String consumes, String produces,
+ boolean requiredBody,
+ Ma
(camel-spring-boot-examples) branch main updated: Update readme.adoc
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-examples.git The following commit(s) were added to refs/heads/main by this push: new a407cb0 Update readme.adoc a407cb0 is described below commit a407cb027662e728765e4d5ef114d64ddf6588bf Author: Claus Ibsen AuthorDate: Wed Jun 5 13:35:14 2024 +0200 Update readme.adoc --- openapi-contract-first/readme.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openapi-contract-first/readme.adoc b/openapi-contract-first/readme.adoc index 7192adb..bf1cf0a 100644 --- a/openapi-contract-first/readme.adoc +++ b/openapi-contract-first/readme.adoc @@ -50,7 +50,7 @@ And then use the CLI to see status: To see which Rest APIs that are available in the running Camel application, you can use camel-jbang as follows: -$camel get service +$camel get platform-http === Help and contributions
(camel) branch rv deleted (was 334fbb2ff56)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch rv in repository https://gitbox.apache.org/repos/asf/camel.git was 334fbb2ff56 CAMEL-20623: camel-rest-openapi - Use client validator from camel-core instead of duplicate code. Add client request validator parse as json if content-type is json and body is required. 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-20623: camel-rest-openapi - Use client validator from camel-core instead of duplicate code. Add client request validator parse as json if content-type is json and bo
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 e6cff4529fe CAMEL-20623: camel-rest-openapi - Use client validator
from camel-core instead of duplicate code. Add client request validator parse
as json if content-type is json and body is required. (#14386)
e6cff4529fe is described below
commit e6cff4529fe997a29fcd05dc5832623a2adf056b
Author: Claus Ibsen
AuthorDate: Wed Jun 5 12:12:40 2024 +0200
CAMEL-20623: camel-rest-openapi - Use client validator from camel-core
instead of duplicate code. Add client request validator parse as json if
content-type is json and body is required. (#14386)
---
.../rest/openapi/RestOpenApiProcessor.java | 216 -
.../camel/support/processor/RestBindingAdvice.java | 7 +
.../processor/RestBindingAdviceFactory.java| 31 ++-
3 files changed, 21 insertions(+), 233 deletions(-)
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
index d3c5c1de632..29b6bd222b4 100644
---
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
+++
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
@@ -20,11 +20,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Function;
import java.util.stream.Collectors;
import io.swagger.v3.oas.models.OpenAPI;
@@ -40,13 +38,9 @@ import org.apache.camel.Processor;
import org.apache.camel.StartupStep;
import org.apache.camel.component.platform.http.spi.PlatformHttpConsumerAware;
import org.apache.camel.http.base.HttpHelper;
-import org.apache.camel.spi.DataType;
-import org.apache.camel.spi.DataTypeAware;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.spi.StartupStepRecorder;
-import org.apache.camel.support.ExchangeHelper;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.RestConsumerContextPathMatcher;
import org.apache.camel.support.processor.DelegateAsyncProcessor;
@@ -54,13 +48,10 @@ import org.apache.camel.support.processor.RestBindingAdvice;
import org.apache.camel.support.processor.RestBindingAdviceFactory;
import org.apache.camel.support.processor.RestBindingConfiguration;
import org.apache.camel.support.service.ServiceHelper;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static
org.apache.camel.support.http.RestUtil.isValidOrAcceptedContentType;
-
public class RestOpenApiProcessor extends DelegateAsyncProcessor implements
CamelContextAware {
private static final Logger LOG =
LoggerFactory.getLogger(RestOpenApiProcessor.class);
@@ -132,13 +123,6 @@ public class RestOpenApiProcessor extends
DelegateAsyncProcessor implements Came
// map path-parameters from operation to camel headers
HttpHelper.evalPlaceholders(exchange.getMessage().getHeaders(),
uri, rcp.getConsumerPath());
-// we have found the op to call, but if validation is enabled then
we need
-// to validate the incoming request first
-if (endpoint.isClientRequestValidation() &&
isInvalidClientRequest(exchange, callback, o, bindingMode)) {
-// okay some validation error so return true
-return true;
-}
-
// process the incoming request
return restOpenapiProcessorStrategy.process(o, verb, uri,
rcp.getBinding(), exchange, callback);
}
@@ -165,206 +149,6 @@ public class RestOpenApiProcessor extends
DelegateAsyncProcessor implements Came
return true;
}
-/**
- * Checks if the incoming request is invalid (has some error) according to
the OpenAPI operation that is intended to
- * be invoked.
- *
- * @return true if some validation error and should stop routing
- */
-protected boolean isInvalidClientRequest(
-Exchange exchange, AsyncCallback callback, Operation o,
RestConfiguration.RestBindingMode bindingMode) {
-
-// this code is similar to logic in camel-core (RestBindingAdvice) for
rest-dsl with code-first approach
-
-boolean isXml = false;
-boolean isJson = false;
-String contentType = ExchangeHelper.getContentType(
(camel) 01/01: CAMEL-20623: camel-rest-openapi - Use client validator from camel-core instead of duplicate code. Add client request validator parse as json if content-type is json and body is required
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch rv
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 334fbb2ff56e78797ccd0be4475690fdb35b0e0a
Author: Claus Ibsen
AuthorDate: Wed Jun 5 11:50:53 2024 +0200
CAMEL-20623: camel-rest-openapi - Use client validator from camel-core
instead of duplicate code. Add client request validator parse as json if
content-type is json and body is required.
---
.../rest/openapi/RestOpenApiProcessor.java | 216 -
.../camel/support/processor/RestBindingAdvice.java | 7 +
.../processor/RestBindingAdviceFactory.java| 31 ++-
3 files changed, 21 insertions(+), 233 deletions(-)
diff --git
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
index d3c5c1de632..29b6bd222b4 100644
---
a/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
+++
b/components/camel-rest-openapi/src/main/java/org/apache/camel/component/rest/openapi/RestOpenApiProcessor.java
@@ -20,11 +20,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Function;
import java.util.stream.Collectors;
import io.swagger.v3.oas.models.OpenAPI;
@@ -40,13 +38,9 @@ import org.apache.camel.Processor;
import org.apache.camel.StartupStep;
import org.apache.camel.component.platform.http.spi.PlatformHttpConsumerAware;
import org.apache.camel.http.base.HttpHelper;
-import org.apache.camel.spi.DataType;
-import org.apache.camel.spi.DataTypeAware;
import org.apache.camel.spi.PackageScanClassResolver;
import org.apache.camel.spi.RestConfiguration;
import org.apache.camel.spi.StartupStepRecorder;
-import org.apache.camel.support.ExchangeHelper;
-import org.apache.camel.support.MessageHelper;
import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.RestConsumerContextPathMatcher;
import org.apache.camel.support.processor.DelegateAsyncProcessor;
@@ -54,13 +48,10 @@ import org.apache.camel.support.processor.RestBindingAdvice;
import org.apache.camel.support.processor.RestBindingAdviceFactory;
import org.apache.camel.support.processor.RestBindingConfiguration;
import org.apache.camel.support.service.ServiceHelper;
-import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.URISupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static
org.apache.camel.support.http.RestUtil.isValidOrAcceptedContentType;
-
public class RestOpenApiProcessor extends DelegateAsyncProcessor implements
CamelContextAware {
private static final Logger LOG =
LoggerFactory.getLogger(RestOpenApiProcessor.class);
@@ -132,13 +123,6 @@ public class RestOpenApiProcessor extends
DelegateAsyncProcessor implements Came
// map path-parameters from operation to camel headers
HttpHelper.evalPlaceholders(exchange.getMessage().getHeaders(),
uri, rcp.getConsumerPath());
-// we have found the op to call, but if validation is enabled then
we need
-// to validate the incoming request first
-if (endpoint.isClientRequestValidation() &&
isInvalidClientRequest(exchange, callback, o, bindingMode)) {
-// okay some validation error so return true
-return true;
-}
-
// process the incoming request
return restOpenapiProcessorStrategy.process(o, verb, uri,
rcp.getBinding(), exchange, callback);
}
@@ -165,206 +149,6 @@ public class RestOpenApiProcessor extends
DelegateAsyncProcessor implements Came
return true;
}
-/**
- * Checks if the incoming request is invalid (has some error) according to
the OpenAPI operation that is intended to
- * be invoked.
- *
- * @return true if some validation error and should stop routing
- */
-protected boolean isInvalidClientRequest(
-Exchange exchange, AsyncCallback callback, Operation o,
RestConfiguration.RestBindingMode bindingMode) {
-
-// this code is similar to logic in camel-core (RestBindingAdvice) for
rest-dsl with code-first approach
-
-boolean isXml = false;
-boolean isJson = false;
-String contentType = ExchangeHelper.getContentType(exchange);
-if (contentType != null) {
-isXml = contentType.toLowerCase(Locale.ENGLISH).contains("xml");
-isJson = contentType.toLowerCase(Locale.ENGLISH).contains("json");
-}
-String accept = exchange.getMessage().getHeader("Accept",
String.class);
-
-
(camel) branch rv created (now 334fbb2ff56)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch rv in repository https://gitbox.apache.org/repos/asf/camel.git at 334fbb2ff56 CAMEL-20623: camel-rest-openapi - Use client validator from camel-core instead of duplicate code. Add client request validator parse as json if content-type is json and body is required. This branch includes the following new commits: new 334fbb2ff56 CAMEL-20623: camel-rest-openapi - Use client validator from camel-core instead of duplicate code. Add client request validator parse as json if content-type is json and body is required. 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-catalog - Also check pojo beans for matching artifact
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 07654a6ae64 camel-catalog - Also check pojo beans for matching artifact
07654a6ae64 is described below
commit 07654a6ae64d447510210b65c73bf1df0c0045f5
Author: Claus Ibsen
AuthorDate: Wed Jun 5 11:00:04 2024 +0200
camel-catalog - Also check pojo beans for matching artifact
---
.../java/org/apache/camel/catalog/DefaultCamelCatalog.java | 10 ++
1 file changed, 10 insertions(+)
diff --git
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index f9bb8954296..f5ee38d6030 100644
---
a/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++
b/catalog/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -617,6 +617,16 @@ public class DefaultCamelCatalog extends
AbstractCachingCamelCatalog implements
} catch (Throwable e) {
// ignore as catalog can be dynamic changed and older releases may
not have newer apis
}
+try {
+for (String name : findBeansNames()) {
+ArtifactModel am = pojoBeanModel(name);
+if (matchArtifact(am, groupId, artifactId, version)) {
+return am;
+}
+}
+} catch (Throwable e) {
+// ignore as catalog can be dynamic changed and older releases may
not have newer apis
+}
return null;
}
(camel) branch main updated: CAMEL-20660: Use synchronous Azure ServiceBusSenderClient (#14314)
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 5d8dae6ce15 CAMEL-20660: Use synchronous Azure ServiceBusSenderClient
(#14314)
5d8dae6ce15 is described below
commit 5d8dae6ce156dc35fae52f001a5dd3b4910da5f2
Author: Dylan Piergies
AuthorDate: Wed Jun 5 09:46:20 2024 +0100
CAMEL-20660: Use synchronous Azure ServiceBusSenderClient (#14314)
* CAMEL-20660: Use synchronous Azure ServiceBusSenderClient
The implementation of CAMEL-20266 introduced an issue whereby the async
client would attempt to execute the `AsyncCallback#done` method. When the
consumer is a `ServiceBusConsumer`, this would cause the callback
invocation to fail because it results in `Mono#block` being invoked on a
Reactor thread.
Switching the `ServiceBusProducer` to synchronous operation seems to be
the most straightforward way to address this issue. It is unknown whether
this issue can also impact other consumers.
* Revert camel-spring.xsd
---
.../camel/catalog/components/azure-servicebus.json | 8 +-
.../servicebus/ServiceBusComponentConfigurer.java | 14 +-
.../servicebus/ServiceBusEndpointConfigurer.java | 14 +-
.../servicebus/ServiceBusEndpointUriFactory.java | 2 +-
.../azure/servicebus/azure-servicebus.json | 8 +-
.../src/main/docs/azure-servicebus-component.adoc | 17 +--
.../azure/servicebus/ServiceBusComponent.java | 2 +-
.../azure/servicebus/ServiceBusConfiguration.java | 16 +--
.../azure/servicebus/ServiceBusProducer.java | 158 +++--
.../servicebus/client/ServiceBusClientFactory.java | 4 +-
.../client/ServiceBusSenderAsyncClientWrapper.java | 133 -
.../operations/ServiceBusSenderOperations.java | 50 +++
.../operations/ServiceBusSenderOperationsTest.java | 44 +++---
.../AzureServicebusComponentBuilderFactory.java| 16 +--
.../dsl/ServiceBusEndpointBuilderFactory.java | 46 +++---
.../kotlin/components/AzureServicebusUriDsl.kt | 10 +-
16 files changed, 171 insertions(+), 371 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-servicebus.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-servicebus.json
index 9192954a44b..b44b54aeefb 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-servicebus.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-servicebus.json
@@ -28,7 +28,7 @@
"clientOptions": { "index": 2, "kind": "property", "displayName": "Client
Options", "group": "common", "label": "common", "required": false, "type":
"object", "javaType": "com.azure.core.util.ClientOptions", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "Sets the ClientOptions
to be sent from the client built from this builder, [...]
"configuration": { "index": 3, "kind": "property", "displayName":
"Configuration", "group": "common", "label": "", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"deprecated": false, "autowired": false, "secret": false, "description": "The
component configurations" },
"headerFilterStrategy": { "index": 4, "kind": "property", "displayName":
"Header Filter Strategy", "group": "common", "label": "common", "required":
false, "type": "object", "javaType":
"org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.azure.servicebus.ServiceBusConfiguration",
"configurationField": "configuration", "description": "To use a custom
HeaderFilterStrategy to filter Serv [...]
-"proxyOptions": { "index": 5, "kind": "property", "displayName": "
(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 583bc609feb Regen
583bc609feb is described below
commit 583bc609feb6df349ca5c683766dac49317ac978
Author: Claus Ibsen
AuthorDate: Wed Jun 5 09:19:58 2024 +0200
Regen
---
.../resources/org/apache/camel/catalog/components/aws2-ec2.json | 2 +-
.../META-INF/org/apache/camel/component/aws2/ec2/aws2-ec2.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ec2.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ec2.json
index b08ca602199..d5de8321e25 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ec2.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ec2.json
@@ -48,7 +48,7 @@
},
"headers": {
"CamelAwsEC2ImageId": { "index": 0, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "An image ID of the AWS marketplace", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#IMAGE_ID" },
-"CamelAwsEC2InstanceType": { "index": 1, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType":
"software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [
"a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal",
"c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge",
"c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge",
"c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", [...]
+"CamelAwsEC2InstanceType": { "index": 1, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType":
"software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [
"a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal",
"c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge",
"c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge",
"c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", [...]
"CamelAwsEC2Operation": { "index": 2, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The operation we want to perform", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#OPERATION" },
"CamelAwsEC2InstanceMinCount": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The minimum number of instances we want
to run.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCE_MIN_COUNT" },
"CamelAwsEC2InstanceMaxCount": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false,
(camel) branch main updated: Bump aws-java-sdk2-version from 2.25.65 to 2.25.66 (#14377)
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 c26059bb069 Bump aws-java-sdk2-version from 2.25.65 to 2.25.66 (#14377) c26059bb069 is described below commit c26059bb069b014679ed0f6979d4dc83ce73316f Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Jun 5 09:13:14 2024 +0200 Bump aws-java-sdk2-version from 2.25.65 to 2.25.66 (#14377) Bumps `aws-java-sdk2-version` from 2.25.65 to 2.25.66. Updates `software.amazon.awssdk:sqs` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:kinesis` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:s3` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:sns` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:cloudwatch` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:ec2` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:eventbridge` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:iam` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:kms` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:lambda` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:secretsmanager` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:sts` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:dynamodb` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:config` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:apache-client` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:athena` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:bedrock` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:bedrockruntime` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:bedrockagent` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:bedrockagentruntime` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:cloudtrail` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:ecs` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:eks` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:netty-nio-client` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:firehose` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:kafka` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:mq` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:redshiftdata` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:ses` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:sfn` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:timestreamquery` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:timestreamwrite` from 2.25.65 to 2.25.66 Updates `software.amazon.awssdk:translate` from 2.25.65 to 2.25.66 --- 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 main updated: Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.7.0 (#14372)
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 fdd4afcfec2 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.7.0 (#14372) fdd4afcfec2 is described below commit fdd4afcfec294584e832b23eae814820a5f8ec14 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Jun 5 07:08:05 2024 +0200 Bump org.apache.maven.plugins:maven-javadoc-plugin from 3.6.3 to 3.7.0 (#14372) Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.6.3 to 3.7.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](https://github.com/apache/maven-javadoc-plugin/compare/maven-javadoc-plugin-3.6.3...maven-javadoc-plugin-3.7.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-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 +- pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index f73717a2fd9..64fc68cdede 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -337,7 +337,7 @@ 3.2.1 9.2.0 3.4.1 -3.6.3 +3.7.0 3.13.1 3.9.0 3.3.0 diff --git a/pom.xml b/pom.xml index 5b7ad72b428..b3175e177c8 100644 --- a/pom.xml +++ b/pom.xml @@ -129,7 +129,7 @@ 3.6.1 3.5.0 3.7.0 -3.6.3 +3.7.0 3.0.1 3.2.0 3.2.5
(camel) branch main updated: Bump org.codehaus.plexus:plexus-xml from 4.0.3 to 4.0.4 (#14352)
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 879765b1939 Bump org.codehaus.plexus:plexus-xml from 4.0.3 to 4.0.4 (#14352) 879765b1939 is described below commit 879765b1939bdbab8be1368d65648909a960ebb1 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Jun 5 06:47:33 2024 +0200 Bump org.codehaus.plexus:plexus-xml from 4.0.3 to 4.0.4 (#14352) Bumps [org.codehaus.plexus:plexus-xml](https://github.com/codehaus-plexus/plexus-xml) from 4.0.3 to 4.0.4. - [Release notes](https://github.com/codehaus-plexus/plexus-xml/releases) - [Commits](https://github.com/codehaus-plexus/plexus-xml/compare/plexus-xml-4.0.3...plexus-xml-4.0.4) --- updated-dependencies: - dependency-name: org.codehaus.plexus:plexus-xml 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> --- tooling/parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/parent/pom.xml b/tooling/parent/pom.xml index d77de7e37f9..6906aab3083 100644 --- a/tooling/parent/pom.xml +++ b/tooling/parent/pom.xml @@ -43,7 +43,7 @@ 1.2.0 2.1.1 4.0.1 -4.0.3 +4.0.4 3.6.2 4.9.2 0.13.1
(camel) branch main updated (22972918675 -> 4634f888f7d)
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 22972918675 Bump org.apache.maven.plugins:maven-plugin-plugin from 3.12.0 to 3.13.1 (#14343) add 4634f888f7d Bump org.apache.maven.plugin-tools:maven-plugin-annotations (#14361) No new revisions were added by this update. Summary of changes: components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml | 2 +- components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml | 2 +- tooling/maven/camel-api-component-maven-plugin/pom.xml | 2 +- tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml | 2 +- tooling/parent/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
(camel) branch main updated: Bump org.apache.maven.plugins:maven-plugin-plugin from 3.12.0 to 3.13.1 (#14343)
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 22972918675 Bump org.apache.maven.plugins:maven-plugin-plugin from 3.12.0 to 3.13.1 (#14343) 22972918675 is described below commit 229729186751c828a3d52dcc692b93f6a08e247e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Jun 5 06:45:05 2024 +0200 Bump org.apache.maven.plugins:maven-plugin-plugin from 3.12.0 to 3.13.1 (#14343) Bumps [org.apache.maven.plugins:maven-plugin-plugin](https://github.com/apache/maven-plugin-tools) from 3.12.0 to 3.13.1. - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.12.0...maven-plugin-tools-3.13.1) --- 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 1e21a35028c..f73717a2fd9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -338,7 +338,7 @@ 9.2.0 3.4.1 3.6.3 -3.12.0 +3.13.1 3.9.0 3.3.0
(camel) branch main updated: CAMEL-20722 new log entry to log the exception (#14344)
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 cc85e529b1d CAMEL-20722 new log entry to log the exception (#14344)
cc85e529b1d is described below
commit cc85e529b1d0dced0999bd65b0fe96c389c4029d
Author: Jang-Vijay Singh
AuthorDate: Tue Jun 4 20:21:13 2024 +0100
CAMEL-20722 new log entry to log the exception (#14344)
* CAMEL-20722 - add log.error for original exception
Original exception is currently not being logged, as another exception
gets raised from the next line within the catch block
* CAMEL-20722 - removed blank newline + added defensive if condition
* CAMEL-20722 - removed whitespace before 'Unexpected'
---
.../apache/camel/test/infra/kafka/services/KafkaService.java | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaService.java
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaService.java
index 38bc88bc533..962843d7282 100644
---
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaService.java
+++
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaService.java
@@ -42,11 +42,12 @@ public interface KafkaService extends TestService,
BeforeTestExecutionCallback,
initialize();
} catch (Exception e) {
Logger log = LoggerFactory.getLogger(KafkaService.class);
-
-final Object o = extensionContext.getTestInstance().get();
-log.error("Failed to initialize service {} for test {} on ({})",
this.getClass().getSimpleName(),
-extensionContext.getDisplayName(), o.getClass().getName());
-
+log.error("Unexpected error in {}: {} {} ",
this.getClass().getSimpleName(), e.getMessage(), e.getCause());
+if (extensionContext != null && extensionContext.getTestInstance()
!= null) {
+Object o = extensionContext.getTestInstance().get();
+log.error("Failed to initialize service {} for test {} on
({})", this.getClass().getSimpleName(),
+extensionContext.getDisplayName(),
o.getClass().getName());
+}
throw e;
}
}
(camel) branch main updated: Bump org.springframework.data:spring-data-redis from 3.2.5 to 3.3.0 (#14353)
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 1410b01aa97 Bump org.springframework.data:spring-data-redis from 3.2.5 to 3.3.0 (#14353) 1410b01aa97 is described below commit 1410b01aa97524e3f1d1411785e4731df55d708a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 4 14:52:31 2024 +0200 Bump org.springframework.data:spring-data-redis from 3.2.5 to 3.3.0 (#14353) Bumps [org.springframework.data:spring-data-redis](https://github.com/spring-projects/spring-data-redis) from 3.2.5 to 3.3.0. - [Release notes](https://github.com/spring-projects/spring-data-redis/releases) - [Commits](https://github.com/spring-projects/spring-data-redis/compare/3.2.5...3.3.0) --- updated-dependencies: - dependency-name: org.springframework.data:spring-data-redis 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 1ef5dd540e2..0b4d400cbe3 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -446,7 +446,7 @@ 1.9.5_1 2.3-groovy-4.0 5.1.2 -3.2.5 +3.3.0 3.2.3 3.1.1 6.1.8
(camel) branch main updated: Bump io.projectreactor:reactor-core from 3.6.5 to 3.6.6 (#14350)
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 874d00cb96a Bump io.projectreactor:reactor-core from 3.6.5 to 3.6.6 (#14350) 874d00cb96a is described below commit 874d00cb96aee1972be218408f6e87155d1ea866 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 4 14:51:52 2024 +0200 Bump io.projectreactor:reactor-core from 3.6.5 to 3.6.6 (#14350) Bumps [io.projectreactor:reactor-core](https://github.com/reactor/reactor-core) from 3.6.5 to 3.6.6. - [Release notes](https://github.com/reactor/reactor-core/releases) - [Commits](https://github.com/reactor/reactor-core/compare/v3.6.5...v3.6.6) --- updated-dependencies: - dependency-name: io.projectreactor:reactor-core 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 a19d1a8ba33..1ef5dd540e2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -417,7 +417,7 @@ 2.3.2 2.3.1 1.0.4 -3.6.5 +3.6.6 1.1.19 3.31.0 2.2.0
(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 6b3cb75a49a Regen 6b3cb75a49a is described below commit 6b3cb75a49a3a19810be0ee57927cdb837b31be0 Author: Claus Ibsen AuthorDate: Tue Jun 4 14:25:33 2024 +0200 Regen --- tooling/camel-spring-boot-dependencies/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index bcaea244347..cefacc6a41d 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -240,12 +240,12 @@ net.bytebuddy byte-buddy -1.14.16 +1.14.17 net.bytebuddy byte-buddy-agent -1.14.16 +1.14.17 org.apache.avro
(camel) branch main updated (87b3aa1fd2a -> 66e5573e965)
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 87b3aa1fd2a Bump com.google.api-client:google-api-client from 2.5.1 to 2.6.0 (#14348) add 66e5573e965 Bump hapi-fhir-version from 7.2.0 to 7.2.1 (#14349) 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 (f6e4e040922 -> 87b3aa1fd2a)
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 f6e4e040922 Bump com.github.beanio:beanio from 3.0.0 to 3.0.1 (#14347) add 87b3aa1fd2a Bump com.google.api-client:google-api-client from 2.5.1 to 2.6.0 (#14348) 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 com.github.beanio:beanio from 3.0.0 to 3.0.1 (#14347)
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 f6e4e040922 Bump com.github.beanio:beanio from 3.0.0 to 3.0.1 (#14347) f6e4e040922 is described below commit f6e4e040922adabc8a1d9521b1c5fb9fd9c7c07f Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 4 14:18:20 2024 +0200 Bump com.github.beanio:beanio from 3.0.0 to 3.0.1 (#14347) Bumps [com.github.beanio:beanio](https://github.com/beanio/beanio) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/beanio/beanio/releases) - [Changelog](https://github.com/beanio/beanio/blob/main/changelog.txt) - [Commits](https://github.com/beanio/beanio/compare/3.0.0...3.0.1) --- updated-dependencies: - dependency-name: com.github.beanio:beanio 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 d070747e38d..dbc306c7d19 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -80,7 +80,7 @@ 2.16.0 1.2.24 12.0.0-beta.21 -3.0.0 +3.0.1 1.78 4.9.0 3.34.0
(camel) branch main updated: Bump com.azure:azure-sdk-bom from 1.2.23 to 1.2.24 (#14335)
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 8275a7ad711 Bump com.azure:azure-sdk-bom from 1.2.23 to 1.2.24 (#14335) 8275a7ad711 is described below commit 8275a7ad711d5da3577ba58206380db1bdaf0d8f Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 4 14:16:44 2024 +0200 Bump com.azure:azure-sdk-bom from 1.2.23 to 1.2.24 (#14335) * Bump com.azure:azure-sdk-bom from 1.2.23 to 1.2.24 Bumps [com.azure:azure-sdk-bom](https://github.com/azure/azure-sdk-for-java) from 1.2.23 to 1.2.24. - [Release notes](https://github.com/azure/azure-sdk-for-java/releases) - [Commits](https://github.com/azure/azure-sdk-for-java/compare/azure-sdk-bom_1.2.23...azure-sdk-bom_1.2.24) --- updated-dependencies: - dependency-name: com.azure:azure-sdk-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * chore: Upgrade test container azurite it allows to be aligned with upgrade of Azure bom to 1.2.24 Signed-off-by: Aurélien Pupier - Signed-off-by: dependabot[bot] Signed-off-by: Aurélien Pupier Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aurélien Pupier --- parent/pom.xml | 2 +- .../apache/camel/test/infra/azure/common/services/container.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 72e2b8cf469..d070747e38d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -78,7 +78,7 @@ 4.2.1 2.25.65 2.16.0 -1.2.23 +1.2.24 12.0.0-beta.21 3.0.0 1.78 diff --git a/test-infra/camel-test-infra-azure-common/src/test/resources/org/apache/camel/test/infra/azure/common/services/container.properties b/test-infra/camel-test-infra-azure-common/src/test/resources/org/apache/camel/test/infra/azure/common/services/container.properties index 272e57df96f..a7d61c3f6e9 100644 --- a/test-infra/camel-test-infra-azure-common/src/test/resources/org/apache/camel/test/infra/azure/common/services/container.properties +++ b/test-infra/camel-test-infra-azure-common/src/test/resources/org/apache/camel/test/infra/azure/common/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -azure.container=mcr.microsoft.com/azure-storage/azurite:3.29.0 +azure.container=mcr.microsoft.com/azure-storage/azurite:3.30.0
(camel) branch main updated (37bfd87e444 -> be4f248e401)
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 37bfd87e444 Bump activemq-artemis-version from 2.33.0 to 2.34.0 (#14328) add be4f248e401 Bump net.revelc.code:impsort-maven-plugin from 1.9.0 to 1.10.0 (#14330) 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 (a04b20a79f5 -> 37bfd87e444)
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 a04b20a79f5 Use correct notation variable input for GitHub Actions add 37bfd87e444 Bump activemq-artemis-version from 2.33.0 to 2.34.0 (#14328) 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 protostream-version from 5.0.3.Final to 5.0.5.Final (#14338)
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 3494db80bd1 Bump protostream-version from 5.0.3.Final to 5.0.5.Final (#14338) 3494db80bd1 is described below commit 3494db80bd12e787d8d71440bc86850611e3cfcd Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 4 12:35:06 2024 +0200 Bump protostream-version from 5.0.3.Final to 5.0.5.Final (#14338) Bumps `protostream-version` from 5.0.3.Final to 5.0.5.Final. Updates `org.infinispan.protostream:protostream-processor` from 5.0.3.Final to 5.0.5.Final - [Release notes](https://github.com/infinispan/protostream/releases) - [Commits](https://github.com/infinispan/protostream/compare/5.0.3.Final...5.0.5.Final) Updates `org.infinispan.protostream:protostream` from 5.0.3.Final to 5.0.5.Final - [Release notes](https://github.com/infinispan/protostream/releases) - [Commits](https://github.com/infinispan/protostream/compare/5.0.3.Final...5.0.5.Final) --- updated-dependencies: - dependency-name: org.infinispan.protostream:protostream-processor dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.infinispan.protostream:protostream 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 a667356859b..c823db416c9 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -406,7 +406,7 @@ 3.25.3 0.6.1 1.8 -5.0.3.Final +5.0.5.Final SRU2023-10.1.6 6.4.5 3.2.3
(camel) branch main updated (3494db80bd1 -> e3a443c87f8)
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 3494db80bd1 Bump protostream-version from 5.0.3.Final to 5.0.5.Final (#14338) add e3a443c87f8 Bump com.graphql-java:graphql-java from 22.0 to 22.1 (#14336) 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 com.googlecode.libphonenumber:libphonenumber (#14337)
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 7b47be40291 Bump com.googlecode.libphonenumber:libphonenumber (#14337) 7b47be40291 is described below commit 7b47be402914d359035fb37ea045596dcbf99e8b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 4 12:29:53 2024 +0200 Bump com.googlecode.libphonenumber:libphonenumber (#14337) Bumps [com.googlecode.libphonenumber:libphonenumber](https://github.com/google/libphonenumber) from 8.13.36 to 8.13.38. - [Release notes](https://github.com/google/libphonenumber/releases) - [Changelog](https://github.com/google/libphonenumber/blob/master/making-metadata-changes.md) - [Commits](https://github.com/google/libphonenumber/compare/v8.13.36...v8.13.38) --- updated-dependencies: - dependency-name: com.googlecode.libphonenumber:libphonenumber 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 028fa91f1a6..a667356859b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -321,7 +321,7 @@ 1.8 0.12 0.12 -8.13.36 +8.13.38 1.0.0 2.21.1
(camel) branch main updated (f4d6d696134 -> f3f1a6b0ead)
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 f4d6d696134 Bump shiro-version from 2.0.0 to 2.0.1 (#14334) add f3f1a6b0ead Bump com.amazonaws:aws-xray-recorder-sdk-bom from 2.15.3 to 2.16.0 (#14331) 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 (2ae4ed78b54 -> 73da4d7119f)
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 2ae4ed78b54 Bump org.cometd.java:cometd-java-client-http-jetty from 8.0.1 to 8.0.2 (#14326) add 73da4d7119f Bump gg.jte:jte from 3.1.10 to 3.1.12 (#14327) 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 (123d3546e92 -> 2ae4ed78b54)
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 123d3546e92 Bump org.redisson:redisson from 3.30.0 to 3.31.0 (#14325) add 2ae4ed78b54 Bump org.cometd.java:cometd-java-client-http-jetty from 8.0.1 to 8.0.2 (#14326) 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 (73da4d7119f -> f4d6d696134)
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 73da4d7119f Bump gg.jte:jte from 3.1.10 to 3.1.12 (#14327) add f4d6d696134 Bump shiro-version from 2.0.0 to 2.0.1 (#14334) 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 org.redisson:redisson from 3.30.0 to 3.31.0 (#14325)
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 123d3546e92 Bump org.redisson:redisson from 3.30.0 to 3.31.0 (#14325) 123d3546e92 is described below commit 123d3546e92bffb596435f739d2ad4cb33e197f5 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 4 12:25:51 2024 +0200 Bump org.redisson:redisson from 3.30.0 to 3.31.0 (#14325) Bumps [org.redisson:redisson](https://github.com/redisson/redisson) from 3.30.0 to 3.31.0. - [Release notes](https://github.com/redisson/redisson/releases) - [Changelog](https://github.com/redisson/redisson/blob/master/CHANGELOG.md) - [Commits](https://github.com/redisson/redisson/compare/redisson-3.30.0...redisson-parent-3.31.0) --- updated-dependencies: - dependency-name: org.redisson:redisson 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 39debb91e34..7fa4d79df48 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -419,7 +419,7 @@ 1.0.4 3.6.5 1.1.19 -3.30.0 +3.31.0 2.2.0 5.4.0 2.29.0.Final
(camel) branch main updated: Bump jooq-version from 3.19.8 to 3.19.9 (#14333)
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 6813de54836 Bump jooq-version from 3.19.8 to 3.19.9 (#14333) 6813de54836 is described below commit 6813de54836413de6866591a1fdbad2c11eeb7ca Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 4 12:24:58 2024 +0200 Bump jooq-version from 3.19.8 to 3.19.9 (#14333) Bumps `jooq-version` from 3.19.8 to 3.19.9. Updates `org.jooq:jooq` from 3.19.8 to 3.19.9 Updates `org.jooq:jooq-codegen-maven` from 3.19.8 to 3.19.9 --- 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 371653149de..39debb91e34 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -288,7 +288,7 @@ 2.0.2 0.1.8 0.9.15 -3.19.8 +3.19.9 0.9.15 0.9.3 2.0.1
(camel) branch main updated (95a358b1220 -> 990a3ae5a3d)
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 95a358b1220 Bump jetty-version from 12.0.8 to 12.0.10 (#14315) add 990a3ae5a3d Revert "Bump jetty-version from 12.0.8 to 12.0.10 (#14315)" 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 (4d6c3bb906f -> 95a358b1220)
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 4d6c3bb906f chore: Use actions/upload-artifact v4 add 95a358b1220 Bump jetty-version from 12.0.8 to 12.0.10 (#14315) 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: CAMEL-20828: camel-platform-http - Allow to known if platform engine is in use or not without triggering creation
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 f36baeb5779 CAMEL-20828: camel-platform-http - Allow to known if
platform engine is in use or not without triggering creation
f36baeb5779 is described below
commit f36baeb577979c54f4d6008f83bcd3fefae24ab2
Author: Claus Ibsen
AuthorDate: Tue Jun 4 11:16:05 2024 +0200
CAMEL-20828: camel-platform-http - Allow to known if platform engine is in
use or not without triggering creation
---
components/camel-openapi-java/pom.xml | 4
.../apache/camel/openapi/RestOpenApiReader.java| 24 +--
.../org/apache/camel/openapi/ComplexTypesTest.java | 4
.../RestOpenApiReaderApiDocsOverrideTest.java | 4
.../openapi/RestOpenApiReaderApiDocsTest.java | 4
.../openapi/RestOpenApiReaderContextPathTest.java | 4
.../openapi/RestOpenApiReaderDayOfWeekTest.java| 4
.../openapi/RestOpenApiReaderDisabledTest.java | 4
...RestOpenApiReaderEnableVendorExtensionTest.java | 4
.../RestOpenApiReaderFileResponseModelTest.java| 4
.../RestOpenApiReaderModelApiSecurityTest.java | 4
.../RestOpenApiReaderModelBookOrderTest.java | 4
.../camel/openapi/RestOpenApiReaderModelTest.java | 4
.../RestOpenApiReaderPropertyPlaceholderTest.java | 4
.../camel/openapi/RestOpenApiReaderTest.java | 4
.../apache/camel/openapi/RestOpenApiV3XOfTest.java | 4
.../camel/openapi/producer/RestOpenApiGetTest.java | 5
.../producer/RestOpenApiGetUriParamTest.java | 5
...SpringRestOpenApiReaderModelApiSecurityTest.xml | 3 ---
.../http/vertx/VertxPlatformHttpEngine.java| 8 +++
.../http/vertx/VertxPlatformHttpEngineTest.java| 8 +++
.../platform/http/spi/PlatformHttpEngine.java | 18 ++
.../org/apache/camel/spi/EmbeddedHttpService.java | 28 +++---
23 files changed, 55 insertions(+), 104 deletions(-)
diff --git a/components/camel-openapi-java/pom.xml
b/components/camel-openapi-java/pom.xml
index dc34c7720c9..98fb640c7e5 100644
--- a/components/camel-openapi-java/pom.xml
+++ b/components/camel-openapi-java/pom.xml
@@ -45,10 +45,6 @@
org.apache.camel
camel-core-engine
-
-org.apache.camel
-camel-platform-http
-
org.apache.camel
camel-xml-io
diff --git
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
index 05948b8ed4a..dde1a809d59 100644
---
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
+++
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
@@ -67,7 +67,6 @@ import io.swagger.v3.oas.models.tags.Tag;
import io.swagger.v3.parser.OpenAPIV3Parser;
import io.swagger.v3.parser.core.models.SwaggerParseResult;
import org.apache.camel.CamelContext;
-import org.apache.camel.component.platform.http.PlatformHttpComponent;
import org.apache.camel.model.rest.ApiKeyDefinition;
import org.apache.camel.model.rest.BasicAuthDefinition;
import org.apache.camel.model.rest.BearerTokenDefinition;
@@ -79,13 +78,13 @@ import org.apache.camel.model.rest.ParamDefinition;
import org.apache.camel.model.rest.ResponseHeaderDefinition;
import org.apache.camel.model.rest.ResponseMessageDefinition;
import org.apache.camel.model.rest.RestDefinition;
-import org.apache.camel.model.rest.RestHostNameResolver;
import org.apache.camel.model.rest.RestPropertyDefinition;
import org.apache.camel.model.rest.RestSecuritiesDefinition;
import org.apache.camel.model.rest.RestSecurityDefinition;
import org.apache.camel.model.rest.SecurityDefinition;
import org.apache.camel.model.rest.VerbDefinition;
import org.apache.camel.spi.ClassResolver;
+import org.apache.camel.spi.EmbeddedHttpService;
import org.apache.camel.spi.NodeIdFactory;
import org.apache.camel.spi.Resource;
import org.apache.camel.spi.RestConfiguration;
@@ -165,19 +164,18 @@ public class RestOpenApiReader {
if (restConfig.getHostNameResolver() !=
RestConfiguration.RestHostNameResolver.none) {
host =
camelContext.getRestConfiguration().getApiHost();
if (host == null || host.isEmpty()) {
-String scheme = "http://;;
+String scheme = "http";
+int port = 0;
host =
RestComponentHelper.resolveRestHostName(host, restConfig);
-PlatformHttpComponent http =
(Platfo
(camel) branch main updated (5177a0395b3 -> 311b35458ca)
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 5177a0395b3 Bump org.apache.maven.plugins:maven-invoker-plugin from 3.6.1 to 3.7.0 (#14319) add 311b35458ca Bump org.freemarker:freemarker from 2.3.32 to 2.3.33 (#14320) 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 org.apache.maven.plugins:maven-invoker-plugin from 3.6.1 to 3.7.0 (#14319)
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 5177a0395b3 Bump org.apache.maven.plugins:maven-invoker-plugin from 3.6.1 to 3.7.0 (#14319) 5177a0395b3 is described below commit 5177a0395b383331eaa240291d1541cf55eeb4de Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 4 09:46:06 2024 +0200 Bump org.apache.maven.plugins:maven-invoker-plugin from 3.6.1 to 3.7.0 (#14319) Bumps [org.apache.maven.plugins:maven-invoker-plugin](https://github.com/apache/maven-invoker-plugin) from 3.6.1 to 3.7.0. - [Release notes](https://github.com/apache/maven-invoker-plugin/releases) - [Commits](https://github.com/apache/maven-invoker-plugin/compare/maven-invoker-plugin-3.6.1...maven-invoker-plugin-3.7.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-invoker-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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0cd148c1e8d..5b7ad72b428 100644 --- a/pom.xml +++ b/pom.xml @@ -128,7 +128,7 @@ 3.13.0 3.6.1 3.5.0 -3.6.1 +3.7.0 3.6.3 3.0.1 3.2.0
(camel) branch main updated (ec8a49e0e39 -> b5b2691362c)
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 ec8a49e0e39 Bump aws-java-sdk2-version from 2.25.64 to 2.25.65 (#14316) add b5b2691362c Bump io.github.littleproxy:littleproxy from 2.2.0 to 2.2.1 (#14317) 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 aws-java-sdk2-version from 2.25.64 to 2.25.65 (#14316)
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 ec8a49e0e39 Bump aws-java-sdk2-version from 2.25.64 to 2.25.65 (#14316) ec8a49e0e39 is described below commit ec8a49e0e39eb887a8945fec330933b2e98e9b05 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 4 09:45:10 2024 +0200 Bump aws-java-sdk2-version from 2.25.64 to 2.25.65 (#14316) Bumps `aws-java-sdk2-version` from 2.25.64 to 2.25.65. Updates `software.amazon.awssdk:sqs` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:kinesis` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:s3` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:sns` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:cloudwatch` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:ec2` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:eventbridge` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:iam` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:kms` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:lambda` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:secretsmanager` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:sts` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:dynamodb` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:config` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:apache-client` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:athena` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:bedrock` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:bedrockruntime` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:bedrockagent` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:bedrockagentruntime` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:cloudtrail` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:ecs` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:eks` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:netty-nio-client` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:firehose` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:kafka` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:mq` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:redshiftdata` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:ses` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:sfn` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:timestreamquery` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:timestreamwrite` from 2.25.64 to 2.25.65 Updates `software.amazon.awssdk:translate` from 2.25.64 to 2.25.65 --- 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-website) branch main updated: Add link to UPS presentation
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 b8a7ec17 Add link to UPS presentation b8a7ec17 is described below commit b8a7ec172562cb8a4b31eebee1068f2ab4066a97 Author: Claus Ibsen AuthorDate: Tue Jun 4 09:22:44 2024 +0200 Add link to UPS presentation --- content/community/articles.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/community/articles.md b/content/community/articles.md index dea30af1..3bf2b5c3 100644 --- a/content/community/articles.md +++ b/content/community/articles.md @@ -4,6 +4,8 @@ title: "Articles" ## Camel Videos + +* [Apache Camel and ActiveMQ at UPS](https://www.youtube.com/watch?v=TDjwr16uaYU) May 2024 where UPS presented their use of Apache Camel and ActiveMQ on OpenShift processing tens of billions messages a day. * [Quarkus Insights #110: Quarkiverse Extension Spotlight of Apache Camel](https://www.youtube.com/watch?v=stBjGMu73B0) November 2022 where Apache Camel was presented on the Quarkus webcast (1h session). * [Cloud Native My Camel: from Low Code to Pro Code, inject Serverless & Cloud Native Goodness](https://www.youtube.com/watch?v=af6xXqvxwjE) by Michael Costello from June 2022, 45-min session on low-code Apache Camel, Camel K and demo with Karavan, the Camel UI designer. * [Connecting the World to Knative with Kamelets](https://www.youtube.com/watch?v=Abxp_HW6lJE) by Roland Huss at KnativeCon 2022, 30 min session on using Camel K and Kamelets as sink and sources for KNative.
(camel) branch main updated: CAMEL-20798: Add endpoint service registry
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 3c81a9c04b7 CAMEL-20798: Add endpoint service registry
3c81a9c04b7 is described below
commit 3c81a9c04b7f46762e9e4c65f3d7f551eceef2a5
Author: Claus Ibsen
AuthorDate: Mon Jun 3 13:10:26 2024 +0200
CAMEL-20798: Add endpoint service registry
---
.../apache/camel/impl/engine/DefaultEndpointServiceRegistry.java | 7 +++
1 file changed, 7 insertions(+)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultEndpointServiceRegistry.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultEndpointServiceRegistry.java
index 5120975d288..c949d02ed40 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultEndpointServiceRegistry.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultEndpointServiceRegistry.java
@@ -90,6 +90,13 @@ public class DefaultEndpointServiceRegistry extends
ServiceSupport implements En
hits = s.getHits();
routeId = s.getRouteId();
}
+if ("out".equals(dir) && stat.isEmpty()) {
+// no OUT stat, then the endpoint may be used only for IN
+stat = findStats(endpoint.getEndpointUri(), "in");
+if (stat.isPresent()) {
+return null;
+}
+}
answer = new DefaultEndpointService(
component, endpoint.getEndpointUri(), adr,
esl.getServiceProtocol(), esl.getServiceMetadata(),
hosted, dir, hits, routeId);
(camel) branch main updated: CAMEL-19985: Smooks component
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 7f3433f6506 CAMEL-19985: Smooks component
7f3433f6506 is described below
commit 7f3433f65061b07e7234d50e1e271e79a29435f1
Author: Claus Ibsen
AuthorDate: Mon Jun 3 12:40:39 2024 +0200
CAMEL-19985: Smooks component
---
components/camel-smooks/pom.xml | 4
.../component/smooks/converter/SourceConverterLoader.java | 4 ++--
.../camel/component/smooks/converter/SourceConverter.java | 15 +++
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/components/camel-smooks/pom.xml b/components/camel-smooks/pom.xml
index fe2c481934c..37ef48a763f 100644
--- a/components/camel-smooks/pom.xml
+++ b/components/camel-smooks/pom.xml
@@ -52,10 +52,6 @@
org.apache.camel
camel-support
-
-org.apache.camel
-camel-file
-
org.smooks
smooks-core
diff --git
a/components/camel-smooks/src/generated/java/org/apache/camel/component/smooks/converter/SourceConverterLoader.java
b/components/camel-smooks/src/generated/java/org/apache/camel/component/smooks/converter/SourceConverterLoader.java
index 72cbcb7b288..ab1c69772f8 100644
---
a/components/camel-smooks/src/generated/java/org/apache/camel/component/smooks/converter/SourceConverterLoader.java
+++
b/components/camel-smooks/src/generated/java/org/apache/camel/component/smooks/converter/SourceConverterLoader.java
@@ -46,8 +46,8 @@ public final class SourceConverterLoader implements
TypeConverterLoader, CamelCo
private void registerConverters(TypeConverterRegistry registry) {
addTypeConverter(registry, javax.xml.transform.Source.class,
java.io.InputStream.class, false,
(type, exchange, value) ->
org.apache.camel.component.smooks.converter.SourceConverter.toStreamSource((java.io.InputStream)
value));
-addTypeConverter(registry, javax.xml.transform.Source.class,
org.apache.camel.component.file.GenericFile.class, false,
-(type, exchange, value) ->
org.apache.camel.component.smooks.converter.SourceConverter.toStreamSource((org.apache.camel.component.file.GenericFile)
value));
+addTypeConverter(registry, javax.xml.transform.Source.class,
org.apache.camel.WrappedFile.class, true,
+(type, exchange, value) ->
org.apache.camel.component.smooks.converter.SourceConverter.toStreamSource((org.apache.camel.WrappedFile)
value, exchange));
addTypeConverter(registry, org.smooks.io.payload.JavaSource.class,
java.lang.Object.class, false,
(type, exchange, value) ->
org.apache.camel.component.smooks.converter.SourceConverter.toJavaSource(value));
addTypeConverter(registry, org.smooks.io.payload.JavaSource.class,
org.smooks.io.payload.JavaResult.class, false,
diff --git
a/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/converter/SourceConverter.java
b/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/converter/SourceConverter.java
index a411b4a784a..d44bf129246 100644
---
a/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/converter/SourceConverter.java
+++
b/components/camel-smooks/src/main/java/org/apache/camel/component/smooks/converter/SourceConverter.java
@@ -23,7 +23,8 @@ import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
import org.apache.camel.Converter;
-import org.apache.camel.component.file.GenericFile;
+import org.apache.camel.Exchange;
+import org.apache.camel.WrappedFile;
import org.smooks.io.payload.JavaResult;
import org.smooks.io.payload.JavaSource;
import org.smooks.io.payload.JavaSourceWithoutEventStream;
@@ -57,9 +58,15 @@ public class SourceConverter {
return new JavaSource(result.getResultMap().values());
}
-@Converter
-public static Source toStreamSource(GenericFile genericFile) {
-return new StreamSource(genericFile.getFile());
+@Converter(allowNull = true)
+public static Source toStreamSource(WrappedFile file, Exchange
exchange) throws Exception {
+Object obj = file.getFile();
+if (obj instanceof File f) {
+return new StreamSource(f);
+} else {
+InputStream is =
exchange.getContext().getTypeConverter().mandatoryConvertTo(InputStream.class,
file.getBody());
+return new StreamSource(is);
+}
}
}
(camel-spring-boot) branch main updated: CAMEL-19985: Smooks component
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 60ce71658ce CAMEL-19985: Smooks component
60ce71658ce is described below
commit 60ce71658ce60ef6259091d5cf31bb3a91eed489
Author: Claus Ibsen
AuthorDate: Mon Jun 3 11:50:15 2024 +0200
CAMEL-19985: Smooks component
---
.../camel/springboot/catalog/components.properties | 1 +
.../springboot/catalog/components/smooks.json | 53 ++
components-starter/camel-smooks-starter/pom.xml| 48 +
.../camel-smooks-starter/src/main/docs/smooks.json | 50 +
.../SmooksComponentAutoConfiguration.java | 77
.../springboot/SmooksComponentConfiguration.java | 95 ++
.../src/main/resources/META-INF/LICENSE.txt| 203 +
.../src/main/resources/META-INF/NOTICE.txt | 11 ++
...rk.boot.autoconfigure.AutoConfiguration.imports | 18 ++
components-starter/pom.xml | 1 +
tooling/camel-spring-boot-bom/pom.xml | 5 +
tooling/camel-spring-boot-dependencies/pom.xml | 5 +
12 files changed, 567 insertions(+)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
index 369a4e47652..ebb2cef6a49 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components.properties
@@ -288,6 +288,7 @@ sjms
sjms2
slack
smb
+smooks
smpp
smpps
smtp
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smooks.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smooks.json
new file mode 100644
index 000..16ce2bb30b2
--- /dev/null
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/smooks.json
@@ -0,0 +1,53 @@
+{
+ "component": {
+"kind": "component",
+"name": "smooks",
+"title": "Smooks",
+"description": "EDI, XML, CSV, etc. based data transformation using
Smooks.",
+"deprecated": false,
+"firstVersion": "4.7.0",
+"label": "transformation",
+"javaType": "org.apache.camel.component.smooks.SmooksComponent",
+"supportLevel": "Preview",
+"groupId": "org.apache.camel.springboot",
+"artifactId": "camel-smooks-starter",
+"version": "4.7.0-SNAPSHOT",
+"scheme": "smooks",
+"extendsScheme": "",
+"syntax": "smooks:smooksConfig",
+"async": false,
+"api": false,
+"consumerOnly": false,
+"producerOnly": false,
+"lenientProperties": false,
+"remote": true
+ },
+ "componentProperties": {
+"bridgeErrorHandler": { "index": 0, "kind": "property", "displayName":
"Bridge Error Handler", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Allows for bridging the consumer to the Camel routing Error Handler, which
mean any exceptions (if possible) occurred while the Camel consumer is trying
to pickup incoming messages, or the like [...]
+"lazyStartProducer": { "index": 1, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
+"autowiredEnabled": { "index": 2, &q
(camel) branch cjmamo-CAMEL-19985 deleted (was 3df0f6a9c6b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch cjmamo-CAMEL-19985 in repository https://gitbox.apache.org/repos/asf/camel.git was 3df0f6a9c6b CAMEL-19985: Smooks component 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/03: feat: add Smooks component
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch cjmamo-CAMEL-19985
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 621e7043693613d66ff1c8cfb4c281e10411a0ab
Author: cjmamo <823038+cjm...@users.noreply.github.com>
AuthorDate: Thu May 30 17:05:40 2024 +0200
feat: add Smooks component
Refs: https://github.com/smooks/smooks-camel-cartridge/issues/211
---
bom/camel-bom/pom.xml | 5 +
catalog/camel-allcomponents/pom.xml| 5 +
.../org/apache/camel/catalog/components.properties | 1 +
components/camel-smooks/pom.xml| 103 +++
.../smooks/SmooksComponentConfigurer.java | 63
.../component/smooks/SmooksEndpointConfigurer.java | 165 +++
.../component/smooks/SmooksEndpointUriFactory.java | 92 ++
.../smooks/converter/ResultConverterLoader.java| 73 +
.../smooks/converter/SourceConverterLoader.java| 62
.../org/apache/camel/component/smooks/smooks.json | 53
.../services/org/apache/camel/TypeConverterLoader | 3 +
.../services/org/apache/camel/component.properties | 7 +
.../services/org/apache/camel/component/smooks | 2 +
.../org/apache/camel/configurer/smooks-component | 2 +
.../org/apache/camel/configurer/smooks-endpoint| 2 +
.../org/apache/camel/urifactory/smooks-endpoint| 2 +
.../src/main/docs/smooks-component.adoc| 48 +++
.../camel/component/smooks/SmooksComponent.java| 51
.../camel/component/smooks/SmooksEndpoint.java | 61
.../camel/component/smooks/SmooksProcessor.java| 291 +++
.../smooks/converter/ResultConverter.java | 133 +
.../smooks/converter/SourceConverter.java | 67 +
.../apache/camel/component/smooks/Coordinate.java | 81 ++
.../component/smooks/SmooksComponentTest.java | 72 +
.../component/smooks/SmooksProcessorTest.java | 322 +
.../smooks/converter/ResultConverterTest.java | 64
.../smooks/converter/SourceConverterTest.java | 54
.../src/test/resources/EBCDIC-input-message.txt| 1 +
.../camel-smooks/src/test/resources/data/order.txt | 4 +
.../src/test/resources/edi-mapping-model.dfdl.xsd | 79 +
.../test/resources/edi-to-xml-smooks-config.xml| 35 +++
.../src/test/resources/xml/expected-order.xml | 51
components/pom.xml | 1 +
.../org/apache/camel/main/components.properties| 1 +
docs/components/modules/ROOT/nav.adoc | 1 +
.../component/ComponentsBuilderFactory.java| 14 +
.../builder/endpoint/EndpointBuilderFactory.java | 1 +
.../camel/builder/endpoint/EndpointBuilders.java | 1 +
.../builder/endpoint/StaticEndpointBuilders.java | 42 +++
.../camel-component-known-dependencies.properties | 1 +
parent/pom.xml | 5 +
41 files changed, 2121 insertions(+)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index a250592fbbd..5bfbac4377a 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1812,6 +1812,11 @@
camel-smb
4.7.0-SNAPSHOT
+
+org.apache.camel
+camel-smooks
+4.7.0-SNAPSHOT
+
org.apache.camel
camel-smpp
diff --git a/catalog/camel-allcomponents/pom.xml
b/catalog/camel-allcomponents/pom.xml
index daf1adf8836..96f648880e9 100644
--- a/catalog/camel-allcomponents/pom.xml
+++ b/catalog/camel-allcomponents/pom.xml
@@ -1592,6 +1592,11 @@
camel-smb
${project.version}
+
+org.apache.camel
+camel-smooks
+${project.version}
+
org.apache.camel
camel-smpp
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
index eda05e1c4c1..e321b253135 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components.properties
@@ -285,6 +285,7 @@ sjms
sjms2
slack
smb
+smooks
smpp
smpps
smtp
diff --git a/components/camel-smooks/pom.xml b/components/camel-smooks/pom.xml
new file mode 100644
index 000..4128c93c996
--- /dev/null
+++ b/components/camel-smooks/pom.xml
@@ -0,0 +1,103 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
+
+4.0.0
+
+
+org.apache.camel
+components
+4.7.0-SNAPSHOT
+
+
+camel-smooks
+jar
+
+Camel :: Smooks :: Parent
+Cam
(camel) branch cjmamo-CAMEL-19985 created (now 3df0f6a9c6b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch cjmamo-CAMEL-19985 in repository https://gitbox.apache.org/repos/asf/camel.git at 3df0f6a9c6b CAMEL-19985: Smooks component This branch includes the following new commits: new 621e7043693 feat: add Smooks component new e48414ad5ec CAMEL-19985: Smooks component new 3df0f6a9c6b CAMEL-19985: Smooks component The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel-spring-boot) branch camel-spring-boot-4.4.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.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 9e8339277eb Regen
9e8339277eb is described below
commit 9e8339277eb89822f651ad087fa04f8e1c2a7ea9
Author: Claus Ibsen
AuthorDate: Mon Jun 3 11:21:55 2024 +0200
Regen
---
.../camel/springboot/catalog/components/cxfrs.json | 60 +++---
.../springboot/catalog/components/netty-http.json | 92 +++---
.../camel/springboot/catalog/components/netty.json | 92 +++---
.../NettyHttpComponentConfiguration.java | 24 +++---
.../springboot/NettyComponentConfiguration.java| 24 +++---
5 files changed, 146 insertions(+), 146 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxfrs.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxfrs.json
index f7fddaf7f63..a52b5c6d0ce 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxfrs.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxfrs.json
@@ -51,35 +51,35 @@
"beanId": { "index": 0, "kind": "path", "displayName": "Bean Id", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To lookup an existing configured CxfRsEndpoint. Must used bean:
as prefix." },
"address": { "index": 1, "kind": "path", "displayName": "Address",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The service publish address." },
"features": { "index": 2, "kind": "parameter", "displayName": "Features",
"group": "common", "label": "", "required": false, "type": "array", "javaType":
"java.util.List", "deprecated": false,
"autowired": false, "secret": false, "description": "Set the feature list to
the CxfRs endpoint." },
-"loggingFeatureEnabled": { "index": 3, "kind": "parameter", "displayName":
"Logging Feature Enabled", "group": "common", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "This option
enables CXF Logging Feature which writes inbound and outbound REST messages to
log." },
-"loggingSizeLimit": { "index": 4, "kind": "parameter", "displayName":
"Logging Size Limit", "group": "common", "label": "", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "description": "To limit the total size of number of bytes the
logger will output when logging feature has been enabled." },
-"modelRef": { "index": 5, "kind": "parameter", "displayName": "Model Ref",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "This option is used to specify the model file
which is useful for the resource class without annotation. When using this
option, then the service class can be omitted, to emulate document-only
endpoints" },
-"providers": { "index": 6, "kind": "parameter", "displayName":
"Providers", "group": "common
(camel) 02/03: CAMEL-19985: Smooks component
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch cjmamo-CAMEL-19985
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e48414ad5ece73e6588c8144c196762f7c0281e7
Author: Claus Ibsen
AuthorDate: Mon Jun 3 10:59:29 2024 +0200
CAMEL-19985: Smooks component
---
.../apache/camel/catalog/components}/smooks.json | 0
.../component/smooks/SmooksEndpointUriFactory.java | 6 +-
.../org/apache/camel/component/smooks/smooks.json | 8 +-
.../src/main/docs/smooks-component.adoc| 2 +-
.../camel/component/smooks/SmooksComponent.java| 20 +-
.../camel/component/smooks/SmooksEndpoint.java | 43 +-
.../camel/component/smooks/SmooksProcessor.java| 133 ++--
.../smooks/converter/ResultConverter.java | 3 +-
.../smooks/converter/SourceConverter.java | 4 +-
.../apache/camel/component/smooks/Coordinate.java | 3 -
.../component/smooks/SmooksComponentTest.java | 7 +-
.../component/smooks/SmooksProcessorTest.java | 7 +-
.../smooks/converter/ResultConverterTest.java | 6 +-
.../smooks/converter/SourceConverterTest.java | 6 +-
.../dsl/SmooksComponentBuilderFactory.java | 151
.../endpoint/dsl/SmooksEndpointBuilderFactory.java | 847 +
16 files changed, 1108 insertions(+), 138 deletions(-)
diff --git
a/components/camel-smooks/src/generated/resources/META-INF/org/apache/camel/component/smooks/smooks.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smooks.json
similarity index 100%
copy from
components/camel-smooks/src/generated/resources/META-INF/org/apache/camel/component/smooks/smooks.json
copy to
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smooks.json
diff --git
a/components/camel-smooks/src/generated/java/org/apache/camel/component/smooks/SmooksEndpointUriFactory.java
b/components/camel-smooks/src/generated/java/org/apache/camel/component/smooks/SmooksEndpointUriFactory.java
index a7552824dd9..781876531a3 100644
---
a/components/camel-smooks/src/generated/java/org/apache/camel/component/smooks/SmooksEndpointUriFactory.java
+++
b/components/camel-smooks/src/generated/java/org/apache/camel/component/smooks/SmooksEndpointUriFactory.java
@@ -17,7 +17,7 @@ import org.apache.camel.spi.EndpointUriFactory;
@Generated("org.apache.camel.maven.packaging.GenerateEndpointUriFactoryMojo")
public class SmooksEndpointUriFactory extends
org.apache.camel.support.component.EndpointUriFactorySupport implements
EndpointUriFactory {
-private static final String BASE = "://smooks-config-path";
+private static final String BASE = ":smooksConfig";
private static final Set PROPERTY_NAMES;
private static final Set SECRET_PROPERTY_NAMES;
@@ -28,7 +28,6 @@ public class SmooksEndpointUriFactory extends
org.apache.camel.support.component
props.add("backoffIdleThreshold");
props.add("backoffMultiplier");
props.add("bridgeErrorHandler");
-props.add("database");
props.add("delay");
props.add("exceptionHandler");
props.add("exchangePattern");
@@ -42,6 +41,7 @@ public class SmooksEndpointUriFactory extends
org.apache.camel.support.component
props.add("scheduler");
props.add("schedulerProperties");
props.add("sendEmptyMessageWhenIdle");
+props.add("smooksConfig");
props.add("startScheduler");
props.add("timeUnit");
props.add("useFixedDelay");
@@ -64,7 +64,7 @@ public class SmooksEndpointUriFactory extends
org.apache.camel.support.component
Map copy = new HashMap<>(properties);
-uri = buildPathParameter(syntax, uri, "database", null, true, copy);
+uri = buildPathParameter(syntax, uri, "smooksConfig", null, true,
copy);
uri = buildQueryParameters(uri, copy, encode);
return uri;
}
diff --git
a/components/camel-smooks/src/generated/resources/META-INF/org/apache/camel/component/smooks/smooks.json
b/components/camel-smooks/src/generated/resources/META-INF/org/apache/camel/component/smooks/smooks.json
index cb677a24991..993bf295f63 100644
---
a/components/camel-smooks/src/generated/resources/META-INF/org/apache/camel/component/smooks/smooks.json
+++
b/components/camel-smooks/src/generated/resources/META-INF/org/apache/camel/component/smooks/smooks.json
@@ -3,10 +3,10 @@
"kind": "component",
"name": "smooks",
"title": "Smooks",
-"description": "Applies fragment-based processing in Smooks to perform a
variety of operations like transformation.",
+"description": &qu
(camel) 03/03: CAMEL-19985: Smooks component
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch cjmamo-CAMEL-19985
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3df0f6a9c6b309b53c4ffacfc8c3e79f4d6a6c2e
Author: Claus Ibsen
AuthorDate: Mon Jun 3 11:09:06 2024 +0200
CAMEL-19985: Smooks component
---
.../apache/camel/catalog/components/smooks.json| 8 +-
components/camel-smooks/pom.xml| 30 +-
.../camel/component/smooks/SmooksProcessor.java| 33 ---
.../modules/ROOT/examples/json/smooks.json | 1 +
.../modules/ROOT/pages/smooks-component.adoc | 1 +
.../component/ComponentsBuilderFactory.java| 5 +-
.../dsl/SmooksComponentBuilderFactory.java | 8 +-
.../builder/endpoint/StaticEndpointBuilders.java | 30 +-
.../endpoint/dsl/SmooksEndpointBuilderFactory.java | 33 ++-
.../apache/camel/kotlin/components/SmooksUriDsl.kt | 329 +
parent/pom.xml | 1 +
11 files changed, 389 insertions(+), 90 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smooks.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smooks.json
index cb677a24991..993bf295f63 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smooks.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/smooks.json
@@ -3,10 +3,10 @@
"kind": "component",
"name": "smooks",
"title": "Smooks",
-"description": "Applies fragment-based processing in Smooks to perform a
variety of operations like transformation.",
+"description": "EDI, XML, CSV, etc. based data transformation using
Smooks.",
"deprecated": false,
"firstVersion": "4.7.0",
-"label": "file",
+"label": "transformation",
"javaType": "org.apache.camel.component.smooks.SmooksComponent",
"supportLevel": "Preview",
"groupId": "org.apache.camel",
@@ -14,7 +14,7 @@
"version": "4.7.0-SNAPSHOT",
"scheme": "smooks",
"extendsScheme": "",
-"syntax": "smooks:\/\/smooks-config-path",
+"syntax": "smooks:smooksConfig",
"async": false,
"api": false,
"consumerOnly": false,
@@ -28,7 +28,7 @@
"autowiredEnabled": { "index": 2, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
},
"properties": {
-"database": { "index": 0, "kind": "path", "displayName": "Database",
"group": "common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "database name" },
+"smooksConfig": { "index": 0, "kind": "path", "displayName": "Smooks
Config", "group": "common", "label": "", "required": true, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "supportFileReference": true,
"description": "Smooks XML configuration file" },
"sendEmptyMessageWhenIdle": { "index": 1, "kind": "parameter",
"displayName": "Send Empty Message When Idle", "group": "consumer", "label":
"consumer", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": f
(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 58a9b2882fa Regen
58a9b2882fa is described below
commit 58a9b2882faaecc6f3a3e67648b38f6906e3e56c
Author: Claus Ibsen
AuthorDate: Mon Jun 3 11:13:28 2024 +0200
Regen
---
.../springboot/catalog/components/netty-http.json | 92 +++---
.../camel/springboot/catalog/components/netty.json | 92 +++---
.../NettyHttpComponentConfiguration.java | 24 +++---
.../springboot/NettyComponentConfiguration.java| 24 +++---
tooling/camel-spring-boot-dependencies/pom.xml | 5 ++
5 files changed, 121 insertions(+), 116 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
index 37db4ed691b..e36555b84db 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
@@ -65,31 +65,31 @@
"producerPoolMinIdle": { "index": 38, "kind": "property", "displayName":
"Producer Pool Min Idle", "group": "producer (advanced)", "label":
"producer,advanced", "required": false, "type": "integer", "javaType": "int",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "Sets the minimum number of instances allowed
in the producer pool before the evi [...]
"udpConnectionlessSending": { "index": 39, "kind": "property",
"displayName": "Udp Connectionless Sending", "group": "producer (advanced)",
"label": "producer,advanced", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "This option supports connection less udp sen
[...]
"useByteBuf": { "index": 40, "kind": "property", "displayName": "Use Byte
Buf", "group": "producer (advanced)", "label": "producer,advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.netty.NettyConfiguration",
"configurationField": "configuration", "description": "If the useByteBuf is
true, netty producer will turn the message body int [...]
-"hostnameVerification": { "index": 41, "kind": "property", "displayName":
"Hostname Verification", "group": " security", "label": "common, security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.netty.NettyConfiguration",
"configurationField": "configuration", "description": "To enable\/disable
hostname verification on SSLEngine" },
-"allowSerializedHeaders": { "index": 42, "kind": "property",
"displayName": "Allow Serialized Headers", "group": "advanced", "label":
"advanced", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration&quo
(camel) branch main updated (f173792ad93 -> 6a87b89406d)
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 f173792ad93 Bump com.google.cloud:libraries-bom from 26.39.0 to 26.40.0 (#14308) add 6a87b89406d CAMEL-20826: camel-package-maven-plugin:generate not creating reproducible jandex.idx files. (#14300) No new revisions were added by this update. Summary of changes: .../camel-servicenow-maven-plugin/pom.xml | 17 +++-- .../camel/maven/packaging/AbstractGenerateMojo.java | 7 +++ .../apache/camel/maven/packaging/PackageJandexMojo.java | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-)
(camel) branch main updated (5dd6f0f1e11 -> f173792ad93)
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 5dd6f0f1e11 Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.3 to 3.6.0 (#14309) add f173792ad93 Bump com.google.cloud:libraries-bom from 26.39.0 to 26.40.0 (#14308) 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 org.apache.maven.plugins:maven-shade-plugin from 3.5.3 to 3.6.0 (#14309)
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 5dd6f0f1e11 Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.3 to 3.6.0 (#14309) 5dd6f0f1e11 is described below commit 5dd6f0f1e115aeb3502bce4f059dd10747ababef Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jun 3 09:54:29 2024 +0200 Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.3 to 3.6.0 (#14309) Bumps [org.apache.maven.plugins:maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.5.3 to 3.6.0. - [Release notes](https://github.com/apache/maven-shade-plugin/releases) - [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.5.3...maven-shade-plugin-3.6.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-shade-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 0daf2a41201..0334b9e6ddc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -346,7 +346,7 @@ 3.1.1 3.2.0 1.9.20 -3.5.3 +3.6.0 3.4.2 3.2.5 3.5.2
(camel) branch main updated (810806f2b0c -> a5b2ebe22e6)
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 810806f2b0c Bump jakarta.xml.soap:jakarta.xml.soap-api from 3.0.1 to 3.0.2 (#14306) add a5b2ebe22e6 Bump com.prowidesoftware:pw-iso20022 (#14307) 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 (b3abbae58d5 -> 810806f2b0c)
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 b3abbae58d5 Bump com.google.apis:google-api-services-calendar (#14304) add 810806f2b0c Bump jakarta.xml.soap:jakarta.xml.soap-api from 3.0.1 to 3.0.2 (#14306) 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 com.google.apis:google-api-services-calendar (#14304)
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 b3abbae58d5 Bump com.google.apis:google-api-services-calendar (#14304) b3abbae58d5 is described below commit b3abbae58d55fffc428cecafce4d2464c1553e88 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jun 3 09:53:30 2024 +0200 Bump com.google.apis:google-api-services-calendar (#14304) Bumps com.google.apis:google-api-services-calendar from v3-rev20240419-2.0.0 to v3-rev20240517-2.0.0. --- updated-dependencies: - dependency-name: com.google.apis:google-api-services-calendar dependency-type: direct:production ... 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 248393d5073..e4979661374 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -185,7 +185,7 @@ 1.23.0 2.5.1 v3-rev20240509-2.0.0 - v3-rev20240419-2.0.0 + v3-rev20240517-2.0.0 v4-rev20240514-2.0.0 v1-rev20240520-2.0.0 1.36.0
(camel) branch main updated (2bb0300a3ae -> d308d05af1f)
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 2bb0300a3ae CAMEL-20812: camel-netty-http: hostnameVerification option not used (#14294) add d308d05af1f Bump org.apache.maven.plugins:maven-enforcer-plugin from 3.4.1 to 3.5.0 (#14305) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch net deleted (was 3f9a37cdffc)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch net in repository https://gitbox.apache.org/repos/asf/camel.git was 3f9a37cdffc CAMEL-20812: camel-netty-http: hostnameVerification option not used 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 (a9a1e108203 -> 6825af1c4b5)
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 a9a1e108203 Bump aws-java-sdk2-version from 2.25.62 to 2.25.64 (#14302) add 6825af1c4b5 Bump huaweicloud-sdk-version from 3.1.97 to 3.1.98 (#14303) 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 (b0a19eb68e9 -> a9a1e108203)
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 b0a19eb68e9 CAMEL-20680 - fixed root cause of slow publish to partition 1 + CAMEL-20722 (#14298) add a9a1e108203 Bump aws-java-sdk2-version from 2.25.62 to 2.25.64 (#14302) 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: CAMEL-20680 - fixed root cause of slow publish to partition 1 + CAMEL-20722 (#14298)
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 b0a19eb68e9 CAMEL-20680 - fixed root cause of slow publish to
partition 1 + CAMEL-20722 (#14298)
b0a19eb68e9 is described below
commit b0a19eb68e969d3fc600c4f0130697bd2947
Author: Jang-Vijay Singh
AuthorDate: Mon Jun 3 08:30:11 2024 +0100
CAMEL-20680 - fixed root cause of slow publish to partition 1 + CAMEL-20722
(#14298)
CAMEL-20680 - fixed root cause of slow publish to partition 1 (add wait
and verify that required number of partitions are fully created before
being used as this is an asynchronous activity)
CAMEL-20722 - re-enabled test as the symptom from build 96 might go away
as a side effect of this
---
.../KafkaBreakOnFirstErrorSeekIssueIT.java | 52 --
1 file changed, 38 insertions(+), 14 deletions(-)
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java
index d7d715872c3..8058e72687b 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorSeekIssueIT.java
@@ -28,6 +28,7 @@ import
org.apache.camel.component.kafka.MockConsumerInterceptor;
import org.apache.camel.component.kafka.integration.common.KafkaAdminUtil;
import org.apache.camel.component.kafka.testutil.CamelKafkaUtil;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.kafka.clients.admin.CreateTopicsResult;
import org.apache.kafka.clients.admin.NewTopic;
import org.apache.kafka.clients.producer.ProducerRecord;
import org.awaitility.Awaitility;
@@ -37,12 +38,12 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Tags;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.condition.EnabledOnOs;
import org.junit.jupiter.api.condition.OS;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -55,13 +56,12 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
@EnabledOnOs(value = { OS.LINUX, OS.MAC, OS.FREEBSD, OS.OPENBSD, OS.WINDOWS },
architectures = { "amd64", "aarch64" },
disabledReason = "This test does not run reliably on some
platforms")
-@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*",
- disabledReason = "CAMEL-20722: Too unreliable on
most of the CI environments")
+
class KafkaBreakOnFirstErrorSeekIssueIT extends BaseExclusiveKafkaTestSupport {
public static final String ROUTE_ID = "breakOnFirstError-19894";
public static final String TOPIC = "breakOnFirstError-19894";
-
+public static final int PARTITION_COUNT = 2;
private static final Logger LOG =
LoggerFactory.getLogger(KafkaBreakOnFirstErrorSeekIssueIT.class);
@EndpointInject("mock:result")
@@ -75,12 +75,19 @@ class KafkaBreakOnFirstErrorSeekIssueIT extends
BaseExclusiveKafkaTestSupport {
kafkaAdminClient = KafkaAdminUtil.createAdminClient(service);
}
-// create the topic w/ 2 partitions
-final NewTopic mytopic = new NewTopic(TOPIC, 2, (short) 1);
-kafkaAdminClient.createTopics(Collections.singleton(mytopic));
+// create the topic w/ more than 1 partitions
+final NewTopic mytopic = new NewTopic(TOPIC, PARTITION_COUNT, (short)
1);
+ CreateTopicsResult r =
kafkaAdminClient.createTopics(Collections.singleton(mytopic));
+
+ // This wait is necessary to ensure that required number of
partitions are actually created
+ Awaitility.await()
+ .timeout(20, TimeUnit.SECONDS)
+ .pollDelay(5, TimeUnit.SECONDS)
+ .untilAsserted(() ->
assertTrue(r.numPartitions(TOPIC).isDone()));
+
}
-@BeforeEach
+ @BeforeEach
public void init() {
// setup the producer
@@ -98,15 +105,23 @@ class KafkaBreakOnFirstErrorSeekIssueIT extends
BaseExclusiveKafkaTestSupport {
kafkaAdminClient.deleteTopics(Collections.singletonList(TOPIC)).all();
}
+
+
@Test
void testCamel19894TestFix() throws Exception {
to.reset();
// will consume the payloads from partition 0
-
(camel) branch main updated: Bump io.pinecone:pinecone-client from 1.0.0 to 1.2.1 (#14301)
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 5578ac5b952 Bump io.pinecone:pinecone-client from 1.0.0 to 1.2.1 (#14301) 5578ac5b952 is described below commit 5578ac5b952adbd398603f06afd74872ebba6785 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jun 3 09:27:07 2024 +0200 Bump io.pinecone:pinecone-client from 1.0.0 to 1.2.1 (#14301) Bumps [io.pinecone:pinecone-client](https://github.com/pinecone-io/pinecone-java-client) from 1.0.0 to 1.2.1. - [Release notes](https://github.com/pinecone-io/pinecone-java-client/releases) - [Changelog](https://github.com/pinecone-io/pinecone-java-client/blob/main/CHANGELOG.md) - [Commits](https://github.com/pinecone-io/pinecone-java-client/compare/v1.0.0...v1.2.1) --- updated-dependencies: - dependency-name: io.pinecone:pinecone-client 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 f88b825dd1e..57186a5aae5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -398,7 +398,7 @@ 42.7.3 0.8.9 4.7.6 -1.0.0 +1.2.1 0.12.0 3.1.6 1.2.1
(camel) branch net updated (0b5c5500eec -> 3f9a37cdffc)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch net in repository https://gitbox.apache.org/repos/asf/camel.git from 0b5c5500eec CAMEL-20812: camel-netty-http: hostnameVerification option not used add 3f9a37cdffc CAMEL-20812: camel-netty-http: hostnameVerification option not used No new revisions were added by this update. Summary of changes: .../dsl/NettyHttpComponentBuilderFactory.java | 36 +++--- 1 file changed, 18 insertions(+), 18 deletions(-)
(camel) branch net updated (5b61290cff8 -> 0b5c5500eec)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch net in repository https://gitbox.apache.org/repos/asf/camel.git from 5b61290cff8 CAMEL-20812: camel-netty-http: hostnameVerification option not used add 0b5c5500eec CAMEL-20812: camel-netty-http: hostnameVerification option not used No new revisions were added by this update. Summary of changes: .../camel/catalog/components/netty-http.json | 92 +-- .../camel/component/netty/http/netty-http.json | 92 +-- .../dsl/NettyHttpEndpointBuilderFactory.java | 180 ++--- .../camel/kotlin/components/NettyHttpUriDsl.kt | 28 ++-- 4 files changed, 196 insertions(+), 196 deletions(-)
(camel) branch net updated (b4f72af3d66 -> 5b61290cff8)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch net
in repository https://gitbox.apache.org/repos/asf/camel.git
discard b4f72af3d66 CAMEL-20812: camel-netty-http: hostnameVerification option
not used
add ed5b774f06e CAMEL-20785: fixes JUnit 5 API abuses
add 2b9391f3f3b CAMEL-20823 Filter out folders when listing files
add 706ea8d28fa CAMEL-20824: camel-core - Backlog tracer should include
internal exchange properties
add e8ea0225e57 CAMEL-20825: camel-rest - Contract first for api-doc
should include the spec
add 8eac2405fff CAMEL-20825: camel-rest - Contract first for api-doc
should include the spec
add 2cbf7047654 Regen SBOM from commit
8eac2405fff282c7b37a43fc6c53a91421083f7a (#14299)
add 6e663329c79 CAMEL-20825: camel-rest - Contract first for api-doc
should include the spec
add 9b90ee93615 CAMEL-20825: camel-rest - Contract first for api-doc
should include the spec
add 4a4f78d43c8 camel-jbang - Allow to specifiy port in jolokia command
add 5b61290cff8 CAMEL-20812: camel-netty-http: hostnameVerification option
not used
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b4f72af3d66)
\
N -- N -- N refs/heads/net (5b61290cff8)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
camel-sbom/camel-sbom.json | 18672 +--
camel-sbom/camel-sbom.xml | 15144 ---
.../camel/catalog/models/restConfiguration.json| 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 1 +
.../SqsProducerAutoCreateQueueLocalstackIT.java| 8 +-
.../file/watch/FileWatchComponentTestBase.java |13 +-
.../component/jpa/JpaWithOptionsTestSupport.java | 5 +-
.../component/nitrite/AbstractNitriteTest.java |15 +-
components/camel-openapi-java/pom.xml | 4 +
.../apache/camel/openapi/RestOpenApiReader.java|67 +-
.../org/apache/camel/openapi/ComplexTypesTest.java | 4 +
.../org/apache/camel/openapi/DummyHttpEngine.java} |21 +-
.../RestOpenApiReaderApiDocsOverrideTest.java | 4 +
.../openapi/RestOpenApiReaderApiDocsTest.java | 4 +
.../openapi/RestOpenApiReaderContextPathTest.java | 4 +
.../openapi/RestOpenApiReaderDayOfWeekTest.java| 4 +
.../openapi/RestOpenApiReaderDisabledTest.java | 4 +
...RestOpenApiReaderEnableVendorExtensionTest.java | 4 +
.../RestOpenApiReaderFileResponseModelTest.java| 4 +
.../RestOpenApiReaderModelApiSecurityTest.java | 4 +
.../RestOpenApiReaderModelBookOrderTest.java | 4 +
.../camel/openapi/RestOpenApiReaderModelTest.java | 4 +
.../RestOpenApiReaderPropertyPlaceholderTest.java | 4 +
.../camel/openapi/RestOpenApiReaderTest.java | 4 +
.../apache/camel/openapi/RestOpenApiV3XOfTest.java | 4 +
.../camel/openapi/producer/RestOpenApiGetTest.java | 5 +
.../producer/RestOpenApiGetUriParamTest.java | 5 +
...SpringRestOpenApiReaderModelApiSecurityTest.xml | 3 +
.../apache/camel/component/smb/SmbConsumer.java| 2 +-
.../org/apache/camel/spi/RestConfiguration.java| 3 +-
.../apache/camel/model/rest/restConfiguration.json | 2 +-
.../camel/model/rest/RestHostNameResolver.java | 3 +-
.../camel/management/BacklogTracerFilterTest.java | 9 +
.../management/BacklogTracerIdOnAllNodesTest.java | 6 +
.../camel/management/BacklogTracerPatternTest.java | 6 +
.../management/BacklogTracerStreamCachingTest.java | 3 +
.../apache/camel/management/BacklogTracerTest.java |24 +
.../org/apache/camel/support/MessageHelper.java| 4 +-
.../modules/ROOT/pages/rest-dsl-openapi.adoc |33 +-
.../dsl/jbang/core/commands/process/Jolokia.java |13 +-
.../dsl/yaml/deserializers/ModelDeserializers.java | 2 +-
.../generated/resources/schema/camelYamlDsl.json | 2 +-
42 files changed, 16388 insertions(+), 17745 deletions(-)
copy
components/{camel-platform-http/src/test/java/org/apache/camel/component/platform/http/JettyCustomPlatformHttpEngine.java
=>
camel-openapi-java/src/test/java/org/apache/camel/openapi/DummyHttpEngine.java}
(64%)
(camel) branch main updated: camel-jbang - Allow to specifiy port in jolokia command
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 4a4f78d43c8 camel-jbang - Allow to specifiy port in jolokia command
4a4f78d43c8 is described below
commit 4a4f78d43c89c42ed0f1ffe052cdabaff64298a2
Author: Claus Ibsen
AuthorDate: Sun Jun 2 17:56:29 2024 +0200
camel-jbang - Allow to specifiy port in jolokia command
---
.../camel/dsl/jbang/core/commands/process/Jolokia.java | 13 ++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
index 111d5eeeda8..355c7f49124 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
@@ -36,6 +36,10 @@ public class Jolokia extends ProcessBaseCommand {
description = "Stops the Jolokia JVM Agent in the
running Camel integration")
boolean stop;
+@CommandLine.Option(names = { "--port" },
+description = "To use a specific port number when
attaching Jolokia JVM Agent (default a free port is found in range 8778-)")
+int port;
+
private volatile long pid;
public Jolokia(CamelJBangMain main) {
@@ -60,10 +64,13 @@ public class Jolokia extends ProcessBaseCommand {
if (stop) {
options = new OptionsAndArgs(null, "stop", Long.toString(pid));
} else {
-// find a new free port to use when starting a new connection
-long port = AvailablePortFinder.getNextAvailable(8778, 1);
+long p = port;
+if (p <= 0) {
+// find a new free port to use when starting a new
connection
+p = AvailablePortFinder.getNextAvailable(8778, 1);
+}
options = new OptionsAndArgs(
-null, "--port", Long.toString(port),
"--discoveryEnabled", "true", "start", Long.toString(pid));
+null, "--port", Long.toString(p),
"--discoveryEnabled", "true", "start", Long.toString(pid));
}
VirtualMachineHandlerOperations vmHandler =
PlatformUtils.createVMAccess(options);
CommandDispatcher dispatcher = new CommandDispatcher(options);
(camel) branch main updated: CAMEL-20825: camel-rest - Contract first for api-doc should include the spec
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 9b90ee93615 CAMEL-20825: camel-rest - Contract first for api-doc
should include the spec
9b90ee93615 is described below
commit 9b90ee93615433071e2b8cf58900252f7b04747e
Author: Claus Ibsen
AuthorDate: Sun Jun 2 17:51:16 2024 +0200
CAMEL-20825: camel-rest - Contract first for api-doc should include the spec
---
.../apache/camel/openapi/RestOpenApiReader.java| 2 +-
.../org/apache/camel/openapi/ComplexTypesTest.java | 4 +++
.../org/apache/camel/openapi/DummyHttpEngine.java | 35 ++
.../RestOpenApiReaderApiDocsOverrideTest.java | 4 +++
.../openapi/RestOpenApiReaderApiDocsTest.java | 4 +++
.../openapi/RestOpenApiReaderContextPathTest.java | 4 +++
.../openapi/RestOpenApiReaderDayOfWeekTest.java| 4 +++
.../openapi/RestOpenApiReaderDisabledTest.java | 4 +++
...RestOpenApiReaderEnableVendorExtensionTest.java | 4 +++
.../RestOpenApiReaderFileResponseModelTest.java| 4 +++
.../RestOpenApiReaderModelApiSecurityTest.java | 4 +++
.../RestOpenApiReaderModelBookOrderTest.java | 4 +++
.../camel/openapi/RestOpenApiReaderModelTest.java | 4 +++
.../RestOpenApiReaderPropertyPlaceholderTest.java | 4 +++
.../camel/openapi/RestOpenApiReaderTest.java | 4 +++
.../apache/camel/openapi/RestOpenApiV3XOfTest.java | 4 +++
.../camel/openapi/producer/RestOpenApiGetTest.java | 5
.../producer/RestOpenApiGetUriParamTest.java | 5
...SpringRestOpenApiReaderModelApiSecurityTest.xml | 3 ++
19 files changed, 105 insertions(+), 1 deletion(-)
diff --git
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
index 3f83205e055..05948b8ed4a 100644
---
a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
+++
b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java
@@ -167,7 +167,7 @@ public class RestOpenApiReader {
if (host == null || host.isEmpty()) {
String scheme = "http://;;
host =
RestComponentHelper.resolveRestHostName(host, restConfig);
-PlatformHttpComponent http =
camelContext.getComponent("platform-http", PlatformHttpComponent.class);
+PlatformHttpComponent http =
(PlatformHttpComponent) camelContext.hasComponent("platform-http");
if (http != null) {
int port = http.getEngine().getServerPort();
if (port > 0) {
diff --git
a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java
b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java
index b39ebeaa8d5..482a865d056 100644
---
a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java
+++
b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/ComplexTypesTest.java
@@ -27,6 +27,7 @@ import java.util.stream.Stream;
import io.swagger.v3.oas.models.OpenAPI;
import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.platform.http.spi.PlatformHttpEngine;
import org.apache.camel.impl.engine.DefaultClassResolver;
import org.apache.camel.model.rest.RestBindingMode;
import org.apache.camel.model.rest.RestDefinition;
@@ -52,6 +53,9 @@ public class ComplexTypesTest extends CamelTestSupport {
@BindToRegistry("dummy-rest")
private final DummyRestConsumerFactory factory = new
DummyRestConsumerFactory();
+@BindToRegistry("platform-http-engine")
+private PlatformHttpEngine engine = new DummyHttpEngine();
+
@Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/DummyHttpEngine.java
b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/DummyHttpEngine.java
new file mode 100644
index 000..cc1d0a4b46c
--- /dev/null
+++
b/components/camel-openapi-java/src/test/java/org/apache/camel/openapi/DummyHttpEngine.java
@@ -0,0 +1,35 @@
+/*
+ * 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
(camel) branch main updated: CAMEL-20825: camel-rest - Contract first for api-doc should include the spec
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 6e663329c79 CAMEL-20825: camel-rest - Contract first for api-doc should include the spec 6e663329c79 is described below commit 6e663329c796f78f2d9f4764aa46cbf911e2473c Author: Claus Ibsen AuthorDate: Sun Jun 2 17:39:32 2024 +0200 CAMEL-20825: camel-rest - Contract first for api-doc should include the spec --- .../src/main/java/org/apache/camel/openapi/RestOpenApiReader.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java index 81887163462..3f83205e055 100644 --- a/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java +++ b/components/camel-openapi-java/src/main/java/org/apache/camel/openapi/RestOpenApiReader.java @@ -68,7 +68,6 @@ import io.swagger.v3.parser.OpenAPIV3Parser; import io.swagger.v3.parser.core.models.SwaggerParseResult; import org.apache.camel.CamelContext; import org.apache.camel.component.platform.http.PlatformHttpComponent; -import org.apache.camel.component.platform.http.spi.PlatformHttpEngine; import org.apache.camel.model.rest.ApiKeyDefinition; import org.apache.camel.model.rest.BasicAuthDefinition; import org.apache.camel.model.rest.BearerTokenDefinition; @@ -95,7 +94,6 @@ import org.apache.camel.support.ObjectHelper; import org.apache.camel.support.PluginHelper; import org.apache.camel.support.RestComponentHelper; import org.apache.camel.util.FileUtil; -import org.apache.camel.util.HostUtils; import org.apache.camel.util.IOHelper; import org.apache.commons.lang3.ClassUtils; import org.slf4j.Logger;
(camel-spring-boot) 02/03: CAMEL-20781: Upgrade Spring Boot 3.1.12
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 commit ab2758b5c804d4e72614b9f82697d65f1ca4e23c Author: Claus Ibsen AuthorDate: Sun Jun 2 08:27:13 2024 +0200 CAMEL-20781: Upgrade Spring Boot 3.1.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c8743d895e..bb7452d62f4 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -3.1.11 +3.1.12 4.0.6-SNAPSHOT
(camel-spring-boot) 03/03: 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 commit a7d3e80306f56723587105135a9b93c55e5d17ba Author: Claus Ibsen AuthorDate: Sun Jun 2 08:41:53 2024 +0200 Regen --- tooling/camel-spring-boot-dependencies/pom.xml | 860 - 1 file changed, 430 insertions(+), 430 deletions(-) diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 52ffea8690c..63dfaa4bfa6 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.11 +1.11.12 io.micrometer micrometer-observation -1.11.11 +1.11.12 io.micrometer micrometer-registry-jmx -1.11.11 +1.11.12 io.micrometer micrometer-tracing -1.1.12 +1.1.13 org.apache.avro @@ -240,17 +240,17 @@ org.apache.camel.maven camel-debezium-maven-plugin -4.0.5 +4.0.6-SNAPSHOT org.apache.camel.maven camel-salesforce-maven-plugin -4.0.5 +4.0.6-SNAPSHOT org.apache.camel.maven camel-servicenow-maven-plugin -4.0.5 +4.0.6-SNAPSHOT org.apache.camel.springboot @@ -1940,2119 +1940,2119 @@ org.apache.camel.tests org.apache.camel.tests.mock-javamail_1.7 -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-activemq -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-allcomponents -4.0.5 +4.0.6-SNAPSHOT pom org.apache.camel camel-amqp -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-api -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-arangodb -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-as2 -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-as2-api -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-asn1 -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-asterisk -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-atmosphere-websocket -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-atom -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-attachments -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-avro -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-avro-rpc -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-avro-rpc-jetty -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-avro-rpc-spi -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-aws-cloudtrail -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-aws-secrets-manager -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-aws-xray -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-aws2-athena -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-aws2-cw -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-aws2-ddb -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-aws2-ec2 -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-aws2-ecs -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-aws2-eks -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-aws2-eventbridge -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-aws2-iam -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-aws2-kinesis -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-aws2-kms -4.0.5 +4.0.6-SNAPSHOT org.apache.camel camel-aws2-lambda -4.0.5 +4.0.6-SNAPSHOT
(camel-spring-boot) branch camel-spring-boot-4.0.x updated (e91f91e250b -> a7d3e80306f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-spring-boot-4.0.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git from e91f91e250b Target Camel 4.0.6-SNAPSHOT for development new fc35ddf5e5a Regen new ab2758b5c80 CAMEL-20781: Upgrade Spring Boot 3.1.12 new a7d3e80306f Regen The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../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 +- .../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 +- .../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-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 | 2 +- .../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.json | 2 +- .../springboot/catalog/components/dataset.json | 2 +- .../catalog/components/debezium-db2.json | 2 +- ..
(camel) branch camel-4.0.x updated: Regen
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 7cbc0e43d73 Regen
7cbc0e43d73 is described below
commit 7cbc0e43d734a024ae9a5389926c626696f55922
Author: Claus Ibsen
AuthorDate: Sun Jun 2 08:34:49 2024 +0200
Regen
---
.../catalog/releases/camel-quarkus-releases.json | 64 ++-
.../camel/catalog/releases/camel-releases.json | 125 +
2 files changed, 187 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
index b72cb8928a9..6fe71068f99 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
@@ -178,17 +178,41 @@
"date": "2023-08-02",
"jdk": "17"
},
+{
+"version": "3.10.0",
+"date": "2024-04-30",
+"jdk": "17, 21"
+},
+{
+"version": "3.11.0",
+"date": "2024-05-30",
+"jdk": "17, 21"
+},
{
"version": "3.2.0",
"date": "2023-09-01",
-"eol": "2024-03-01",
+"eol": "2024-07-06",
"kind": "lts",
"jdk": "17"
},
{
"version": "3.2.1",
"date": "2023-10-09",
-"eol": "2024-03-01",
+"eol": "2024-07-06",
+"kind": "lts",
+"jdk": "17"
+},
+{
+"version": "3.2.2",
+"date": "2023-11-07",
+"eol": "2024-07-06",
+"kind": "lts",
+"jdk": "17"
+},
+{
+"version": "3.2.3",
+"date": "2023-12-05",
+"eol": "2024-07-06",
"kind": "lts",
"jdk": "17"
},
@@ -201,5 +225,41 @@
"version": "3.5.0",
"date": "2023-10-25",
"jdk": "17"
+},
+{
+"version": "3.6.0",
+"date": "2023-11-29",
+"jdk": "17"
+},
+{
+"version": "3.7.0",
+"date": "2024-01-31",
+"jdk": "17"
+},
+{
+"version": "3.8.0",
+"date": "2024-02-28",
+"eol": "2025-02-12",
+"kind": "lts",
+"jdk": "17, 21"
+},
+{
+"version": "3.8.1",
+"date": "2024-03-19",
+"eol": "2025-02-12",
+"kind": "lts",
+"jdk": "17, 21"
+},
+{
+"version": "3.8.2",
+"date": "2024-05-03",
+"eol": "2025-02-12",
+"kind": "lts",
+"jdk": "17, 21"
+},
+{
+"version": "3.9.0",
+"date": "2024-03-27",
+"jdk": "17, 21"
}
]
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-releases.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-releases.json
index de7b53eea64..7714186bb48 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-releases.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-releases.json
@@ -376,6 +376,13 @@
"kind": "lts",
"jdk": "8,11"
},
+{
+"version": "3.14.10",
+"date": "2023-11-09",
+"eol": "2023-12-16",
+"kind": "lts",
+"jdk": "8, 11"
+},
{
"version": "3.14.2",
(camel) 02/02: CAMEL-20781: Upgrade Spring Boot 3.1.12
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 commit 2629081d002b4ffd3d2987cadd80e82218bfda53 Author: Claus Ibsen AuthorDate: Sun Jun 2 08:29:20 2024 +0200 CAMEL-20781: Upgrade Spring Boot 3.1.12 --- parent/pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 229f41acddb..53b4a206dce 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -335,8 +335,8 @@ 3.5.2 3.4.0 4.2.21 -1.11.11 -1.1.12 +1.11.12 +1.1.13 3.0.3 4.0.2 2.2.3 @@ -398,7 +398,7 @@ 2.3.1 1.0.4 3.5.16 -1.1.18 +1.1.19 3.23.2 2.1.0 5.3.1 @@ -424,11 +424,11 @@ 3.7.7 1.9.5_1 2.3-groovy-4.0 -5.0.3 +5.0.5 3.1.2 3.1.5 3.0.4 -6.0.19 +6.0.21 3.0.10 6.1.9 4.0.10
(camel) branch camel-4.0.x updated (204a6d56268 -> 2629081d002)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-4.0.x in repository https://gitbox.apache.org/repos/asf/camel.git from 204a6d56268 CAMEL-20731: mvn camel-report:route-coverage fails on routes with multiple doCatch blocks new 7cd9fbd6144 Regen new 2629081d002 CAMEL-20781: Upgrade Spring Boot 3.1.12 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: .../apache/camel/catalog/components/activemq.json | 2 +- .../org/apache/camel/catalog/components/amqp.json | 2 +- .../apache/camel/catalog/components/arangodb.json | 2 +- .../org/apache/camel/catalog/components/as2.json | 2 +- .../apache/camel/catalog/components/asterisk.json | 2 +- .../catalog/components/atmosphere-websocket.json | 2 +- .../org/apache/camel/catalog/components/atom.json | 2 +- .../org/apache/camel/catalog/components/avro.json | 2 +- .../camel/catalog/components/aws-cloudtrail.json | 2 +- .../catalog/components/aws-secrets-manager.json| 2 +- .../camel/catalog/components/aws2-athena.json | 2 +- .../apache/camel/catalog/components/aws2-cw.json | 2 +- .../apache/camel/catalog/components/aws2-ddb.json | 2 +- .../camel/catalog/components/aws2-ddbstream.json | 2 +- .../apache/camel/catalog/components/aws2-ec2.json | 2 +- .../apache/camel/catalog/components/aws2-ecs.json | 2 +- .../apache/camel/catalog/components/aws2-eks.json | 2 +- .../camel/catalog/components/aws2-eventbridge.json | 2 +- .../apache/camel/catalog/components/aws2-iam.json | 2 +- .../catalog/components/aws2-kinesis-firehose.json | 2 +- .../camel/catalog/components/aws2-kinesis.json | 2 +- .../apache/camel/catalog/components/aws2-kms.json | 2 +- .../camel/catalog/components/aws2-lambda.json | 2 +- .../apache/camel/catalog/components/aws2-mq.json | 2 +- .../apache/camel/catalog/components/aws2-msk.json | 2 +- .../apache/camel/catalog/components/aws2-s3.json | 2 +- .../apache/camel/catalog/components/aws2-ses.json | 2 +- .../apache/camel/catalog/components/aws2-sns.json | 2 +- .../apache/camel/catalog/components/aws2-sqs.json | 2 +- .../catalog/components/aws2-step-functions.json| 2 +- .../apache/camel/catalog/components/aws2-sts.json | 2 +- .../camel/catalog/components/aws2-translate.json | 2 +- .../camel/catalog/components/azure-cosmosdb.json | 2 +- .../camel/catalog/components/azure-eventhubs.json | 2 +- .../camel/catalog/components/azure-files.json | 2 +- .../camel/catalog/components/azure-key-vault.json | 2 +- .../camel/catalog/components/azure-servicebus.json | 2 +- .../catalog/components/azure-storage-blob.json | 2 +- .../catalog/components/azure-storage-datalake.json | 2 +- .../catalog/components/azure-storage-queue.json| 2 +- .../camel/catalog/components/bean-validator.json | 2 +- .../org/apache/camel/catalog/components/bean.json | 2 +- .../apache/camel/catalog/components/bonita.json| 2 +- .../org/apache/camel/catalog/components/box.json | 2 +- .../apache/camel/catalog/components/braintree.json | 2 +- .../apache/camel/catalog/components/browse.json| 2 +- .../camel/catalog/components/caffeine-cache.json | 2 +- .../catalog/components/caffeine-loadcache.json | 2 +- .../camel/catalog/components/chatscript.json | 2 +- .../org/apache/camel/catalog/components/chunk.json | 2 +- .../org/apache/camel/catalog/components/class.json | 2 +- .../apache/camel/catalog/components/cm-sms.json| 2 +- .../apache/camel/catalog/components/coap+tcp.json | 2 +- .../org/apache/camel/catalog/components/coap.json | 2 +- .../apache/camel/catalog/components/coaps+tcp.json | 2 +- .../org/apache/camel/catalog/components/coaps.json | 2 +- .../apache/camel/catalog/components/cometd.json| 2 +- .../apache/camel/catalog/components/cometds.json | 2 +- .../apache/camel/catalog/components/consul.json| 2 +- .../camel/catalog/components/controlbus.json | 2 +- .../apache/camel/catalog/components/couchbase.json | 2 +- .../apache/camel/catalog/components/couchdb.json | 2 +- .../org/apache/camel/catalog/components/cql.json | 2 +- .../org/apache/camel/catalog/components/cron.json | 2 +- .../apache/camel/catalog/components/crypto.json| 2 +- .../org/apache/camel/catalog/components/cxf.json | 2 +- .../org/apache/camel/catalog/components/cxfrs.json | 2 +- .../camel/catalog/components/dataformat.json | 2 +- .../camel/catalog/components/dataset-test.json | 2 +- .../apache/camel/catalog/components/dataset.json | 2 +- .../camel/catalog/components/debezium-db2.json | 2 +- .../came
(camel) 03/04: Update known releases in catalog
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 f8e50c89611728aaf22bdfdb2548b1e92641b67d
Author: Claus Ibsen
AuthorDate: Sun Jun 2 08:15:34 2024 +0200
Update known releases in catalog
---
.../catalog/releases/camel-quarkus-releases.json | 19
.../camel/catalog/releases/camel-releases.json | 26 ++
2 files changed, 45 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
index fc927e5941f..453b22c38c1 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json
@@ -178,6 +178,16 @@
"date": "2023-08-02",
"jdk": "17"
},
+{
+"version": "3.10.0",
+"date": "2024-04-30",
+"jdk": "17,21"
+},
+{
+"version": "3.11.0",
+"date": "2024-05-30",
+"jdk": "17,21"
+},
{
"version": "3.2.0",
"date": "2023-09-01",
@@ -230,12 +240,21 @@
"version": "3.8.0",
"date": "2024-02-28",
"eol": "2025-02-12",
+"kind": "lts",
"jdk": "17,21"
},
{
"version": "3.8.1",
"date": "2024-03-19",
"eol": "2025-02-12",
+"kind": "lts",
+"jdk": "17,21"
+},
+{
+"version": "3.8.2",
+"date": "2024-05-03",
+"eol": "2025-02-12",
+"kind": "lts",
"jdk": "17,21"
},
{
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-releases.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-releases.json
index 8cb72a2d075..d567befb99c 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-releases.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-releases.json
@@ -646,6 +646,13 @@
"kind": "lts",
"jdk": "11,17"
},
+{
+"version": "3.22.2",
+"date": "2024-05-05",
+"eol": "2024-12-31",
+"kind": "lts",
+"jdk": "11,17"
+},
{
"version": "3.3.0",
"date": "2020-05-15",
@@ -841,6 +848,13 @@
"kind": "lts",
"jdk": "17"
},
+{
+"version": "4.0.5",
+"date": "2024-04-26",
+"eol": "2024-08-14",
+"kind": "lts",
+"jdk": "17"
+},
{
"version": "4.1.0",
"date": "2023-10-11",
@@ -870,9 +884,21 @@
"kind": "lts",
"jdk": "17,21"
},
+{
+"version": "4.4.2",
+"date": "2024-04-25",
+"eol": "2025-02-17",
+"kind": "lts",
+"jdk": "17,21"
+},
{
"version": "4.5.0",
"date": "2024-03-28",
"jdk": "17,21"
+},
+{
+"version": "4.6.0",
+"date": "2024-05-10",
+"jdk": "17,21"
}
]
(camel) 04/04: CAMEL-20780: Upgrade Spring Boot 3.2.6
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 8ab4759a3e00f2f83e149bf085b01f8e63a4ded4 Author: Claus Ibsen AuthorDate: Sun Jun 2 08:23:46 2024 +0200 CAMEL-20780: Upgrade Spring Boot 3.2.6 --- parent/pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index b7c2605c021..76c338ceaf7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -338,8 +338,8 @@ 3.5.2 3.4.0 4.2.25 -1.12.5 -1.2.5 +1.12.6 +1.2.6 3.1 4.0.2 2.2.3 @@ -402,7 +402,7 @@ 2.3.1 1.0.4 3.6.5 -1.1.18 +1.1.19 3.26.0 2.2.0 5.4.0 @@ -428,11 +428,11 @@ 3.7.8 1.9.5_1 2.3-groovy-4.0 -5.1.1 +5.1.2 3.2.2 3.2.3 3.1.1 -6.1.6 +6.1.8 3.1.1 6.2.4 4.0.10
(camel) branch camel-4.4.x updated (5caf7fef9f3 -> 8ab4759a3e0)
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 5caf7fef9f3 CAMEL-20819: camel-jbang - Reload mode with supervising route controller does not reload routes new 38ffddbddcb Regen new 3844d01707f Regen new f8e50c89611 Update known releases in catalog new 8ab4759a3e0 CAMEL-20780: Upgrade Spring Boot 3.2.6 The 4 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-sbom/camel-sbom.json | 7422 +-- camel-sbom/camel-sbom.xml | 7444 ++-- .../apache/camel/catalog/components/activemq.json |2 +- .../org/apache/camel/catalog/components/amqp.json |2 +- .../apache/camel/catalog/components/arangodb.json |2 +- .../org/apache/camel/catalog/components/as2.json |2 +- .../apache/camel/catalog/components/asterisk.json |2 +- .../catalog/components/atmosphere-websocket.json |2 +- .../org/apache/camel/catalog/components/atom.json |2 +- .../org/apache/camel/catalog/components/avro.json |2 +- .../camel/catalog/components/aws-cloudtrail.json |2 +- .../camel/catalog/components/aws-config.json |2 +- .../catalog/components/aws-secrets-manager.json|2 +- .../camel/catalog/components/aws2-athena.json |2 +- .../apache/camel/catalog/components/aws2-cw.json |2 +- .../apache/camel/catalog/components/aws2-ddb.json |2 +- .../camel/catalog/components/aws2-ddbstream.json |2 +- .../apache/camel/catalog/components/aws2-ec2.json |2 +- .../apache/camel/catalog/components/aws2-ecs.json |2 +- .../apache/camel/catalog/components/aws2-eks.json |2 +- .../camel/catalog/components/aws2-eventbridge.json |2 +- .../apache/camel/catalog/components/aws2-iam.json |2 +- .../catalog/components/aws2-kinesis-firehose.json |2 +- .../camel/catalog/components/aws2-kinesis.json |2 +- .../apache/camel/catalog/components/aws2-kms.json |2 +- .../camel/catalog/components/aws2-lambda.json |2 +- .../apache/camel/catalog/components/aws2-mq.json |2 +- .../apache/camel/catalog/components/aws2-msk.json |2 +- .../catalog/components/aws2-redshift-data.json |2 +- .../apache/camel/catalog/components/aws2-s3.json |2 +- .../apache/camel/catalog/components/aws2-ses.json |2 +- .../apache/camel/catalog/components/aws2-sns.json |2 +- .../apache/camel/catalog/components/aws2-sqs.json |2 +- .../catalog/components/aws2-step-functions.json|2 +- .../apache/camel/catalog/components/aws2-sts.json |2 +- .../camel/catalog/components/aws2-timestream.json |2 +- .../camel/catalog/components/aws2-translate.json |2 +- .../camel/catalog/components/azure-cosmosdb.json |2 +- .../camel/catalog/components/azure-eventhubs.json |2 +- .../camel/catalog/components/azure-files.json |2 +- .../camel/catalog/components/azure-key-vault.json |2 +- .../camel/catalog/components/azure-servicebus.json |2 +- .../catalog/components/azure-storage-blob.json |2 +- .../catalog/components/azure-storage-datalake.json |2 +- .../catalog/components/azure-storage-queue.json|2 +- .../camel/catalog/components/bean-validator.json |2 +- .../org/apache/camel/catalog/components/bean.json |2 +- .../apache/camel/catalog/components/bonita.json|2 +- .../org/apache/camel/catalog/components/box.json |2 +- .../apache/camel/catalog/components/braintree.json |2 +- .../apache/camel/catalog/components/browse.json|2 +- .../camel/catalog/components/caffeine-cache.json |2 +- .../catalog/components/caffeine-loadcache.json |2 +- .../camel/catalog/components/chatscript.json |2 +- .../org/apache/camel/catalog/components/chunk.json |2 +- .../org/apache/camel/catalog/components/class.json |2 +- .../apache/camel/catalog/components/cm-sms.json|2 +- .../apache/camel/catalog/components/coap+tcp.json |2 +- .../org/apache/camel/catalog/components/coap.json |2 +- .../apache/camel/catalog/components/coaps+tcp.json |2 +- .../org/apache/camel/catalog/components/coaps.json |2 +- .../apache/camel/catalog/components/cometd.json|2 +- .../apache/camel/catalog/components/cometds.json |2 +- .../apache/camel/catalog/components/consul.json|2 +- .../camel/catalog/components/controlbus.json |2 +- .../apache/camel/catalog/components/couchbase.json |2 +- .../apache/camel/catalog/components/couchdb.json |2 +- .../org/apache/camel/catalog/components/cql.json |2 +- .../org/
(camel-spring-boot) 03/03: Regen
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 commit 72dfd0c2ad802fcf481cee6e7905b5f82b6440fe Author: Claus Ibsen AuthorDate: Sun Jun 2 08:23:36 2024 +0200 Regen --- tooling/camel-spring-boot-dependencies/pom.xml | 884 - 1 file changed, 442 insertions(+), 442 deletions(-) diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 67664fef903..9b887a88a97 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -210,27 +210,27 @@ io.micrometer micrometer-commons -1.12.5 +1.12.6 io.micrometer micrometer-observation -1.12.5 +1.12.6 io.micrometer micrometer-registry-jmx -1.12.5 +1.12.6 io.micrometer micrometer-registry-prometheus -1.12.5 +1.12.6 io.micrometer micrometer-tracing -1.2.5 +1.2.6 net.bytebuddy @@ -265,17 +265,17 @@ org.apache.camel.maven camel-debezium-maven-plugin -4.4.2 +4.4.3-SNAPSHOT org.apache.camel.maven camel-salesforce-maven-plugin -4.4.2 +4.4.3-SNAPSHOT org.apache.camel.maven camel-servicenow-maven-plugin -4.4.2 +4.4.3-SNAPSHOT org.apache.camel.springboot @@ -2000,2174 +2000,2174 @@ org.apache.camel.tests org.apache.camel.tests.mock-javamail_1.7 -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-activemq -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-allcomponents -4.4.2 +4.4.3-SNAPSHOT pom org.apache.camel camel-amqp -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-api -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-arangodb -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-as2 -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-as2-api -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-asn1 -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-asterisk -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-atmosphere-websocket -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-atom -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-attachments -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-avro -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-avro-rpc -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-avro-rpc-jetty -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-avro-rpc-spi -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-aws-cloudtrail -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-aws-config -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-aws-secrets-manager -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-aws-xray -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-aws2-athena -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-aws2-cw -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-aws2-ddb -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-aws2-ec2 -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-aws2-ecs -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-aws2-eks -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-aws2-eventbridge -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-aws2-iam -4.4.2 +4.4.3-SNAPSHOT org.apache.camel camel-aws2-kinesis -4.4.2 +4.4.3-SNAPSHOT
(camel-spring-boot) 02/03: CAMEL-20780: Upgrade Spring Boot 3.2.6
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 commit ab1c49a6508399dfaab4edbddb284c710c8e0dc2 Author: Claus Ibsen AuthorDate: Sun Jun 2 08:19:14 2024 +0200 CAMEL-20780: Upgrade Spring Boot 3.2.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2baa3a1839e..4e8998411b0 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -3.2.5 +3.2.6 4.4.3-SNAPSHOT
(camel-spring-boot) branch camel-spring-boot-4.4.x updated (1ab1ecd4edb -> 72dfd0c2ad8)
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 1ab1ecd4edb cherry-pick CAMEL-20738 Make Jasypt beans conditional so that can be overridden (#1141) new 24e154eae19 Regen new ab1c49a6508 CAMEL-20780: Upgrade Spring Boot 3.2.6 new 72dfd0c2ad8 Regen The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../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 | 2 +- .../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 +- .../springboo
(camel) branch camel-4.4.x updated: CAMEL-20819: camel-jbang - Reload mode with supervising route controller does not reload routes
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 5caf7fef9f3 CAMEL-20819: camel-jbang - Reload mode with supervising
route controller does not reload routes
5caf7fef9f3 is described below
commit 5caf7fef9f30a1234c45c3f13fbec495d4d775b5
Author: Claus Ibsen
AuthorDate: Fri May 31 10:33:20 2024 +0200
CAMEL-20819: camel-jbang - Reload mode with supervising route controller
does not reload routes
---
.../org/apache/camel/spi/SupervisingRouteController.java | 14 ++
.../impl/engine/DefaultSupervisingRouteController.java| 15 ++-
.../main/java/org/apache/camel/builder/RouteBuilder.java | 8
.../mbean/ManagedSupervisingRouteControllerMBean.java | 3 +++
.../mbean/ManagedSupervisingRouteController.java | 5 +
.../camel/support/FileWatcherResourceReloadStrategy.java | 2 +-
6 files changed, 45 insertions(+), 2 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/SupervisingRouteController.java
b/core/camel-api/src/main/java/org/apache/camel/spi/SupervisingRouteController.java
index f80e8248bda..649cadaeb62 100644
---
a/core/camel-api/src/main/java/org/apache/camel/spi/SupervisingRouteController.java
+++
b/core/camel-api/src/main/java/org/apache/camel/spi/SupervisingRouteController.java
@@ -179,4 +179,18 @@ public interface SupervisingRouteController extends
RouteController {
*/
boolean isStartingRoutes();
+/**
+ * Started routes
+ */
+default void startRoutes() {
+startRoutes(false);
+}
+
+/**
+ * Started routes
+ *
+ * @param reloaded whether the routes to be started is part of reloading
routes
+ */
+void startRoutes(boolean reloaded);
+
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
index 9eaaa2b0766..a0e3b64d7c6 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
@@ -76,6 +76,7 @@ public class DefaultSupervisingRouteController extends
DefaultRouteController im
private final RouteManager routeManager;
private volatile CamelContextStartupListener listener;
private volatile boolean startingRoutes = true; // state during starting
routes on bootstrap
+private volatile boolean reloadingRoutes;
private volatile BackOffTimer timer;
private volatile ScheduledExecutorService executorService;
private volatile BackOff backOff;
@@ -100,6 +101,17 @@ public class DefaultSupervisingRouteController extends
DefaultRouteController im
this.routeManager = new RouteManager();
}
+@Override
+public void startRoutes(boolean reloaded) {
+reloadingRoutes = reloaded;
+try {
+startNonSupervisedRoutes();
+startSupervisedRoutes();
+} finally {
+reloadingRoutes = false;
+}
+}
+
// *
// Properties
// *
@@ -520,7 +532,8 @@ public class DefaultSupervisingRouteController extends
DefaultRouteController im
}
}
-if (getCamelContext().getStartupSummaryLevel() !=
StartupSummaryLevel.Off
+// reloading routes has its own summary
+if (!reloadingRoutes && getCamelContext().getStartupSummaryLevel() !=
StartupSummaryLevel.Off
&& getCamelContext().getStartupSummaryLevel() !=
StartupSummaryLevel.Oneline) {
// log after first round of attempts (some routes may be scheduled
for restart)
logRouteStartupSummary();
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
index 6c3d491ae99..c0e3909fc26 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
@@ -56,6 +56,7 @@ import org.apache.camel.spi.PropertiesComponent;
import org.apache.camel.spi.Resource;
import org.apache.camel.spi.ResourceAware;
import org.apache.camel.spi.RestConfiguration;
+import org.apache.camel.spi.SupervisingRouteController;
import org.apache.camel.support.LifecycleStrategySupport;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
@@ -701,6 +702,13 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
// trigger upda
