[camel-quarkus] 06/08: 3579 Improve quartz test coverage
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 7df5826485e363d50842f4f036f4ac00dadf9e50 Author: JiriOndrusek AuthorDate: Tue Mar 8 09:44:20 2022 +0100 3579 Improve quartz test coverage --- .../ROOT/pages/reference/extensions/quartz.adoc| 58 ++ extensions/quartz/deployment/pom.xml | 10 + .../quartz/deployment/QuartzProcessor.java | 58 +- extensions/quartz/runtime/pom.xml | 14 ++ .../quartz/runtime/src/main/doc/limitations.adoc | 4 + extensions/quartz/runtime/src/main/doc/usage.adoc | 46 + .../CamelQuarkusQuartzConnectionProvider.java | 66 +++ integration-tests/quartz/pom.xml | 30 +++ .../component/quartz/it/QuartzResource.java| 74 .../quarkus/component/quartz/it/QuartzRoutes.java | 28 ++- .../src/main/resources/application.properties | 47 + .../db/migration/V1.0.1__QuarkusQuartz.sql | 207 + .../src/main/resources/quartz-node-A.properties| 62 ++ .../src/main/resources/quartz-node-B.properties| 63 +++ .../src/main/resources/quartz-node-C.properties| 67 +++ .../quartz/src/main/resources/quartz.properties| 26 +++ .../quarkus/component/quartz/it/QuartzTest.java| 76 pom.xml| 1 + poms/bom/pom.xml | 5 + 19 files changed, 940 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/quartz.adoc b/docs/modules/ROOT/pages/reference/extensions/quartz.adoc index 99c7cdf..196d77f 100644 --- a/docs/modules/ROOT/pages/reference/extensions/quartz.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/quartz.adoc @@ -38,3 +38,61 @@ Or add the coordinates to your existing project: Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. + +== Usage + +=== Clustering + +There are two options how to run Quartz in clustered mode: + + Quarkus based + +This is the preferred option. Follow the https://quarkus.io/guides/quartz[scheduling periodic tasks quartz guide]. + +- Define database configuration in `application.properties`. +- Use for example `flyway` to create database tables required for `Quartz`. + += Quartz based with an Agroal datasource + +Follow the http://www.quartz-scheduler.org/documentation/quartz-1.8.6/configuration/ConfigJDBCJobStoreClustering.html#configure-clustering-with-jdbc-jobstore[Configure Clustering with JDBC-JobStore Guide] with different DS configuration: + +- Use `quartz.properties` to configure `JobStore`. +- Define datasource via quarkus (see the https://quarkus.io/guides/datasource[Quarkus datasource documentation)] and use `CamelQuarkusQuartzConnectionProvider` as `ConnectionProvider` in `quartz.properties`: + +``` +... +org.quartz.jobStore.dataSource = myDS + +# datasource configuration +org.quartz.dataSource.myDS.connectionProvider.class = org.apache.camel.quarkus.component.quartz.CamelQuarkusQuartzConnectionProvider +org.quartz.dataSource.myDSB.dataSourceName = ds_name_if_not_set_default_ds_will_be_used +``` + + +- You can use for example `flyway` to create database tables required for `Quartz`. + += Quartz based + +You can follow the http://www.quartz-scheduler.org/documentation/quartz-1.8.6/configuration/ConfigJDBCJobStoreClustering.html#configure-clustering-with-jdbc-jobstore[Configure Clustering with JDBC-JobStore Guide] without any modification: + +``` +... +org.quartz.jobStore.dataSource = myDS + +# datasource configuration +org.quartz.dataSource.myDS.driver = org.postgresql.Driver + +# datasource configuration +org.quartz.dataSource.myDS.URL=jdbc:postgresql://localhost:5432/default +org.quartz.dataSource.myDS.user = quarkus +org.quartz.dataSource.myDS.password = quarkus +``` + + +== Camel Quarkus limitations + +=== JDBC Job Store + +Quartz's property `org.quartz.jobStore.useProperties` is set to `true` and can not be modified. The value is forced by the Quarkus Quartz extension. +See the Quartz documentation for more information about `org.quartz.jobStore.useProperties`. + diff --git a/extensions/quartz/deployment/pom.xml b/extensions/quartz/deployment/pom.xml index 6c9eb0d..2420c69 100644 --- a/extensions/quartz/deployment/pom.xml +++ b/extensions/quartz/deployment/pom.xml @@ -33,6 +33,12 @@ io.quarkus quarkus-quartz-deployment + + +mchange-commons-java +com.mchange + + org.apache.camel.quarkus @@ -42,6 +48,10 @@ org.apache.camel.quarkus camel-quarkus-quartz + +io.quarkus +
[camel-quarkus] 04/08: Work around Tika version incompatibilities between Quarkus Tika & Camel Tika #3599
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3555acffbf9c8f1b60066bdd0fdeffe2f17e420d
Author: James Netherton
AuthorDate: Tue Mar 8 10:50:20 2022 +
Work around Tika version incompatibilities between Quarkus Tika & Camel
Tika #3599
---
extensions/tika/runtime/pom.xml| 11 ++--
.../camel/quarkus/component/tika/TikaRecorder.java | 33 +-
.../tika/graalvm/TikaProducerSubstitutions.java| 77 ++
3 files changed, 115 insertions(+), 6 deletions(-)
diff --git a/extensions/tika/runtime/pom.xml b/extensions/tika/runtime/pom.xml
index 3470945..74ae8a2 100644
--- a/extensions/tika/runtime/pom.xml
+++ b/extensions/tika/runtime/pom.xml
@@ -58,11 +58,7 @@
org.apache.tika
-tika-core
-
-
-org.apache.tika
-tika-parsers
+*
@@ -74,6 +70,11 @@
io.quarkiverse.tika
quarkus-tika
+
+org.graalvm.nativeimage
+svm
+provided
+
diff --git
a/extensions/tika/runtime/src/main/java/org/apache/camel/quarkus/component/tika/TikaRecorder.java
b/extensions/tika/runtime/src/main/java/org/apache/camel/quarkus/component/tika/TikaRecorder.java
index 6d6760b..c5ea87f 100644
---
a/extensions/tika/runtime/src/main/java/org/apache/camel/quarkus/component/tika/TikaRecorder.java
+++
b/extensions/tika/runtime/src/main/java/org/apache/camel/quarkus/component/tika/TikaRecorder.java
@@ -18,9 +18,14 @@ package org.apache.camel.quarkus.component.tika;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
import java.util.Collections;
import java.util.Set;
+import javax.xml.transform.TransformerConfigurationException;
+
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -36,12 +41,14 @@ import org.apache.camel.Producer;
import org.apache.camel.component.tika.TikaComponent;
import org.apache.camel.component.tika.TikaConfiguration;
import org.apache.camel.component.tika.TikaEndpoint;
+import org.apache.camel.component.tika.TikaParseOutputFormat;
import org.apache.camel.component.tika.TikaProducer;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
+import org.apache.tika.parser.html.BoilerpipeContentHandler;
@Recorder
public class TikaRecorder {
@@ -78,7 +85,7 @@ public class TikaRecorder {
@Override
public Producer createProducer() throws Exception {
TikaParser tikaParser = tikaParserProducer.tikaParser();
-return new TikaProducer(this, new Parser() {
+return new QuarkusTikaProducer(this, new Parser() {
@Override
public Set getSupportedTypes(ParseContext
parseContext) {
return Collections.emptySet();
@@ -99,4 +106,28 @@ public class TikaRecorder {
}
}
+// TODO: Remove this when Camel Tika & Quarkus Tika versions are aligned
+// https://github.com/apache/camel-quarkus/issues/3599
+static class QuarkusTikaProducer extends TikaProducer {
+
+public QuarkusTikaProducer(TikaEndpoint endpoint) {
+super(endpoint);
+}
+
+public QuarkusTikaProducer(TikaEndpoint endpoint, Parser parser) {
+super(endpoint, parser);
+}
+
+@Override
+protected ContentHandler getContentHandler(TikaConfiguration
configuration, OutputStream outputStream)
+throws TransformerConfigurationException,
UnsupportedEncodingException {
+TikaParseOutputFormat outputFormat =
configuration.getTikaParseOutputFormat();
+if (outputFormat.equals(TikaParseOutputFormat.textMain)) {
+return new BoilerpipeContentHandler(
+new OutputStreamWriter(outputStream,
configuration.getTikaParseOutputEncoding()));
+}
+return super.getContentHandler(configuration, outputStream);
+}
+}
+
}
diff --git
a/extensions/tika/runtime/src/main/java/org/apache/camel/quarkus/component/tika/graalvm/TikaProducerSubstitutions.java
b/extensions/tika/runtime/src/main/java/org/apache/camel/quarkus/component/tika/graalvm/TikaProducerSubstitutions.java
new file mode 100644
index 000..343edae
--- /dev/null
+++
b/extensions/tika/runtime/src/main/java/org/apache/camel/quarkus/component/tika/graalvm/TikaProducerSubstitutions.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software
[camel-quarkus] 07/08: Temporarilly disable Aws2KinesisTest.kinesis due to #3638
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit e12983982ddcd9e58baf051bcd48fbc994d1b487
Author: James Netherton
AuthorDate: Fri Mar 18 12:22:02 2022 +
Temporarilly disable Aws2KinesisTest.kinesis due to #3638
---
.../apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTest.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTest.java
b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTest.java
index cfc8a43..e35ca1c 100644
---
a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTest.java
+++
b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTest.java
@@ -32,6 +32,7 @@ import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.ConfigProvider;
import org.hamcrest.Matchers;
import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.localstack.LocalStackContainer.Service;
import software.amazon.awssdk.core.ResponseInputStream;
@@ -51,6 +52,7 @@ class Aws2KinesisTest {
@Aws2Client(Service.S3)
S3Client client;
+@Disabled("https://github.com/apache/camel-quarkus/issues/3638;)
@Test
public void kinesis() {
final String msg = "kinesis-" +
java.util.UUID.randomUUID().toString().replace("-", "");
[camel-quarkus] 05/08: Fix #3592 add some ReflectiveClassBuildItem for camel-kafka (#3594)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 88cf86ddc43a4bc6bf3e44aa69ea4e7c69cbadb3
Author: Amos Feng
AuthorDate: Fri Mar 11 17:06:30 2022 +0800
Fix #3592 add some ReflectiveClassBuildItem for camel-kafka (#3594)
---
.../component/kafka/deployment/KafkaProcessor.java | 26 ++
.../quarkus/test/support/kafka/InjectKafka.java| 27 ++
.../test/support/kafka/KafkaTestResource.java | 7 +++
integration-tests/kafka/pom.xml| 4 ++
.../kafka/it/CamelKafkaHealthCheckIT.java | 23 +
.../kafka/it/CamelKafkaHealthCheckTest.java| 59 ++
.../kafka/it/KafkaHealthCheckProfile.java | 29 +++
7 files changed, 175 insertions(+)
diff --git
a/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
b/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
index 90e2945..270a7a1 100644
---
a/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
+++
b/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
@@ -16,7 +16,9 @@
*/
package org.apache.camel.quarkus.component.kafka.deployment;
+import java.util.Collection;
import java.util.Optional;
+import java.util.stream.Stream;
import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
import io.quarkus.deployment.Capabilities;
@@ -24,19 +26,28 @@ import io.quarkus.deployment.Capability;
import io.quarkus.deployment.IsNormal;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import
io.quarkus.deployment.builditem.DevServicesLauncherConfigResultBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig;
import io.quarkus.kafka.client.deployment.KafkaBuildTimeConfig;
import org.apache.camel.quarkus.component.kafka.KafkaClientFactoryProducer;
import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.ConfigProvider;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
class KafkaProcessor {
private static final String FEATURE = "camel-kafka";
private static final String CAMEL_KAFKA_BROKERS =
"camel.component.kafka.brokers";
private static final String KAFKA_BOOTSTRAP_SERVERS =
"kafka.bootstrap.servers";
+private static final DotName[] KAFKA_CLIENTS_TYPES = {
+DotName.createSimple("org.apache.kafka.clients.producer.Producer"),
+DotName.createSimple("org.apache.kafka.clients.consumer.Consumer")
+};
@BuildStep
FeatureBuildItem feature() {
@@ -68,4 +79,19 @@ class KafkaProcessor {
}
}
}
+
+@BuildStep
+public void reflectiveClasses(CombinedIndexBuildItem combinedIndex,
+BuildProducer reflectiveClass) {
+IndexView index = combinedIndex.getIndex();
+
+Stream.of(KAFKA_CLIENTS_TYPES)
+.map(index::getAllKnownImplementors)
+.flatMap(Collection::stream)
+.map(ClassInfo::toString)
+.forEach(name -> reflectiveClass.produce(new
ReflectiveClassBuildItem(false, true, name)));
+
+reflectiveClass
+.produce(new ReflectiveClassBuildItem(false, true,
"org.apache.kafka.clients.producer.internals.Sender"));
+}
}
diff --git
a/integration-tests-support/kafka/src/main/java/org/apache/camel/quarkus/test/support/kafka/InjectKafka.java
b/integration-tests-support/kafka/src/main/java/org/apache/camel/quarkus/test/support/kafka/InjectKafka.java
new file mode 100644
index 000..02dca6a
--- /dev/null
+++
b/integration-tests-support/kafka/src/main/java/org/apache/camel/quarkus/test/support/kafka/InjectKafka.java
@@ -0,0 +1,27 @@
+/*
+ * 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,
+ *
[camel-quarkus] 03/08: Temporary hacks to handle version misalignment of smallrye-health and smallrye-faulttolerance in Quarkus & Camel
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 7178534ca3c28ea5623d4e916df35cfe08b67975
Author: James Netherton
AuthorDate: Fri Feb 11 10:08:03 2022 +
Temporary hacks to handle version misalignment of smallrye-health and
smallrye-faulttolerance in Quarkus & Camel
---
.../MicroprofileFaultToleranceProcessor.java | 9 +
.../microprofile-fault-tolerance/runtime/pom.xml | 2 +
.../FaultToleranceConfiguration.java | 120 +
.../faulttolerance/FaultToleranceConstants.java} | 21 +-
.../faulttolerance/FaultToleranceProcessor.java| 536 +
.../FaultToleranceProcessorFactory.java} | 28 +-
.../faulttolerance/FaultToleranceReifier.java | 193
.../apache/camel/model/CircuitBreakerDefinition| 18 +
.../runtime/CamelMicroProfileHealthRecorder.java | 3 +-
...amelQuarkusMicroProfileHealthCheckRegistry.java | 62 +++
10 files changed, 958 insertions(+), 34 deletions(-)
diff --git
a/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
b/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
index 05673b1..6e8c382 100644
---
a/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
+++
b/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
@@ -16,9 +16,13 @@
*/
package
org.apache.camel.quarkus.component.microprofile.fault.tolerance.deployment;
+import java.nio.file.Paths;
+
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import
org.apache.camel.component.microprofile.faulttolerance.FaultToleranceProcessorFactory;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
class MicroprofileFaultToleranceProcessor {
@@ -35,4 +39,9 @@ class MicroprofileFaultToleranceProcessor {
"META-INF/services/org/apache/camel/model/CircuitBreakerDefinition");
}
+@BuildStep
+CamelServiceBuildItem camelCronServicePattern() {
+return new
CamelServiceBuildItem(Paths.get("META-INF/services/org/apache/camel/model/CircuitBreakerDefinition"),
+FaultToleranceProcessorFactory.class.getName());
+}
}
diff --git a/extensions/microprofile-fault-tolerance/runtime/pom.xml
b/extensions/microprofile-fault-tolerance/runtime/pom.xml
index 3401f07..22e3962 100644
--- a/extensions/microprofile-fault-tolerance/runtime/pom.xml
+++ b/extensions/microprofile-fault-tolerance/runtime/pom.xml
@@ -56,10 +56,12 @@
org.apache.camel.quarkus
camel-quarkus-core
+
diff --git
a/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
b/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
new file mode 100644
index 000..7cb3d4d
--- /dev/null
+++
b/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
@@ -0,0 +1,120 @@
+/*
+ * 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.microprofile.faulttolerance;
+
+public class FaultToleranceConfiguration {
+
+private long delay;
+private int successThreshold;
+private int requestVolumeThreshold;
+private float failureRatio;
+private boolean timeoutEnabled;
+private long timeoutDuration;
+private
[camel-quarkus] 08/08: Temporarilly manually update google-auth-library-credentials until gRPC is upgraded to 1.45.x
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 8f456bc904ad080334a5c029b2f18f88d513f424 Author: James Netherton AuthorDate: Fri Mar 18 13:09:23 2022 + Temporarilly manually update google-auth-library-credentials until gRPC is upgraded to 1.45.x --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ca7873c..475a2c0 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ 1.1.2 1.111 0.8.0 - 0.22.2 + 1.5.3 21.3.1 1.43.2 4.0
[camel-quarkus] 02/08: Test for Debezium mysql - passing additionalProperties results in wrong properties beeing passed #3488
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3699da4a644c1edeade0070d76a249f29e863677
Author: JiriOndrusek
AuthorDate: Mon Feb 21 15:51:05 2022 +0100
Test for Debezium mysql - passing additionalProperties results in wrong
properties beeing passed #3488
---
.../common/it/AbstractDebeziumResource.java| 29 +-
.../common/it/postgres/DebeziumPostgresTest.java | 15 +++
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git
a/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/AbstractDebeziumResource.java
b/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/AbstractDebeziumResource.java
index ff49301..0e74a9b 100644
---
a/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/AbstractDebeziumResource.java
+++
b/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/AbstractDebeziumResource.java
@@ -16,11 +16,20 @@
*/
package org.apache.camel.quarkus.component.debezium.common.it;
+import java.util.Map;
+import java.util.stream.Collectors;
+
import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import org.apache.camel.CamelContext;
import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.component.debezium.DebeziumConstants;
+import org.apache.camel.component.debezium.DebeziumEndpoint;
import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.inject.ConfigProperty;
@@ -41,10 +50,23 @@ public abstract class AbstractDebeziumResource {
@Inject
Config config;
+@Inject
+CamelContext camelContext;
+
public AbstractDebeziumResource(Type type) {
this.type = type;
}
+@Path("/getAdditionalProperties")
+@GET
+@Produces(MediaType.APPLICATION_JSON)
+public Map getAdditionalProperties() {
+DebeziumEndpoint endpoint = (DebeziumEndpoint)
camelContext.getEndpoint(getEndpointUrl()
++ "=CET");
+return
endpoint.getConfiguration().getAdditionalProperties().entrySet().stream()
+.collect(Collectors.toMap(Map.Entry::getKey, e -> (String)
e.getValue()));
+}
+
String getEndpoinUrl(String hostname, String port, String username, String
password, String databaseServerName,
String offsetStorageFileName) {
return type.getComponent() + ":localhost?"
@@ -90,6 +112,11 @@ public abstract class AbstractDebeziumResource {
}
private Exchange receiveAsExchange() {
+String endpoint = getEndpointUrl();
+return consumerTemplate.receive(endpoint, TIMEOUT);
+}
+
+protected String getEndpointUrl() {
String endpoint = getEndpoinUrl(
config.getValue(type.getPropertyHostname(), String.class),
config.getValue(type.getPropertyPort(), String.class),
@@ -97,6 +124,6 @@ public abstract class AbstractDebeziumResource {
config.getValue(type.getPropertyPassword(), String.class),
"qa",
config.getValue(type.getPropertyOffsetFileName(),
String.class));
-return consumerTemplate.receive(endpoint, TIMEOUT);
+return endpoint;
}
}
diff --git
a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java
b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java
index c610735..4a7148a 100644
---
a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java
+++
b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java
@@ -22,6 +22,7 @@ import java.sql.SQLException;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
import
org.apache.camel.quarkus.component.debezium.common.it.AbstractDebeziumTest;
import org.apache.camel.quarkus.component.debezium.common.it.Type;
import org.eclipse.microprofile.config.Config;
@@ -30,8 +31,12 @@ import org.jboss.logging.Logger;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+import static org.hamcrest.Matchers.is;
+
@QuarkusTest
@QuarkusTestResource(DebeziumPostgresTestResource.class)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@@ -51,6
[camel-quarkus] 01/08: Upgrade Camel to 3.16.0
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 12a983de6d658bafbfdca77e31e794b3518f4e66
Author: James Netherton
AuthorDate: Wed Feb 9 11:13:37 2022 +
Upgrade Camel to 3.16.0
---
docs/antora.yml| 6 +-
.../examples/components/elasticsearch-rest.yml | 2 +-
docs/modules/ROOT/examples/dataformats/ical.yml| 2 +-
.../ROOT/examples/dataformats/jacksonXml.yml | 2 +-
docs/modules/ROOT/pages/migration-guide/2.8.0.adoc | 2 +-
.../reference/extensions/elasticsearch-rest.adoc | 6 +-
.../ROOT/pages/reference/extensions/fhir.adoc | 2 +-
.../ROOT/pages/reference/extensions/ical.adoc | 4 +-
.../pages/reference/extensions/jacksonxml.adoc | 4 +-
.../ROOT/pages/reference/extensions/yaml-dsl.adoc | 6 --
.../pages/user-guide/defining-camel-routes.adoc| 6 +-
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
.../camel/quarkus/component/fhir/FhirConfig.java | 2 +-
.../camel/quarkus/component/fhir/FhirFlags.java| 2 +-
.../main/resources/META-INF/quarkus-extension.yaml | 2 +-
.../main/resources/META-INF/quarkus-extension.yaml | 2 +-
.../deployment/MicroProfileHealthProcessor.java| 5 --
.../MicroProfileHealthCamelChecksDisabledTest.java | 6 +-
extensions/openapi-java/deployment/pom.xml | 5 ++
.../openapi/java/deployment/RESTOpenAPITest.java | 4 +-
.../openapi/java/deployment/RestRoutes.java| 7 +-
.../src/test/resources/application.properties | 2 +-
.../resources/routes/{my-route.xml => rests.xml} | 4 +-
.../resources/routes/{my-route.xml => routes.xml} | 16 ++--
.../src/main/resources/application.properties | 2 +-
.../component/stream/it/StreamResource.java| 2 +-
.../quarkus/component/stream/it/StreamTest.java| 2 +-
integration-tests/google-storage/pom.xml | 5 ++
.../storage/it/GoogleStorageTestResource.java | 13 +--
.../quarkus/component/kafka/CamelKafkaRoutes.java | 2 +-
.../src/main/resources/rests/my-rests.xml | 8 +-
.../src/main/resources/routes/my-routes.xml| 7 ++
.../src/main/resources/rests/my-rests.xml | 8 +-
.../src/main/resources/routes/my-routes.xml| 7 ++
.../camel/quarkus/main/CoreMainXmlJaxbTest.java| 2 +-
.../src/main/resources/routes/my-rests.yaml| 6 +-
.../it/health/CustomHealthCheckRepository.java | 17
.../microprofile/it/health/FailingHealthCheck.java | 2 +-
.../it/health/FailureThresholdHealthCheck.java | 51
.../it/health/MicroProfileHealthResource.java | 17 +---
.../src/main/resources/application.properties | 7 +-
.../it/health/MicroProfileHealthTest.java | 67
.../component/openapijava/it/OpenApiRoutes.java| 44 --
.../openapijava/it/common/OpenApiTest.java | 4 +-
integration-tests/platform-http/pom.xml| 17
.../platform/http/it/PlatformHttpRouteBuilder.java | 18 ++---
.../component/http/server/it/PlatformHttpTest.java | 4 +-
integration-tests/rest/pom.xml | 17
.../quarkus/component/rest/it/RestRoutes.java | 93 +++---
integration-tests/servlet/pom.xml | 21 -
.../quarkus/component/servlet/CamelRoute.java | 19 +++--
pom.xml| 8 +-
52 files changed, 233 insertions(+), 337 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index e4edba8..ea53a51 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -29,11 +29,11 @@ asciidoc:
min-maven-version: 3.8.1 # replace ${min-maven-version}
target-maven-version: 3.8.4 # replace ${target-maven-version}
-camel-version: 3.15.0 # replace ${camel.version}
-camel-docs-version: 3.15.x # replace ${camel.docs.components.version}
+camel-version: 3.16.0-SNAPSHOT # replace ${camel.version}
+camel-docs-version: 3.16.x # replace ${camel.docs.components.version}
quarkus-version: 2.7.5.Final # replace ${quarkus.version}
graalvm-version: 21.3.1 # replace ${graalvm.version}
graalvm-docs-version: 21.3
# attributes used in xrefs to other Antora components
-cq-camel-components: 3.15.x@components # replace
${camel.docs.components.xref}
+cq-camel-components: 3.16.x@components # replace
${camel.docs.components.xref}
quarkus-examples-version: latest
diff --git a/docs/modules/ROOT/examples/components/elasticsearch-rest.yml
b/docs/modules/ROOT/examples/components/elasticsearch-rest.yml
index 9532a39..e00e4ff 100644
--- a/docs/modules/ROOT/examples/components/elasticsearch-rest.yml
+++ b/docs/modules/ROOT/examples/components/elasticsearch-rest.yml
@@ -4,7 +4,7 @@ cqArtifactId: camel-quarkus-elasticsearch-rest
cqArtifactIdBase: elasticsearch-rest
cqNativeSupported: true
cqStatus: Stable
[camel-quarkus] branch camel-main updated (8704a16 -> 8f456bc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard 8704a16 Temporarilly manually update google-auth-library-credentials until gRPC is upgraded to 1.45.x discard a22c3cf Temporarilly disable Aws2KinesisTest.kinesis due to #3638 discard 42bd5b2 3579 Improve quartz test coverage discard 03020bc Fix #3592 add some ReflectiveClassBuildItem for camel-kafka (#3594) discard fe173e0 Work around Tika version incompatibilities between Quarkus Tika & Camel Tika #3599 discard e3415aa Temporary hacks to handle version misalignment of smallrye-health and smallrye-faulttolerance in Quarkus & Camel discard 012b764 Test for Debezium mysql - passing additionalProperties results in wrong properties beeing passed #3488 discard dbf9ea7 Upgrade Camel to 3.16.0 add c226c97 Updated CHANGELOG.md new 12a983d Upgrade Camel to 3.16.0 new 3699da4 Test for Debezium mysql - passing additionalProperties results in wrong properties beeing passed #3488 new 7178534 Temporary hacks to handle version misalignment of smallrye-health and smallrye-faulttolerance in Quarkus & Camel new 3555acf Work around Tika version incompatibilities between Quarkus Tika & Camel Tika #3599 new 88cf86d Fix #3592 add some ReflectiveClassBuildItem for camel-kafka (#3594) new 7df5826 3579 Improve quartz test coverage new e129839 Temporarilly disable Aws2KinesisTest.kinesis due to #3638 new 8f456bc Temporarilly manually update google-auth-library-credentials until gRPC is upgraded to 1.45.x 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 (8704a16) \ N -- N -- N refs/heads/camel-main (8f456bc) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 8 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: CHANGELOG.md | 6 ++ 1 file changed, 6 insertions(+)
[camel-k] branch main updated: Updated CHANGELOG.md
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 32415fa Updated CHANGELOG.md 32415fa is described below commit 32415faf582c2b750cb6d5304066d05c6c3aa84d Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sun Mar 20 03:07:50 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 9 + 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d83ca5..2c35ffd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +## [Unreleased](https://github.com/apache/camel-k/tree/HEAD) + +[Full Changelog](https://github.com/apache/camel-k/compare/1.9.0-nightly...HEAD) + +**Closed issues:** + +- Be able to configure PodMonitor via prometheus trait [\#2812](https://github.com/apache/camel-k/issues/2812) +- SEDA low performance issue [\#2808](https://github.com/apache/camel-k/issues/2808) + ## [1.9.0-nightly](https://github.com/apache/camel-k/tree/1.9.0-nightly) (2022-03-14) [Full Changelog](https://github.com/apache/camel-k/compare/1.9.0-nightly.202203101127...1.9.0-nightly)
[camel-k-runtime] branch main updated: Updated CHANGELOG.md
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-runtime.git The following commit(s) were added to refs/heads/main by this push: new 91a0d3b Updated CHANGELOG.md 91a0d3b is described below commit 91a0d3b52755161f058c5477e3510be02afa8204 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sun Mar 20 03:04:36 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1407c87..81eeec3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ - build\(deps\): bump spock-core from 2.0-groovy-3.0 to 2.1-groovy-3.0 [\#801](https://github.com/apache/camel-k-runtime/pull/801) ([dependabot[bot]](https://github.com/apps/dependabot)) - build\(deps\): bump versions-maven-plugin from 2.9.0 to 2.10.0 [\#800](https://github.com/apache/camel-k-runtime/pull/800) ([dependabot[bot]](https://github.com/apps/dependabot)) - build\(deps\): bump maven-plugin-annotations from 3.6.2 to 3.6.4 [\#799](https://github.com/apache/camel-k-runtime/pull/799) ([dependabot[bot]](https://github.com/apps/dependabot)) +- build\(deps\): bump groovy-version from 3.0.9 to 3.0.10 [\#798](https://github.com/apache/camel-k-runtime/pull/798) ([dependabot[bot]](https://github.com/apps/dependabot)) - Removed staging repositories for Camel-quarkus 2.8.0-M1 [\#797](https://github.com/apache/camel-k-runtime/pull/797) ([oscerd](https://github.com/oscerd)) - Move dsl-jsh to core project - Removed the jsh module from camel-k-ru… [\#796](https://github.com/apache/camel-k-runtime/pull/796) ([oscerd](https://github.com/oscerd)) - Build 3.15.0 [\#795](https://github.com/apache/camel-k-runtime/pull/795) ([oscerd](https://github.com/oscerd))
[camel-karaf] branch automatic-periodic-sync updated (224073b -> f8199b1)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-karaf.git. omit 224073b [create-pull-request] automated change add d615f90 [create-pull-request] automated change add f8199b1 Regen 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 (224073b) \ N -- N -- N refs/heads/automatic-periodic-sync (f8199b1) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/karaf/components/cxf.json | 8 +++ .../camel/catalog/karaf/components/dataset.json| 3 + .../catalog/karaf/components/digitalocean.json | 26 +++ .../apache/camel/catalog/karaf/components/dns.json | 8 +++ .../camel/catalog/karaf/components/docker.json | 83 ++ .../camel/catalog/karaf/components/drill.json | 3 + .../camel/catalog/karaf/components/dropbox.json| 15 7 files changed, 146 insertions(+)
[camel-spring-boot] branch automatic-periodic-sync updated (e5a236c -> 8d457d0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. omit e5a236c [create-pull-request] automated change add 79a5738 [create-pull-request] automated change add c146987 CAMEL-17800 add tests in camel-sql-starter (#472) add 8d457d0 Regen 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 (e5a236c) \ N -- N -- N refs/heads/automatic-periodic-sync (8d457d0) 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: .../springboot/catalog/components/atomix-map.json | 12 ++ .../catalog/components/atomix-messaging.json | 10 ++ .../catalog/components/atomix-multimap.json| 9 ++ .../catalog/components/atomix-queue.json | 8 + .../springboot/catalog/components/atomix-set.json | 9 ++ .../catalog/components/atomix-value.json | 10 ++ .../camel/springboot/catalog/components/cxf.json | 8 + .../camel/springboot/catalog/components/cxfrs.json | 18 +++ .../springboot/catalog/components/dataset.json | 3 + .../catalog/components/debezium-mongodb.json | 9 ++ .../catalog/components/debezium-mysql.json | 9 ++ .../catalog/components/debezium-postgres.json | 9 ++ .../catalog/components/debezium-sqlserver.json | 9 ++ .../catalog/components/digitalocean.json | 26 .../camel/springboot/catalog/components/dns.json | 8 + .../springboot/catalog/components/docker.json | 83 ++ .../camel/springboot/catalog/components/drill.json | 3 + .../springboot/catalog/components/dropbox.json | 15 ++ components-starter/camel-sql-starter/pom.xml | 15 ++ .../org/apache/camel/component/sql/BaseSql.java| 70 + .../sql/DataSourceAutoConfigurationTest.java | 72 - .../sql/SqlConsumerDynamicParameterTest.java | 114 ++ .../sql/SqlEndpointMisconfigureDataSourceTest.java | 104 + .../camel/component/sql/SqlGeneratedKeysTest.java | 106 + .../sql/SqlProducerExpressionParameterTest.java} | 81 +- .../camel/component/sql/SqlProducerInTest.java}| 72 - .../sql/SqlProducerOutputHeaderTest.java} | 63 .../sql/SqlProducerOutputTypeStreamListTest.java} | 76 +- .../camel/component/sql/SqlProducerToDTest.java} | 69 + .../sql/SqlProducerUpdateHeadersTest.java} | 61 .../sql/SqlProducerUseMessageBodyForSqlTest.java | 153 +++ .../component/sql/SqlTransactedRouteTest.java | 168 + .../component/sql/aggregation}/HeaderDto.java | 4 +- .../JdbcAggregateRecoverDeadLetterChannelTest.java | 130 .../JdbcAggregateSerializedHeadersTest.java| 128 .../aggregation/JdbcAggregateStoreAsTextTest.java | 161 .../sql/aggregation/MyAggregationStrategy.java | 19 +++ .../CustomizedJdbcMessageIdRepositoryTest.java | 131 .../JdbcCachedMessageIdRepositoryTest.java | 128 .../idempotent/JdbcMessageIdRepositoryTest.java| 126 .../component/sql/support/DummyJDBCDriver.java | 66 ...dbcOrphanLockAwareIdempotentRepositoryTest.java | 106 + .../resources/sql/createAndPopulateDatabase.sql| 23 +++ .../resources/sql/createAndPopulateDatabase3.sql | 27 .../sql/idempotentWithOrphanLockRemoval.sql| 14 ++ .../src/test/resources/sql/init.sql| 29 .../src/test/resources/sql/init3.sql | 35 + .../src/test/resources/sql/selectProjectsIn.sql| 22 +++ 48 files changed, 2271 insertions(+), 360 deletions(-) create mode 100644 components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/BaseSql.java delete mode 100644 components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/DataSourceAutoConfigurationTest.java create mode 100644 components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlConsumerDynamicParameterTest.java create mode 100644 components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/SqlEndpointMisconfigureDataSourceTest.java create mode 100644
[GitHub] [camel-k] github-actions[bot] closed issue #2812: Be able to configure PodMonitor via prometheus trait
github-actions[bot] closed issue #2812: URL: https://github.com/apache/camel-k/issues/2812 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] github-actions[bot] closed issue #2808: SEDA low performance issue
github-actions[bot] closed issue #2808: URL: https://github.com/apache/camel-k/issues/2808 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (65e0309 -> 6930024)
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 65e0309 Regen for commit 81f676aed62ca2b72fc4d7aa2979dc56aa7288db (#7240) add 6930024 Polished No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/main/BaseMainSupport.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[camel] branch regen_bot updated (d583268 -> 65e0309)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. omit d583268 Regen for commit 81f676aed62ca2b72fc4d7aa2979dc56aa7288db add 65e0309 Regen for commit 81f676aed62ca2b72fc4d7aa2979dc56aa7288db (#7240) 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 (d583268) \ N -- N -- N refs/heads/regen_bot (65e0309) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[camel] branch main updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 6930024 Polished
6930024 is described below
commit 6930024be42f44743d5eef66b0483c59c5c20e50
Author: Claus Ibsen
AuthorDate: Sat Mar 19 18:23:27 2022 +0100
Polished
---
.../src/main/java/org/apache/camel/main/BaseMainSupport.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index cf7cb55..8d2b2c3 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -185,7 +185,7 @@ public abstract class BaseMainSupport extends BaseService {
}
/**
- * Adds a initial property for the properties component, which will be
used before any locations are resolved.
+ * Adds a property (initial) for the properties component, which will be
used before any locations are resolved.
*
* @param key the property key
* @param value the property value
@@ -775,6 +775,7 @@ public abstract class BaseMainSupport extends BaseService {
CamelContext camelContext, MainConfigurationProperties config,
Map autoConfiguredProperties)
throws Exception {
+
if (config.getFileConfigurations() != null) {
String[] locs = config.getFileConfigurations().split(",");
for (String loc : locs) {
[camel] branch main updated: Regen for commit 81f676aed62ca2b72fc4d7aa2979dc56aa7288db (#7240)
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 65e0309 Regen for commit 81f676aed62ca2b72fc4d7aa2979dc56aa7288db (#7240) 65e0309 is described below commit 65e03097eb07c601ec11340c77b887852b942c7c Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Mar 19 18:07:37 2022 +0100 Regen for commit 81f676aed62ca2b72fc4d7aa2979dc56aa7288db (#7240) Signed-off-by: GitHub Co-authored-by: davsclaus --- .../apache/camel/catalog/schemas/camel-spring.xsd | 2 +- .../modules/ROOT/pages/camel-maven-plugin.adoc | 21 + 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd index f193c1c..d249fcd 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd @@ -712,7 +712,7 @@ Evaluates a JSONPath expression against a JSON message body. diff --git a/docs/user-manual/modules/ROOT/pages/camel-maven-plugin.adoc b/docs/user-manual/modules/ROOT/pages/camel-maven-plugin.adoc index 3dba4ec..969bca2 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-maven-plugin.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-maven-plugin.adoc @@ -3,6 +3,7 @@ The Camel Maven Plugin supports the following goals - camel:run - To run your Camel application + - camel:dev - To run your Camel application in developer mode - camel:prepare-fatjar - To prepare your Camel application for being packaged as a fat-jar (such as by maven-assembly-plugin) == camel:run @@ -93,6 +94,26 @@ The idea with the built-in logging is that you sometimes want to avoid messing w up logging, and just want a quick and easy log to console that looks good. +== camel:dev + +The `camel:dev` is an extension to `camel:run` to run the Camel application in developer mode. +In this mode, among others, Camel will use hot-reloading of DSL routes (xml, yaml and java) that are located from +the `src/main/resources` directory. + +=== Options + +The maven plugin *dev* goal supports the following options which can be configured from the command line (use `-D` syntax), or defined in the `pom.xml` file in the `` tag. + +|=== +| Parameter | Default Value | Description +| routesDirectory | src/main/resources | To watch the directory for file changes which triggers a live reload of the Camel routes on-the-fly. +| duration | -1 | Sets the time duration (seconds) that the application will run for before terminating. A value <= 0 will run forever. +| durationIdle | -1 | Sets the idle time duration (seconds) duration that the application can be idle before terminating. A value <= 0 will run forever. +| durationMaxMessages | -1 | Sets the duration of maximum number of messages that the application will process before terminating. +| logClasspath | false | Whether to log the classpath when starting +| loggingLevel | OFF | Whether to use built-in console logging (uses log4j), which does not require to add any logging dependency to your project. However, the logging is fixed to log to the console, with a color style that is similar to Spring Boot. You can change the root logging level to: FATAL, ERROR, WARN, INFO, DEBUG, TRACE, OFF +|=== + == camel:prepare-fatjar The `camel:prepare-fatjar` goal of the Camel Maven Plugin is used to prepare your Camel application
[GitHub] [camel] davsclaus merged pull request #7240: Generated sources regen
davsclaus merged pull request #7240: URL: https://github.com/apache/camel/pull/7240 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (1798a66 -> d583268)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. discard 1798a66 Regen for commit 8179785acfdf4a6579cd6ab2ec5803cfc088588d add 81f676a Add doc for camel:dev maven plugin add d583268 Regen for commit 81f676aed62ca2b72fc4d7aa2979dc56aa7288db 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 (1798a66) \ N -- N -- N refs/heads/regen_bot (d583268) 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: .../modules/ROOT/pages/camel-maven-plugin.adoc | 21 + .../src/main/docs/camel-maven-plugin.adoc | 21 + 2 files changed, 42 insertions(+)
[camel] branch regen_bot updated (e38ccd8 -> 1798a66)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. discard e38ccd8 Regen for commit 6832fc27c6648d7757255ee0fd75cd889997d20e add 8179785 CAMEL-17815: camel-jbang - In modeline mode then eager discover routes and pre-load spec/* from camel-k integration yaml files to allow properties to be used during bootstrap. add 1798a66 Regen for commit 8179785acfdf4a6579cd6ab2ec5803cfc088588d 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 (e38ccd8) \ N -- N -- N refs/heads/regen_bot (1798a66) 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: .../src/main/java/org/apache/camel/spi/RoutesLoader.java | 8 1 file changed, 8 insertions(+)
[camel] branch regen_bot updated (a50e368 -> e38ccd8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. omit a50e368 Regen for commit 3fe499dcb71a63bf5245a4282702af328c9548b1 add 5a8deab Regen add 784684f Regen for commit 3fe499dcb71a63bf5245a4282702af328c9548b1 (#7235) add 2f97665 CAMEL-17815: camel-jbang - In modeline mode then eager discover routes and pre-load modeline to allow properties to be used during bootstrap. add 72dcb90 CAMEL-17815: camel-jbang - In modeline mode then eager discover routes and pre-load modeline to allow properties to be used during bootstrap. add 6832fc2 CAMEL-17815: camel-jbang - In modeline mode then eager discover routes and pre-load spec/* from camel-k integration yaml files to allow properties to be used during bootstrap. add e38ccd8 Regen for commit 6832fc27c6648d7757255ee0fd75cd889997d20e 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 (a50e368) \ N -- N -- N refs/heads/regen_bot (e38ccd8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../org/apache/camel/spi/RoutesBuilderLoader.java | 12 +++ .../java/org/apache/camel/spi/RoutesLoader.java| 4 + .../camel/impl/engine/DefaultRoutesLoader.java | 38 ++--- .../org/apache/camel/main/BaseMainSupport.java | 3 +- .../org/apache/camel/main/RoutesConfigurer.java| 12 ++- .../IntegrationConfigurationPropertiesSource.java | 12 ++- .../camel/dsl/yaml/YamlRoutesBuilderLoader.java| 99 +- .../dsl/yaml/YamlRoutesBuilderLoaderSupport.java | 6 +- 8 files changed, 145 insertions(+), 41 deletions(-)
[camel-spring-boot] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 8d457d0 Regen
8d457d0 is described below
commit 8d457d0fb29b770e1e5ef6e57b9309a23ce5ccc9
Author: Claus Ibsen
AuthorDate: Sat Mar 19 15:26:27 2022 +0100
Regen
---
.../springboot/catalog/components/atomix-map.json | 12
.../catalog/components/atomix-messaging.json | 10 +++
.../catalog/components/atomix-multimap.json| 9 +++
.../catalog/components/atomix-queue.json | 8 +++
.../springboot/catalog/components/atomix-set.json | 9 +++
.../catalog/components/atomix-value.json | 10 +++
.../camel/springboot/catalog/components/cxf.json | 8 +++
.../camel/springboot/catalog/components/cxfrs.json | 18 +
.../springboot/catalog/components/dataset.json | 3 +
.../catalog/components/debezium-mongodb.json | 9 +++
.../catalog/components/debezium-mysql.json | 9 +++
.../catalog/components/debezium-postgres.json | 9 +++
.../catalog/components/debezium-sqlserver.json | 9 +++
.../catalog/components/digitalocean.json | 26 +++
.../camel/springboot/catalog/components/dns.json | 8 +++
.../springboot/catalog/components/docker.json | 83 ++
.../camel/springboot/catalog/components/drill.json | 3 +
.../springboot/catalog/components/dropbox.json | 15
18 files changed, 258 insertions(+)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atomix-map.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atomix-map.json
index 898fcc7..e620c1d 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atomix-map.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atomix-map.json
@@ -41,6 +41,18 @@
"resourceConfigs": { "kind": "property", "displayName": "Resource
Configs", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "java.util.Map",
"prefix": "resource.config", "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.atomix.client.map.AtomixMapConfiguration",
"configurationField": "configuration", "description": "Cluster wide resources
config [...]
"resourceOptions": { "kind": "property", "displayName": "Resource
Options", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "java.util.Map",
"prefix": "resource.options", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.atomix.client.map.AtomixMapConfiguration",
"configurationField": "configuration", "description": "Local resources
configurations" }
},
+ "headers": {
+"CamelAtomixResourceName": { "kind": "header", "displayName": "", "group":
"producer", "label": "producer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The name of the resource" },
+"CamelAtomixResourceAction": { "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"org.apache.camel.component.atomix.client.map.AtomixMap.Action", "enum": [
"PUT", "PUT_IF_ABSENT", "GET", "CLEAR", "SIZE", "CONTAINS_KEY",
"CONTAINS_VALUE", "IS_EMPTY", "ENTRY_SET", "REMOVE", "REPLACE", "VALUES" ],
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The action to perform" },
+"CamelAtomixResourceKey": { "kind": "header", "displayName": "", "group":
"common", "label": "", "required": false, "javaType": "Object", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The key to operate on" },
+"CamelAtomixResourceValue": { "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"Object", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The value, if missing In Body is used" },
+"CamelAtomixResourceDefaultValue": { "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"Object", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The default value of the resource" },
+"CamelAtomixResourceOldValue": { "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType": "Object",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false,
[camel] branch main updated: Add doc for camel:dev maven plugin
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 81f676a Add doc for camel:dev maven plugin 81f676a is described below commit 81f676aed62ca2b72fc4d7aa2979dc56aa7288db Author: Claus Ibsen AuthorDate: Sat Mar 19 15:25:53 2022 +0100 Add doc for camel:dev maven plugin --- .../src/main/docs/camel-maven-plugin.adoc | 21 + 1 file changed, 21 insertions(+) diff --git a/tooling/maven/camel-maven-plugin/src/main/docs/camel-maven-plugin.adoc b/tooling/maven/camel-maven-plugin/src/main/docs/camel-maven-plugin.adoc index 3dba4ec..969bca2 100644 --- a/tooling/maven/camel-maven-plugin/src/main/docs/camel-maven-plugin.adoc +++ b/tooling/maven/camel-maven-plugin/src/main/docs/camel-maven-plugin.adoc @@ -3,6 +3,7 @@ The Camel Maven Plugin supports the following goals - camel:run - To run your Camel application + - camel:dev - To run your Camel application in developer mode - camel:prepare-fatjar - To prepare your Camel application for being packaged as a fat-jar (such as by maven-assembly-plugin) == camel:run @@ -93,6 +94,26 @@ The idea with the built-in logging is that you sometimes want to avoid messing w up logging, and just want a quick and easy log to console that looks good. +== camel:dev + +The `camel:dev` is an extension to `camel:run` to run the Camel application in developer mode. +In this mode, among others, Camel will use hot-reloading of DSL routes (xml, yaml and java) that are located from +the `src/main/resources` directory. + +=== Options + +The maven plugin *dev* goal supports the following options which can be configured from the command line (use `-D` syntax), or defined in the `pom.xml` file in the `` tag. + +|=== +| Parameter | Default Value | Description +| routesDirectory | src/main/resources | To watch the directory for file changes which triggers a live reload of the Camel routes on-the-fly. +| duration | -1 | Sets the time duration (seconds) that the application will run for before terminating. A value <= 0 will run forever. +| durationIdle | -1 | Sets the idle time duration (seconds) duration that the application can be idle before terminating. A value <= 0 will run forever. +| durationMaxMessages | -1 | Sets the duration of maximum number of messages that the application will process before terminating. +| logClasspath | false | Whether to log the classpath when starting +| loggingLevel | OFF | Whether to use built-in console logging (uses log4j), which does not require to add any logging dependency to your project. However, the logging is fixed to log to the console, with a color style that is similar to Spring Boot. You can change the root logging level to: FATAL, ERROR, WARN, INFO, DEBUG, TRACE, OFF +|=== + == camel:prepare-fatjar The `camel:prepare-fatjar` goal of the Camel Maven Plugin is used to prepare your Camel application
[camel-karaf] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new f8199b1 Regen
f8199b1 is described below
commit f8199b105a5afdd5941a09bb07f22a7fa27007e5
Author: Claus Ibsen
AuthorDate: Sat Mar 19 15:20:44 2022 +0100
Regen
---
.../apache/camel/catalog/karaf/components/cxf.json | 8 +++
.../camel/catalog/karaf/components/dataset.json| 3 +
.../catalog/karaf/components/digitalocean.json | 26 +++
.../apache/camel/catalog/karaf/components/dns.json | 8 +++
.../camel/catalog/karaf/components/docker.json | 83 ++
.../camel/catalog/karaf/components/drill.json | 3 +
.../camel/catalog/karaf/components/dropbox.json| 15
7 files changed, 146 insertions(+)
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/cxf.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/cxf.json
index 58b5f66..b39e0bc 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/cxf.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/cxf.json
@@ -29,6 +29,14 @@
"headerFilterStrategy": { "kind": "property", "displayName": "Header
Filter Strategy", "group": "filter", "label": "filter", "required": false,
"type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and
from Camel message." },
"useGlobalSslContextParameters": { "kind": "property", "displayName": "Use
Global Ssl Context Parameters", "group": "security", "label": "security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Enable usage of global SSL context parameters." }
},
+ "headers": {
+"operationName": { "kind": "header", "displayName": "", "group": "common",
"label": "", "required": false, "javaType": "String", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "The
name of the operation." },
+"operationNamespace": { "kind": "header", "displayName": "", "group":
"common", "label": "", "required": false, "javaType": "String", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The operation namespace." },
+"CamelDestinationOverrideUrl": { "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The destination override url" },
+"ResponseContext": { "kind": "header", "displayName": "", "group":
"common", "label": "", "required": false, "javaType": "Map",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The response context" },
+"CamelAuthentication": { "kind": "header", "displayName": "", "group":
"common", "label": "", "required": false, "javaType":
"javax.security.auth.Subject", "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "description": "The authentication" },
+"RequestContext": { "kind": "header", "displayName": "", "group":
"common", "label": "", "required": false, "javaType": "Object", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The request context" }
+ },
"properties": {
"beanId": { "kind": "path", "displayName": "Bean Id", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "To lookup an existing configured CxfEndpoint. Must used bean:
as prefix." },
"address": { "kind": "path", "displayName": "Address", "group": "service",
"label": "service", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The service publish address." },
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/dataset.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/dataset.json
index 8408103..9bf8b48 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/dataset.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/dataset.json
@@ -28,6 +28,9 @@
"autowiredEnabled": {
[camel] branch main updated: CAMEL-17815: camel-jbang - In modeline mode then eager discover routes and pre-load spec/* from camel-k integration yaml files to allow properties to be used during bootst
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 8179785 CAMEL-17815: camel-jbang - In modeline mode then eager
discover routes and pre-load spec/* from camel-k integration yaml files to
allow properties to be used during bootstrap.
8179785 is described below
commit 8179785acfdf4a6579cd6ab2ec5803cfc088588d
Author: Claus Ibsen
AuthorDate: Sat Mar 19 15:18:53 2022 +0100
CAMEL-17815: camel-jbang - In modeline mode then eager discover routes and
pre-load spec/* from camel-k integration yaml files to allow properties to be
used during bootstrap.
---
.../src/main/java/org/apache/camel/spi/RoutesLoader.java | 8
1 file changed, 8 insertions(+)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/RoutesLoader.java
b/core/camel-api/src/main/java/org/apache/camel/spi/RoutesLoader.java
index e00720e..f67d475 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/RoutesLoader.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/RoutesLoader.java
@@ -116,6 +116,14 @@ public interface RoutesLoader extends CamelContextAware {
*/
Collection findRoutesBuilders(Collection
resources) throws Exception;
+/**
+ * Pre-parses the {@link RoutesBuilder} from {@link Resource}.
+ *
+ * This is used during bootstrap, to eager detect configurations from
route DSL resources which makes it possible to
+ * specify configurations that affect the bootstrap, such as by
camel-jbang and camel-yaml-dsl.
+ *
+ * @param resource the resource to be pre parsed.
+ */
default void preParseRoute(Resource resource) throws Exception {
// noop
}
[camel] 02/03: CAMEL-17815: camel-jbang - In modeline mode then eager discover routes and pre-load modeline to allow properties to be used during bootstrap.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 72dcb90f8a862f6cfeb8cd4a67f86c788bcc9ab6
Author: Claus Ibsen
AuthorDate: Sat Mar 19 08:36:41 2022 +0100
CAMEL-17815: camel-jbang - In modeline mode then eager discover routes and
pre-load modeline to allow properties to be used during bootstrap.
---
.../dsl/yaml/IntegrationConfigurationPropertiesSource.java | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/IntegrationConfigurationPropertiesSource.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/IntegrationConfigurationPropertiesSource.java
index b420507..14d270f 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/IntegrationConfigurationPropertiesSource.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/IntegrationConfigurationPropertiesSource.java
@@ -63,7 +63,7 @@ public class IntegrationConfigurationPropertiesSource
implements PropertiesSourc
if (line.contains("=")) {
String key = StringHelper.before(line, "=").trim();
String value = StringHelper.after(line, "=").trim();
-properties.setProperty(key, value);
+setProperty(key, value);
} else {
if (ResourceHelper.hasScheme(line)) {
// it is a properties file so load resource
@@ -74,7 +74,7 @@ public class IntegrationConfigurationPropertiesSource
implements PropertiesSourc
String v = prop.getProperty(k);
String key = k.trim();
String value = v.trim();
-properties.setProperty(key, value);
+setProperty(key, value);
}
} catch (Exception e) {
// ignore
@@ -83,6 +83,14 @@ public class IntegrationConfigurationPropertiesSource
implements PropertiesSourc
}
}
+protected void setProperty(String key, String value) {
+properties.setProperty(key, value);
+if (!camelContext.isStarted()) {
+// if we are bootstrapping then also set as initial property, so
it can be used there as well
+camelContext.getPropertiesComponent().addInitialProperty(key,
value);
+}
+}
+
@Override
public String toString() {
return "camel-yaml-dsl";
[camel] branch main updated (784684f -> 6832fc2)
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 784684f Regen for commit 3fe499dcb71a63bf5245a4282702af328c9548b1 (#7235) new 2f97665 CAMEL-17815: camel-jbang - In modeline mode then eager discover routes and pre-load modeline to allow properties to be used during bootstrap. new 72dcb90 CAMEL-17815: camel-jbang - In modeline mode then eager discover routes and pre-load modeline to allow properties to be used during bootstrap. new 6832fc2 CAMEL-17815: camel-jbang - In modeline mode then eager discover routes and pre-load spec/* from camel-k integration yaml files to allow properties to be used during bootstrap. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/camel/spi/RoutesBuilderLoader.java | 12 +++ .../java/org/apache/camel/spi/RoutesLoader.java| 4 + .../camel/impl/engine/DefaultRoutesLoader.java | 38 ++--- .../org/apache/camel/main/BaseMainSupport.java | 3 +- .../org/apache/camel/main/RoutesConfigurer.java| 12 ++- .../IntegrationConfigurationPropertiesSource.java | 12 ++- .../camel/dsl/yaml/YamlRoutesBuilderLoader.java| 99 +- .../dsl/yaml/YamlRoutesBuilderLoaderSupport.java | 6 +- 8 files changed, 145 insertions(+), 41 deletions(-)
[camel] 03/03: CAMEL-17815: camel-jbang - In modeline mode then eager discover routes and pre-load spec/* from camel-k integration yaml files to allow properties to be used during bootstrap.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6832fc27c6648d7757255ee0fd75cd889997d20e
Author: Claus Ibsen
AuthorDate: Sat Mar 19 13:59:13 2022 +0100
CAMEL-17815: camel-jbang - In modeline mode then eager discover routes and
pre-load spec/* from camel-k integration yaml files to allow properties to be
used during bootstrap.
---
.../org/apache/camel/spi/RoutesBuilderLoader.java | 12 +++
.../java/org/apache/camel/spi/RoutesLoader.java| 4 +
.../camel/impl/engine/DefaultRoutesLoader.java | 38 ++---
.../org/apache/camel/main/RoutesConfigurer.java| 8 ++
.../camel/dsl/yaml/YamlRoutesBuilderLoader.java| 99 +-
.../dsl/yaml/YamlRoutesBuilderLoaderSupport.java | 6 +-
6 files changed, 132 insertions(+), 35 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/RoutesBuilderLoader.java
b/core/camel-api/src/main/java/org/apache/camel/spi/RoutesBuilderLoader.java
index f55da10..7492e03 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/RoutesBuilderLoader.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/RoutesBuilderLoader.java
@@ -49,4 +49,16 @@ public interface RoutesBuilderLoader extends StaticService,
CamelContextAware {
* @return a {@link RoutesBuilder}
*/
RoutesBuilder loadRoutesBuilder(Resource resource) throws Exception;
+
+/**
+ * Pre-parses the {@link RoutesBuilder} from {@link Resource}.
+ *
+ * This is used during bootstrap, to eager detect configurations from
route DSL resources which makes it possible to
+ * specify configurations that affect the bootstrap, such as by
camel-jbang and camel-yaml-dsl.
+ *
+ * @param resource the resource to be pre parsed.
+ */
+default void preParseRoute(Resource resource) throws Exception {
+// noop
+}
}
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/RoutesLoader.java
b/core/camel-api/src/main/java/org/apache/camel/spi/RoutesLoader.java
index 4ac5c35..e00720e 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/RoutesLoader.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/RoutesLoader.java
@@ -115,4 +115,8 @@ public interface RoutesLoader extends CamelContextAware {
* @return a collection {@link RoutesBuilder}
*/
Collection findRoutesBuilders(Collection
resources) throws Exception;
+
+default void preParseRoute(Resource resource) throws Exception {
+// noop
+}
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
index 1d134e3..0f4737f 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultRoutesLoader.java
@@ -87,24 +87,14 @@ public class DefaultRoutesLoader extends ServiceSupport
implements RoutesLoader,
List answer = new ArrayList<>(resources.size());
for (Resource resource : resources) {
-// the loader to use is derived from the file extension
-final String extension = FileUtil.onlyExt(resource.getLocation(),
false);
-
-if (ObjectHelper.isEmpty(extension)) {
-throw new IllegalArgumentException(
-"Unable to determine file extension for resource: " +
resource.getLocation());
-}
-
-RoutesBuilderLoader loader = getRoutesLoader(extension);
-if (loader == null) {
-throw new IllegalArgumentException(
-"Cannot find RoutesBuilderLoader in classpath
supporting file extension: " + extension);
-}
+RoutesBuilderLoader loader = resolveRoutesBuilderLoader(resource);
if (camelContext.isModeline()) {
ModelineFactory factory =
camelContext.adapt(ExtendedCamelContext.class).getModelineFactory();
// gather resources for modeline
factory.parseModeline(resource);
+// pre-parse before loading
+loader.preParseRoute(resource);
}
RoutesBuilder builder = loader.loadRoutesBuilder(resource);
@@ -116,6 +106,11 @@ public class DefaultRoutesLoader extends ServiceSupport
implements RoutesLoader,
return answer;
}
+@Override
+public void preParseRoute(Resource resource) throws Exception {
+resolveRoutesBuilderLoader(resource).preParseRoute(resource);
+}
+
/**
* Looks up a {@link RoutesBuilderLoader} in the registry or fallback to a
factory finder mechanism if none found.
*
@@ -178,4 +173,21 @@ public class DefaultRoutesLoader extends ServiceSupport
implements
[camel] 01/03: CAMEL-17815: camel-jbang - In modeline mode then eager discover routes and pre-load modeline to allow properties to be used during bootstrap.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2f976651ec8f43e2cc92c544e47d29d9287e189d
Author: Claus Ibsen
AuthorDate: Sat Mar 19 08:32:05 2022 +0100
CAMEL-17815: camel-jbang - In modeline mode then eager discover routes and
pre-load modeline to allow properties to be used during bootstrap.
---
.../src/main/java/org/apache/camel/main/BaseMainSupport.java | 3 +--
.../src/main/java/org/apache/camel/main/RoutesConfigurer.java | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index 27c0aa5..cf7cb55 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -680,8 +680,7 @@ public abstract class BaseMainSupport extends BaseService {
}
protected void autoConfigurationRoutesIncludePattern(
-CamelContext camelContext, Map
autoConfiguredProperties)
-throws Exception {
+CamelContext camelContext, Map
autoConfiguredProperties) {
Object pattern =
getInitialProperties().getProperty("camel.main.routesIncludePattern");
if (pattern != null) {
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java
b/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java
index 9e979ef..e680485 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/RoutesConfigurer.java
@@ -251,8 +251,8 @@ public class RoutesConfigurer {
try {
LOG.debug("RoutesCollectorEnabled: {}", getRoutesCollector());
-// add discovered routes from directories
-StopWatch watch = new StopWatch();
+// we can only scan for modeline for routes that we can load
from directory as modelines
+// are comments in the source files
Collection routesFromDirectory =
getRoutesCollector().collectRoutesFromDirectory(
camelContext,
getRoutesExcludePattern(),
[GitHub] [camel-examples] tmarwen commented on pull request #85: CAMEL-17575: Update `Main` examples entry to use package scanning
tmarwen commented on pull request #85:
URL: https://github.com/apache/camel-examples/pull/85#issuecomment-1073013555
@essobedo excluding the modules you mentioned being failing systematically
for you, below are the list of ones remaining failing for me:
* `camel-example-aggregate-dist`: this module test fixture succeeds
sometimes when exceeding the timeout within the test assertion
* `camel-example-endpointdsl-aws2-s3-kafka`: this module succeeds when
forcing a `Thread.sleep(1000)` before sending the first message triggering the
routes `template.send("direct:putObject", exchange -> { //...});`. Otherwise it
succeeds when run separately (not as part of all the project test run).
* `camel-example-debezium`: this module test fixture succeeds as well only
when ran separately
* `camel-example-jooq`: this module test fixture succeeds as well only when
ran separately
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-kafka-connector-examples] nathanhagemann edited a comment on issue #336: Kamelet with id cassandra-sink not found in locations: classpath:/kamelets
nathanhagemann edited a comment on issue #336:
URL:
https://github.com/apache/camel-kafka-connector-examples/issues/336#issuecomment-1072995856
Also tried with CamelCassandraQLSinkConnector
--##
name=CamelCassandraQLSinkConnector
topics=pie
tasks.max=1
connector.class=org.apache.camel.kafkaconnector.cql.CamelCqlSinkConnector
key.converter=org.apache.kafka.connect.storage.StringConverter
value.converter=org.apache.kafka.connect.storage.StringConverter
camel.sink.path.hosts=10.66.16.10
camel.sink.path.port=9042
camel.sink.path.keyspace=dev
camel.sink.endpoint.cql=INSERT INTO pie (type, invented) VALUES (?,?)
camel.sink.endpoint.username=cameldevloader
camel.sink.endpoint.password=newpassword
--##
This works but all of the data is in the first field like this:
FIRST COLUMN: type SECOND COLUMN: invented
FIRST COLUMN: {"type":"Pecan","invented":1870} SECOND COLUMN: NaN
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-kafka-connector-examples] nathanhagemann edited a comment on issue #336: Kamelet with id cassandra-sink not found in locations: classpath:/kamelets
nathanhagemann edited a comment on issue #336:
URL:
https://github.com/apache/camel-kafka-connector-examples/issues/336#issuecomment-1072995856
Also tried with CamelCassandraQLSinkConnector
--##
name=CamelCassandraQLSinkConnector
topics=pie
tasks.max=1
connector.class=org.apache.camel.kafkaconnector.cql.CamelCqlSinkConnector
key.converter=org.apache.kafka.connect.storage.StringConverter
value.converter=org.apache.kafka.connect.storage.StringConverter
camel.sink.path.hosts=10.66.16.10
camel.sink.path.port=9042
camel.sink.path.keyspace=dev
camel.sink.endpoint.cql=INSERT INTO pie (type, invented) VALUES (?,?)
camel.sink.endpoint.username=cameldevloader
camel.sink.endpoint.password=newpassword
--##
This works but all of the data is in the first field like this:
FIRST COLUMN: type SECOND COLUMN: invented
FIRST COLUMN: {"Type:":"Pecan","Invented":1870} SECOND COLUMN: NaN
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-kafka-connector-examples] nathanhagemann edited a comment on issue #336: Kamelet with id cassandra-sink not found in locations: classpath:/kamelets
nathanhagemann edited a comment on issue #336:
URL:
https://github.com/apache/camel-kafka-connector-examples/issues/336#issuecomment-1072995856
Also tried with CamelCassandraQLSinkConnector
--##
name=CamelCassandraQLSinkConnector
topics=pie
tasks.max=1
connector.class=org.apache.camel.kafkaconnector.cql.CamelCqlSinkConnector
key.converter=org.apache.kafka.connect.storage.StringConverter
value.converter=org.apache.kafka.connect.storage.StringConverter
camel.sink.path.hosts=10.66.16.10
camel.sink.path.port=9042
camel.sink.path.keyspace=dev
camel.sink.endpoint.cql=INSERT INTO pie (type, invented) VALUES (?,?)
camel.sink.endpoint.username=cameldevloader
camel.sink.endpoint.password=newpassword
--##
This works but all of the data is in the first field like this:
FIRST COLUMN: type SECOND COLUMN: invented
0FIRST COLUMN: {"Type:":"Pecan","Invented":1870} SECOND COLUMN: NaN
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-kafka-connector-examples] nathanhagemann edited a comment on issue #336: Kamelet with id cassandra-sink not found in locations: classpath:/kamelets
nathanhagemann edited a comment on issue #336:
URL:
https://github.com/apache/camel-kafka-connector-examples/issues/336#issuecomment-1072995856
Also tried with CamelCassandraQLSinkConnector
--##
name=CamelCassandraQLSinkConnector
topics=pie
tasks.max=1
connector.class=org.apache.camel.kafkaconnector.cql.CamelCqlSinkConnector
key.converter=org.apache.kafka.connect.storage.StringConverter
value.converter=org.apache.kafka.connect.storage.StringConverter
camel.sink.path.hosts=10.66.16.10
camel.sink.path.port=9042
camel.sink.path.keyspace=dev
camel.sink.endpoint.cql=INSERT INTO pie (type, invented) VALUES (?,?)
camel.sink.endpoint.username=cameldevloader
camel.sink.endpoint.password=newpassword
--##
This works but all of the data is in the first field like this:
type\t\t\tinvented
0{"Type:":"Pecan","Invented":1870}\t\tNaN
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-kafka-connector-examples] nathanhagemann commented on issue #336: Kamelet with id cassandra-sink not found in locations: classpath:/kamelets
nathanhagemann commented on issue #336:
URL:
https://github.com/apache/camel-kafka-connector-examples/issues/336#issuecomment-1072995856
Also tried with CamelCassandraQLSinkConnector
--##
name=CamelCassandraQLSinkConnector
topics=pie
tasks.max=1
connector.class=org.apache.camel.kafkaconnector.cql.CamelCqlSinkConnector
key.converter=org.apache.kafka.connect.storage.StringConverter
value.converter=org.apache.kafka.connect.storage.StringConverter
camel.sink.path.hosts=10.66.16.10
camel.sink.path.port=9042
camel.sink.path.keyspace=dev
camel.sink.endpoint.cql=INSERT INTO pie (type, invented) VALUES (?,?)
camel.sink.endpoint.username=cameldevloader
camel.sink.endpoint.password=newpassword
--##
This works but all of the data is in the first field like this:
type invented
0{"Type:":"Pecan","Invented":1870} NaN
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] github-actions[bot] opened a new pull request #7240: Generated sources regen
github-actions[bot] opened a new pull request #7240: URL: https://github.com/apache/camel/pull/7240 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] oscerd merged pull request #7239: Generated sources regen
oscerd merged pull request #7239: URL: https://github.com/apache/camel/pull/7239 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] opened a new pull request #7239: Generated sources regen
github-actions[bot] opened a new pull request #7239: URL: https://github.com/apache/camel/pull/7239 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] oscerd merged pull request #7238: Generated sources regen
oscerd merged pull request #7238: URL: https://github.com/apache/camel/pull/7238 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] opened a new pull request #7238: Generated sources regen
github-actions[bot] opened a new pull request #7238: URL: https://github.com/apache/camel/pull/7238 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] oscerd merged pull request #7237: Generated sources regen
oscerd merged pull request #7237: URL: https://github.com/apache/camel/pull/7237 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] opened a new pull request #7237: Generated sources regen
github-actions[bot] opened a new pull request #7237: URL: https://github.com/apache/camel/pull/7237 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 02/02: Regen for commit 3fe499dcb71a63bf5245a4282702af328c9548b1 (#7235)
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 784684f892165520d8e2e407a2cdf92ec4115fdc Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Mar 19 09:23:38 2022 +0100 Regen for commit 3fe499dcb71a63bf5245a4282702af328c9548b1 (#7235) Signed-off-by: GitHub Co-authored-by: davsclaus
[camel] 01/02: 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.git
commit 5a8deab8e227d303fc3171fa2204f0994d8b917c
Author: Claus Ibsen
AuthorDate: Sat Mar 19 08:24:23 2022 +0100
Regen
---
.../camel/catalog/components/atomix-map.json | 12
.../camel/catalog/components/atomix-messaging.json | 10 +++
.../camel/catalog/components/atomix-multimap.json | 9 +++
.../camel/catalog/components/atomix-queue.json | 8 +++
.../camel/catalog/components/atomix-set.json | 9 +++
.../camel/catalog/components/atomix-value.json | 10 +++
.../org/apache/camel/catalog/components/cxf.json | 8 +++
.../org/apache/camel/catalog/components/cxfrs.json | 18 +
.../apache/camel/catalog/components/dataset.json | 3 +
.../camel/catalog/components/debezium-mongodb.json | 9 +++
.../camel/catalog/components/debezium-mysql.json | 9 +++
.../catalog/components/debezium-postgres.json | 9 +++
.../catalog/components/debezium-sqlserver.json | 9 +++
.../camel/catalog/components/digitalocean.json | 26 +++
.../org/apache/camel/catalog/components/dns.json | 8 +++
.../apache/camel/catalog/components/docker.json| 83 ++
.../org/apache/camel/catalog/components/drill.json | 3 +
.../apache/camel/catalog/components/dropbox.json | 15
.../apache/camel/catalog/schemas/camel-spring.xsd | 2 +-
19 files changed, 259 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atomix-map.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atomix-map.json
index 24e85a9..9e3e43a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atomix-map.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atomix-map.json
@@ -41,6 +41,18 @@
"resourceConfigs": { "kind": "property", "displayName": "Resource
Configs", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "java.util.Map",
"prefix": "resource.config", "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.atomix.client.map.AtomixMapConfiguration",
"configurationField": "configuration", "description": "Cluster wide resources
config [...]
"resourceOptions": { "kind": "property", "displayName": "Resource
Options", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "java.util.Map",
"prefix": "resource.options", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.atomix.client.map.AtomixMapConfiguration",
"configurationField": "configuration", "description": "Local resources
configurations" }
},
+ "headers": {
+"CamelAtomixResourceName": { "kind": "header", "displayName": "", "group":
"producer", "label": "producer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The name of the resource" },
+"CamelAtomixResourceAction": { "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"org.apache.camel.component.atomix.client.map.AtomixMap.Action", "enum": [
"PUT", "PUT_IF_ABSENT", "GET", "CLEAR", "SIZE", "CONTAINS_KEY",
"CONTAINS_VALUE", "IS_EMPTY", "ENTRY_SET", "REMOVE", "REPLACE", "VALUES" ],
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The action to perform" },
+"CamelAtomixResourceKey": { "kind": "header", "displayName": "", "group":
"common", "label": "", "required": false, "javaType": "Object", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The key to operate on" },
+"CamelAtomixResourceValue": { "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"Object", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The value, if missing In Body is used" },
+"CamelAtomixResourceDefaultValue": { "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"Object", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The default value of the resource" },
+"CamelAtomixResourceOldValue": { "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType": "Object",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The old value" },
+"CamelAtomixResourceActionHasResult": { "kind": "header", "displayName":
"", "group": "producer", "label": "producer",
[camel] branch main created (now 784684f)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. at 784684f Regen for commit 3fe499dcb71a63bf5245a4282702af328c9548b1 (#7235) This branch includes the following new commits: new 5a8deab Regen new 784684f Regen for commit 3fe499dcb71a63bf5245a4282702af328c9548b1 (#7235) 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.
[GitHub] [camel] oscerd merged pull request #7236: Generated sources regen
oscerd merged pull request #7236: URL: https://github.com/apache/camel/pull/7236 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] opened a new pull request #7236: Generated sources regen
github-actions[bot] opened a new pull request #7236: URL: https://github.com/apache/camel/pull/7236 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Regen for commit 3fe499dcb71a63bf5245a4282702af328c9548b1 (#7235)
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 784684f Regen for commit 3fe499dcb71a63bf5245a4282702af328c9548b1 (#7235) 784684f is described below commit 784684f892165520d8e2e407a2cdf92ec4115fdc Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Mar 19 09:23:38 2022 +0100 Regen for commit 3fe499dcb71a63bf5245a4282702af328c9548b1 (#7235) Signed-off-by: GitHub Co-authored-by: davsclaus
[GitHub] [camel] davsclaus merged pull request #7235: Generated sources regen
davsclaus merged pull request #7235: URL: https://github.com/apache/camel/pull/7235 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] opened a new pull request #7235: Generated sources regen
github-actions[bot] opened a new pull request #7235: URL: https://github.com/apache/camel/pull/7235 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: 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.git
commit 5a8deab8e227d303fc3171fa2204f0994d8b917c
Author: Claus Ibsen
AuthorDate: Sat Mar 19 08:24:23 2022 +0100
Regen
---
.../camel/catalog/components/atomix-map.json | 12
.../camel/catalog/components/atomix-messaging.json | 10 +++
.../camel/catalog/components/atomix-multimap.json | 9 +++
.../camel/catalog/components/atomix-queue.json | 8 +++
.../camel/catalog/components/atomix-set.json | 9 +++
.../camel/catalog/components/atomix-value.json | 10 +++
.../org/apache/camel/catalog/components/cxf.json | 8 +++
.../org/apache/camel/catalog/components/cxfrs.json | 18 +
.../apache/camel/catalog/components/dataset.json | 3 +
.../camel/catalog/components/debezium-mongodb.json | 9 +++
.../camel/catalog/components/debezium-mysql.json | 9 +++
.../catalog/components/debezium-postgres.json | 9 +++
.../catalog/components/debezium-sqlserver.json | 9 +++
.../camel/catalog/components/digitalocean.json | 26 +++
.../org/apache/camel/catalog/components/dns.json | 8 +++
.../apache/camel/catalog/components/docker.json| 83 ++
.../org/apache/camel/catalog/components/drill.json | 3 +
.../apache/camel/catalog/components/dropbox.json | 15
.../apache/camel/catalog/schemas/camel-spring.xsd | 2 +-
19 files changed, 259 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atomix-map.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atomix-map.json
index 24e85a9..9e3e43a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atomix-map.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atomix-map.json
@@ -41,6 +41,18 @@
"resourceConfigs": { "kind": "property", "displayName": "Resource
Configs", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "java.util.Map",
"prefix": "resource.config", "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.atomix.client.map.AtomixMapConfiguration",
"configurationField": "configuration", "description": "Cluster wide resources
config [...]
"resourceOptions": { "kind": "property", "displayName": "Resource
Options", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "java.util.Map",
"prefix": "resource.options", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.atomix.client.map.AtomixMapConfiguration",
"configurationField": "configuration", "description": "Local resources
configurations" }
},
+ "headers": {
+"CamelAtomixResourceName": { "kind": "header", "displayName": "", "group":
"producer", "label": "producer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The name of the resource" },
+"CamelAtomixResourceAction": { "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"org.apache.camel.component.atomix.client.map.AtomixMap.Action", "enum": [
"PUT", "PUT_IF_ABSENT", "GET", "CLEAR", "SIZE", "CONTAINS_KEY",
"CONTAINS_VALUE", "IS_EMPTY", "ENTRY_SET", "REMOVE", "REPLACE", "VALUES" ],
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The action to perform" },
+"CamelAtomixResourceKey": { "kind": "header", "displayName": "", "group":
"common", "label": "", "required": false, "javaType": "Object", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The key to operate on" },
+"CamelAtomixResourceValue": { "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"Object", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The value, if missing In Body is used" },
+"CamelAtomixResourceDefaultValue": { "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"Object", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The default value of the resource" },
+"CamelAtomixResourceOldValue": { "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType": "Object",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The old value" },
+"CamelAtomixResourceActionHasResult": { "kind": "header", "displayName":
"", "group": "producer", "label": "producer",
[camel] branch main created (now 5a8deab)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. at 5a8deab Regen This branch includes the following new commits: new 5a8deab Regen The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[GitHub] [camel] oscerd merged pull request #7234: Generated sources regen
oscerd merged pull request #7234: URL: https://github.com/apache/camel/pull/7234 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (0cefaa9 -> a50e368)
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 0cefaa9 CAMEL-17815: camel-jbang - In modeline mode then eager discover routes and pre-load modeline to allow properties to be used during bootstrap. add 3fe499d CAMEL-17792: Add documentation about the message headers (D) (#7232) add a50e368 Regen for commit 3fe499dcb71a63bf5245a4282702af328c9548b1 No new revisions were added by this update. Summary of changes: .../camel/catalog/components/atomix-map.json | 12 .../camel/catalog/components/atomix-messaging.json | 10 +++ .../camel/catalog/components/atomix-multimap.json | 9 +++ .../camel/catalog/components/atomix-queue.json | 8 +++ .../camel/catalog/components/atomix-set.json | 9 +++ .../camel/catalog/components/atomix-value.json | 10 +++ .../org/apache/camel/catalog/components/cxf.json | 8 +++ .../org/apache/camel/catalog/components/cxfrs.json | 18 + .../apache/camel/catalog/components/dataset.json | 3 + .../camel/catalog/components/debezium-mongodb.json | 9 +++ .../camel/catalog/components/debezium-mysql.json | 9 +++ .../catalog/components/debezium-postgres.json | 9 +++ .../catalog/components/debezium-sqlserver.json | 9 +++ .../camel/catalog/components/digitalocean.json | 26 +++ .../org/apache/camel/catalog/components/dns.json | 8 +++ .../apache/camel/catalog/components/docker.json| 83 + .../org/apache/camel/catalog/components/drill.json | 3 + .../apache/camel/catalog/components/dropbox.json | 15 .../component/atomix/client/map/atomix-map.json| 12 .../atomix/client/messaging/atomix-messaging.json | 10 +++ .../atomix/client/multimap/atomix-multimap.json| 9 +++ .../atomix/client/queue/atomix-queue.json | 8 +++ .../component/atomix/client/set/atomix-set.json| 9 +++ .../atomix/client/value/atomix-value.json | 10 +++ .../src/main/docs/atomix-map-component.adoc| 58 +-- .../src/main/docs/atomix-messaging-component.adoc | 3 + .../src/main/docs/atomix-multimap-component.adoc | 3 + .../src/main/docs/atomix-queue-component.adoc | 3 + .../src/main/docs/atomix-set-component.adoc| 3 + .../src/main/docs/atomix-value-component.adoc | 3 + .../atomix/client/AtomixClientConstants.java | 55 +- .../atomix/client/map/AtomixMapEndpoint.java | 7 +- .../client/messaging/AtomixMessagingEndpoint.java | 7 +- .../client/multimap/AtomixMultiMapEndpoint.java| 7 +- .../atomix/client/queue/AtomixQueueEndpoint.java | 7 +- .../atomix/client/set/AtomixSetEndpoint.java | 7 +- .../atomix/client/value/AtomixValueEndpoint.java | 7 +- .../component/cxf/common/message/CxfConstants.java | 46 .../org/apache/camel/component/cxf/cxf.json| 8 +++ .../apache/camel/component/cxf/jaxrs/cxfrs.json| 18 + .../camel-cxf/src/main/docs/cxf-component.adoc | 4 +- .../camel-cxf/src/main/docs/cxfrs-component.adoc | 4 +- .../camel/component/cxf/CxfClientCallback.java | 6 +- .../apache/camel/component/cxf/CxfEndpoint.java| 8 ++- .../camel/component/cxf/CxfEndpointUtils.java | 4 +- .../apache/camel/component/cxf/CxfProducer.java| 16 ++--- .../camel/component/cxf/DefaultCxfBinding.java | 45 ++-- .../camel/component/cxf/jaxrs/CxfRsEndpoint.java | 7 +- .../camel/component/cxf/jaxrs/CxfRsProducer.java | 26 +++ .../component/cxf/jaxrs/DefaultCxfRsBinding.java | 36 +- .../component/cxf/jaxrs/SimpleCxfRsBinding.java| 3 +- .../apache/camel/component/dataset/dataset.json| 3 + .../src/main/docs/dataset-component.adoc | 3 + .../camel/component/dataset/DataSetConstants.java | 11 +-- .../camel/component/dataset/DataSetConsumer.java | 2 +- .../camel/component/dataset/DataSetEndpoint.java | 18 ++--- .../component/debezium/DebeziumConstants.java | 16 + .../camel/component/debezium/debezium-mongodb.json | 9 +++ .../src/main/docs/debezium-mongodb-component.adoc | 17 + .../debezium/DebeziumMongodbEndpoint.java | 3 +- .../camel/component/debezium/debezium-mysql.json | 9 +++ .../src/main/docs/debezium-mysql-component.adoc| 19 + .../component/debezium/DebeziumMySqlEndpoint.java | 3 +- .../component/debezium/debezium-postgres.json | 9 +++ .../src/main/docs/debezium-postgres-component.adoc | 18 + .../debezium/DebeziumPostgresEndpoint.java | 3 +- .../component/debezium/debezium-sqlserver.json | 9 +++ .../main/docs/debezium-sqlserver-component.adoc| 18 + .../debezium/DebeziumSqlserverEndpoint.java| 3 +- .../camel/component/digitalocean/digitalocean.json | 26 +++ .../src/main/docs/digitalocean-component.adoc | 4 ++
[GitHub] [camel] github-actions[bot] opened a new pull request #7234: Generated sources regen
github-actions[bot] opened a new pull request #7234: URL: https://github.com/apache/camel/pull/7234 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch main updated: CAMEL-17800 add tests in camel-sql-starter (#472)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new c146987 CAMEL-17800 add tests in camel-sql-starter (#472)
c146987 is described below
commit c146987cd321204e2492ffc2b739b5422db2e165
Author: JiriOndrusek
AuthorDate: Sat Mar 19 09:02:06 2022 +0100
CAMEL-17800 add tests in camel-sql-starter (#472)
---
components-starter/camel-sql-starter/pom.xml | 15 ++
.../org/apache/camel/component/sql/BaseSql.java| 70 +
.../sql/DataSourceAutoConfigurationTest.java | 72 -
.../sql/SqlConsumerDynamicParameterTest.java | 114 ++
.../sql/SqlEndpointMisconfigureDataSourceTest.java | 104 +
.../camel/component/sql/SqlGeneratedKeysTest.java | 106 +
.../sql/SqlProducerExpressionParameterTest.java| 94
.../camel/component/sql/SqlProducerInTest.java | 93
.../component/sql/SqlProducerOutputHeaderTest.java | 83 ++
.../sql/SqlProducerOutputTypeStreamListTest.java | 96
.../camel/component/sql/SqlProducerToDTest.java| 92 +++
.../sql/SqlProducerUpdateHeadersTest.java | 82 ++
.../sql/SqlProducerUseMessageBodyForSqlTest.java | 153 +++
.../component/sql/SqlTransactedRouteTest.java | 168 +
.../camel/component/sql/aggregation/HeaderDto.java | 60
.../JdbcAggregateRecoverDeadLetterChannelTest.java | 130
.../JdbcAggregateSerializedHeadersTest.java| 128
.../aggregation/JdbcAggregateStoreAsTextTest.java | 161
.../sql/aggregation/MyAggregationStrategy.java | 19 +++
.../CustomizedJdbcMessageIdRepositoryTest.java | 131
.../JdbcCachedMessageIdRepositoryTest.java | 128
.../idempotent/JdbcMessageIdRepositoryTest.java| 126
.../component/sql/support/DummyJDBCDriver.java | 66
...dbcOrphanLockAwareIdempotentRepositoryTest.java | 106 +
.../resources/sql/createAndPopulateDatabase.sql| 23 +++
.../resources/sql/createAndPopulateDatabase3.sql | 27
.../sql/idempotentWithOrphanLockRemoval.sql| 14 ++
.../src/test/resources/sql/init.sql| 29
.../src/test/resources/sql/init3.sql | 35 +
.../src/test/resources/sql/selectProjectsIn.sql| 22 +++
30 files changed, 2409 insertions(+), 138 deletions(-)
diff --git a/components-starter/camel-sql-starter/pom.xml
b/components-starter/camel-sql-starter/pom.xml
index 58bbc46..54be447 100644
--- a/components-starter/camel-sql-starter/pom.xml
+++ b/components-starter/camel-sql-starter/pom.xml
@@ -45,6 +45,21 @@
${spring-boot-version}
test
+
+ org.apache.derby
+ derby
+ test
+
+
+ org.hsqldb
+ hsqldb
+ test
+
+
+ org.awaitility
+ awaitility
+ test
+
org.apache.camel.springboot
diff --git
a/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/BaseSql.java
b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/BaseSql.java
new file mode 100644
index 000..22e528c
--- /dev/null
+++
b/components-starter/camel-sql-starter/src/test/java/org/apache/camel/component/sql/BaseSql.java
@@ -0,0 +1,70 @@
+package org.apache.camel.component.sql;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Configuration;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+
+import javax.sql.DataSource;
+
+public class BaseSql {
+
+@Autowired
+protected CamelContext context;
+
+@Autowired
+protected ProducerTemplate template;
+
+protected static EmbeddedDatabase initEmptyDb() {
+return initDb(null);
+}
+
+protected static EmbeddedDatabase initDb() {
+return initDb("sql/createAndPopulateDatabase.sql");
+}
+
+protected static EmbeddedDatabase initDb(String script) {
+return initDb(EmbeddedDatabaseType.DERBY, script);
+}
+
+protected static EmbeddedDatabase initDb(EmbeddedDatabaseType type, String
script) {
+EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder()
+.setName(BaseSql.class.getSimpleName())
+.setType(type);
+if(script
[GitHub] [camel-spring-boot] davsclaus merged pull request #472: CAMEL-17800 add tests in camel-sql-starter
davsclaus merged pull request #472: URL: https://github.com/apache/camel-spring-boot/pull/472 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch main updated: [create-pull-request] automated change
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 79a5738 [create-pull-request] automated change
79a5738 is described below
commit 79a5738c0c7ff15dfbf50fd2790d0b2286adb64d
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Mar 19 01:08:20 2022 +
[create-pull-request] automated change
---
.../org/apache/camel/springboot/catalog/components/platform-http.json| 1 +
1 file changed, 1 insertion(+)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json
index 957717b..824f8c8 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json
@@ -32,6 +32,7 @@
"consumes": { "kind": "parameter", "displayName": "Consumes", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The content type this endpoint accepts as an
input, such as application\/xml or application\/json. null or \/ mean
no restriction." },
"httpMethodRestrict": { "kind": "parameter", "displayName": "Http Method
Restrict", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "A comma separated list of HTTP methods
to serve, e.g. GET,POST . If no methods are specified, all methods will be
served." },
"matchOnUriPrefix": { "kind": "parameter", "displayName": "Match On Uri
Prefix", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether or not the
consumer should try to find a target consumer by matching the URI prefix if no
exact match is found." },
+"muteException": { "kind": "parameter", "displayName": "Mute Exception",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "description": "If enabled and an Exchange failed
processing on the consumer side the response's body won't contain the
exception's stack trace." },
"produces": { "kind": "parameter", "displayName": "Produces", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The content type this endpoint produces, such
as application\/xml or application\/json." },
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By default the
con [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false,
"description": "Sets the exchange pattern when the consumer creates an
exchange." },
[camel-karaf] branch main updated: [create-pull-request] automated change
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-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new d615f90 [create-pull-request] automated change
d615f90 is described below
commit d615f90d5105928df2f024daf6efe1f03ea9d803
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Mar 19 01:02:22 2022 +
[create-pull-request] automated change
---
.../camel/catalog/karaf/components.properties | 2 -
.../catalog/karaf/components/mongodb-gridfs.json | 48 -
.../camel/catalog/karaf/components/mongodb.json| 61 --
3 files changed, 111 deletions(-)
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components.properties
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components.properties
index 374b217..f22d3af 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components.properties
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components.properties
@@ -113,8 +113,6 @@ mina
minio
mllp
mock
-mongodb
-mongodb-gridfs
msv
mustache
mvel
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/mongodb-gridfs.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/mongodb-gridfs.json
deleted file mode 100644
index 3e110a5..000
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/mongodb-gridfs.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
- "component": {
-"kind": "component",
-"name": "mongodb-gridfs",
-"title": "MongoDB GridFS",
-"description": "Interact with MongoDB GridFS.",
-"deprecated": false,
-"firstVersion": "2.18.0",
-"label": "database,nosql",
-"javaType": "org.apache.camel.component.mongodb.gridfs.GridFsComponent",
-"supportLevel": "Stable",
-"groupId": "org.apache.camel",
-"artifactId": "camel-mongodb-gridfs",
-"version": "3.16.0-SNAPSHOT",
-"scheme": "mongodb-gridfs",
-"extendsScheme": "",
-"syntax": "mongodb-gridfs:connectionBean",
-"async": false,
-"api": false,
-"consumerOnly": false,
-"producerOnly": false,
-"lenientProperties": false
- },
- "componentProperties": {
-"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a me [...]
-"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Whether the producer
should be started lazy (on the first message). By starting lazy you can use
this to allow CamelContext and routes to startup in situations where a producer
may otherwise fail during star [...]
-"autowiredEnabled": { "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 type, which t [...]
- },
- "properties": {
-"connectionBean": { "kind": "path", "displayName": "Connection Bean",
"group": "common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Name of com.mongodb.client.MongoClient
to use." },
-"bucket": { "kind": "parameter", "displayName": "Bucket", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "fs", "description": "Sets the name of the GridFS bucket within
the database. Default is fs." },
-"database": { "kind": "parameter", "displayName": "Database", "group":
"common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false,
[GitHub] [camel-spring-boot] oscerd merged pull request #475: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
oscerd merged pull request #475: URL: https://github.com/apache/camel-spring-boot/pull/475 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karaf] oscerd merged pull request #126: [Github Actions] Periodic Sync Camel Karaf Main Branch
oscerd merged pull request #126: URL: https://github.com/apache/camel-karaf/pull/126 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k-runtime] lburgazzoli merged pull request #798: build(deps): bump groovy-version from 3.0.9 to 3.0.10
lburgazzoli merged pull request #798: URL: https://github.com/apache/camel-k-runtime/pull/798 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k-runtime] branch main updated: build(deps): bump groovy-version from 3.0.9 to 3.0.10
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/main by this push: new 6bec6c7 build(deps): bump groovy-version from 3.0.9 to 3.0.10 6bec6c7 is described below commit 6bec6c758de375dc2d2f577b6031a70bf99ba802 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Mar 18 23:00:35 2022 + build(deps): bump groovy-version from 3.0.9 to 3.0.10 Bumps `groovy-version` from 3.0.9 to 3.0.10. Updates `groovy` from 3.0.9 to 3.0.10 - [Release notes](https://github.com/apache/groovy/releases) - [Commits](https://github.com/apache/groovy/commits) Updates `groovy-xml` from 3.0.9 to 3.0.10 - [Release notes](https://github.com/apache/groovy/releases) - [Commits](https://github.com/apache/groovy/commits) Updates `groovy-json` from 3.0.9 to 3.0.10 - [Release notes](https://github.com/apache/groovy/releases) - [Commits](https://github.com/apache/groovy/commits) Updates `groovy-yaml` from 3.0.9 to 3.0.10 - [Release notes](https://github.com/apache/groovy/releases) - [Commits](https://github.com/apache/groovy/commits) Updates `groovy-test` from 3.0.9 to 3.0.10 - [Release notes](https://github.com/apache/groovy/releases) - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-xml dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-json dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-yaml dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.codehaus.groovy:groovy-test dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index db0715f..df47615 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ 2.7.3.Final -3.0.9 +3.0.10 2.1-groovy-3.0 2.9.0 3.1.0
[camel] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 5a8deab Regen
5a8deab is described below
commit 5a8deab8e227d303fc3171fa2204f0994d8b917c
Author: Claus Ibsen
AuthorDate: Sat Mar 19 08:24:23 2022 +0100
Regen
---
.../camel/catalog/components/atomix-map.json | 12
.../camel/catalog/components/atomix-messaging.json | 10 +++
.../camel/catalog/components/atomix-multimap.json | 9 +++
.../camel/catalog/components/atomix-queue.json | 8 +++
.../camel/catalog/components/atomix-set.json | 9 +++
.../camel/catalog/components/atomix-value.json | 10 +++
.../org/apache/camel/catalog/components/cxf.json | 8 +++
.../org/apache/camel/catalog/components/cxfrs.json | 18 +
.../apache/camel/catalog/components/dataset.json | 3 +
.../camel/catalog/components/debezium-mongodb.json | 9 +++
.../camel/catalog/components/debezium-mysql.json | 9 +++
.../catalog/components/debezium-postgres.json | 9 +++
.../catalog/components/debezium-sqlserver.json | 9 +++
.../camel/catalog/components/digitalocean.json | 26 +++
.../org/apache/camel/catalog/components/dns.json | 8 +++
.../apache/camel/catalog/components/docker.json| 83 ++
.../org/apache/camel/catalog/components/drill.json | 3 +
.../apache/camel/catalog/components/dropbox.json | 15
.../apache/camel/catalog/schemas/camel-spring.xsd | 2 +-
19 files changed, 259 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atomix-map.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atomix-map.json
index 24e85a9..9e3e43a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atomix-map.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/atomix-map.json
@@ -41,6 +41,18 @@
"resourceConfigs": { "kind": "property", "displayName": "Resource
Configs", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "java.util.Map",
"prefix": "resource.config", "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.atomix.client.map.AtomixMapConfiguration",
"configurationField": "configuration", "description": "Cluster wide resources
config [...]
"resourceOptions": { "kind": "property", "displayName": "Resource
Options", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "java.util.Map",
"prefix": "resource.options", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.atomix.client.map.AtomixMapConfiguration",
"configurationField": "configuration", "description": "Local resources
configurations" }
},
+ "headers": {
+"CamelAtomixResourceName": { "kind": "header", "displayName": "", "group":
"producer", "label": "producer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The name of the resource" },
+"CamelAtomixResourceAction": { "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"org.apache.camel.component.atomix.client.map.AtomixMap.Action", "enum": [
"PUT", "PUT_IF_ABSENT", "GET", "CLEAR", "SIZE", "CONTAINS_KEY",
"CONTAINS_VALUE", "IS_EMPTY", "ENTRY_SET", "REMOVE", "REPLACE", "VALUES" ],
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The action to perform" },
+"CamelAtomixResourceKey": { "kind": "header", "displayName": "", "group":
"common", "label": "", "required": false, "javaType": "Object", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The key to operate on" },
+"CamelAtomixResourceValue": { "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"Object", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The value, if missing In Body is used" },
+"CamelAtomixResourceDefaultValue": { "kind": "header", "displayName": "",
"group": "producer", "label": "producer", "required": false, "javaType":
"Object", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The default value of the resource" },
+"CamelAtomixResourceOldValue": { "kind": "header", "displayName": "",
"group": "common", "label": "", "required": false, "javaType": "Object",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The old value" },
+
[GitHub] [camel] davsclaus merged pull request #7232: CAMEL-17792: Add documentation about the message headers (D)
davsclaus merged pull request #7232: URL: https://github.com/apache/camel/pull/7232 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch quarkus-main updated (276bc4d -> 592c61b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard 276bc4d Temporary hacks to handle version misalignment of smallrye-health and smallrye-faulttolerance in Quarkus & Camel discard 9b89532 Upgrade to Quarkus 2.8.0.CR1 add c7b1b57 Remove weka extension #3532 add ec1b4ad Remove ipfs extension #3532 add a665ddc Fix the migration guide #3532 new 2d46856 Upgrade to Quarkus 2.8.0.CR1 new 592c61b Temporary hacks to handle version misalignment of smallrye-health and smallrye-faulttolerance in Quarkus & Camel 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 (276bc4d) \ N -- N -- N refs/heads/quarkus-main (592c61b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: docs/modules/ROOT/pages/migration-guide/2.8.0.adoc | 7 ++ extensions-jvm/weka/deployment/pom.xml | 61 -- .../component/weka/deployment/WekaProcessor.java | 46 extensions-jvm/weka/pom.xml| 37 -- extensions-jvm/weka/runtime/pom.xml| 123 .../main/resources/META-INF/quarkus-extension.yaml | 32 -- extensions/ipfs/deployment/pom.xml | 61 -- .../component/ipfs/deployment/IpfsProcessor.java | 30 - extensions/ipfs/pom.xml| 37 -- extensions/ipfs/runtime/pom.xml| 125 .../main/resources/META-INF/quarkus-extension.yaml | 31 - integration-tests-jvm/weka/pom.xml | 83 -- .../quarkus/component/weka/it/WekaResource.java| 51 - .../camel/quarkus/component/weka/it/WekaTest.java | 34 -- integration-tests/ipfs/pom.xml | 126 - .../quarkus/component/ipfs/it/IpfsResource.java| 58 -- .../camel/quarkus/component/ipfs/it/IpfsIT.java| 24 .../camel/quarkus/component/ipfs/it/IpfsTest.java | 79 - .../component/ipfs/it/IpfsTestResource.java| 54 - tooling/scripts/validate-github-workflows.groovy | 2 +- tooling/test-list/pom.xml | 1 - 21 files changed, 8 insertions(+), 1094 deletions(-) delete mode 100644 extensions-jvm/weka/deployment/pom.xml delete mode 100644 extensions-jvm/weka/deployment/src/main/java/org/apache/camel/quarkus/component/weka/deployment/WekaProcessor.java delete mode 100644 extensions-jvm/weka/pom.xml delete mode 100644 extensions-jvm/weka/runtime/pom.xml delete mode 100644 extensions-jvm/weka/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 extensions/ipfs/deployment/pom.xml delete mode 100644 extensions/ipfs/deployment/src/main/java/org/apache/camel/quarkus/component/ipfs/deployment/IpfsProcessor.java delete mode 100644 extensions/ipfs/pom.xml delete mode 100644 extensions/ipfs/runtime/pom.xml delete mode 100644 extensions/ipfs/runtime/src/main/resources/META-INF/quarkus-extension.yaml delete mode 100644 integration-tests-jvm/weka/pom.xml delete mode 100644 integration-tests-jvm/weka/src/main/java/org/apache/camel/quarkus/component/weka/it/WekaResource.java delete mode 100644 integration-tests-jvm/weka/src/test/java/org/apache/camel/quarkus/component/weka/it/WekaTest.java delete mode 100644 integration-tests/ipfs/pom.xml delete mode 100644 integration-tests/ipfs/src/main/java/org/apache/camel/quarkus/component/ipfs/it/IpfsResource.java delete mode 100644 integration-tests/ipfs/src/test/java/org/apache/camel/quarkus/component/ipfs/it/IpfsIT.java delete mode 100644 integration-tests/ipfs/src/test/java/org/apache/camel/quarkus/component/ipfs/it/IpfsTest.java delete mode 100644 integration-tests/ipfs/src/test/java/org/apache/camel/quarkus/component/ipfs/it/IpfsTestResource.java
[camel-quarkus] 01/02: Upgrade to Quarkus 2.8.0.CR1
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 2d468568c203a207814e5a57b118718d445c0bb7
Author: James Netherton
AuthorDate: Thu Jan 20 07:52:37 2022 +
Upgrade to Quarkus 2.8.0.CR1
---
docs/antora.yml| 6 ++---
.../deployment/OpenTelemetryProcessor.java | 2 +-
integration-tests/http/pom.xml | 2 +-
.../kafka/oauth/it/container/KafkaContainer.java | 30 +-
integration-tests/vertx-websocket/pom.xml | 2 +-
pom.xml| 11
poms/build-parent/pom.xml | 9 +++
7 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index e4edba8..63dfdcb 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,9 +31,9 @@ asciidoc:
target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.15.0 # replace ${camel.version}
camel-docs-version: 3.15.x # replace ${camel.docs.components.version}
-quarkus-version: 2.7.5.Final # replace ${quarkus.version}
-graalvm-version: 21.3.1 # replace ${graalvm.version}
-graalvm-docs-version: 21.3
+quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
+graalvm-version: 22.0.0.2 # replace ${graalvm.version}
+graalvm-docs-version: 22.0
# attributes used in xrefs to other Antora components
cq-camel-components: 3.15.x@components # replace
${camel.docs.components.xref}
quarkus-examples-version: latest
diff --git
a/extensions/opentelemetry/deployment/src/main/java/org/apache/camel/quarkus/component/opentelemetry/deployment/OpenTelemetryProcessor.java
b/extensions/opentelemetry/deployment/src/main/java/org/apache/camel/quarkus/component/opentelemetry/deployment/OpenTelemetryProcessor.java
index 3622992..1040841 100644
---
a/extensions/opentelemetry/deployment/src/main/java/org/apache/camel/quarkus/component/opentelemetry/deployment/OpenTelemetryProcessor.java
+++
b/extensions/opentelemetry/deployment/src/main/java/org/apache/camel/quarkus/component/opentelemetry/deployment/OpenTelemetryProcessor.java
@@ -19,7 +19,7 @@ package
org.apache.camel.quarkus.component.opentelemetry.deployment;
import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import
io.quarkus.opentelemetry.deployment.tracing.TracerProcessor.TracerEnabled;
+import io.quarkus.opentelemetry.deployment.tracing.TracerEnabled;
import
org.apache.camel.quarkus.component.opentelemetry.OpenTelemetryTracerProducer;
class OpenTelemetryProcessor {
diff --git a/integration-tests/http/pom.xml b/integration-tests/http/pom.xml
index 0bb8a2a..793de20 100644
--- a/integration-tests/http/pom.xml
+++ b/integration-tests/http/pom.xml
@@ -61,7 +61,7 @@
io.quarkus
-quarkus-undertow-websockets
+quarkus-websockets
io.quarkus
diff --git
a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
index 31885bf..e95e062 100644
---
a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
+++
b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
@@ -16,17 +16,20 @@
*/
package org.apache.camel.quarkus.kafka.oauth.it.container;
-import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import javax.json.Json;
+import javax.json.stream.JsonParser;
+
import com.github.dockerjava.api.command.InspectContainerResponse;
-import io.strimzi.StrimziKafkaContainer;
+import io.strimzi.test.container.StrimziKafkaContainer;
+import org.apache.commons.io.IOUtils;
import org.jboss.logging.Logger;
import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.Network;
@@ -45,19 +48,22 @@ public class KafkaContainer extends
FixedHostPortGenericContainer supportedKafkaVersions = new
ArrayList<>(3);
+private static final List supportedKafkaVersions = new
ArrayList<>();
static {
-InputStream inputStream =
StrimziKafkaContainer.class.getResourceAsStream("/kafka-versions.txt");
-InputStreamReader streamReader = new InputStreamReader(inputStream,
StandardCharsets.UTF_8);
-
-try (BufferedReader bufferedReader = new
[camel-quarkus] 02/02: Temporary hacks to handle version misalignment of smallrye-health and smallrye-faulttolerance in Quarkus & Camel
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 592c61bed8987863207563e2bc19742b110079d2
Author: James Netherton
AuthorDate: Fri Feb 11 10:08:03 2022 +
Temporary hacks to handle version misalignment of smallrye-health and
smallrye-faulttolerance in Quarkus & Camel
---
.../MicroprofileFaultToleranceProcessor.java | 9 +
.../microprofile-fault-tolerance/runtime/pom.xml | 2 +
.../FaultToleranceConfiguration.java | 120 +
.../faulttolerance/FaultToleranceConstants.java} | 21 +-
.../faulttolerance/FaultToleranceProcessor.java| 536 +
.../FaultToleranceProcessorFactory.java} | 28 +-
.../faulttolerance/FaultToleranceReifier.java | 193
.../apache/camel/model/CircuitBreakerDefinition| 18 +
.../deployment/MicroProfileHealthEnabledTest.java | 4 +-
.../runtime/CamelMicroProfileHealthCheck.java | 67 +++
.../runtime/CamelMicroProfileHealthHelper.java | 63 +++
.../runtime/CamelMicroProfileHealthRecorder.java | 3 +-
.../CamelMicroProfileRepositoryHealthCheck.java| 72 +++
...amelQuarkusMicroProfileHealthCheckRegistry.java | 185 +++
.../it/CoreFaultToleranceProducers.java| 4 +-
15 files changed, 1287 insertions(+), 38 deletions(-)
diff --git
a/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
b/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
index 05673b1..6e8c382 100644
---
a/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
+++
b/extensions/microprofile-fault-tolerance/deployment/src/main/java/org/apache/camel/quarkus/component/microprofile/fault/tolerance/deployment/MicroprofileFaultToleranceProcessor.java
@@ -16,9 +16,13 @@
*/
package
org.apache.camel.quarkus.component.microprofile.fault.tolerance.deployment;
+import java.nio.file.Paths;
+
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import
io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem;
+import
org.apache.camel.component.microprofile.faulttolerance.FaultToleranceProcessorFactory;
+import org.apache.camel.quarkus.core.deployment.spi.CamelServiceBuildItem;
class MicroprofileFaultToleranceProcessor {
@@ -35,4 +39,9 @@ class MicroprofileFaultToleranceProcessor {
"META-INF/services/org/apache/camel/model/CircuitBreakerDefinition");
}
+@BuildStep
+CamelServiceBuildItem camelCronServicePattern() {
+return new
CamelServiceBuildItem(Paths.get("META-INF/services/org/apache/camel/model/CircuitBreakerDefinition"),
+FaultToleranceProcessorFactory.class.getName());
+}
}
diff --git a/extensions/microprofile-fault-tolerance/runtime/pom.xml
b/extensions/microprofile-fault-tolerance/runtime/pom.xml
index 3401f07..22e3962 100644
--- a/extensions/microprofile-fault-tolerance/runtime/pom.xml
+++ b/extensions/microprofile-fault-tolerance/runtime/pom.xml
@@ -56,10 +56,12 @@
org.apache.camel.quarkus
camel-quarkus-core
+
diff --git
a/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
b/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
new file mode 100644
index 000..7cb3d4d
--- /dev/null
+++
b/extensions/microprofile-fault-tolerance/runtime/src/main/java/org/apache/camel/component/microprofile/faulttolerance/FaultToleranceConfiguration.java
@@ -0,0 +1,120 @@
+/*
+ * 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
