(camel) branch main updated: CAMEL-20911: camel-jbang - Export to Quarkus should include workaround for a CEQ bug that causes Camel to not start at all.
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 a4997d07fde CAMEL-20911: camel-jbang - Export to Quarkus should
include workaround for a CEQ bug that causes Camel to not start at all.
a4997d07fde is described below
commit a4997d07fdee75475c7e1f004ce588bc26dbb2bf
Author: Claus Ibsen
AuthorDate: Wed Jun 26 07:40:33 2024 +0200
CAMEL-20911: camel-jbang - Export to Quarkus should include workaround for
a CEQ bug that causes Camel to not start at all.
---
.../org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java | 8
1 file changed, 8 insertions(+)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
index 858d7693a4e..4e70d9c932d 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
@@ -32,6 +32,7 @@ import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.dsl.jbang.core.common.CatalogLoader;
import org.apache.camel.dsl.jbang.core.common.CommandLineHelper;
import org.apache.camel.dsl.jbang.core.common.RuntimeUtil;
+import org.apache.camel.dsl.jbang.core.common.VersionHelper;
import org.apache.camel.tooling.maven.MavenGav;
import org.apache.camel.tooling.model.ArtifactModel;
import org.apache.camel.util.CamelCaseOrderedProperties;
@@ -191,6 +192,13 @@ class ExportQuarkus extends Export {
properties.setProperty("camel.main.routes-include-pattern",
routes);
}
}
+
+// CAMEL-20911 workaround due to a bug in CEQ 3.11 and 3.12
+if (VersionHelper.isBetween(quarkusVersion, "3.11", "3.13")) {
+if
(!properties.containsKey("quarkus.camel.openapi.codegen.model-package")) {
+properties.put("quarkus.camel.openapi.codegen.model-package",
"org.apache.camel.quarkus");
+}
+}
}
private static String removeScheme(String s) {
(camel) branch regen_bot updated (7a316a0f33c -> 6da0d416cbc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 7a316a0f33c Update releases in catalog add 1a6a1666e71 camel-core - Using shared dummy exchange instance for special needs i… (#14616) add 87c8e832e9f remote vs local counter to better observe how many internal and external messages is being processed (#14617) add e0676a7d577 Regen SBOM from commit 87c8e832e9f73ae1f33867085f82b9303bb69939 (#14619) add f74ebce1a48 CAMEL-20879: camel-core: remote vs local endpoints counters add 91d04880525 CAMEL-20722 - increase consumer count, add Availability wait (#14620) add b4091909277 chore(deps): Bump huaweicloud-sdk-version from 3.1.101 to 3.1.102 (#14621) add b1122f4abcc chore(deps): Bump sshd-version from 2.13.0 to 2.13.1 (#14622) add 12086f46c4b chore(deps): Bump undertow-version from 2.3.13.Final to 2.3.14.Final (#14624) add 99a8ddb1596 chore(deps): Bump aws-java-sdk2-version from 2.26.5 to 2.26.7 (#14623) add 90fe5209b0e chore(deps-dev): Bump com.networknt:json-schema-validator (#14626) add b104d8b3af8 chore(deps): Bump io.github.littleproxy:littleproxy from 2.2.1 to 2.2.3 (#14625) add b52830b560f CAMEL-20794: AWS2 Kinesis producer supports sending batch (#14618) add 6ddb848a250 CAMEL-20906: camel-core - Route reload NPE. Add WARN and avoid NPE. add b84db97df62 CAMEL-20901: Add an option to provide a custom Vertx instance to ArangoDB add d7f818d04ae Upgrade to Quarkus 3.11.3 add 367757d6496 Upgrade to SB 3.3.1 add f765808912e CAMEL-20909 - Camel-Aws-Kinesis: Support KCL Consumers (#14628) add d5062309366 chore(deps): Bump aws-java-sdk2-version from 2.26.7 to 2.26.8 (#14631) add 9754c5937b6 chore(deps): Bump org.apache.drill.exec:drill-jdbc-all (#14632) add 6ab2e71bf0c chore(deps): Bump io.minio:minio from 8.5.10 to 8.5.11 (#14633) add 5cac6d7e734 chore(deps): Bump org.apache.maven.plugins:maven-dependency-plugin (#14634) add 0d15379c6e9 chore(deps): Bump com.twilio.sdk:twilio from 10.2.1 to 10.3.0 (#14630) add f52826cbb86 chore(deps-dev): Bump com.fasterxml.woodstox:woodstox-core (#14629) add a28edec232b chore(deps): Bump io.smallrye.config:smallrye-config from 3.8.2 to 3.8.3 (#14635) add 2b202110f88 chore(deps): Bump org.wiremock:wiremock from 3.6.0 to 3.7.0 (#14636) add a35c86036cb CAMEL-20838: use a JUnit extension for collecting the test name when necessary add 111c1d56377 camel-mail - Fix stream caching with pollEnrich and attachment (#14638) add 8a2116fb4b9 CAMEL-20912, CAMEL-20913 - Camel-AWS-Kinesis: KCL Consumers add parameters for passing Cloudwatch and DynamoDB Clients and for profile/default/session credentials Providers add ade2e6bb8c7 CAMEL-20912, CAMEL-20913 - Camel-AWS-Kinesis: KCL Consumers add parameters for passing Cloudwatch and DynamoDB Clients and for profile/default/session credentials Providers add 6da0d416cbc CAMEL-20921: camel-xml-io - Fix loading route configuration if using camel root tag. Thanks to Adriano Machado for unit test. (#14642) No new revisions were added by this update. Summary of changes: camel-sbom/camel-sbom.json | 11034 +-- camel-sbom/camel-sbom.xml | 9488 .../apache/camel/catalog/components/arangodb.json |10 +- .../camel/catalog/components/aws2-kinesis.json |82 +- .../arangodb/ArangoDbComponentConfigurer.java | 5 +- .../arangodb/ArangoDbEndpointConfigurer.java | 3 + .../arangodb/ArangoDbEndpointUriFactory.java | 3 +- .../apache/camel/component/arangodb/arangodb.json |10 +- .../component/arangodb/ArangoDbComponent.java |15 + .../camel/component/arangodb/ArangoDbEndpoint.java |20 +- .../arangodb/integration/ArangoCustomVertxIT.java | 110 + .../component/avro/AvroConsumerTestSupport.java|12 +- .../component/avro/AvroProducerTestSupport.java| 9 +- components/camel-aws/camel-aws2-kinesis/pom.xml| 5 + .../aws2/kinesis/Kinesis2ComponentConfigurer.java |18 + .../aws2/kinesis/Kinesis2EndpointConfigurer.java |18 + .../aws2/kinesis/Kinesis2EndpointUriFactory.java | 5 +- .../camel/component/aws2/kinesis/aws2-kinesis.json |82 +- .../aws2/kinesis/KclKinesis2Consumer.java | 283 + .../aws2/kinesis/Kinesis2Configuration.java|37 + .../component/aws2/kinesis/Kinesis2Endpoint.java |22 +- .../component/aws2/kinesis/Kinesis2Producer.java |96 +- .../kinesis/integration/KclKinesisConsumerIT.java |73 + .../kinesis/integration/KinesisProducerIT.java |13 +- .../camel/component/consul/ConsulTestSupport.java | 8 +- .../component/controlbus/ControlBusProducer.java | 9 +-
(camel) branch xml-rc deleted (was 3308c71f63e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch xml-rc in repository https://gitbox.apache.org/repos/asf/camel.git was 3308c71f63e CAMEL-20921: camel-xml-io - Fix loading route configuration if using camel root tag. Thanks to Adriano Machado for unit test. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch camel-4.4.x updated: CAMEL-20921: camel-xml-io - Fix loading route configuration if using camel root tag. Thanks to Adriano Machado for unit test. (#14642)
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 c3877b73453 CAMEL-20921: camel-xml-io - Fix loading route
configuration if using camel root tag. Thanks to Adriano Machado for unit test.
(#14642)
c3877b73453 is described below
commit c3877b734539f45035ceefdaea834d1b3ac042ac
Author: Claus Ibsen
AuthorDate: Wed Jun 26 07:16:27 2024 +0200
CAMEL-20921: camel-xml-io - Fix loading route configuration if using camel
root tag. Thanks to Adriano Machado for unit test. (#14642)
---
.../camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 18 ++--
.../apache/camel/dsl/xml/io/XmlLoadAppTest.java| 25
.../org/apache/camel/dsl/xml/io/camel-app13.xml| 34 ++
3 files changed, 75 insertions(+), 2 deletions(-)
diff --git
a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
index d8e0e8e8e0d..feb21dece1b 100644
---
a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
+++
b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
@@ -172,11 +172,25 @@ public class XmlRoutesBuilderLoader extends
RouteBuilderLoaderSupport {
@Override
public void configuration() throws Exception {
switch (xmlInfo.getRootElementName()) {
-case "routeConfigurations", "routeConfiguration" ->
+// load any route configuration before that may be nested
under camel/spring/blueprint root tag
+case "beans", "blueprint", "camel", "routeConfigurations",
"routeConfiguration": {
+BeansDefinition bp =
camelAppCache.get(input.getLocation());
+if (bp != null) {
+bp.getRouteConfigurations().forEach(rc -> {
+rc.setResource(getResource());
+List list = new
ArrayList<>();
+list.add(rc);
+RouteConfigurationsDefinition def = new
RouteConfigurationsDefinition();
+def.setResource(getResource());
+def.setRouteConfigurations(list);
+addConfigurations(def);
+});
+// remove the configurations we have added
+bp.getRouteConfigurations().clear();
+}
new XmlModelParser(resource,
xmlInfo.getRootElementNamespace())
.parseRouteConfigurationsDefinition()
.ifPresent(this::addConfigurations);
-default -> {
}
}
}
diff --git
a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java
b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java
index b5fe1debb42..6b82b13808d 100644
---
a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java
+++
b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.dsl.xml.io;
import java.util.Map;
+import org.apache.camel.Route;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.rest.DummyRestConsumerFactory;
import org.apache.camel.component.rest.DummyRestProcessorFactory;
@@ -311,4 +312,28 @@ public class XmlLoadAppTest {
context.stop();
}
}
+
+@Test
+public void testLoadAppWithRouteConfigAndRoutes() throws Exception {
+try (DefaultCamelContext context = new DefaultCamelContext()) {
+context.start();
+
+// camel-app13 has a route configuration and a route using the
configuration
+Resource resource =
PluginHelper.getResourceLoader(context).resolveResource(
+"/org/apache/camel/dsl/xml/io/camel-app13.xml");
+
+PluginHelper.getRoutesLoader(context).loadRoutes(resource);
+
+Route routewithConfig = context.getRoute("routeWithConfig");
+assertNotNull(routewithConfig, "Loaded routeWithConfig route
should be there");
+assertEquals(1, routewithConfig.getOnExceptions().size(), "Loaded
route should have onException");
+assertEquals(1, context.getRoutes().size());
+
+// test that loaded route works
+MockEndpoint bar = context.getEndpoint("mock:afterException",
MockEndpoint.class);
+bar.expectedBodiesReceived("Hi World");
+
(camel) branch main updated: CAMEL-20921: camel-xml-io - Fix loading route configuration if using camel root tag. Thanks to Adriano Machado for unit test. (#14642)
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 6da0d416cbc CAMEL-20921: camel-xml-io - Fix loading route
configuration if using camel root tag. Thanks to Adriano Machado for unit test.
(#14642)
6da0d416cbc is described below
commit 6da0d416cbcef8a5404baa4b073c7f6d09606201
Author: Claus Ibsen
AuthorDate: Wed Jun 26 07:16:27 2024 +0200
CAMEL-20921: camel-xml-io - Fix loading route configuration if using camel
root tag. Thanks to Adriano Machado for unit test. (#14642)
---
.../camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 18 ++--
.../apache/camel/dsl/xml/io/XmlLoadAppTest.java| 25
.../org/apache/camel/dsl/xml/io/camel-app13.xml| 34 ++
3 files changed, 75 insertions(+), 2 deletions(-)
diff --git
a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
index 49028290c6c..56bfbd8577c 100644
---
a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
+++
b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
@@ -160,11 +160,25 @@ public class XmlRoutesBuilderLoader extends
RouteBuilderLoaderSupport {
@Override
public void configuration() throws Exception {
switch (xmlInfo.getRootElementName()) {
-case "routeConfigurations", "routeConfiguration" ->
+// load any route configuration before that may be nested
under camel/spring/blueprint root tag
+case "beans", "blueprint", "camel", "routeConfigurations",
"routeConfiguration": {
+BeansDefinition bp =
camelAppCache.get(input.getLocation());
+if (bp != null) {
+bp.getRouteConfigurations().forEach(rc -> {
+rc.setResource(getResource());
+List list = new
ArrayList<>();
+list.add(rc);
+RouteConfigurationsDefinition def = new
RouteConfigurationsDefinition();
+def.setResource(getResource());
+def.setRouteConfigurations(list);
+addConfigurations(def);
+});
+// remove the configurations we have added
+bp.getRouteConfigurations().clear();
+}
new XmlModelParser(resource,
xmlInfo.getRootElementNamespace())
.parseRouteConfigurationsDefinition()
.ifPresent(this::addConfigurations);
-default -> {
}
}
}
diff --git
a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java
b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java
index c93a55aa48d..114f538344b 100644
---
a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java
+++
b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.dsl.xml.io;
import java.util.Map;
+import org.apache.camel.Route;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.rest.DummyRestConsumerFactory;
import org.apache.camel.component.rest.DummyRestProcessorFactory;
@@ -336,4 +337,28 @@ public class XmlLoadAppTest {
context.stop();
}
}
+
+@Test
+public void testLoadAppWithRouteConfigAndRoutes() throws Exception {
+try (DefaultCamelContext context = new DefaultCamelContext()) {
+context.start();
+
+// camel-app13 has a route configuration and a route using the
configuration
+Resource resource =
PluginHelper.getResourceLoader(context).resolveResource(
+"/org/apache/camel/dsl/xml/io/camel-app13.xml");
+
+PluginHelper.getRoutesLoader(context).loadRoutes(resource);
+
+Route routewithConfig = context.getRoute("routeWithConfig");
+assertNotNull(routewithConfig, "Loaded routeWithConfig route
should be there");
+assertEquals(1, routewithConfig.getOnExceptions().size(), "Loaded
route should have onException");
+assertEquals(1, context.getRoutes().size());
+
+// test that loaded route works
+MockEndpoint bar = context.getEndpoint("mock:afterException",
MockEndpoint.class);
+bar.expectedBodiesReceived("Hi World");
+
(camel) 01/01: CAMEL-20921: camel-xml-io - Fix loading route configuration if using camel root tag. Thanks to Adriano Machado for unit test.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch xml-rc
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3308c71f63e3739a1329823fa2075f86426f903d
Author: Claus Ibsen
AuthorDate: Wed Jun 26 07:00:49 2024 +0200
CAMEL-20921: camel-xml-io - Fix loading route configuration if using camel
root tag. Thanks to Adriano Machado for unit test.
---
.../camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 18 ++--
.../apache/camel/dsl/xml/io/XmlLoadAppTest.java| 25
.../org/apache/camel/dsl/xml/io/camel-app13.xml| 34 ++
3 files changed, 75 insertions(+), 2 deletions(-)
diff --git
a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
index 49028290c6c..56bfbd8577c 100644
---
a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
+++
b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
@@ -160,11 +160,25 @@ public class XmlRoutesBuilderLoader extends
RouteBuilderLoaderSupport {
@Override
public void configuration() throws Exception {
switch (xmlInfo.getRootElementName()) {
-case "routeConfigurations", "routeConfiguration" ->
+// load any route configuration before that may be nested
under camel/spring/blueprint root tag
+case "beans", "blueprint", "camel", "routeConfigurations",
"routeConfiguration": {
+BeansDefinition bp =
camelAppCache.get(input.getLocation());
+if (bp != null) {
+bp.getRouteConfigurations().forEach(rc -> {
+rc.setResource(getResource());
+List list = new
ArrayList<>();
+list.add(rc);
+RouteConfigurationsDefinition def = new
RouteConfigurationsDefinition();
+def.setResource(getResource());
+def.setRouteConfigurations(list);
+addConfigurations(def);
+});
+// remove the configurations we have added
+bp.getRouteConfigurations().clear();
+}
new XmlModelParser(resource,
xmlInfo.getRootElementNamespace())
.parseRouteConfigurationsDefinition()
.ifPresent(this::addConfigurations);
-default -> {
}
}
}
diff --git
a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java
b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java
index c93a55aa48d..114f538344b 100644
---
a/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java
+++
b/dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlLoadAppTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.dsl.xml.io;
import java.util.Map;
+import org.apache.camel.Route;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.rest.DummyRestConsumerFactory;
import org.apache.camel.component.rest.DummyRestProcessorFactory;
@@ -336,4 +337,28 @@ public class XmlLoadAppTest {
context.stop();
}
}
+
+@Test
+public void testLoadAppWithRouteConfigAndRoutes() throws Exception {
+try (DefaultCamelContext context = new DefaultCamelContext()) {
+context.start();
+
+// camel-app13 has a route configuration and a route using the
configuration
+Resource resource =
PluginHelper.getResourceLoader(context).resolveResource(
+"/org/apache/camel/dsl/xml/io/camel-app13.xml");
+
+PluginHelper.getRoutesLoader(context).loadRoutes(resource);
+
+Route routewithConfig = context.getRoute("routeWithConfig");
+assertNotNull(routewithConfig, "Loaded routeWithConfig route
should be there");
+assertEquals(1, routewithConfig.getOnExceptions().size(), "Loaded
route should have onException");
+assertEquals(1, context.getRoutes().size());
+
+// test that loaded route works
+MockEndpoint bar = context.getEndpoint("mock:afterException",
MockEndpoint.class);
+bar.expectedBodiesReceived("Hi World");
+context.createProducerTemplate().sendBody("direct:throwException",
"Hi World");
+bar.assertIsSatisfied();
+}
+}
}
diff --git
a/dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/camel-app13.xml
(camel) branch xml-rc created (now 3308c71f63e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch xml-rc in repository https://gitbox.apache.org/repos/asf/camel.git at 3308c71f63e CAMEL-20921: camel-xml-io - Fix loading route configuration if using camel root tag. Thanks to Adriano Machado for unit test. This branch includes the following new commits: new 3308c71f63e CAMEL-20921: camel-xml-io - Fix loading route configuration if using camel root tag. Thanks to Adriano Machado for unit test. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel-k) branch release-2.2.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.2.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.2.x by this push: new 14543edf1 chore: changelog automatic update 14543edf1 is described below commit 14543edf13710539a26b18855ed3c3569c6e9381 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Jun 26 01:09:44 2024 + chore: changelog automatic update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1674b85cb..6bf4aa642 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Jolokia trait failure [\#5666](https://github.com/apache/camel-k/issues/5666) - Add TimeoutSeconds to knative-service trait [\#5652](https://github.com/apache/camel-k/issues/5652) - Add TLS configuration in the ingress trait [\#5635](https://github.com/apache/camel-k/issues/5635) - Installation tests are unstable [\#5632](https://github.com/apache/camel-k/issues/5632)
(camel-k) branch release-2.3.x updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.3.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.3.x by this push: new d6e522549 chore: nightly automatic updates d6e522549 is described below commit d6e522549cb9fe0860e99e66e2044b4ca8f2c03d Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Jun 26 00:29:07 2024 + chore: nightly automatic updates --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1674b85cb..6bf4aa642 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Jolokia trait failure [\#5666](https://github.com/apache/camel-k/issues/5666) - Add TimeoutSeconds to knative-service trait [\#5652](https://github.com/apache/camel-k/issues/5652) - Add TLS configuration in the ingress trait [\#5635](https://github.com/apache/camel-k/issues/5635) - Installation tests are unstable [\#5632](https://github.com/apache/camel-k/issues/5632)
(camel-k) branch main updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 659063f5d chore: nightly automatic updates 659063f5d is described below commit 659063f5d82f2bfe2c2dbd836ea0c294a3f99781 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Jun 25 23:43:44 2024 + chore: nightly automatic updates --- CHANGELOG.md | 2 ++ coverage.out | 11 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72da745d7..8da4d6e69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Jolokia trait failure [\#5666](https://github.com/apache/camel-k/issues/5666) - Add TimeoutSeconds to knative-service trait [\#5652](https://github.com/apache/camel-k/issues/5652) - Add TLS configuration in the ingress trait [\#5635](https://github.com/apache/camel-k/issues/5635) - Installation tests are unstable [\#5632](https://github.com/apache/camel-k/issues/5632) @@ -38,6 +39,7 @@ **Merged pull requests:** +- fix\(trait\): explicit jolokia agent dependency [\#5668](https://github.com/apache/camel-k/pull/5668) ([squakez](https://github.com/squakez)) - chore\(deps\): bump k8s.io/klog/v2 from 2.130.0 to 2.130.1 [\#5665](https://github.com/apache/camel-k/pull/5665) ([dependabot[bot]](https://github.com/apps/dependabot)) - feat\(\#5121\): adding timeZone property to the Cron trait spec [\#5664](https://github.com/apache/camel-k/pull/5664) ([lsergio](https://github.com/lsergio)) - \(\#5463\) Add make targets: setup-knative, setup-yaks [\#5661](https://github.com/apache/camel-k/pull/5661) ([tdiesler](https://github.com/tdiesler)) diff --git a/coverage.out b/coverage.out index ef57d1eda..7b39392bf 100644 --- a/coverage.out +++ b/coverage.out @@ -1568,16 +1568,17 @@ github.com/apache/camel-k/v2/pkg/trait/istio.go:65: Apply 100.0% github.com/apache/camel-k/v2/pkg/trait/istio.go:77: injectIstioAnnotation 100.0% github.com/apache/camel-k/v2/pkg/trait/jolokia.go:45: newJolokiaTrait 100.0% github.com/apache/camel-k/v2/pkg/trait/jolokia.go:54: Configure 100.0% -github.com/apache/camel-k/v2/pkg/trait/jolokia.go:62: Apply 95.1% -github.com/apache/camel-k/v2/pkg/trait/jolokia.go:149: setDefaultJolokiaOption 100.0% -github.com/apache/camel-k/v2/pkg/trait/jolokia.go:177: addToJolokiaOptions 78.6% +github.com/apache/camel-k/v2/pkg/trait/jolokia.go:62: Apply 95.2% +github.com/apache/camel-k/v2/pkg/trait/jolokia.go:150: setDefaultJolokiaOption 100.0% +github.com/apache/camel-k/v2/pkg/trait/jolokia.go:178: addToJolokiaOptions 78.6% github.com/apache/camel-k/v2/pkg/trait/jvm.go:58: newJvmTrait 100.0% github.com/apache/camel-k/v2/pkg/trait/jvm.go:67: Configure 90.9% github.com/apache/camel-k/v2/pkg/trait/jvm.go:96: Apply 78.0% github.com/apache/camel-k/v2/pkg/trait/jvm.go:189: enableDebug 100.0% github.com/apache/camel-k/v2/pkg/trait/jvm.go:206: prepareClasspathItems 100.0% -github.com/apache/camel-k/v2/pkg/trait/jvm.go:231: prepareHTTPProxy 90.9% -github.com/apache/camel-k/v2/pkg/trait/jvm.go:291: getLegacyCamelQuarkusDependenciesPaths 100.0% +github.com/apache/camel-k/v2/pkg/trait/jvm.go:236:
(camel-quarkus) branch dependabot/maven/me.escoffier.certs-certificate-generator-junit5-0.7.1 created (now 76d71753d8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/me.escoffier.certs-certificate-generator-junit5-0.7.1 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 76d71753d8 Bump me.escoffier.certs:certificate-generator-junit5 from 0.6.0 to 0.7.1 No new revisions were added by this update.
(camel-examples) branch docker deleted (was 73f7ac3b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch docker in repository https://gitbox.apache.org/repos/asf/camel-examples.git was 73f7ac3b fix as2 example - CAMEL-19164: upgrade to http components 5.x 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-examples) branch main updated: Migrate to Docker Compose v2 (#139)
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-examples.git
The following commit(s) were added to refs/heads/main by this push:
new 304268e8 Migrate to Docker Compose v2 (#139)
304268e8 is described below
commit 304268e855d533e16dbbc47468755a9ed283ff5f
Author: John Poth
AuthorDate: Tue Jun 25 17:46:14 2024 +0200
Migrate to Docker Compose v2 (#139)
* Migrate to Docker Compose v2
* fix as2 example - CAMEL-19164: upgrade to http components 5.x
---
.../apache/camel/example/as2/ExamineAS2ServerEndpointExchange.java | 4 ++--
as2/src/main/resources/META-INF/spring/camel-context.xml| 2 +-
resume-api/resume-api-aws2-kinesis/README.md| 4 ++--
.../resume-api-aws2-kinesis/{docker-compose.yaml => compose.yaml} | 1 -
resume-api/resume-api-cassandraql/README.md | 4 ++--
.../resume-api-cassandraql/{docker-compose.yaml => compose.yaml}| 1 -
resume-api/resume-api-file-offset/README.md | 4 ++--
.../docker-compose.yaml => resume-api-file-offset/compose.yaml} | 1 -
resume-api/resume-api-fileset-clusterized/README.md | 4 ++--
.../{docker-compose.yaml => compose.yaml} | 1 -
resume-api/resume-api-fileset-wal/README.md | 6 +++---
.../docker-compose.yaml => resume-api-fileset-wal/compose.yaml} | 1 -
resume-api/resume-api-fileset/README.md | 4 ++--
resume-api/resume-api-fileset/{docker-compose.yaml => compose.yaml} | 1 -
14 files changed, 16 insertions(+), 22 deletions(-)
diff --git
a/as2/src/main/java/org/apache/camel/example/as2/ExamineAS2ServerEndpointExchange.java
b/as2/src/main/java/org/apache/camel/example/as2/ExamineAS2ServerEndpointExchange.java
index fb060088..d988f20e 100644
---
a/as2/src/main/java/org/apache/camel/example/as2/ExamineAS2ServerEndpointExchange.java
+++
b/as2/src/main/java/org/apache/camel/example/as2/ExamineAS2ServerEndpointExchange.java
@@ -20,8 +20,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.component.as2.api.util.AS2Utils;
import org.apache.camel.component.as2.internal.AS2Constants;
-import org.apache.http.HttpRequest;
-import org.apache.http.protocol.HttpCoreContext;
+import org.apache.hc.core5.http.HttpRequest;
+import org.apache.hc.core5.http.protocol.HttpCoreContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/as2/src/main/resources/META-INF/spring/camel-context.xml
b/as2/src/main/resources/META-INF/spring/camel-context.xml
index eef81e52..e16ae4c7 100644
--- a/as2/src/main/resources/META-INF/spring/camel-context.xml
+++ b/as2/src/main/resources/META-INF/spring/camel-context.xml
@@ -70,7 +70,7 @@ UNZ+1+000778'
- application/edifact;charset=US-ASCII
+ application/edifact;charset=US-ASCII
7bit
diff --git a/resume-api/resume-api-aws2-kinesis/README.md
b/resume-api/resume-api-aws2-kinesis/README.md
index a4e125e9..9dd98a1a 100644
--- a/resume-api/resume-api-aws2-kinesis/README.md
+++ b/resume-api/resume-api-aws2-kinesis/README.md
@@ -15,7 +15,7 @@ Building the demo
To build the demo and the containers:
```shell
-mvn clean package && docker-compose build
+mvn clean package && docker compose build
```
Run
@@ -24,7 +24,7 @@ Run
To run the demo:
```shell
-docker-compose up -d && docker-compose logs --no-log-prefix -f example ;
docker-compose down
+docker compose up -d && docker compose logs --no-log-prefix -f example ;
docker compose down
```
Advanced / Manual
diff --git a/resume-api/resume-api-aws2-kinesis/docker-compose.yaml
b/resume-api/resume-api-aws2-kinesis/compose.yaml
similarity index 99%
rename from resume-api/resume-api-aws2-kinesis/docker-compose.yaml
rename to resume-api/resume-api-aws2-kinesis/compose.yaml
index 524d8a16..bc0fac29 100644
--- a/resume-api/resume-api-aws2-kinesis/docker-compose.yaml
+++ b/resume-api/resume-api-aws2-kinesis/compose.yaml
@@ -15,7 +15,6 @@
## limitations under the License.
## ---
-version: '3.4'
services:
kinesis:
image: localstack/localstack:latest
diff --git a/resume-api/resume-api-cassandraql/README.md
b/resume-api/resume-api-cassandraql/README.md
index 36176186..e3b78eb4 100644
--- a/resume-api/resume-api-cassandraql/README.md
+++ b/resume-api/resume-api-cassandraql/README.md
@@ -13,7 +13,7 @@ Building the demo
To build the demo and the containers:
```shell
-mvn clean package && docker-compose build
+mvn clean package && docker compose build
```
Run
@@ -22,7 +22,7 @@ Run
To run the demo:
```shell
-docker-compose up -d && docker-compose logs --no-log-prefix -f example ;
docker-compose
(camel-quarkus) branch main updated: Miscellaneous test framework tidy ups
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new e6e6cc155e Miscellaneous test framework tidy ups
e6e6cc155e is described below
commit e6e6cc155e3d61bccde2468696524ac76daaf5fd
Author: James Netherton
AuthorDate: Tue Jun 25 14:43:00 2024 +0100
Miscellaneous test framework tidy ups
---
...RouteBuilderWarningWithProducedBuilderTest.java | 2 +-
...teBuilderWarningWithoutProducedBuilderTest.java | 2 +-
.../apache/camel/quarkus/test/CallbackUtil.java| 9 +-
.../quarkus/test/CamelQuarkusTestSupport.java | 126 -
4 files changed, 80 insertions(+), 59 deletions(-)
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningWithProducedBuilderTest.java
b/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningWithProducedBuilderTest.java
index c06ce134b7..ca5e383650 100644
---
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningWithProducedBuilderTest.java
+++
b/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningWithProducedBuilderTest.java
@@ -56,6 +56,6 @@ public class RouteBuilderWarningWithProducedBuilderTest {
Assertions.assertEquals(0L, ts.getTestsSkipped());
Assertions.assertTrue(TEST.getLogRecords().stream()
-.anyMatch(logRecord ->
logRecord.getMessage().contains("`RouteBuilder` detected")));
+.anyMatch(logRecord ->
logRecord.getMessage().contains("RouteBuilder beans are present")));
}
}
diff --git
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningWithoutProducedBuilderTest.java
b/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningWithoutProducedBuilderTest.java
index 9436d05368..184bc0e01a 100644
---
a/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningWithoutProducedBuilderTest.java
+++
b/test-framework/junit5-extension-tests/src/test/java/org/apache/camel/quarkus/test/extensions/routeBuilder/RouteBuilderWarningWithoutProducedBuilderTest.java
@@ -55,6 +55,6 @@ public class RouteBuilderWarningWithoutProducedBuilderTest {
Assertions.assertEquals(0L, ts.getTestsSkipped());
Assertions.assertFalse(TEST.getLogRecords().stream()
-.anyMatch(logRecord ->
logRecord.getMessage().contains("`RouteBuilder` detected")));
+.anyMatch(logRecord ->
logRecord.getMessage().contains("RouteBuilder beans are present")));
}
}
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java
b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java
index e67ab30b82..10f32a3298 100644
---
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java
+++
b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java
@@ -33,6 +33,9 @@ import org.junit.jupiter.engine.execution.NamespaceAwareStore;
import org.junit.platform.engine.support.store.NamespacedHierarchicalStore;
public class CallbackUtil {
+private CallbackUtil() {
+// Utility class
+}
static boolean isPerClass(CamelQuarkusTestSupport testSupport) {
return getLifecycle(testSupport).filter(lc ->
lc.equals(TestInstance.Lifecycle.PER_CLASS)).isPresent();
@@ -47,13 +50,13 @@ public class CallbackUtil {
}
static void resetContext(CamelQuarkusTestSupport testInstance) {
-
//if routeBuilder (from the test) was used, all routes from that
builder has to be stopped and removed
//because routes will be created again (in case of
TestInstance.Lifecycle.PER_CLASS, this method is not executed)
-if (testInstance.isUseRouteBuilder() && testInstance.createdRoutes !=
null) {
+Set createdRoutes = testInstance.getCreatedRoutes();
+if (testInstance.isUseRouteBuilder() && createdRoutes != null) {
try {
-for (String r : testInstance.createdRoutes) {
+for (String r : createdRoutes) {
testInstance.context().getRouteController().stopRoute(r);
testInstance.context().removeRoute(r);
}
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CamelQuarkusTestSupport.java
index
(camel-quarkus) branch main updated: Improve the testing guide
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 67758a7b31 Improve the testing guide
67758a7b31 is described below
commit 67758a7b31a055cede4e0bca1b064aae8772422d
Author: James Netherton
AuthorDate: Tue Jun 25 14:35:50 2024 +0100
Improve the testing guide
* Fix grammar
* Reword some sentences for brevity
* Explain some of the core differences CamelTestSupport &
CamelQuarkusTestSupport testing
* Add some usage examples for CamelQuarkusTestSupport
* Improve the limitations section for better clarity
---
docs/modules/ROOT/pages/user-guide/testing.adoc | 342 +++-
1 file changed, 274 insertions(+), 68 deletions(-)
diff --git a/docs/modules/ROOT/pages/user-guide/testing.adoc
b/docs/modules/ROOT/pages/user-guide/testing.adoc
index 947f14ed5a..2ad31d57bf 100644
--- a/docs/modules/ROOT/pages/user-guide/testing.adoc
+++ b/docs/modules/ROOT/pages/user-guide/testing.adoc
@@ -2,19 +2,17 @@
:page-aliases: testing.adoc
Testing offers a good way to ensure camel routes behave as expected over time.
-Before going deeper in the subject, it is strongly advised to read
xref:user-guide/first-steps.adoc[First Steps] and
https://quarkus.io/guides/getting-started-testing[Quarkus testing].
+Before going deeper into the subject, it is strongly advised to read
xref:user-guide/first-steps.adoc[First Steps] and
https://quarkus.io/guides/getting-started-testing[Quarkus testing].
-When it comes to testing a route in the context of Quarkus, the paved road is
to write local integration tests.
+When it comes to testing a route in the context of Quarkus, the recommended
approach is to write local integration tests.
This has the advantage of covering both JVM and native mode.
-The xref:#_cameltestsupport_style_of_testing[`CamelTestSupport` approach] can
be used since Camel Quarkus 2.12.0. Note that it can only work in JVM mode.
-
-Let's enumerate some points of interest below.
+xref:#_cameltestsupport_style_of_testing[`CamelTestSupport`] style testing can
also be used. Note that it can only work in JVM mode.
== A test running in JVM mode
-The key point is to use the `@QuarkusTest` annotation that will bootstrap
Quarkus and start Camel routes before the `@Test` logic is executed,
-like in the example beneath:
+All tests should be annotated with `@QuarkusTest`. This will bootstrap Quarkus
and start Camel routes before the `@Test` logic is executed,
+like in the example below:
[source,java]
@@ -25,9 +23,8 @@ import org.junit.jupiter.api.Test;
@QuarkusTest
class MyTest {
@Test
-public void test() {
+void test() {
// Use any suitable code that send test data to the route and then
assert outcomes
-...
}
}
@@ -37,11 +34,11 @@ An example implementation can be found
https://github.com/apache/camel-quarkus/b
[[native-tests]]
== A test running in native mode
-As long as all extensions your application depends on are supported in native
mode,
-you should definitely test that your application really works in native mode.
-The test logic defined in JVM mode can then be reused in native mode thanks to
inheriting from the respective JVM mode class.
-`@QuarkusIntegrationTest` annotation is there to instruct the Quarkus JUnit
extension to compile the application under test to native image
-and start it before running the tests.
+Providing all extensions your application depends on are supported in native
mode,
+you should test that your application works correctly native mode.
+The test logic defined in JVM mode can be reused in native mode, by inheriting
from the respective JVM mode class.
+The `@QuarkusIntegrationTest` annotation instructs the Quarkus JUnit extension
to compile the application under test to a native image
+and will start it before running the tests.
[source,java]
@@ -49,35 +46,31 @@ import io.quarkus.test.junit.QuarkusIntegrationTest;
@QuarkusIntegrationTest
class MyIT extends MyTest {
- ...
}
-An implementation of a native test may help to capture more details
https://github.com/apache/camel-quarkus/blob/main/integration-tests/bindy/src/test/java/org/apache/camel/quarkus/component/bindy/it/MessageRecordIT.java[here].
+An example implementation of a native can be found
https://github.com/apache/camel-quarkus/blob/main/integration-tests/bindy/src/test/java/org/apache/camel/quarkus/component/bindy/it/MessageRecordIT.java[here].
[[jvm-vs-native-tests]]
-== `@QuarkusTest` vs. `@QuarkusIntegrationTest`
+== `@QuarkusTest` Vs `@QuarkusIntegrationTest`
JVM mode tests annotated with `@QuarkusTest` are executed in the same JVM as
the application under test.
-Thanks to that, `@Inject`-ing beans from the application into the test code is
possible.
-You can also
(camel-examples) branch docker updated (f71d2933 -> 73f7ac3b)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch docker in repository https://gitbox.apache.org/repos/asf/camel-examples.git from f71d2933 Migrate to Docker Compose v2 add 73f7ac3b fix as2 example - CAMEL-19164: upgrade to http components 5.x No new revisions were added by this update. Summary of changes: .../apache/camel/example/as2/ExamineAS2ServerEndpointExchange.java| 4 ++-- as2/src/main/resources/META-INF/spring/camel-context.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
(camel-examples) 01/01: Migrate to Docker Compose v2
This is an automated email from the ASF dual-hosted git repository.
jpoth pushed a commit to branch docker
in repository https://gitbox.apache.org/repos/asf/camel-examples.git
commit f71d29339a06dbafd18a179be2589682d6baff26
Author: John Poth
AuthorDate: Mon Jun 24 13:29:33 2024 +0200
Migrate to Docker Compose v2
---
resume-api/resume-api-aws2-kinesis/README.md| 4 ++--
.../resume-api-aws2-kinesis/{docker-compose.yaml => compose.yaml} | 1 -
resume-api/resume-api-cassandraql/README.md | 4 ++--
.../resume-api-cassandraql/{docker-compose.yaml => compose.yaml}| 1 -
resume-api/resume-api-file-offset/README.md | 4 ++--
.../resume-api-file-offset/{docker-compose.yaml => compose.yaml}| 1 -
resume-api/resume-api-fileset-clusterized/README.md | 4 ++--
.../{docker-compose.yaml => compose.yaml} | 1 -
resume-api/resume-api-fileset-wal/README.md | 6 +++---
.../docker-compose.yaml => resume-api-fileset-wal/compose.yaml} | 1 -
resume-api/resume-api-fileset/README.md | 4 ++--
.../docker-compose.yaml => resume-api-fileset/compose.yaml} | 1 -
12 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/resume-api/resume-api-aws2-kinesis/README.md
b/resume-api/resume-api-aws2-kinesis/README.md
index a4e125e9..9dd98a1a 100644
--- a/resume-api/resume-api-aws2-kinesis/README.md
+++ b/resume-api/resume-api-aws2-kinesis/README.md
@@ -15,7 +15,7 @@ Building the demo
To build the demo and the containers:
```shell
-mvn clean package && docker-compose build
+mvn clean package && docker compose build
```
Run
@@ -24,7 +24,7 @@ Run
To run the demo:
```shell
-docker-compose up -d && docker-compose logs --no-log-prefix -f example ;
docker-compose down
+docker compose up -d && docker compose logs --no-log-prefix -f example ;
docker compose down
```
Advanced / Manual
diff --git a/resume-api/resume-api-aws2-kinesis/docker-compose.yaml
b/resume-api/resume-api-aws2-kinesis/compose.yaml
similarity index 99%
rename from resume-api/resume-api-aws2-kinesis/docker-compose.yaml
rename to resume-api/resume-api-aws2-kinesis/compose.yaml
index 524d8a16..bc0fac29 100644
--- a/resume-api/resume-api-aws2-kinesis/docker-compose.yaml
+++ b/resume-api/resume-api-aws2-kinesis/compose.yaml
@@ -15,7 +15,6 @@
## limitations under the License.
## ---
-version: '3.4'
services:
kinesis:
image: localstack/localstack:latest
diff --git a/resume-api/resume-api-cassandraql/README.md
b/resume-api/resume-api-cassandraql/README.md
index 36176186..e3b78eb4 100644
--- a/resume-api/resume-api-cassandraql/README.md
+++ b/resume-api/resume-api-cassandraql/README.md
@@ -13,7 +13,7 @@ Building the demo
To build the demo and the containers:
```shell
-mvn clean package && docker-compose build
+mvn clean package && docker compose build
```
Run
@@ -22,7 +22,7 @@ Run
To run the demo:
```shell
-docker-compose up -d && docker-compose logs --no-log-prefix -f example ;
docker-compose down
+docker compose up -d && docker compose logs --no-log-prefix -f example ;
docker compose down
```
Advanced / Manual
diff --git a/resume-api/resume-api-cassandraql/docker-compose.yaml
b/resume-api/resume-api-cassandraql/compose.yaml
similarity index 99%
rename from resume-api/resume-api-cassandraql/docker-compose.yaml
rename to resume-api/resume-api-cassandraql/compose.yaml
index 2de66f5c..85f67e02 100644
--- a/resume-api/resume-api-cassandraql/docker-compose.yaml
+++ b/resume-api/resume-api-cassandraql/compose.yaml
@@ -15,7 +15,6 @@
## limitations under the License.
## ---
-version: '3.4'
services:
cassandra:
image: cassandra:4
diff --git a/resume-api/resume-api-file-offset/README.md
b/resume-api/resume-api-file-offset/README.md
index 55406bcc..e5cb7955 100644
--- a/resume-api/resume-api-file-offset/README.md
+++ b/resume-api/resume-api-file-offset/README.md
@@ -14,7 +14,7 @@ Building the demo
To build the demo and the containers:
```shell
-mvn clean package && docker-compose build
+mvn clean package && docker compose build
```
@@ -25,7 +25,7 @@ Run
To run the demo:
```shell
-docker-compose up -d && docker-compose logs --no-log-prefix -f example ;
docker-compose down
+docker compose up -d && docker compose logs --no-log-prefix -f example ;
docker compose down
```
Advanced / Manual
diff --git a/resume-api/resume-api-file-offset/docker-compose.yaml
b/resume-api/resume-api-file-offset/compose.yaml
similarity index 99%
rename from resume-api/resume-api-file-offset/docker-compose.yaml
rename to resume-api/resume-api-file-offset/compose.yaml
index e1ee1bd6..7b5c3e81 100644
--- a/resume-api/resume-api-file-offset/docker-compose.yaml
+++
(camel-examples) branch docker created (now f71d2933)
This is an automated email from the ASF dual-hosted git repository. jpoth pushed a change to branch docker in repository https://gitbox.apache.org/repos/asf/camel-examples.git at f71d2933 Migrate to Docker Compose v2 This branch includes the following new commits: new f71d2933 Migrate to Docker Compose v2 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-spring-boot) branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 22243b74da3 Regen
22243b74da3 is described below
commit 22243b74da3a9763ffbf705b38a20ce502fce39d
Author: Andrea Cosentino
AuthorDate: Tue Jun 25 14:32:11 2024 +0200
Regen
Signed-off-by: Andrea Cosentino
---
.../catalog/components/aws2-kinesis.json | 84 +++---
.../src/main/docs/aws2-kinesis.json| 12
.../springboot/Kinesis2ComponentConfiguration.java | 31
.../springboot/Kinesis2ComponentConverter.java | 4 ++
4 files changed, 91 insertions(+), 40 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json
index 768104cc592..60219f3aa01 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json
@@ -39,20 +39,22 @@
"amazonKinesisClient": { "index": 13, "kind": "property", "displayName":
"Amazon Kinesis Client", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType":
"software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false,
"deprecationNote": "", "autowired": true, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration",
"configurationField": "configuration", "description": "Amazon Kinesis clien
[...]
"asyncClient": { "index": 14, "kind": "property", "displayName": "Async
Client", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration",
"configurationField": "configuration", "description": "If we want to a
KinesisAsyncClient instance set it to true" },
"autowiredEnabled": { "index": 15, "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 [...]
-"useKclConsumers": { "index": 16, "kind": "property", "displayName": "Use
Kcl Consumers", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration",
"configurationField": "configuration", "description": "If we want to a KCL
Consumer set it to true" },
-"healthCheckConsumerEnabled": { "index": 17, "kind": "property",
"displayName": "Health Check Consumer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all consumer based health checks
from this component" },
-"healthCheckProducerEnabled": { "index": 18, "kind": "property",
"displayName": "Health Check Producer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all producer based health checks
from this component. Notice: Camel has by default disabled all producer based
health-checks. You can turn on produce [...]
-"proxyHost": { "index": 19, "kind": "property", "displayName": "Proxy
Host", "group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the Kinesis client" },
-"proxyPort": { "index": 20, "kind": "property", "displayName": "Proxy
Port", "group": "proxy", "label": "proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false,
(camel-k) branch main updated: fix(trait): explicit jolokia agent dependency
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 6afb7deb6 fix(trait): explicit jolokia agent dependency
6afb7deb6 is described below
commit 6afb7deb63a98684f56a70cd3e7919b949a9710e
Author: Pasquale Congiusti
AuthorDate: Tue Jun 25 11:12:14 2024 +0200
fix(trait): explicit jolokia agent dependency
Closes #5666
---
pkg/trait/jolokia.go | 1 +
pkg/trait/jolokia_test.go | 3 +++
pkg/trait/jvm.go | 20
pkg/trait/jvm_test.go | 43 +++
4 files changed, 67 insertions(+)
diff --git a/pkg/trait/jolokia.go b/pkg/trait/jolokia.go
index 9499eef0d..e78bd9f50 100644
--- a/pkg/trait/jolokia.go
+++ b/pkg/trait/jolokia.go
@@ -127,6 +127,7 @@ func (t *jolokiaTrait) Apply(e *Environment) error {
}
}
container.Args = append(container.Args,
"-javaagent:"+jolokiaFilepath+"="+strings.Join(optionValues, ","))
+ container.Args = append(container.Args, "-cp", jolokiaFilepath)
containerPort := corev1.ContainerPort{
Name: "jolokia",
diff --git a/pkg/trait/jolokia_test.go b/pkg/trait/jolokia_test.go
index c5c685cc5..6668f3850 100644
--- a/pkg/trait/jolokia_test.go
+++ b/pkg/trait/jolokia_test.go
@@ -55,6 +55,7 @@ func TestApplyJolokiaTraitNominalShouldSucceed(t *testing.T) {
assert.Equal(t, container.Args, []string{
"-javaagent:dependencies/lib/main/org.jolokia.jolokia-agent-jvm-1.7.1.jar=discoveryEnabled=false,host=*,port=8778",
+ "-cp",
"dependencies/lib/main/org.jolokia.jolokia-agent-jvm-1.7.1.jar",
})
assert.Len(t, container.Ports, 1)
@@ -85,6 +86,7 @@ func TestApplyJolokiaTraitForOpenShiftProfileShouldSucceed(t
*testing.T) {
"clientPrincipal.1=cn=system:master-proxy,clientPrincipal.2=cn=hawtio-online.hawtio.svc,"
+
"clientPrincipal.3=cn=fuse-console.fuse.svc,discoveryEnabled=false,extendedClientCheck=true,"
+
"host=*,port=8778,protocol=https,useSslClientAuthentication=true",
+ "-cp",
"dependencies/lib/main/org.jolokia.jolokia-agent-jvm-1.7.1.jar",
})
assert.Len(t, container.Ports, 1)
@@ -134,6 +136,7 @@ func TestApplyJolokiaTraitWithOptionShouldOverrideDefault(t
*testing.T) {
"-javaagent:dependencies/lib/main/org.jolokia.jolokia-agent-jvm-1.7.1.jar=caCert=.cacert,clientPrincipal=cn:any,"
+
"discoveryEnabled=true,extendedClientCheck=false,host=explicit-host,port=8778,protocol=http,"
+
"useSslClientAuthentication=false",
+ "-cp",
"dependencies/lib/main/org.jolokia.jolokia-agent-jvm-1.7.1.jar",
})
}
diff --git a/pkg/trait/jvm.go b/pkg/trait/jvm.go
index 7ca44edd4..2a352f52b 100644
--- a/pkg/trait/jvm.go
+++ b/pkg/trait/jvm.go
@@ -204,6 +204,7 @@ func (t *jvmTrait) enableDebug(e *Environment) string {
}
func (t *jvmTrait) prepareClasspathItems(container *corev1.Container) []string
{
+ existingClasspaths := extractExistingClasspathItems(container)
classpath := sets.NewSet()
// Deprecated: replaced by
/etc/camel/resources.d/[_configmaps/_secrets]
(camel.ResourcesConfigmapsMountPath/camel.ResourcesSecretsMountPath).
classpath.Add("./resources")
@@ -223,9 +224,28 @@ func (t *jvmTrait) prepareClasspathItems(container
*corev1.Container) []string {
// Keep class path sorted so that it's consistent over reconciliation
cycles
sort.Strings(items)
+ if existingClasspaths != nil {
+ existingClasspaths = append(existingClasspaths, items...)
+ return existingClasspaths
+ }
+
return items
}
+// extractExistingClasspathItems returns any container classpath option (if
exists).
+func extractExistingClasspathItems(container *corev1.Container) []string {
+ for i, arg := range container.Args {
+ if arg == "-cp" || arg == "-classpath" {
+ if i < len(container.Args) {
+ // return the next argument
+ return strings.Split(container.Args[i+1], ":")
+ }
+ }
+ }
+
+ return nil
+}
+
// Translate HTTP proxy environment variables, that are set by the environment
trait,
// into corresponding JVM system properties.
func (t *jvmTrait) prepareHTTPProxy(container *corev1.Container) ([]string,
error) {
diff --git a/pkg/trait/jvm_test.go b/pkg/trait/jvm_test.go
index 13041de49..fefefffd2 100644
--- a/pkg/trait/jvm_test.go
+++ b/pkg/trait/jvm_test.go
@@ -449,6 +449,49 @@ func TestApplyJvmTraitWithClasspath(t *testing.T) {
(camel) branch kinesis-kcl deleted (was 6c07ef354cc)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch kinesis-kcl in repository https://gitbox.apache.org/repos/asf/camel.git was 6c07ef354cc CAMEL-20912, CAMEL-20913 - Camel-AWS-Kinesis: KCL Consumers add parameters for passing Cloudwatch and DynamoDB Clients and for profile/default/session credentials Providers 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) 02/02: CAMEL-20912, CAMEL-20913 - Camel-AWS-Kinesis: KCL Consumers add parameters for passing Cloudwatch and DynamoDB Clients and for profile/default/session credentials Providers
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ade2e6bb8c70352aebc7908ad30d857d2a451463
Author: Andrea Cosentino
AuthorDate: Tue Jun 25 11:46:25 2024 +0200
CAMEL-20912, CAMEL-20913 - Camel-AWS-Kinesis: KCL Consumers add parameters
for passing Cloudwatch and DynamoDB Clients and for profile/default/session
credentials Providers
Signed-off-by: Andrea Cosentino
---
.../camel/catalog/components/aws2-kinesis.json | 84 -
.../dsl/Aws2KinesisComponentBuilderFactory.java| 36
.../dsl/Kinesis2EndpointBuilderFactory.java| 192 +
.../camel/kotlin/components/Aws2KinesisUriDsl.kt | 14 ++
4 files changed, 286 insertions(+), 40 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
index 355c628c0c6..ce904d5350e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
@@ -39,20 +39,22 @@
"amazonKinesisClient": { "index": 13, "kind": "property", "displayName":
"Amazon Kinesis Client", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType":
"software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false,
"deprecationNote": "", "autowired": true, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration",
"configurationField": "configuration", "description": "Amazon Kinesis clien
[...]
"asyncClient": { "index": 14, "kind": "property", "displayName": "Async
Client", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration",
"configurationField": "configuration", "description": "If we want to a
KinesisAsyncClient instance set it to true" },
"autowiredEnabled": { "index": 15, "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 [...]
-"useKclConsumers": { "index": 16, "kind": "property", "displayName": "Use
Kcl Consumers", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration",
"configurationField": "configuration", "description": "If we want to a KCL
Consumer set it to true" },
-"healthCheckConsumerEnabled": { "index": 17, "kind": "property",
"displayName": "Health Check Consumer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all consumer based health checks
from this component" },
-"healthCheckProducerEnabled": { "index": 18, "kind": "property",
"displayName": "Health Check Producer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all producer based health checks
from this component. Notice: Camel has by default disabled all producer based
health-checks. You can turn on produce [...]
-"proxyHost": { "index": 19, "kind": "property", "displayName": "Proxy
Host", "group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the Kinesis client" },
-"proxyPort": { "index": 20, "kind": "property", "displayName": "Proxy
Port", "group": "proxy", "label": "proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
(camel) 01/02: CAMEL-20912, CAMEL-20913 - Camel-AWS-Kinesis: KCL Consumers add parameters for passing Cloudwatch and DynamoDB Clients and for profile/default/session credentials Providers
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 8a2116fb4b91ed040a7134019b9b2d278d3b0919 Author: Andrea Cosentino AuthorDate: Tue Jun 25 11:29:31 2024 +0200 CAMEL-20912, CAMEL-20913 - Camel-AWS-Kinesis: KCL Consumers add parameters for passing Cloudwatch and DynamoDB Clients and for profile/default/session credentials Providers Signed-off-by: Andrea Cosentino --- .../aws2/kinesis/Kinesis2ComponentConfigurer.java | 12 +++ .../aws2/kinesis/Kinesis2EndpointConfigurer.java | 12 +++ .../aws2/kinesis/Kinesis2EndpointUriFactory.java | 4 +- .../camel/component/aws2/kinesis/aws2-kinesis.json | 84 .../aws2/kinesis/KclKinesis2Consumer.java | 112 - .../aws2/kinesis/Kinesis2Configuration.java| 26 + .../kinesis/integration/KclKinesisConsumerIT.java | 6 +- 7 files changed, 186 insertions(+), 70 deletions(-) diff --git a/components/camel-aws/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java b/components/camel-aws/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java index 47834f557c6..8f6412022df 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java +++ b/components/camel-aws/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java @@ -42,7 +42,11 @@ public class Kinesis2ComponentConfigurer extends PropertyConfigurerSupport imple case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true; case "cborenabled": case "cborEnabled": getOrCreateConfiguration(target).setCborEnabled(property(camelContext, boolean.class, value)); return true; +case "cloudwatchasyncclient": +case "cloudWatchAsyncClient": getOrCreateConfiguration(target).setCloudWatchAsyncClient(property(camelContext, software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient.class, value)); return true; case "configuration": target.setConfiguration(property(camelContext, org.apache.camel.component.aws2.kinesis.Kinesis2Configuration.class, value)); return true; +case "dynamodbasyncclient": +case "dynamoDbAsyncClient": getOrCreateConfiguration(target).setDynamoDbAsyncClient(property(camelContext, software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient.class, value)); return true; case "healthcheckconsumerenabled": case "healthCheckConsumerEnabled": target.setHealthCheckConsumerEnabled(property(camelContext, boolean.class, value)); return true; case "healthcheckproducerenabled": @@ -112,7 +116,11 @@ public class Kinesis2ComponentConfigurer extends PropertyConfigurerSupport imple case "bridgeErrorHandler": return boolean.class; case "cborenabled": case "cborEnabled": return boolean.class; +case "cloudwatchasyncclient": +case "cloudWatchAsyncClient": return software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient.class; case "configuration": return org.apache.camel.component.aws2.kinesis.Kinesis2Configuration.class; +case "dynamodbasyncclient": +case "dynamoDbAsyncClient": return software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient.class; case "healthcheckconsumerenabled": case "healthCheckConsumerEnabled": return boolean.class; case "healthcheckproducerenabled": @@ -178,7 +186,11 @@ public class Kinesis2ComponentConfigurer extends PropertyConfigurerSupport imple case "bridgeErrorHandler": return target.isBridgeErrorHandler(); case "cborenabled": case "cborEnabled": return getOrCreateConfiguration(target).isCborEnabled(); +case "cloudwatchasyncclient": +case "cloudWatchAsyncClient": return getOrCreateConfiguration(target).getCloudWatchAsyncClient(); case "configuration": return target.getConfiguration(); +case "dynamodbasyncclient": +case "dynamoDbAsyncClient": return getOrCreateConfiguration(target).getDynamoDbAsyncClient(); case "healthcheckconsumerenabled": case "healthCheckConsumerEnabled": return target.isHealthCheckConsumerEnabled(); case "healthcheckproducerenabled": diff --git a/components/camel-aws/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointConfigurer.java b/components/camel-aws/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointConfigurer.java index c656b45554a..43aa3bdfddd 100644 ---
(camel) branch main updated (111c1d56377 -> ade2e6bb8c7)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 111c1d56377 camel-mail - Fix stream caching with pollEnrich and attachment (#14638) new 8a2116fb4b9 CAMEL-20912, CAMEL-20913 - Camel-AWS-Kinesis: KCL Consumers add parameters for passing Cloudwatch and DynamoDB Clients and for profile/default/session credentials Providers new ade2e6bb8c7 CAMEL-20912, CAMEL-20913 - Camel-AWS-Kinesis: KCL Consumers add parameters for passing Cloudwatch and DynamoDB Clients and for profile/default/session credentials Providers The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../camel/catalog/components/aws2-kinesis.json | 84 - .../aws2/kinesis/Kinesis2ComponentConfigurer.java | 12 ++ .../aws2/kinesis/Kinesis2EndpointConfigurer.java | 12 ++ .../aws2/kinesis/Kinesis2EndpointUriFactory.java | 4 +- .../camel/component/aws2/kinesis/aws2-kinesis.json | 84 - .../aws2/kinesis/KclKinesis2Consumer.java | 112 +--- .../aws2/kinesis/Kinesis2Configuration.java| 26 +++ .../kinesis/integration/KclKinesisConsumerIT.java | 6 +- .../dsl/Aws2KinesisComponentBuilderFactory.java| 36 .../dsl/Kinesis2EndpointBuilderFactory.java| 192 + .../camel/kotlin/components/Aws2KinesisUriDsl.kt | 14 ++ 11 files changed, 472 insertions(+), 110 deletions(-)
(camel) branch msc deleted (was 42ebca7c135)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch msc in repository https://gitbox.apache.org/repos/asf/camel.git was 42ebca7c135 CAMEL-20907: camel-mail - PollEnrich should work with stream caching to ignore if folder is not open. 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-mail - Fix stream caching with pollEnrich and attachment (#14638)
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 111c1d56377 camel-mail - Fix stream caching with pollEnrich and
attachment (#14638)
111c1d56377 is described below
commit 111c1d563774d0fc0424679f630506edea9149ac
Author: Claus Ibsen
AuthorDate: Tue Jun 25 12:17:13 2024 +0200
camel-mail - Fix stream caching with pollEnrich and attachment (#14638)
* CAMEL-20907: camel-mail - Added unit test with pollEnrich and attachments.
* CAMEL-20907: camel-mail - PollEnrich should work with stream caching to
ignore if folder is not open.
---
.../camel/component/mail/MailConverters.java | 35 +++---
.../mail/MailAttachmentPollEnrichTest.java | 128 +
2 files changed, 150 insertions(+), 13 deletions(-)
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
index 0abdeadd5ba..846c8f18168 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
@@ -80,21 +80,30 @@ public final class MailConverters {
*/
@Converter
public static String toString(Multipart multipart) throws
MessagingException, IOException {
-int size = multipart.getCount();
-for (int i = 0; i < size; i++) {
-BodyPart part = multipart.getBodyPart(i);
-Object content = part.getContent();
-while (content instanceof MimeMultipart) {
-if (multipart.getCount() < 1) {
-break;
+try {
+int size = multipart.getCount();
+for (int i = 0; i < size; i++) {
+BodyPart part = multipart.getBodyPart(i);
+Object content = part.getContent();
+while (content instanceof MimeMultipart) {
+if (multipart.getCount() < 1) {
+break;
+}
+part = ((MimeMultipart) content).getBodyPart(0);
+content = part.getContent();
+}
+// Perform a case-insensitive "startsWith" check that works
for different locales
+String prefix = "text";
+if (part.getContentType().regionMatches(true, 0, prefix, 0,
prefix.length())) {
+return part.getContent().toString();
}
-part = ((MimeMultipart) content).getBodyPart(0);
-content = part.getContent();
}
-// Perform a case insensitive "startsWith" check that works for
different locales
-String prefix = "text";
-if (part.getContentType().regionMatches(true, 0, prefix, 0,
prefix.length())) {
-return part.getContent().toString();
+} catch (MessagingException e) {
+Throwable cause = e.getCause();
+if (cause != null && "Folder is not
Open".equals(cause.getMessage())) {
+// ignore if folder is not open and we cannot read the mail
+} else {
+throw e;
}
}
return null;
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java
new file mode 100644
index 000..d6f93411dda
--- /dev/null
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java
@@ -0,0 +1,128 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mail;
+
+import java.util.Map;
+
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.Producer;
+import
(camel) 01/02: CAMEL-20912, CAMEL-20913 - Camel-AWS-Kinesis: KCL Consumers add parameters for passing Cloudwatch and DynamoDB Clients and for profile/default/session credentials Providers
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch kinesis-kcl in repository https://gitbox.apache.org/repos/asf/camel.git commit 93295d03394e98bc4616c903437e0919fbd63154 Author: Andrea Cosentino AuthorDate: Tue Jun 25 11:29:31 2024 +0200 CAMEL-20912, CAMEL-20913 - Camel-AWS-Kinesis: KCL Consumers add parameters for passing Cloudwatch and DynamoDB Clients and for profile/default/session credentials Providers Signed-off-by: Andrea Cosentino --- .../aws2/kinesis/Kinesis2ComponentConfigurer.java | 12 +++ .../aws2/kinesis/Kinesis2EndpointConfigurer.java | 12 +++ .../aws2/kinesis/Kinesis2EndpointUriFactory.java | 4 +- .../camel/component/aws2/kinesis/aws2-kinesis.json | 84 .../aws2/kinesis/KclKinesis2Consumer.java | 112 - .../aws2/kinesis/Kinesis2Configuration.java| 26 + .../kinesis/integration/KclKinesisConsumerIT.java | 6 +- 7 files changed, 186 insertions(+), 70 deletions(-) diff --git a/components/camel-aws/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java b/components/camel-aws/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java index 47834f557c6..8f6412022df 100644 --- a/components/camel-aws/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java +++ b/components/camel-aws/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java @@ -42,7 +42,11 @@ public class Kinesis2ComponentConfigurer extends PropertyConfigurerSupport imple case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true; case "cborenabled": case "cborEnabled": getOrCreateConfiguration(target).setCborEnabled(property(camelContext, boolean.class, value)); return true; +case "cloudwatchasyncclient": +case "cloudWatchAsyncClient": getOrCreateConfiguration(target).setCloudWatchAsyncClient(property(camelContext, software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient.class, value)); return true; case "configuration": target.setConfiguration(property(camelContext, org.apache.camel.component.aws2.kinesis.Kinesis2Configuration.class, value)); return true; +case "dynamodbasyncclient": +case "dynamoDbAsyncClient": getOrCreateConfiguration(target).setDynamoDbAsyncClient(property(camelContext, software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient.class, value)); return true; case "healthcheckconsumerenabled": case "healthCheckConsumerEnabled": target.setHealthCheckConsumerEnabled(property(camelContext, boolean.class, value)); return true; case "healthcheckproducerenabled": @@ -112,7 +116,11 @@ public class Kinesis2ComponentConfigurer extends PropertyConfigurerSupport imple case "bridgeErrorHandler": return boolean.class; case "cborenabled": case "cborEnabled": return boolean.class; +case "cloudwatchasyncclient": +case "cloudWatchAsyncClient": return software.amazon.awssdk.services.cloudwatch.CloudWatchAsyncClient.class; case "configuration": return org.apache.camel.component.aws2.kinesis.Kinesis2Configuration.class; +case "dynamodbasyncclient": +case "dynamoDbAsyncClient": return software.amazon.awssdk.services.dynamodb.DynamoDbAsyncClient.class; case "healthcheckconsumerenabled": case "healthCheckConsumerEnabled": return boolean.class; case "healthcheckproducerenabled": @@ -178,7 +186,11 @@ public class Kinesis2ComponentConfigurer extends PropertyConfigurerSupport imple case "bridgeErrorHandler": return target.isBridgeErrorHandler(); case "cborenabled": case "cborEnabled": return getOrCreateConfiguration(target).isCborEnabled(); +case "cloudwatchasyncclient": +case "cloudWatchAsyncClient": return getOrCreateConfiguration(target).getCloudWatchAsyncClient(); case "configuration": return target.getConfiguration(); +case "dynamodbasyncclient": +case "dynamoDbAsyncClient": return getOrCreateConfiguration(target).getDynamoDbAsyncClient(); case "healthcheckconsumerenabled": case "healthCheckConsumerEnabled": return target.isHealthCheckConsumerEnabled(); case "healthcheckproducerenabled": diff --git a/components/camel-aws/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointConfigurer.java b/components/camel-aws/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointConfigurer.java index c656b45554a..43aa3bdfddd 100644 ---
(camel) 02/02: CAMEL-20912, CAMEL-20913 - Camel-AWS-Kinesis: KCL Consumers add parameters for passing Cloudwatch and DynamoDB Clients and for profile/default/session credentials Providers
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch kinesis-kcl
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6c07ef354cc66dbe8ff019bbb13020cf94a7610a
Author: Andrea Cosentino
AuthorDate: Tue Jun 25 11:46:25 2024 +0200
CAMEL-20912, CAMEL-20913 - Camel-AWS-Kinesis: KCL Consumers add parameters
for passing Cloudwatch and DynamoDB Clients and for profile/default/session
credentials Providers
Signed-off-by: Andrea Cosentino
---
.../camel/catalog/components/aws2-kinesis.json | 84 -
.../dsl/Aws2KinesisComponentBuilderFactory.java| 36
.../dsl/Kinesis2EndpointBuilderFactory.java| 192 +
.../camel/kotlin/components/Aws2KinesisUriDsl.kt | 14 ++
4 files changed, 286 insertions(+), 40 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
index 355c628c0c6..ce904d5350e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-kinesis.json
@@ -39,20 +39,22 @@
"amazonKinesisClient": { "index": 13, "kind": "property", "displayName":
"Amazon Kinesis Client", "group": "advanced", "label": "advanced", "required":
false, "type": "object", "javaType":
"software.amazon.awssdk.services.kinesis.KinesisClient", "deprecated": false,
"deprecationNote": "", "autowired": true, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration",
"configurationField": "configuration", "description": "Amazon Kinesis clien
[...]
"asyncClient": { "index": 14, "kind": "property", "displayName": "Async
Client", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration",
"configurationField": "configuration", "description": "If we want to a
KinesisAsyncClient instance set it to true" },
"autowiredEnabled": { "index": 15, "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 [...]
-"useKclConsumers": { "index": 16, "kind": "property", "displayName": "Use
Kcl Consumers", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration",
"configurationField": "configuration", "description": "If we want to a KCL
Consumer set it to true" },
-"healthCheckConsumerEnabled": { "index": 17, "kind": "property",
"displayName": "Health Check Consumer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all consumer based health checks
from this component" },
-"healthCheckProducerEnabled": { "index": 18, "kind": "property",
"displayName": "Health Check Producer Enabled", "group": "health", "label":
"health", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Used for enabling or disabling all producer based health checks
from this component. Notice: Camel has by default disabled all producer based
health-checks. You can turn on produce [...]
-"proxyHost": { "index": 19, "kind": "property", "displayName": "Proxy
Host", "group": "proxy", "label": "proxy", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.kinesis.Kinesis2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the Kinesis client" },
-"proxyPort": { "index": 20, "kind": "property", "displayName": "Proxy
Port", "group": "proxy", "label": "proxy", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
(camel) branch kinesis-kcl created (now 6c07ef354cc)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch kinesis-kcl in repository https://gitbox.apache.org/repos/asf/camel.git at 6c07ef354cc CAMEL-20912, CAMEL-20913 - Camel-AWS-Kinesis: KCL Consumers add parameters for passing Cloudwatch and DynamoDB Clients and for profile/default/session credentials Providers This branch includes the following new commits: new 93295d03394 CAMEL-20912, CAMEL-20913 - Camel-AWS-Kinesis: KCL Consumers add parameters for passing Cloudwatch and DynamoDB Clients and for profile/default/session credentials Providers new 6c07ef354cc CAMEL-20912, CAMEL-20913 - Camel-AWS-Kinesis: KCL Consumers add parameters for passing Cloudwatch and DynamoDB Clients and for profile/default/session credentials Providers 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.
(camel) 02/02: CAMEL-20907: camel-mail - PollEnrich should work with stream caching to ignore if folder is not open.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch msc
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 42ebca7c135009da18fcca259709dcf9e0de5e38
Author: Claus Ibsen
AuthorDate: Tue Jun 25 11:10:14 2024 +0200
CAMEL-20907: camel-mail - PollEnrich should work with stream caching to
ignore if folder is not open.
---
.../camel/component/mail/MailConverters.java | 35 ++
.../mail/MailAttachmentPollEnrichTest.java | 8 -
2 files changed, 29 insertions(+), 14 deletions(-)
diff --git
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
index 0abdeadd5ba..846c8f18168 100644
---
a/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
+++
b/components/camel-mail/src/main/java/org/apache/camel/component/mail/MailConverters.java
@@ -80,21 +80,30 @@ public final class MailConverters {
*/
@Converter
public static String toString(Multipart multipart) throws
MessagingException, IOException {
-int size = multipart.getCount();
-for (int i = 0; i < size; i++) {
-BodyPart part = multipart.getBodyPart(i);
-Object content = part.getContent();
-while (content instanceof MimeMultipart) {
-if (multipart.getCount() < 1) {
-break;
+try {
+int size = multipart.getCount();
+for (int i = 0; i < size; i++) {
+BodyPart part = multipart.getBodyPart(i);
+Object content = part.getContent();
+while (content instanceof MimeMultipart) {
+if (multipart.getCount() < 1) {
+break;
+}
+part = ((MimeMultipart) content).getBodyPart(0);
+content = part.getContent();
+}
+// Perform a case-insensitive "startsWith" check that works
for different locales
+String prefix = "text";
+if (part.getContentType().regionMatches(true, 0, prefix, 0,
prefix.length())) {
+return part.getContent().toString();
}
-part = ((MimeMultipart) content).getBodyPart(0);
-content = part.getContent();
}
-// Perform a case insensitive "startsWith" check that works for
different locales
-String prefix = "text";
-if (part.getContentType().regionMatches(true, 0, prefix, 0,
prefix.length())) {
-return part.getContent().toString();
+} catch (MessagingException e) {
+Throwable cause = e.getCause();
+if (cause != null && "Folder is not
Open".equals(cause.getMessage())) {
+// ignore if folder is not open and we cannot read the mail
+} else {
+throw e;
}
}
return null;
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java
index ae81d4f7eb9..d6f93411dda 100644
---
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java
@@ -107,13 +107,19 @@ public class MailAttachmentPollEnrichTest extends
CamelTestSupport {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-from("direct:start").streamCache("false")
+from("direct:start")
.pollEnrich(james.uriPrefix(Protocol.pop3) +
"=100=100", 5000)
.process(e -> {
AttachmentMessage attachmentMessage =
e.getIn(AttachmentMessage.class);
Map attachments =
attachmentMessage.getAttachments();
assertEquals(1, attachments.size());
assertEquals("logo.jpeg",
attachments.keySet().iterator().next());
+
+DataHandler dh =
attachments.values().iterator().next();
+byte[] data =
context.getTypeConverter().convertTo(byte[].class, e, dh.getInputStream());
+assertNotNull(data);
+// should be logo that are 10.000 bytes or longer
+assertTrue(data.length > 1, "Should be 1
bytes or more");
})
.to("mock:result");
}
(camel) 01/02: CAMEL-20907: camel-mail - Added unit test with pollEnrich and attachments.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch msc
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 67693e28296d8cea5162384344e6aa157b762787
Author: Claus Ibsen
AuthorDate: Tue Jun 25 10:57:03 2024 +0200
CAMEL-20907: camel-mail - Added unit test with pollEnrich and attachments.
---
.../mail/MailAttachmentPollEnrichTest.java | 122 +
1 file changed, 122 insertions(+)
diff --git
a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java
new file mode 100644
index 000..ae81d4f7eb9
--- /dev/null
+++
b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailAttachmentPollEnrichTest.java
@@ -0,0 +1,122 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.mail;
+
+import java.util.Map;
+
+import jakarta.activation.DataHandler;
+import jakarta.activation.FileDataSource;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.Producer;
+import org.apache.camel.attachment.Attachment;
+import org.apache.camel.attachment.AttachmentMessage;
+import org.apache.camel.attachment.DefaultAttachment;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mail.Mailbox.MailboxUser;
+import org.apache.camel.component.mail.Mailbox.Protocol;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Unit test for Camel attachments and Mail attachments.
+ */
+public class MailAttachmentPollEnrichTest extends CamelTestSupport {
+private static final MailboxUser james = Mailbox.getOrCreateUser("james",
"secret");
+
+@Test
+public void testPollEnrichMailWithAttachments() throws Exception {
+// clear mailbox
+Mailbox.clearAll();
+
+// START SNIPPET: e1
+
+// create an exchange with a normal body and attachment to be produced
as email
+Endpoint endpoint =
context.getEndpoint(james.uriPrefix(Protocol.smtp));
+
+// create the exchange with the mail message that is multipart with a
file and a Hello World text/plain message.
+Exchange exchange = endpoint.createExchange();
+AttachmentMessage in = exchange.getIn(AttachmentMessage.class);
+in.setBody("Hello World");
+DefaultAttachment att = new DefaultAttachment(new
FileDataSource("src/test/data/logo.jpeg"));
+att.addHeader("Content-Description", "some sample content");
+in.addAttachmentObject("logo.jpeg", att);
+
+// create a producer that can produce the exchange (= send the mail)
+Producer producer = endpoint.createProducer();
+// start the producer
+producer.start();
+// and let it go (processes the exchange by sending the email)
+producer.process(exchange);
+
+// END SNIPPET: e1
+
+MockEndpoint mock = getMockEndpoint("mock:result");
+mock.expectedMessageCount(1);
+
+template.sendBody("direct:start", "Trigger");
+
+mock.assertIsSatisfied();
+Exchange out = mock.assertExchangeReceived(0);
+
+// plain text
+assertEquals("Hello World", out.getIn().getBody(String.class));
+
+// attachment
+Map attachments =
out.getIn(AttachmentMessage.class).getAttachmentObjects();
+assertNotNull(attachments, "Should have attachments");
+assertEquals(1, attachments.size());
+
+Attachment attachment =
out.getIn(AttachmentMessage.class).getAttachmentObject("logo.jpeg");
+DataHandler handler = attachment.getDataHandler();
+assertNotNull(handler, "The logo should be there");
+
+// content type should match
+boolean match1 = "image/jpeg;
name=logo.jpeg".equals(handler.getContentType());
+
(camel) branch msc created (now 42ebca7c135)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch msc in repository https://gitbox.apache.org/repos/asf/camel.git at 42ebca7c135 CAMEL-20907: camel-mail - PollEnrich should work with stream caching to ignore if folder is not open. This branch includes the following new commits: new 67693e28296 CAMEL-20907: camel-mail - Added unit test with pollEnrich and attachments. new 42ebca7c135 CAMEL-20907: camel-mail - PollEnrich should work with stream caching to ignore if folder is not open. 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.
(camel-quarkus) branch camel-main updated: Fixed awt version conflict + generated poms
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new 83c367726c Fixed awt version conflict + generated poms
83c367726c is described below
commit 83c367726c397b60a8d60ae31471dfa777ab6b32
Author: JiriOndrusek
AuthorDate: Tue Jun 25 10:26:59 2024 +0200
Fixed awt version conflict + generated poms
---
pom.xml| 1 +
poms/bom/pom.xml | 28
poms/bom/src/main/generated/flattened-full-pom.xml | 28
.../src/main/generated/flattened-reduced-pom.xml | 38 ++
.../generated/flattened-reduced-verbose-pom.xml| 38 ++
5 files changed, 133 insertions(+)
diff --git a/pom.xml b/pom.xml
index ed65349f20..c1d83a3999 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,7 @@
3.7.0
${kudu-version}
2.0.0
+1.4.0
2.24.0
0.31.0
${mapstruct-version}
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index c1ce0f9364..4707ce921d 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -319,6 +319,14 @@
commons-logging
commons-logging
+
+javax.validation
+validation-api
+
+
+org.checkerframework
+checker-qual
+
@@ -6613,6 +6621,11 @@
okio
${okio.version}
+
+com.squareup.okio
+okio-jvm
+${okio.version}
+
com.squareup.retrofit2
converter-jackson
@@ -7125,6 +7138,16 @@
kotlin-script-util
${kotlin.version}
+
+org.jetbrains.kotlin
+kotlin-scripting-compiler-embeddable
+${kotlin.version}
+
+
+org.jetbrains.kotlin
+
kotlin-scripting-compiler-impl-embeddable
+${kotlin.version}
+
org.jetbrains.kotlin
kotlin-scripting-jvm
@@ -7135,6 +7158,11 @@
kotlin-scripting-jvm-host
${kotlin.version}
+
+org.jetbrains.kotlinx
+kotlinx-serialization-core-jvm
+${kotlinx.version}
+
org.jolokia
jolokia-agent-jvm
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 094c25c097..a9f274a000 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -257,6 +257,14 @@
commons-logging
commons-logging
+
+javax.validation
+validation-api
+
+
+org.checkerframework
+checker-qual
+
@@ -6535,6 +6543,11 @@
okio
3.6.0
+
+com.squareup.okio
+okio-jvm
+3.6.0
+
com.squareup.retrofit2
converter-jackson
@@ -7046,6 +7059,16 @@
kotlin-script-util
2.0.0
+
+org.jetbrains.kotlin
+kotlin-scripting-compiler-embeddable
+2.0.0
+
+
+org.jetbrains.kotlin
+kotlin-scripting-compiler-impl-embeddable
+2.0.0
+
org.jetbrains.kotlin
kotlin-scripting-jvm
@@ -7056,6 +7079,11 @@
kotlin-scripting-jvm-host
2.0.0
+
+org.jetbrains.kotlinx
+kotlinx-serialization-core-jvm
+1.4.0
+
org.jolokia
jolokia-agent-jvm
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 39bf377d96..1e75e8b57d 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -257,6 +257,14 @@
commons-logging
commons-logging
+
+javax.validation
+validation-api
+
+
+org.checkerframework
+checker-qual
+
@@ -6520,6 +6528,11 @@
okio
3.6.0
+
+com.squareup.okio
+okio-jvm
+3.6.0
+
com.squareup.retrofit2
(camel-karaf) branch main updated: Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2 (#386)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/main by this push: new b3faaa07 Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2 (#386) b3faaa07 is described below commit b3faaa07ab60fac148764f0bc9ec70f7a65fa2e8 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 25 08:20:10 2024 + Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2 (#386) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3fca3299..b8591dc7 100644 --- a/pom.xml +++ b/pom.xml @@ -565,7 +565,7 @@ 5.1.9 3.13.0 3.7.1 -3.4.1 +3.4.2 3.6.0
(camel-karaf) branch dependabot/maven/org.apache.maven.plugins-maven-jar-plugin-3.4.2 deleted (was 9070610e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-jar-plugin-3.4.2 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 9070610e Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2 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-20838: use a JUnit extension for collecting the test name when necessary
This is an automated email from the ASF dual-hosted git repository.
orpiske 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 a35c86036cb CAMEL-20838: use a JUnit extension for collecting the test
name when necessary
a35c86036cb is described below
commit a35c86036cb836636e1013b10a9dc47f8c35839f
Author: Otavio Rodolfo Piske
AuthorDate: Wed Jun 19 14:25:49 2024 +0200
CAMEL-20838: use a JUnit extension for collecting the test name when
necessary
---
.../component/avro/AvroConsumerTestSupport.java| 12 -
.../component/avro/AvroProducerTestSupport.java| 9 +++-
.../camel/component/consul/ConsulTestSupport.java | 8 ++-
.../es/integration/ElasticsearchTestSupport.java | 8 ++-
.../file/watch/FileWatchComponentTestBase.java | 20 ---
.../component/nitrite/AbstractNitriteTest.java | 8 ++-
.../apache/camel/test/junit5/CamelTestSupport.java | 5 ++
.../camel/test/junit5/TestNameExtension.java | 63 ++
8 files changed, 121 insertions(+), 12 deletions(-)
diff --git
a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
index 3f8585680bf..cc8f7cb2dec 100644
---
a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
+++
b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroConsumerTestSupport.java
@@ -27,7 +27,10 @@ import org.apache.camel.avro.impl.KeyValueProtocolImpl;
import org.apache.camel.avro.test.TestPojo;
import org.apache.camel.avro.test.TestReflection;
import org.apache.camel.avro.test.TestReflectionImpl;
+import org.apache.camel.test.junit5.TestNameExtension;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -55,6 +58,10 @@ public abstract class AvroConsumerTestSupport extends
AvroTestSupport {
KeyValueProtocolImpl keyValue = new KeyValueProtocolImpl();
TestReflection testReflection = new TestReflectionImpl();
+@RegisterExtension
+@Order(10)
+TestNameExtension testNameExtension = new TestNameExtension();
+
protected abstract void initializeTranceiver() throws IOException;
@Override
@@ -187,7 +194,7 @@ public abstract class AvroConsumerTestSupport extends
AvroTestSupport {
}
protected ConsumerRouteType getRouteType() {
-switch (getCurrentTestName()) {
+switch (testNameExtension.getCurrentTestName()) {
case "testInOut()":
case "testInOnly()":
return ConsumerRouteType.specific;
@@ -204,7 +211,8 @@ public abstract class AvroConsumerTestSupport extends
AvroTestSupport {
case "testInOnlyToNotExistingRoute()":
return ConsumerRouteType.specificProcessorWrong;
default:
-throw new IllegalStateException(String.format("Test '%s' is
not listed.", getCurrentTestName()));
+throw new IllegalStateException(
+String.format("Test '%s' is not listed.",
testNameExtension.getCurrentTestName()));
}
}
}
diff --git
a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java
b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java
index 2645b9cbfd7..c08490fb209 100644
---
a/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java
+++
b/components/camel-avro-rpc/camel-avro-rpc-component/src/test/java/org/apache/camel/component/avro/AvroProducerTestSupport.java
@@ -24,7 +24,10 @@ import org.apache.camel.avro.generated.Value;
import org.apache.camel.avro.impl.KeyValueProtocolImpl;
import org.apache.camel.avro.test.TestReflectionImpl;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit5.TestNameExtension;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,6 +38,10 @@ public abstract class AvroProducerTestSupport extends
AvroTestSupport {
KeyValueProtocolImpl keyValue = new KeyValueProtocolImpl();
TestReflectionImpl testReflection = new TestReflectionImpl();
+@RegisterExtension
+@Order(10)
+TestNameExtension testNameExtension = new TestNameExtension();
+
(camel-karaf) branch dependabot/maven/log4j2-version-2.23.1 deleted (was da9ac2d4)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch dependabot/maven/log4j2-version-2.23.1 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was da9ac2d4 Bump log4j2-version from 2.21.1 to 2.23.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch dependabot/maven/testcontainers-version-1.19.8 deleted (was 08279127)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch dependabot/maven/testcontainers-version-1.19.8 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 08279127 Bump testcontainers-version from 1.19.7 to 1.19.8 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch dependabot/maven/spring-amqp-version-3.1.6 deleted (was 20062c97)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch dependabot/maven/spring-amqp-version-3.1.6 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 20062c97 Bump spring-amqp-version from 3.1.5 to 3.1.6 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch main updated: Bump spring-amqp-version from 3.1.5 to 3.1.6 (#383)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/main by this push: new 1fa2f77f Bump spring-amqp-version from 3.1.5 to 3.1.6 (#383) 1fa2f77f is described below commit 1fa2f77f79378d4eabf9f1fb3d1678d6c5b4f811 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 25 10:00:45 2024 +0200 Bump spring-amqp-version from 3.1.5 to 3.1.6 (#383) Bumps `spring-amqp-version` from 3.1.5 to 3.1.6. Updates `org.springframework.amqp:spring-rabbit` from 3.1.5 to 3.1.6 - [Release notes](https://github.com/spring-projects/spring-amqp/releases) - [Commits](https://github.com/spring-projects/spring-amqp/compare/v3.1.5...v3.1.6) Updates `org.springframework.amqp:spring-amqp` from 3.1.5 to 3.1.6 - [Release notes](https://github.com/spring-projects/spring-amqp/releases) - [Commits](https://github.com/spring-projects/spring-amqp/compare/v3.1.5...v3.1.6) --- updated-dependencies: - dependency-name: org.springframework.amqp:spring-rabbit dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework.amqp:spring-amqp 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> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 720403a0..3fca3299 100644 --- a/pom.xml +++ b/pom.xml @@ -559,7 +559,7 @@ 8.0.0 10 2.0.13 -3.1.5 +3.1.6 5.1.9
(camel-karaf) branch dependabot/maven/org.eclipse.jgit-org.eclipse.jgit-6.10.0.202406032230-r deleted (was 8d1879ab)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch dependabot/maven/org.eclipse.jgit-org.eclipse.jgit-6.10.0.202406032230-r in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 8d1879ab Bump org.eclipse.jgit:org.eclipse.jgit The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch dependabot/maven/org.apache.maven.plugins-maven-jar-plugin-3.4.2 updated (d08c85be -> 9070610e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-jar-plugin-3.4.2 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git discard d08c85be Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2 add e7f1f8a1 Bump maven-version from 3.9.7 to 3.9.8 (#388) add 941c83e8 Bump org.apache.maven.plugins:maven-dependency-plugin (#387) add 9070610e Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2 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 (d08c85be) \ N -- N -- N refs/heads/dependabot/maven/org.apache.maven.plugins-maven-jar-plugin-3.4.2 (9070610e) 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: pom.xml | 2 +- tooling/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(camel-karaf) branch dependabot/maven/org.apache.maven.plugins-maven-dependency-plugin-3.7.1 deleted (was 2548c119)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-dependency-plugin-3.7.1 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 2548c119 Bump org.apache.maven.plugins:maven-dependency-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch main updated (e7f1f8a1 -> 941c83e8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git from e7f1f8a1 Bump maven-version from 3.9.7 to 3.9.8 (#388) add 941c83e8 Bump org.apache.maven.plugins:maven-dependency-plugin (#387) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel-karaf) branch dependabot/maven/maven-version-3.9.8 deleted (was dd51901d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/maven-version-3.9.8 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was dd51901d Bump maven-version from 3.9.7 to 3.9.8 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch main updated: Bump maven-version from 3.9.7 to 3.9.8 (#388)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karaf.git The following commit(s) were added to refs/heads/main by this push: new e7f1f8a1 Bump maven-version from 3.9.7 to 3.9.8 (#388) e7f1f8a1 is described below commit e7f1f8a1fc1a7da11262fcbc95016e28ddd63bf2 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 25 07:56:47 2024 + Bump maven-version from 3.9.7 to 3.9.8 (#388) --- tooling/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/pom.xml b/tooling/pom.xml index f08fd9a6..23fc96d6 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -29,7 +29,7 @@ Apache Camel :: Karaf :: Tooling -3.9.7 +3.9.8
(camel) branch dependabot/maven/org.wiremock-wiremock-3.7.0 deleted (was 37732b2fa1b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.wiremock-wiremock-3.7.0 in repository https://gitbox.apache.org/repos/asf/camel.git was 37732b2fa1b chore(deps): Bump org.wiremock:wiremock from 3.6.0 to 3.7.0 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: chore(deps): Bump org.wiremock:wiremock from 3.6.0 to 3.7.0 (#14636)
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 2b202110f88 chore(deps): Bump org.wiremock:wiremock from 3.6.0 to 3.7.0 (#14636) 2b202110f88 is described below commit 2b202110f8827bcd365985e3128936eafdd54fd6 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 25 09:48:17 2024 +0200 chore(deps): Bump org.wiremock:wiremock from 3.6.0 to 3.7.0 (#14636) Bumps [org.wiremock:wiremock](https://github.com/wiremock/wiremock) from 3.6.0 to 3.7.0. - [Release notes](https://github.com/wiremock/wiremock/releases) - [Commits](https://github.com/wiremock/wiremock/compare/3.6.0...3.7.0) --- updated-dependencies: - dependency-name: org.wiremock:wiremock 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 60baf9fdf64..ca9106974a0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -479,7 +479,7 @@ 5.0.0 4.10.0 2.2.2.Final -3.6.0 +3.7.0 4.4.1 7.0.0 4.25
(camel) branch dependabot/maven/io.smallrye.config-smallrye-config-3.8.3 deleted (was 90750107802)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.smallrye.config-smallrye-config-3.8.3 in repository https://gitbox.apache.org/repos/asf/camel.git was 90750107802 chore(deps): Bump io.smallrye.config:smallrye-config from 3.8.2 to 3.8.3 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: chore(deps): Bump io.smallrye.config:smallrye-config from 3.8.2 to 3.8.3 (#14635)
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 a28edec232b chore(deps): Bump io.smallrye.config:smallrye-config from 3.8.2 to 3.8.3 (#14635) a28edec232b is described below commit a28edec232b5c3642d5e439919d80015bf6bdf20 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 25 09:47:55 2024 +0200 chore(deps): Bump io.smallrye.config:smallrye-config from 3.8.2 to 3.8.3 (#14635) Bumps [io.smallrye.config:smallrye-config](https://github.com/smallrye/smallrye-config) from 3.8.2 to 3.8.3. - [Release notes](https://github.com/smallrye/smallrye-config/releases) - [Commits](https://github.com/smallrye/smallrye-config/compare/3.8.2...3.8.3) --- updated-dependencies: - dependency-name: io.smallrye.config:smallrye-config 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 148b7a602fa..60baf9fdf64 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -433,7 +433,7 @@ 2.0.13 2.0.13 4.3.5 -3.8.2 +3.8.3 4.1.0 6.3.0 0.13.0
(camel) branch dependabot/maven/com.fasterxml.woodstox-woodstox-core-7.0.0 deleted (was 8f7972c2f75)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.fasterxml.woodstox-woodstox-core-7.0.0 in repository https://gitbox.apache.org/repos/asf/camel.git was 8f7972c2f75 chore(deps-dev): Bump com.fasterxml.woodstox:woodstox-core 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 (0d15379c6e9 -> f52826cbb86)
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 0d15379c6e9 chore(deps): Bump com.twilio.sdk:twilio from 10.2.1 to 10.3.0 (#14630) add f52826cbb86 chore(deps-dev): Bump com.fasterxml.woodstox:woodstox-core (#14629) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch dependabot/maven/com.twilio.sdk-twilio-10.3.0 deleted (was f87c9e7a5cc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.twilio.sdk-twilio-10.3.0 in repository https://gitbox.apache.org/repos/asf/camel.git was f87c9e7a5cc chore(deps): Bump com.twilio.sdk:twilio from 10.2.1 to 10.3.0 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: chore(deps): Bump com.twilio.sdk:twilio from 10.2.1 to 10.3.0 (#14630)
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 0d15379c6e9 chore(deps): Bump com.twilio.sdk:twilio from 10.2.1 to 10.3.0 (#14630) 0d15379c6e9 is described below commit 0d15379c6e9f76131cdffe247a8809709d97adba Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Jun 25 09:44:40 2024 +0200 chore(deps): Bump com.twilio.sdk:twilio from 10.2.1 to 10.3.0 (#14630) Bumps [com.twilio.sdk:twilio](https://github.com/twilio/twilio-java) from 10.2.1 to 10.3.0. - [Release notes](https://github.com/twilio/twilio-java/releases) - [Changelog](https://github.com/twilio/twilio-java/blob/main/CHANGES.md) - [Commits](https://github.com/twilio/twilio-java/compare/10.2.1...10.3.0) --- updated-dependencies: - dependency-name: com.twilio.sdk:twilio 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 8b3a5d72151..570b201f7a2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -466,7 +466,7 @@ 1.19.8 3.1.2.RELEASE 2.9.2 -10.2.1 +10.3.0 4.1.2 2.3.14.Final 2.9.1
(camel) branch dependabot/maven/org.apache.maven.plugins-maven-dependency-plugin-3.7.1 deleted (was 04b3e869818)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-dependency-plugin-3.7.1 in repository https://gitbox.apache.org/repos/asf/camel.git was 04b3e869818 chore(deps): Bump org.apache.maven.plugins:maven-dependency-plugin 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 (6ab2e71bf0c -> 5cac6d7e734)
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 6ab2e71bf0c chore(deps): Bump io.minio:minio from 8.5.10 to 8.5.11 (#14633) add 5cac6d7e734 chore(deps): Bump org.apache.maven.plugins:maven-dependency-plugin (#14634) No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch dependabot/maven/io.minio-minio-8.5.11 deleted (was 50671a14761)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.minio-minio-8.5.11 in repository https://gitbox.apache.org/repos/asf/camel.git was 50671a14761 chore(deps): Bump io.minio:minio from 8.5.10 to 8.5.11 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 (9754c5937b6 -> 6ab2e71bf0c)
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 9754c5937b6 chore(deps): Bump org.apache.drill.exec:drill-jdbc-all (#14632) add 6ab2e71bf0c chore(deps): Bump io.minio:minio from 8.5.10 to 8.5.11 (#14633) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch dependabot/maven/org.apache.drill.exec-drill-jdbc-all-1.21.2 deleted (was ceb135514d0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.drill.exec-drill-jdbc-all-1.21.2 in repository https://gitbox.apache.org/repos/asf/camel.git was ceb135514d0 chore(deps): Bump org.apache.drill.exec:drill-jdbc-all 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 dependabot/maven/aws-java-sdk2-version-2.26.8 deleted (was c9ce11a7443)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/aws-java-sdk2-version-2.26.8 in repository https://gitbox.apache.org/repos/asf/camel.git was c9ce11a7443 chore(deps): Bump aws-java-sdk2-version from 2.26.7 to 2.26.8 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 (f765808912e -> d5062309366)
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 f765808912e CAMEL-20909 - Camel-Aws-Kinesis: Support KCL Consumers (#14628) add d5062309366 chore(deps): Bump aws-java-sdk2-version from 2.26.7 to 2.26.8 (#14631) 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 (d5062309366 -> 9754c5937b6)
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 d5062309366 chore(deps): Bump aws-java-sdk2-version from 2.26.7 to 2.26.8 (#14631) add 9754c5937b6 chore(deps): Bump org.apache.drill.exec:drill-jdbc-all (#14632) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch dependabot/maven/org.wiremock-wiremock-3.7.0 created (now 37732b2fa1b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.wiremock-wiremock-3.7.0 in repository https://gitbox.apache.org/repos/asf/camel.git at 37732b2fa1b chore(deps): Bump org.wiremock:wiremock from 3.6.0 to 3.7.0 No new revisions were added by this update.
(camel) branch dependabot/maven/io.smallrye.config-smallrye-config-3.8.3 created (now 90750107802)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.smallrye.config-smallrye-config-3.8.3 in repository https://gitbox.apache.org/repos/asf/camel.git at 90750107802 chore(deps): Bump io.smallrye.config:smallrye-config from 3.8.2 to 3.8.3 No new revisions were added by this update.
(camel) branch dependabot/maven/org.apache.maven.plugins-maven-dependency-plugin-3.7.1 created (now 04b3e869818)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-dependency-plugin-3.7.1 in repository https://gitbox.apache.org/repos/asf/camel.git at 04b3e869818 chore(deps): Bump org.apache.maven.plugins:maven-dependency-plugin No new revisions were added by this update.
(camel) branch dependabot/maven/io.minio-minio-8.5.11 created (now 50671a14761)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.minio-minio-8.5.11 in repository https://gitbox.apache.org/repos/asf/camel.git at 50671a14761 chore(deps): Bump io.minio:minio from 8.5.10 to 8.5.11 No new revisions were added by this update.
(camel) branch dependabot/maven/org.apache.drill.exec-drill-jdbc-all-1.21.2 created (now ceb135514d0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.drill.exec-drill-jdbc-all-1.21.2 in repository https://gitbox.apache.org/repos/asf/camel.git at ceb135514d0 chore(deps): Bump org.apache.drill.exec:drill-jdbc-all No new revisions were added by this update.
(camel) branch dependabot/maven/aws-java-sdk2-version-2.26.8 created (now c9ce11a7443)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/aws-java-sdk2-version-2.26.8 in repository https://gitbox.apache.org/repos/asf/camel.git at c9ce11a7443 chore(deps): Bump aws-java-sdk2-version from 2.26.7 to 2.26.8 No new revisions were added by this update.
(camel) branch dependabot/maven/com.twilio.sdk-twilio-10.3.0 created (now f87c9e7a5cc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.twilio.sdk-twilio-10.3.0 in repository https://gitbox.apache.org/repos/asf/camel.git at f87c9e7a5cc chore(deps): Bump com.twilio.sdk:twilio from 10.2.1 to 10.3.0 No new revisions were added by this update.
(camel) branch dependabot/maven/com.fasterxml.woodstox-woodstox-core-7.0.0 created (now 8f7972c2f75)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.fasterxml.woodstox-woodstox-core-7.0.0 in repository https://gitbox.apache.org/repos/asf/camel.git at 8f7972c2f75 chore(deps-dev): Bump com.fasterxml.woodstox:woodstox-core No new revisions were added by this update.
