(camel-kafka-connector) branch mvn-upg deleted (was ea769cf6ee)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch mvn-upg in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git was ea769cf6ee Upgrade maven plugins The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-kafka-connector) branch main updated: Upgrade maven plugins (#1627)
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-kafka-connector.git The following commit(s) were added to refs/heads/main by this push: new 3afac4 Upgrade maven plugins (#1627) 3afac4 is described below commit 3afac467e24757cb75cae7af78dc464d3f01 Author: Claus Ibsen AuthorDate: Wed May 8 09:26:44 2024 +0200 Upgrade maven plugins (#1627) --- parent/pom.xml | 14 +++--- pom.xml| 14 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index b2a170977e..13e29f194a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -38,27 +38,27 @@ 42.4.4 3.3.0 -3.8.1 -3.1.1 -3.0.1 -3.2.0 +3.13.0 +3.6.3 +3.3.1 +3.3.1 1.8 1.6.7 1.12 3.5.1 3.1.0 2.22.2 -3.0.0-M4 +3.2.5 2.12.12 1.6.0 8.29 3.1.0 -3.0.0-M4 +3.2.5 0.0.7 3.0 -3.0.20 +3.0.21 quay.io/strimzi/kafka:0.32.0-kafka-3.2.1 quay.io/strimzi/kafka:0.32.0-kafka-3.2.1 diff --git a/pom.xml b/pom.xml index c150c89033..f7344c943e 100644 --- a/pom.xml +++ b/pom.xml @@ -38,13 +38,13 @@ false UTF-8 1.6 -3.0.0-M1 -3.0.0-M4 -3.1.1 -3.3.0 -3.1.0 - 1.7 -2.7.10 +3.1.2 +3.2.5 +3.6.3 +3.7.1 +3.3.1 + 1.11 +2.8.0
(camel-kafka-connector) 01/01: Upgrade maven plugins
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch mvn-upg in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit ea769cf6eeef07f033fd8584d884ad4fb9ad3b30 Author: Claus Ibsen AuthorDate: Wed May 8 06:32:07 2024 +0200 Upgrade maven plugins --- parent/pom.xml | 14 +++--- pom.xml| 14 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index b2a170977e..13e29f194a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -38,27 +38,27 @@ 42.4.4 3.3.0 -3.8.1 -3.1.1 -3.0.1 -3.2.0 +3.13.0 +3.6.3 +3.3.1 +3.3.1 1.8 1.6.7 1.12 3.5.1 3.1.0 2.22.2 -3.0.0-M4 +3.2.5 2.12.12 1.6.0 8.29 3.1.0 -3.0.0-M4 +3.2.5 0.0.7 3.0 -3.0.20 +3.0.21 quay.io/strimzi/kafka:0.32.0-kafka-3.2.1 quay.io/strimzi/kafka:0.32.0-kafka-3.2.1 diff --git a/pom.xml b/pom.xml index c150c89033..f7344c943e 100644 --- a/pom.xml +++ b/pom.xml @@ -38,13 +38,13 @@ false UTF-8 1.6 -3.0.0-M1 -3.0.0-M4 -3.1.1 -3.3.0 -3.1.0 - 1.7 -2.7.10 +3.1.2 +3.2.5 +3.6.3 +3.7.1 +3.3.1 + 1.11 +2.8.0
(camel-kafka-connector) branch mvn-upg created (now ea769cf6ee)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch mvn-upg in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git at ea769cf6ee Upgrade maven plugins This branch includes the following new commits: new ea769cf6ee Upgrade maven plugins The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) 01/02: Fix HTML route coverage report generation on Windows machines (#14078)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 917469fa76b063b32c9d0e9bdfbfdf028e605cbb
Author: Adriano Machado <60320+ammach...@users.noreply.github.com>
AuthorDate: Tue May 7 23:59:49 2024 -0400
Fix HTML route coverage report generation on Windows machines (#14078)
---
.../src/main/java/org/apache/camel/maven/RouteCoverageMojo.java| 2 +-
.../apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java | 2 +-
.../main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java| 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
index 09cb718e8a8..4e8d8ee15c2 100644
---
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
+++
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
@@ -361,7 +361,7 @@ public class RouteCoverageMojo extends AbstractExecMojo {
String out = processor.generateReport(project, xmlPath, htmlPath);
getLog().info(out);
} catch (Exception e) {
-getLog().warn("Error generating HTML route coverage reports " +
e.getMessage());
+getLog().warn("Error generating HTML route coverage reports due "
+ e.getMessage());
}
}
diff --git
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java
index b82fcb7a507..4273ba7b674 100644
---
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java
+++
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java
@@ -72,7 +72,7 @@ public class CoverageResultsProcessor {
parseAllTestResults(xmlPath);
-if (testResults.size() > 0) {
+if (!testResults.isEmpty()) {
gatherBestRouteCoverages();
diff --git
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
index ac960befd66..fd886bc1815 100644
---
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
+++
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
@@ -27,6 +27,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
public class FileUtil {
@@ -100,6 +101,6 @@ public class FileUtil {
public String readFileFromClassPath(String path) throws IOException {
-return IOUtils.resourceToString(path, Charset.defaultCharset(),
FileUtil.class.getClassLoader());
+return IOUtils.resourceToString(FilenameUtils.separatorsToUnix(path),
Charset.defaultCharset(), FileUtil.class.getClassLoader());
}
}
(camel) 02/02: Fix HTML route coverage report generation on Windows machines
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 90c4e191ce18c63080565a8c53cbab18c2e0c213
Author: Claus Ibsen
AuthorDate: Wed May 8 06:00:29 2024 +0200
Fix HTML route coverage report generation on Windows machines
---
.../main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
index fd886bc1815..14f44155c9c 100644
---
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
+++
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
@@ -101,6 +101,7 @@ public class FileUtil {
public String readFileFromClassPath(String path) throws IOException {
-return IOUtils.resourceToString(FilenameUtils.separatorsToUnix(path),
Charset.defaultCharset(), FileUtil.class.getClassLoader());
+return IOUtils.resourceToString(FilenameUtils.separatorsToUnix(path),
Charset.defaultCharset(),
+FileUtil.class.getClassLoader());
}
}
(camel) branch camel-4.4.x updated (b8f369c9396 -> 90c4e191ce1)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-4.4.x in repository https://gitbox.apache.org/repos/asf/camel.git from b8f369c9396 CAMEL-20731: mvn camel-report:route-coverage fails on routes with multiple doCatch blocks new 917469fa76b Fix HTML route coverage report generation on Windows machines (#14078) new 90c4e191ce1 Fix HTML route coverage report generation on Windows machines 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: .../src/main/java/org/apache/camel/maven/RouteCoverageMojo.java | 2 +- .../apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java | 2 +- .../main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-)
(camel) branch main updated: Fix HTML route coverage report generation on Windows machines
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 a80fb1c1df4 Fix HTML route coverage report generation on Windows
machines
a80fb1c1df4 is described below
commit a80fb1c1df4713d6a5308c6ec6e34b7e3f3f7c1b
Author: Claus Ibsen
AuthorDate: Wed May 8 06:00:29 2024 +0200
Fix HTML route coverage report generation on Windows machines
---
.../main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java| 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
index fd886bc1815..14f44155c9c 100644
---
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
+++
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
@@ -101,6 +101,7 @@ public class FileUtil {
public String readFileFromClassPath(String path) throws IOException {
-return IOUtils.resourceToString(FilenameUtils.separatorsToUnix(path),
Charset.defaultCharset(), FileUtil.class.getClassLoader());
+return IOUtils.resourceToString(FilenameUtils.separatorsToUnix(path),
Charset.defaultCharset(),
+FileUtil.class.getClassLoader());
}
}
(camel) branch main updated: Fix HTML route coverage report generation on Windows machines (#14078)
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 49e89fa2d17 Fix HTML route coverage report generation on Windows
machines (#14078)
49e89fa2d17 is described below
commit 49e89fa2d176d14bdf48ca99c6289ff5bb0613c2
Author: Adriano Machado <60320+ammach...@users.noreply.github.com>
AuthorDate: Tue May 7 23:59:49 2024 -0400
Fix HTML route coverage report generation on Windows machines (#14078)
---
.../src/main/java/org/apache/camel/maven/RouteCoverageMojo.java| 2 +-
.../apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java | 2 +-
.../main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java| 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
index f6edcfaddb7..bcce20ecb24 100644
---
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
+++
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
@@ -374,7 +374,7 @@ public class RouteCoverageMojo extends AbstractMojo {
String out = processor.generateReport(project, xmlPath, htmlPath);
getLog().info(out);
} catch (Exception e) {
-getLog().warn("Error generating HTML route coverage reports " +
e.getMessage());
+getLog().warn("Error generating HTML route coverage reports due "
+ e.getMessage());
}
}
diff --git
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java
index b82fcb7a507..4273ba7b674 100644
---
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java
+++
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/CoverageResultsProcessor.java
@@ -72,7 +72,7 @@ public class CoverageResultsProcessor {
parseAllTestResults(xmlPath);
-if (testResults.size() > 0) {
+if (!testResults.isEmpty()) {
gatherBestRouteCoverages();
diff --git
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
index ac960befd66..fd886bc1815 100644
---
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
+++
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/htmlxlsx/process/FileUtil.java
@@ -27,6 +27,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
public class FileUtil {
@@ -100,6 +101,6 @@ public class FileUtil {
public String readFileFromClassPath(String path) throws IOException {
-return IOUtils.resourceToString(path, Charset.defaultCharset(),
FileUtil.class.getClassLoader());
+return IOUtils.resourceToString(FilenameUtils.separatorsToUnix(path),
Charset.defaultCharset(), FileUtil.class.getClassLoader());
}
}
(camel-kafka-connector) branch main updated: Fix tests todo (#1623)
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-kafka-connector.git
The following commit(s) were added to refs/heads/main by this push:
new 72117f6e6d Fix tests todo (#1623)
72117f6e6d is described below
commit 72117f6e6d2f0084f2883066f3a24f5e8f3e2620
Author: Andrea Tarocchi
AuthorDate: Wed May 8 05:58:17 2024 +0200
Fix tests todo (#1623)
* fix(tests): removed elastic search testcontainer hack.
* fix(tooling): added a new line at the end of generated java files header
to make generated files more consistent in formatting
---
.../ElasticSearchLocalContainerServiceHack.java| 60 --
.../sink/CamelSinkElasticSearchITCase.java | 5 +-
.../sql/source/CamelSourceSQLITCase.java | 1 -
.../camel-kafka-connector-java-header.txt | 2 +-
4 files changed, 3 insertions(+), 65 deletions(-)
diff --git
a/tests/itests-elasticsearch/src/test/java/org/apache/camel/kafkaconnector/elasticsearch/common/ElasticSearchLocalContainerServiceHack.java
b/tests/itests-elasticsearch/src/test/java/org/apache/camel/kafkaconnector/elasticsearch/common/ElasticSearchLocalContainerServiceHack.java
deleted file mode 100644
index 52568694b0..00
---
a/tests/itests-elasticsearch/src/test/java/org/apache/camel/kafkaconnector/elasticsearch/common/ElasticSearchLocalContainerServiceHack.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.kafkaconnector.elasticsearch.common;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.nio.file.Files;
-import java.nio.file.OpenOption;
-import java.nio.file.Path;
-
-import
org.apache.camel.test.infra.elasticsearch.services.ElasticSearchLocalContainerService;
-import org.testcontainers.elasticsearch.ElasticsearchContainer;
-
-public class ElasticSearchLocalContainerServiceHack extends
ElasticSearchLocalContainerService {
-public ElasticSearchLocalContainerServiceHack() {
-super();
-}
-
-public ElasticSearchLocalContainerServiceHack(String imageName) {
-super(imageName);
-}
-
-public ElasticSearchLocalContainerServiceHack(ElasticsearchContainer
container) {
-super(container);
-}
-
-@Override
-public void registerProperties() {
-System.setProperty("elasticsearch.host", this.getElasticSearchHost());
-System.setProperty("elasticsearch.port",
String.valueOf(this.getPort()));
-this.getContainer().caCertAsBytes().ifPresent(content -> {
-try {
-Field certPath =
getClass().getSuperclass().getDeclaredField("certPath");
-certPath.setAccessible(true); // enables access to private
variables
-certPath.set(this, Files.createTempFile("http_ca", ".crt"));
-Files.write((Path) certPath.get(this), content, new
OpenOption[0]);
-
-Field sslContext =
getClass().getSuperclass().getDeclaredField("sslContext");
-sslContext.setAccessible(true); // enables access to private
variables
-sslContext.set(this,
this.getContainer().createSslContextFromCa());
-} catch (IOException | NoSuchFieldException |
IllegalAccessException var3) {
-throw new RuntimeException(var3);
-}
-});
-}
-}
diff --git
a/tests/itests-elasticsearch/src/test/java/org/apache/camel/kafkaconnector/elasticsearch/sink/CamelSinkElasticSearchITCase.java
b/tests/itests-elasticsearch/src/test/java/org/apache/camel/kafkaconnector/elasticsearch/sink/CamelSinkElasticSearchITCase.java
index 082389c944..891dc59a70 100644
---
a/tests/itests-elasticsearch/src/test/java/org/apache/camel/kafkaconnector/elasticsearch/sink/CamelSinkElasticSearchITCase.java
+++
b/tests/itests-elasticsearch/src/test/java/org/apache/camel/kafkaconnector/elasticsearch/sink/CamelSinkElasticSearchITCase.java
@@ -29,7 +29,7 @@ import
org.apache.camel.kafkaconnector.common.test.CamelSinkTestSupport;
import
(camel) branch main updated: Add since to deprecated annotations (#14064)
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 2e9894ca9f1 Add since to deprecated annotations (#14064) 2e9894ca9f1 is described below commit 2e9894ca9f13138d24e3dbc6ccf458742a828018 Author: Guillaume Nodet AuthorDate: Wed May 8 05:49:22 2024 +0200 Add since to deprecated annotations (#14064) --- .../component/activemq/ActiveMQConfiguration.java | 4 +- .../src/main/java/org/apache/camel/Exchange.java | 52 +++--- .../org/apache/camel/ExtendedCamelContext.java | 2 +- .../main/java/org/apache/camel/PooledExchange.java | 2 +- .../spi/RecoverableAggregationRepository.java | 4 +- .../impl/engine/DefaultCamelContextExtension.java | 2 +- .../org/apache/camel/impl/engine/DefaultRoute.java | 2 +- .../impl/converter/CoreTypeConverterRegistry.java | 2 +- .../impl/cloud/ServiceCallProcessorFactory.java| 2 +- .../java/org/apache/camel/impl/DefaultModel.java | 2 +- .../java/org/apache/camel/builder/Builder.java | 4 +- .../org/apache/camel/builder/BuilderSupport.java | 4 +- .../org/apache/camel/builder/ExpressionClause.java | 4 +- .../camel/builder/ExpressionClauseSupport.java | 4 +- .../camel/builder/LanguageBuilderFactory.java | 2 +- .../builder/LegacyDeadLetterChannelBuilder.java| 2 +- .../builder/LegacyDefaultErrorHandlerBuilder.java | 2 +- .../camel/builder/LegacyErrorHandlerBuilder.java | 2 +- .../builder/LegacyErrorHandlerBuilderRef.java | 2 +- .../builder/LegacyErrorHandlerBuilderSupport.java | 2 +- .../camel/builder/LegacyNoErrorHandlerBuilder.java | 2 +- .../apache/camel/model/OnCompletionDefinition.java | 2 +- .../apache/camel/model/ProcessorDefinition.java| 6 +-- .../org/apache/camel/model/RouteDefinition.java| 2 +- ...klistServiceCallServiceFilterConfiguration.java | 5 ++- ...ngServiceCallServiceDiscoveryConfiguration.java | 2 +- ...edServiceCallServiceDiscoveryConfiguration.java | 2 +- ...binedServiceCallServiceFilterConfiguration.java | 2 +- ...ulServiceCallServiceDiscoveryConfiguration.java | 2 +- ...ustomServiceCallServiceFilterConfiguration.java | 2 +- ...erviceCallServiceLoadBalancerConfiguration.java | 2 +- ...nsServiceCallServiceDiscoveryConfiguration.java | 2 +- ...althyServiceCallServiceFilterConfiguration.java | 2 +- ...esServiceCallServiceDiscoveryConfiguration.java | 2 +- ...roughServiceCallServiceFilterConfiguration.java | 2 +- .../model/cloud/ServiceCallConfiguration.java | 2 +- .../cloud/ServiceCallConfigurationDefinition.java | 2 +- .../camel/model/cloud/ServiceCallDefinition.java | 2 +- .../cloud/ServiceCallDefinitionConstants.java | 2 +- .../cloud/ServiceCallExpressionConfiguration.java | 2 +- .../ServiceCallServiceChooserConfiguration.java| 2 +- .../ServiceCallServiceDiscoveryConfiguration.java | 2 +- .../ServiceCallServiceFilterConfiguration.java | 2 +- ...erviceCallServiceLoadBalancerConfiguration.java | 2 +- ...icServiceCallServiceDiscoveryConfiguration.java | 2 +- ...erServiceCallServiceDiscoveryConfiguration.java | 2 +- .../DeadLetterChannelConfiguration.java| 2 +- .../errorhandler/DeadLetterChannelProperties.java | 2 +- .../DefaultErrorHandlerConfiguration.java | 2 +- .../DefaultErrorHandlerProperties.java | 2 +- .../errorhandler/ErrorHandlerRefConfiguration.java | 2 +- .../errorhandler/ErrorHandlerRefProperties.java| 2 +- .../errorhandler/NoErrorHandlerConfiguration.java | 2 +- .../errorhandler/NoErrorHandlerProperties.java | 2 +- .../camel/model/language/JoorExpression.java | 2 +- .../apache/camel/reifier/ServiceCallReifier.java | 2 +- .../LegacyDeadLetterChannelReifier.java| 2 +- .../LegacyDefaultErrorHandlerReifier.java | 2 +- .../errorhandler/LegacyErrorHandlerRefReifier.java | 2 +- .../errorhandler/LegacyNoErrorHandlerReifier.java | 2 +- .../reifier/language/JoorExpressionReifier.java| 2 +- .../test/java/org/apache/camel/TestSupport.java| 10 ++--- .../org/apache/camel/util/ReflectionInjector.java | 2 +- .../mbean/ManagedBacklogDebuggerMBean.java | 2 +- .../management/mbean/ManagedBacklogDebugger.java | 2 +- .../camel/support/DefaultExchangeHolder.java | 2 +- .../camel/support/DefaultHeaderFilterStrategy.java | 2 +- .../camel/support/DefaultLRUCacheFactory.java | 6 +-- .../camel/support/DefaultPooledExchange.java | 2 +- .../org/apache/camel/support/LRUCacheFactory.java | 6 +-- .../support/component/AbstractApiComponent.java| 4 +- .../org/apache/camel/support/http/HttpUtil.java| 2 +- .../main/java/org/apache/camel/util/DoubleMap.java | 2 +- .../java/org/apache/camel/util/URISupport.java | 4 +- 74 files changed, 120
(camel) branch main updated: camel-jbang - Add Oracle JDBC driver as known JAR
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 018e8bf2f3c camel-jbang - Add Oracle JDBC driver as known JAR
018e8bf2f3c is described below
commit 018e8bf2f3cad04be5fcc254362755c1f5fe4096
Author: Claus Ibsen
AuthorDate: Tue May 7 22:13:53 2024 +0200
camel-jbang - Add Oracle JDBC driver as known JAR
---
.../src/main/resources/camel-main-known-dependencies.properties | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/dsl/camel-kamelet-main/src/main/resources/camel-main-known-dependencies.properties
b/dsl/camel-kamelet-main/src/main/resources/camel-main-known-dependencies.properties
index 06af8ca8c7c..b1171d629b0 100644
---
a/dsl/camel-kamelet-main/src/main/resources/camel-main-known-dependencies.properties
+++
b/dsl/camel-kamelet-main/src/main/resources/camel-main-known-dependencies.properties
@@ -43,4 +43,6 @@ quarkus.datasource.db-kind\=mariadb =
io.quarkus:quarkus-jdbc-mariadb:${quarkus-
quarkus.datasource.db-kind\=mssql =
io.quarkus:quarkus-jdbc-mssql:${quarkus-version}
quarkus.datasource.db-kind\=mysql =
io.quarkus:quarkus-jdbc-mysql:${quarkus-version}
quarkus.datasource.db-kind\=oracle =
io.quarkus:quarkus-jdbc-oracle:${quarkus-version}
-quarkus.datasource.db-kind\=postgresql =
io.quarkus:quarkus-jdbc-postgresql:${quarkus-version}
\ No newline at end of file
+quarkus.datasource.db-kind\=postgresql =
io.quarkus:quarkus-jdbc-postgresql:${quarkus-version}
+org.springframework.jdbc.datasource.SimpleDriverDataSource = camel:sql
+oracle.jdbc.driver.OracleDriver = com.oracle.database.jdbc:ojdbc11:23.4.0.24.05
\ No newline at end of file
(camel) branch main updated: CAMEL-20745: camel-core - Add support for constructors to lookup beans when using beans in DSL
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 8b0a9c8df0c CAMEL-20745: camel-core - Add support for constructors to
lookup beans when using beans in DSL
8b0a9c8df0c is described below
commit 8b0a9c8df0c833aa2f480aeb2c3c331e46bae8eb
Author: Claus Ibsen
AuthorDate: Tue May 7 22:13:25 2024 +0200
CAMEL-20745: camel-core - Add support for constructors to lookup beans when
using beans in DSL
---
.../camel/support/PropertyBindingSupport.java | 41 --
1 file changed, 31 insertions(+), 10 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
index df8297c3df0..353585af5a8 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
@@ -1258,7 +1258,7 @@ public final class PropertyBindingSupport {
public static Object newInstanceConstructorParameters(CamelContext
camelContext, Class type, String parameters)
throws Exception {
String[] params = StringQuoteHelper.splitSafeQuote(parameters, ',',
false);
-Constructor found = findMatchingConstructor(type.getConstructors(),
params);
+Constructor found = findMatchingConstructor(camelContext,
type.getConstructors(), params);
if (found != null) {
Object[] arr = new Object[found.getParameterCount()];
for (int i = 0; i < found.getParameterCount(); i++) {
@@ -1300,7 +1300,8 @@ public final class PropertyBindingSupport {
* @param params the parameters
* @return the constructor, or null if no matching
constructor can be found
*/
-private static Constructor findMatchingConstructor(Constructor[]
constructors, String[] params) {
+private static Constructor findMatchingConstructor(
+CamelContext camelContext, Constructor[] constructors, String[]
params) {
List> candidates = new ArrayList<>();
Constructor fallbackCandidate = null;
@@ -1317,7 +1318,7 @@ public final class PropertyBindingSupport {
parameter = parameter.trim();
}
-Class parameterType = getValidParameterType(parameter);
+Class parameterType = getValidParameterType(camelContext,
parameter);
Class expectedType = ctr.getParameterTypes()[i];
if (parameterType != null && expectedType != null) {
@@ -1358,7 +1359,7 @@ public final class PropertyBindingSupport {
CamelContext camelContext, Class type, String factoryMethod,
String parameters)
throws Exception {
String[] params = StringQuoteHelper.splitSafeQuote(parameters, ',',
false);
-Method found = findMatchingFactoryMethod(type.getMethods(),
factoryMethod, params);
+Method found = findMatchingFactoryMethod(camelContext,
type.getMethods(), factoryMethod, params);
if (found != null) {
Object[] arr = new Object[found.getParameterCount()];
for (int i = 0; i < found.getParameterCount(); i++) {
@@ -1397,12 +1398,14 @@ public final class PropertyBindingSupport {
*
* This implementation is similar to the logic in camel-bean.
*
+ * @param camelContext the camel context
* @param methods the methods
* @param factoryMethod the name of the factory method
* @param paramsthe parameters
* @return the constructor, or null if no matching
constructor can be found
*/
-private static Method findMatchingFactoryMethod(Method[] methods, String
factoryMethod, String[] params) {
+private static Method findMatchingFactoryMethod(
+CamelContext camelContext, Method[] methods, String factoryMethod,
String[] params) {
List candidates = new ArrayList<>();
Method fallbackCandidate = null;
@@ -1430,7 +1433,7 @@ public final class PropertyBindingSupport {
parameter = parameter.trim();
}
-Class parameterType = getValidParameterType(parameter);
+Class parameterType = getValidParameterType(camelContext,
parameter);
Class expectedType = method.getParameterTypes()[i];
if (parameterType != null && expectedType != null) {
@@ -1462,10 +1465,11 @@ public final class PropertyBindingSupport {
*
* This implementation is similar to the logic in camel-bean.
*
- * @param value the value
- * @return the parameter type the given value is being mapped as,
(camel) branch wiremock303 deleted (was 586a2c3af85)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch wiremock303 in repository https://gitbox.apache.org/repos/asf/camel.git was 586a2c3af85 Upgrade to wiremock 3.0.3 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: Wiremock303 (#14077)
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 db5bbd75fe0 Wiremock303 (#14077)
db5bbd75fe0 is described below
commit db5bbd75fe0b18d2e90c1416a52c142952cce3bd
Author: Claus Ibsen
AuthorDate: Tue May 7 17:03:51 2024 +0200
Wiremock303 (#14077)
* Upgrade to wiremock 3.0.3
* Upgrade to wiremock 3.0.3
---
components/camel-rest-openapi/pom.xml | 3 +--
parent/pom.xml| 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/components/camel-rest-openapi/pom.xml
b/components/camel-rest-openapi/pom.xml
index 1ce9beb3d4b..9383cb8404b 100644
--- a/components/camel-rest-openapi/pom.xml
+++ b/components/camel-rest-openapi/pom.xml
@@ -135,8 +135,7 @@
org.wiremock
wiremock
-
-3.0.1
+${wiremock-version}
test
diff --git a/parent/pom.xml b/parent/pom.xml
index bd62472c705..f2aa90ce417 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -478,7 +478,7 @@
5.0.0
4.10.0
2.2.2.Final
-3.0.1
+3.0.3
4.4.1
6.6.2
4.25
(camel) branch dependabot/maven/components/camel-rest-openapi/org.wiremock-wiremock-3.0.3 deleted (was ccf98f1dc52)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch dependabot/maven/components/camel-rest-openapi/org.wiremock-wiremock-3.0.3 in repository https://gitbox.apache.org/repos/asf/camel.git was ccf98f1dc52 Bump org.wiremock:wiremock in /components/camel-rest-openapi The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch wiremock303 created (now 586a2c3af85)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch wiremock303 in repository https://gitbox.apache.org/repos/asf/camel.git at 586a2c3af85 Upgrade to wiremock 3.0.3 This branch includes the following new commits: new 20c076fc0d2 Upgrade to wiremock 3.0.3 new 586a2c3af85 Upgrade to wiremock 3.0.3 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) 02/02: Upgrade to wiremock 3.0.3
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch wiremock303
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 586a2c3af852da3103c773a4f0169c61ea0894bb
Author: Claus Ibsen
AuthorDate: Tue May 7 16:19:15 2024 +0200
Upgrade to wiremock 3.0.3
---
components/camel-rest-openapi/pom.xml | 2 +-
parent/pom.xml| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/camel-rest-openapi/pom.xml
b/components/camel-rest-openapi/pom.xml
index 5a9f3f1e5cf..9383cb8404b 100644
--- a/components/camel-rest-openapi/pom.xml
+++ b/components/camel-rest-openapi/pom.xml
@@ -135,7 +135,7 @@
org.wiremock
wiremock
-3.0.3
+${wiremock-version}
test
diff --git a/parent/pom.xml b/parent/pom.xml
index bd62472c705..f2aa90ce417 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -478,7 +478,7 @@
5.0.0
4.10.0
2.2.2.Final
-3.0.1
+3.0.3
4.4.1
6.6.2
4.25
(camel) 01/02: Upgrade to wiremock 3.0.3
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch wiremock303 in repository https://gitbox.apache.org/repos/asf/camel.git commit 20c076fc0d2c4e4eda076ff162bda19ced332093 Author: Claus Ibsen AuthorDate: Tue May 7 16:17:57 2024 +0200 Upgrade to wiremock 3.0.3 --- components/camel-rest-openapi/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/camel-rest-openapi/pom.xml b/components/camel-rest-openapi/pom.xml index 1ce9beb3d4b..5a9f3f1e5cf 100644 --- a/components/camel-rest-openapi/pom.xml +++ b/components/camel-rest-openapi/pom.xml @@ -135,8 +135,7 @@ org.wiremock wiremock - -3.0.1 +3.0.3 test
(camel) branch main updated: Updated dependency coordinates for artifacts moved elsewhere: (#14072)
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 58923e17330 Updated dependency coordinates for artifacts moved
elsewhere: (#14072)
58923e17330 is described below
commit 58923e1733094a824c16ec6d38a77c5100745cbe
Author: Marco Santarelli
AuthorDate: Tue May 7 15:57:27 2024 +0200
Updated dependency coordinates for artifacts moved elsewhere: (#14072)
mysql:mysql-connector-java -> com.mysql:mysql-connector-j
xyz.rogfam:littleproxy -> io.github.littleproxy:littleproxy
com.github.tomakehurst:wiremock -> org.wiremock:wiremock
---
components/camel-bonita/pom.xml | 2 +-
components/camel-debezium/camel-debezium-mysql/pom.xml| 8
.../src/main/docs/debezium-mysql-component.adoc | 6 +++---
components/camel-ftp/pom.xml | 2 +-
components/camel-oaipmh/pom.xml | 2 +-
components/camel-openstack/pom.xml| 2 +-
components/camel-platform-http-vertx/pom.xml | 2 +-
components/camel-pubnub/pom.xml | 2 +-
components/camel-rest-openapi/pom.xml | 2 +-
components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml | 2 +-
components/camel-thymeleaf/pom.xml| 2 +-
components/camel-xchange/pom.xml | 2 +-
.../src/main/resources/camel-main-known-dependencies.properties | 2 +-
13 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml
index 704c00b6b82..3a874134b81 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -70,7 +70,7 @@
test
-com.github.tomakehurst
+org.wiremock
wiremock
${wiremock-version}
test
diff --git a/components/camel-debezium/camel-debezium-mysql/pom.xml
b/components/camel-debezium/camel-debezium-mysql/pom.xml
index 9a5fb2aa33f..b52abde4a74 100644
--- a/components/camel-debezium/camel-debezium-mysql/pom.xml
+++ b/components/camel-debezium/camel-debezium-mysql/pom.xml
@@ -45,15 +45,15 @@
${debezium-version}
-mysql
-mysql-connector-java
+com.mysql
+mysql-connector-j
-mysql
-mysql-connector-java
+com.mysql
+mysql-connector-j
${debezium-mysql-connector-version}
provided
diff --git
a/components/camel-debezium/camel-debezium-mysql/src/main/docs/debezium-mysql-component.adoc
b/components/camel-debezium/camel-debezium-mysql/src/main/docs/debezium-mysql-component.adoc
index eec9d405525..12c61ab029e 100644
---
a/components/camel-debezium/camel-debezium-mysql/src/main/docs/debezium-mysql-component.adoc
+++
b/components/camel-debezium/camel-debezium-mysql/src/main/docs/debezium-mysql-component.adoc
@@ -51,13 +51,13 @@ debezium-mysql:name[?options]
[NOTE]
-Due to licensing issues, you will need to add the dependency for
`mysql-connector-java` if you are using MySQL connector, add the following to
your POM file:
+Due to licensing issues, you will need to add the dependency for
`mysql-connector-j` if you are using MySQL connector, add the following to your
POM file:
[source,xml]
-mysql
-mysql-connector-java
+com.mysql
+mysql-connector-j
8.0.15
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 0ae02d6467f..42843a2d87e 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -101,7 +101,7 @@
-xyz.rogfam
+io.github.littleproxy
littleproxy
${littleproxy-version}
test
diff --git a/components/camel-oaipmh/pom.xml b/components/camel-oaipmh/pom.xml
index 05b1eb8371b..000ecfb25a2 100644
--- a/components/camel-oaipmh/pom.xml
+++ b/components/camel-oaipmh/pom.xml
@@ -61,7 +61,7 @@
test
-com.github.tomakehurst
+org.wiremock
wiremock
${wiremock-version}
test
diff --git a/components/camel-openstack/pom.xml
b/components/camel-openstack/pom.xml
index 44fcd0b062a..eea32670937 100644
--- a/components/camel-openstack/pom.xml
+++ b/components/camel-openstack/pom.xml
@@ -78,7 +78,7 @@
test
-com.github.tomakehurst
+org.wiremock
wiremock
${wiremock-version}
(camel) branch main updated: CAMEL-17829_read_disposition-type_from_HttpContext (#14074)
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 3d3fde7d9f7 CAMEL-17829_read_disposition-type_from_HttpContext (#14074)
3d3fde7d9f7 is described below
commit 3d3fde7d9f73051bbf3901510440b7f33a4589ad
Author: Jono Morris
AuthorDate: Wed May 8 01:57:02 2024 +1200
CAMEL-17829_read_disposition-type_from_HttpContext (#14074)
---
.../java/org/apache/camel/component/as2/api/protocol/ResponseMDN.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/ResponseMDN.java
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/ResponseMDN.java
index 9d52c03c3c1..791a853ede7 100644
---
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/ResponseMDN.java
+++
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/protocol/ResponseMDN.java
@@ -66,6 +66,8 @@ public class ResponseMDN implements HttpResponseInterceptor {
public static final String BOUNDARY_PARAM_NAME = "boundary";
+public static final String DISPOSITION_TYPE = "Disposition-Type";
+
private static final String DEFAULT_MDN_MESSAGE_TEMPLATE = "MDN for -\n"
+ " Message ID:
$requestHeaders[\"Message-Id\"]\n"
+ " Subject:
$requestHeaders[\"Subject\"]\n"
@@ -139,7 +141,7 @@ public class ResponseMDN implements HttpResponseInterceptor
{
String boundary = EntityUtils.createBoundaryValue();
DispositionNotificationMultipartReportEntity multipartReportEntity;
if (AS2DispositionType.FAILED.getType()
-.equals(HttpMessageUtils.getHeaderValue(request,
AS2Header.DISPOSITION_TYPE))) {
+.equals(coreContext.getAttribute(DISPOSITION_TYPE,
String.class))) {
// Return a failed Message Disposition Notification Receipt in
response body
String mdnMessage =
createMdnDescription(httpEntityEnclosingRequest, response,
DispositionMode.AUTOMATIC_ACTION_MDN_SENT_AUTOMATICALLY,
(camel) branch kafka-pause deleted (was 15f308f17de)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch kafka-pause in repository https://gitbox.apache.org/repos/asf/camel.git was 15f308f17de CAMEL-19358: camel-kafka - Add test for suspend/resume kafka consumer. Add JMX operation to expose pause state. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: CAMEL-19358: camel-kafka - Add test for suspend/resume kafka consumer. Add JMX operation to expose pause state. (#14075)
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 29e00a48b17 CAMEL-19358: camel-kafka - Add test for suspend/resume
kafka consumer. Add JMX operation to expose pause state. (#14075)
29e00a48b17 is described below
commit 29e00a48b17c358b728e68c7c6269fc671900339
Author: Claus Ibsen
AuthorDate: Tue May 7 15:56:47 2024 +0200
CAMEL-19358: camel-kafka - Add test for suspend/resume kafka consumer. Add
JMX operation to expose pause state. (#14075)
---
.../camel/component/kafka/KafkaConsumer.java | 13 +-
.../camel/component/kafka/KafkaFetchRecords.java | 4 +-
.../kafka/integration/KafkaConsumerFullIT.java | 52 ++
3 files changed, 67 insertions(+), 2 deletions(-)
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
index d2a9d080015..f0c75bd3eb6 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
@@ -27,6 +27,8 @@ import java.util.stream.Collectors;
import org.apache.camel.Processor;
import org.apache.camel.Suspendable;
+import org.apache.camel.api.management.ManagedAttribute;
+import org.apache.camel.api.management.ManagedResource;
import
org.apache.camel.component.kafka.consumer.errorhandler.KafkaConsumerListener;
import org.apache.camel.health.HealthCheckAware;
import org.apache.camel.health.HealthCheckHelper;
@@ -46,6 +48,7 @@ import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@ManagedResource(description = "Managed KafkaConsumer")
public class KafkaConsumer extends DefaultConsumer
implements ResumeAware, HealthCheckAware,
ConsumerListenerAware,
Suspendable {
@@ -242,7 +245,15 @@ public class KafkaConsumer extends DefaultConsumer
}
public List healthStates() {
-return tasks.stream().map(t ->
t.healthState()).collect(Collectors.toList());
+return
tasks.stream().map(KafkaFetchRecords::healthState).collect(Collectors.toList());
+}
+
+/**
+ * Whether the Kafka client is currently paused
+ */
+@ManagedAttribute(description = "Whether the Kafka client is currently
paused")
+public boolean isKafkaPaused() {
+return tasks.stream().allMatch(KafkaFetchRecords::isPaused);
}
@Override
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
index 26ee3cf3330..a40a29ebbd6 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
@@ -549,7 +549,9 @@ public class KafkaFetchRecords implements Runnable {
}
public boolean isPaused() {
-return !consumer.paused().isEmpty();
+// cannot use consumer directly as you can have
ConcurrentModificationException as kafka client does not permit
+// multiple threads to use the client consumer, so we check the state
only
+return state == State.PAUSED;
}
public void setConnected(boolean connected) {
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
index 9398f17a35d..318ecc59e22 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
@@ -25,6 +25,7 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kafka.KafkaConstants;
+import org.apache.camel.component.kafka.KafkaConsumer;
import org.apache.camel.component.kafka.KafkaEndpoint;
import org.apache.camel.component.kafka.MockConsumerInterceptor;
import org.apache.camel.component.kafka.SeekPolicy;
@@ -43,6 +44,7 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestMethodOrder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testcontainers.shaded.org.awaitility.Awaitility;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -223,6 +225,56 @@ public class KafkaConsumerFullIT extend
(camel) 01/01: CAMEL-19358: camel-kafka - Add test for suspend/resume kafka consumer. Add JMX operation to expose pause state.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch kafka-pause
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 15f308f17de85cde42eb6fe0dffc87ad3cf710da
Author: Claus Ibsen
AuthorDate: Tue May 7 14:44:49 2024 +0200
CAMEL-19358: camel-kafka - Add test for suspend/resume kafka consumer. Add
JMX operation to expose pause state.
---
.../camel/component/kafka/KafkaConsumer.java | 13 +-
.../camel/component/kafka/KafkaFetchRecords.java | 4 +-
.../kafka/integration/KafkaConsumerFullIT.java | 52 ++
3 files changed, 67 insertions(+), 2 deletions(-)
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
index d2a9d080015..f0c75bd3eb6 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaConsumer.java
@@ -27,6 +27,8 @@ import java.util.stream.Collectors;
import org.apache.camel.Processor;
import org.apache.camel.Suspendable;
+import org.apache.camel.api.management.ManagedAttribute;
+import org.apache.camel.api.management.ManagedResource;
import
org.apache.camel.component.kafka.consumer.errorhandler.KafkaConsumerListener;
import org.apache.camel.health.HealthCheckAware;
import org.apache.camel.health.HealthCheckHelper;
@@ -46,6 +48,7 @@ import org.apache.kafka.clients.consumer.ConsumerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@ManagedResource(description = "Managed KafkaConsumer")
public class KafkaConsumer extends DefaultConsumer
implements ResumeAware, HealthCheckAware,
ConsumerListenerAware,
Suspendable {
@@ -242,7 +245,15 @@ public class KafkaConsumer extends DefaultConsumer
}
public List healthStates() {
-return tasks.stream().map(t ->
t.healthState()).collect(Collectors.toList());
+return
tasks.stream().map(KafkaFetchRecords::healthState).collect(Collectors.toList());
+}
+
+/**
+ * Whether the Kafka client is currently paused
+ */
+@ManagedAttribute(description = "Whether the Kafka client is currently
paused")
+public boolean isKafkaPaused() {
+return tasks.stream().allMatch(KafkaFetchRecords::isPaused);
}
@Override
diff --git
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
index 26ee3cf3330..a40a29ebbd6 100644
---
a/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
+++
b/components/camel-kafka/src/main/java/org/apache/camel/component/kafka/KafkaFetchRecords.java
@@ -549,7 +549,9 @@ public class KafkaFetchRecords implements Runnable {
}
public boolean isPaused() {
-return !consumer.paused().isEmpty();
+// cannot use consumer directly as you can have
ConcurrentModificationException as kafka client does not permit
+// multiple threads to use the client consumer, so we check the state
only
+return state == State.PAUSED;
}
public void setConnected(boolean connected) {
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
index 9398f17a35d..318ecc59e22 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerFullIT.java
@@ -25,6 +25,7 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.kafka.KafkaConstants;
+import org.apache.camel.component.kafka.KafkaConsumer;
import org.apache.camel.component.kafka.KafkaEndpoint;
import org.apache.camel.component.kafka.MockConsumerInterceptor;
import org.apache.camel.component.kafka.SeekPolicy;
@@ -43,6 +44,7 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.TestMethodOrder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.testcontainers.shaded.org.awaitility.Awaitility;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -223,6 +225,56 @@ public class KafkaConsumerFullIT extends
BaseKafkaTestSupport {
assertInstanceOf(MyKafkaHeaderDeserializer.class,
kafkaEndpoint.getConfiguration().getHeaderDeserializer());
}
+@Order(6)
+@Test
+public void kafkaMessageIsConsumedByCamelAfterSuspendRes
(camel) branch kafka-pause created (now 15f308f17de)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch kafka-pause in repository https://gitbox.apache.org/repos/asf/camel.git at 15f308f17de CAMEL-19358: camel-kafka - Add test for suspend/resume kafka consumer. Add JMX operation to expose pause state. This branch includes the following new commits: new 15f308f17de CAMEL-19358: camel-kafka - Add test for suspend/resume kafka consumer. Add JMX operation to expose pause state. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel-kamelets-examples) branch main updated: Use kafka component directly
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-kamelets-examples.git The following commit(s) were added to refs/heads/main by this push: new 6e3fd62 Use kafka component directly 6e3fd62 is described below commit 6e3fd62d7872734fe25d376a94871ea537fc16b5 Author: Claus Ibsen AuthorDate: Tue May 7 14:38:57 2024 +0200 Use kafka component directly --- jbang/kafka-health/consumer.camel.yaml | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jbang/kafka-health/consumer.camel.yaml b/jbang/kafka-health/consumer.camel.yaml index 83ad2e0..173c973 100644 --- a/jbang/kafka-health/consumer.camel.yaml +++ b/jbang/kafka-health/consumer.camel.yaml @@ -1,9 +1,6 @@ # camel-k: language=yaml - from: -uri: "kamelet:kafka-not-secured-source" -parameters: - topic: "foobar" - bootstrapServers: 'localhost:9092' +uri: "kafka:foobar?brokers=localhost:9092" steps: - to: "log:info?showAll=true=true" \ No newline at end of file
(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 fe5da2805db Polished
fe5da2805db is described below
commit fe5da2805db24679c9f07da9b095f1bdd507ee1c
Author: Claus Ibsen
AuthorDate: Tue May 7 10:50:38 2024 +0200
Polished
---
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 4
1 file changed, 4 insertions(+)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 07420806a1a..480a08e0759 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -855,6 +855,8 @@ public class Run extends CamelCommand {
// export to hidden folder
ExportQuarkus eq = new ExportQuarkus(getMain());
eq.symbolicLink = true;
+eq.mavenWrapper = true;
+eq.gradleWrapper = false;
eq.quarkusVersion = this.quarkusVersion;
eq.camelVersion = this.camelVersion;
eq.kameletsVersion = this.kameletsVersion;
@@ -920,6 +922,8 @@ public class Run extends CamelCommand {
// export to hidden folder
ExportSpringBoot eq = new ExportSpringBoot(getMain());
eq.symbolicLink = true;
+eq.mavenWrapper = true;
+eq.gradleWrapper = false;
eq.springBootVersion = this.springBootVersion;
eq.camelVersion = this.camelVersion;
eq.camelSpringBootVersion = this.camelVersion;
(camel) branch main updated: [CAMEL-20728] add S3 multipart upload support for stream producer in camel-aws2-s3 (#14062)
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 11559d4de8f [CAMEL-20728] add S3 multipart upload support for stream
producer in camel-aws2-s3 (#14062)
11559d4de8f is described below
commit 11559d4de8fcd114900fabe1e790c1a6dd1c3d74
Author: Benjamin BONNET
AuthorDate: Tue May 7 10:36:46 2024 +0200
[CAMEL-20728] add S3 multipart upload support for stream producer in
camel-aws2-s3 (#14062)
* add S3 multipart upload support for stream producer
* clean useless condition
* review feedback on logging
---
.../aws2/s3/stream/AWS2S3StreamUploadProducer.java | 72 +++
.../integration/S3StreamUploadS3MultipartIT.java | 102 +
2 files changed, 154 insertions(+), 20 deletions(-)
diff --git
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
index 9fe8bb11042..8d23db6f1a5 100644
---
a/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
+++
b/components/camel-aws/camel-aws2-s3/src/main/java/org/apache/camel/component/aws2/s3/stream/AWS2S3StreamUploadProducer.java
@@ -127,21 +127,36 @@ public class AWS2S3StreamUploadProducer extends
DefaultProducer {
UploadState state = null;
int totalSize = 0;
byte[] b;
-while ((b = AWS2S3Utils.toByteArray(is,
getConfiguration().getBufferSize())).length > 0) {
+int maxRead = (getConfiguration().isMultiPartUpload()
+? Math.toIntExact(getConfiguration().getPartSize()) :
getConfiguration().getBufferSize());
+if (uploadAggregate != null) {
+uploadAggregate.index++;
+maxRead -= uploadAggregate.buffer.size();
+}
+
+while ((b = AWS2S3Utils.toByteArray(is, maxRead)).length
+ > 0) {
totalSize += b.length;
+if (getConfiguration().isMultiPartUpload())
+maxRead -= b.length;
synchronized (lock) {
// aggregate with previously received exchanges
if (ObjectHelper.isNotEmpty(uploadAggregate)) {
uploadAggregate.buffer.write(b);
-uploadAggregate.index++;
-
+if (getConfiguration().isMultiPartUpload() &&
+uploadAggregate.buffer.size() >=
getConfiguration().getPartSize()) {
+uploadPart(uploadAggregate);
+maxRead =
Math.toIntExact(getConfiguration().getPartSize());
+continue;
+}
if (uploadAggregate.buffer.size() >=
getConfiguration().getBatchSize()
-|| uploadAggregate.index ==
getConfiguration().getBatchMessageNumber()) {
+|| (uploadAggregate.index >=
getConfiguration().getBatchMessageNumber()
+&& uploadAggregate.buffer.size() <
getConfiguration().getPartSize())) {
-uploadPart(uploadAggregate);
+if (uploadAggregate.buffer.size() > 0)
+uploadPart(uploadAggregate);
CompleteMultipartUploadResponse uploadResult =
completeUpload(uploadAggregate);
this.uploadAggregate = null;
-
Message message = getMessageForResponse(exchange);
message.setHeader(AWS2S3Constants.E_TAG,
uploadResult.eTag());
if (uploadResult.versionId() != null) {
@@ -151,11 +166,10 @@ public class AWS2S3StreamUploadProducer extends
DefaultProducer {
continue;
}
}
-
if (state == null) {
state = new UploadState();
} else {
-state.index++;
+state.index = 1;
}
state.buffer.write(b);
@@ -201,17 +215,21 @@ public class AWS2S3StreamUploadProducer extends
DefaultProducer {
try {
if (totalSize >= getConfiguration().getBatchSize()
|| state.buffer.size() >=
getConfiguration().getBatchSize()
-|| state.index ==
getConfiguration().getBatchMessageNumber()) {
+|| state.index >=
getConfiguration().getBatchMessageNumber()) {
uploadPart(state);
CompleteMultipartUploadResponse uploadResult =
completeUpload(state);
-
Message message = getMessageForResponse(exc
(camel) branch regen created (now 45e5c5213b3)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch regen in repository https://gitbox.apache.org/repos/asf/camel.git at 45e5c5213b3 Avoid causing all PRs to fail when there is a new camel release and catalog is not updated. We update catalog releases manually. This branch includes the following new commits: new 45e5c5213b3 Avoid causing all PRs to fail when there is a new camel release and catalog is not updated. We update catalog releases manually. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) 01/01: Avoid causing all PRs to fail when there is a new camel release and catalog is not updated. We update catalog releases manually.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch regen in repository https://gitbox.apache.org/repos/asf/camel.git commit 45e5c5213b31d5b335e7959e86e6b1b26a5ac3bb Author: Claus Ibsen AuthorDate: Tue May 7 09:45:57 2024 +0200 Avoid causing all PRs to fail when there is a new camel release and catalog is not updated. We update catalog releases manually. --- etc/scripts/regen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/scripts/regen.sh b/etc/scripts/regen.sh index 1693627e08f..0bff605af48 100755 --- a/etc/scripts/regen.sh +++ b/etc/scripts/regen.sh @@ -24,6 +24,6 @@ git clean -fdx rm -Rf **/src/generated/ # Regenerate everything -./mvnw --batch-mode -Pupdate-camel-releases,regen -DskipTests install +./mvnw --batch-mode -Pregen -DskipTests install # One additional pass to get the info for the 'others' jars ./mvnw --batch-mode install -f catalog/camel-catalog
(camel) branch main updated (b38847360cc -> 20bc8461545)
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 b38847360cc Add 4.7 upgrade page add 20bc8461545 Update known releases in catalog No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/releases/camel-quarkus-releases.json | 7 +++ 1 file changed, 7 insertions(+)
(camel) branch main updated (a567390b4c9 -> b38847360cc)
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 a567390b4c9 (chores) camel-jpa: break large and complex methods add b38847360cc Add 4.7 upgrade page No new revisions were added by this update. Summary of changes: .../modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc| 8 docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide.adoc | 1 + 2 files changed, 9 insertions(+) create mode 100644 docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_7.adoc
(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 055b60c3420 Regen
055b60c3420 is described below
commit 055b60c34208939e9248b6827b8529a95c7ff074
Author: Claus Ibsen
AuthorDate: Tue May 7 06:47:17 2024 +0200
Regen
---
.../springboot/catalog/components/pinecone.json| 28 ++
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pinecone.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pinecone.json
index 91e3d10f3fe..d66dd763960 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pinecone.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pinecone.json
@@ -29,21 +29,19 @@
"autowiredEnabled": { "index": 3, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching t [...]
},
"headers": {
-"CamelPineconeAction": { "index": 0, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"enum": [ "CREATE_COLLECTION", "CREATE_INDEX", "UPSERT", "INSERT", "SEARCH",
"DELETE" ], "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The action to be performed.", "constantName":
"org.apache.camel.component.pinecone.PineconeVectorDb$Headers#ACTION" },
-"CamelPineconeOperationStatus": { "index": 1, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Operation Status.", "constantName":
"org.apache.camel.component.pinecone.PineconeVectorDb$Headers#OPERATION_STATUS"
},
-"CamelPineconeOperationStatusValue": { "index": 2, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "int", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Operation Status Value.",
"constantName":
"org.apache.camel.component.pinecone.PineconeVectorDb$Headers#OPERATION_STATUS_VALUE"
},
-"CamelPineconeTextFieldName": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Text Field Name for Insert\/Upsert
operation", "constantName":
"org.apache.camel.component.pinecone.PineconeVectorDb$Headers#TEXT_FIELD_NAME"
},
-"CamelPineconeVectorFieldName": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "Vector Field Name for Insert\/Upsert
opera
(camel-kafka-connector) branch main updated: #1622: Upgrade maven wrapper to 3.9.6
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-kafka-connector.git The following commit(s) were added to refs/heads/main by this push: new d606060132 #1622: Upgrade maven wrapper to 3.9.6 d606060132 is described below commit d60606013278d33f8ca043534c758959c3979009 Author: Claus Ibsen AuthorDate: Mon May 6 18:43:50 2024 +0200 #1622: Upgrade maven wrapper to 3.9.6 --- .mvn/wrapper/maven-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 63f9ec6d1f..346d645fd0 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
(camel-kafka-connector) branch rrf deleted (was 413d90167e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch rrf in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git was 413d90167e Regen The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-kafka-connector) branch main updated: Rrf (#1621)
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-kafka-connector.git
The following commit(s) were added to refs/heads/main by this push:
new ed622b4f16 Rrf (#1621)
ed622b4f16 is described below
commit ed622b4f16a92958bd05f1d26039158bbf3e40df
Author: Claus Ibsen
AuthorDate: Mon May 6 18:34:39 2024 +0200
Rrf (#1621)
* #1618: Block atlassian maven repo so build is faster
* Regen
* Regen
---
.mvn/maven.config | 2 +
.mvn/rrf/groupId-B_shibboleth.txt | 3 +
.mvn/rrf/groupId-atlassian.txt | 7 +
.../camel-azure-storage-files-sink-sink.json | 45 ++
.../camel-azure-storage-files-source-source.json | 66 +
...picurio-registry-not-secured-source-source.json | 106 +++
...-batch-azure-schema-registry-source-source.json | 125 +
...amel-kafka-batch-not-secured-source-source.json | 86
.../camel-kafka-batch-scram-source-source.json | 112 +++
.../camel-kafka-batch-source-source.json | 112 +++
.../camel-kafka-batch-ssl-source-source.json | 151 +
.../connectors/camel-snowflake-sink-sink.json | 43 ++
.../connectors/camel-snowflake-source-source.json | 56
.../camel-spring-rabbitmq-sink-sink.json | 55
.../camel-spring-rabbitmq-source-source.json | 62 +
.../camel-postgresql-sink-kafka-connector/pom.xml | 2 +-
.../pom.xml| 2 +-
17 files changed, 1033 insertions(+), 2 deletions(-)
diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 00..7408098dbe
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1,2 @@
+-Daether.remoteRepositoryFilter.groupId=true
+-Daether.remoteRepositoryFilter.groupId.basedir=${session.rootDirectory}/.mvn/rrf/
diff --git a/.mvn/rrf/groupId-B_shibboleth.txt
b/.mvn/rrf/groupId-B_shibboleth.txt
new file mode 100644
index 00..0a64483308
--- /dev/null
+++ b/.mvn/rrf/groupId-B_shibboleth.txt
@@ -0,0 +1,3 @@
+net.shibboleth
+net.shibboleth.utilities
+org.opensaml
diff --git a/.mvn/rrf/groupId-atlassian.txt b/.mvn/rrf/groupId-atlassian.txt
new file mode 100644
index 00..45b48708ed
--- /dev/null
+++ b/.mvn/rrf/groupId-atlassian.txt
@@ -0,0 +1,7 @@
+com.atlassian.event
+com.atlassian.httpclient
+com.atlassian.jira
+com.atlassian.platform
+com.atlassian.pom
+com.atlassian.sal
+io.atlassian.fugue
diff --git
a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-files-sink-sink.json
b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-files-sink-sink.json
new file mode 100644
index 00..2d80946176
--- /dev/null
+++
b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-azure-storage-files-sink-sink.json
@@ -0,0 +1,45 @@
+{
+ "connector": {
+ "class":
"org.apache.camel.kafkaconnector.azurestoragefilessink.CamelAzurestoragefilessinkSinkConnector",
+ "artifactId": "camel-azure-storage-files-sink-kafka-connector",
+ "groupId": "org.apache.camel.kafkaconnector",
+ "id": "camel-azure-storage-files-sink-sink",
+ "type": "sink",
+ "version": "4.4.2-SNAPSHOT",
+ "description": "Upload data to Azure Storage Files Share.\n\nIn
the header, you can set the `file` \/ `ce-file` property to specify the
filename to upload. If you do set property in the header, the Kamelet uses the
exchange ID as filename."
+ },
+ "properties": {
+ "camel.kamelet.azure-storage-files-sink.accountName": {
+ "name":
"camel.kamelet.azure-storage-files-sink.accountName",
+ "description": "The Azure Storage Blob account name.",
+ "priority": "HIGH",
+ "required": "true"
+ },
+ "camel.kamelet.azure-storage-files-sink.shareName": {
+ "name":
"camel.kamelet.azure-storage-files-sink.shareName",
+ "description": "The Azure Storage File Share share
name.",
+ "priority": "HIGH",
+ "required": "true"
+ },
+ "camel.kamelet.azure-storage-files-sink.sharedKey": {
+ "name":
"camel.kamelet.azure-storage-files-
(camel-kafka-connector) branch rrf updated (b64307b8da -> 413d90167e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch rrf in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git from b64307b8da Regen add 413d90167e Regen No new revisions were added by this update. Summary of changes: .../awscloudtrailsource/CamelAwscloudtrailsourceSourceConnector.java | 3 +-- .../CamelAwscloudtrailsourceSourceConnectorConfig.java | 3 +-- .../awscloudtrailsource/CamelAwscloudtrailsourceSourceTask.java| 3 +-- .../awscloudwatchsink/CamelAwscloudwatchsinkSinkConnector.java | 3 +-- .../awscloudwatchsink/CamelAwscloudwatchsinkSinkConnectorConfig.java | 3 +-- .../awscloudwatchsink/CamelAwscloudwatchsinkSinkTask.java | 3 +-- .../camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnector.java | 3 +-- .../kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnectorConfig.java | 3 +-- .../camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkTask.java | 3 +-- .../awsddbstreamssource/CamelAwsddbstreamssourceSourceConnector.java | 3 +-- .../CamelAwsddbstreamssourceSourceConnectorConfig.java | 3 +-- .../awsddbstreamssource/CamelAwsddbstreamssourceSourceTask.java| 3 +-- .../camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkConnector.java | 3 +-- .../kafkaconnector/awsec2sink/CamelAwsec2sinkSinkConnectorConfig.java | 3 +-- .../camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkTask.java | 3 +-- .../awseventbridgesink/CamelAwseventbridgesinkSinkConnector.java | 3 +-- .../awseventbridgesink/CamelAwseventbridgesinkSinkConnectorConfig.java | 3 +-- .../awseventbridgesink/CamelAwseventbridgesinkSinkTask.java| 3 +-- .../CamelAwskinesisfirehosesinkSinkConnector.java | 3 +-- .../CamelAwskinesisfirehosesinkSinkConnectorConfig.java| 3 +-- .../awskinesisfirehosesink/CamelAwskinesisfirehosesinkSinkTask.java| 3 +-- .../awskinesissink/CamelAwskinesissinkSinkConnector.java | 3 +-- .../awskinesissink/CamelAwskinesissinkSinkConnectorConfig.java | 3 +-- .../kafkaconnector/awskinesissink/CamelAwskinesissinkSinkTask.java | 3 +-- .../awskinesissource/CamelAwskinesissourceSourceConnector.java | 3 +-- .../awskinesissource/CamelAwskinesissourceSourceConnectorConfig.java | 3 +-- .../awskinesissource/CamelAwskinesissourceSourceTask.java | 3 +-- .../kafkaconnector/awslambdasink/CamelAwslambdasinkSinkConnector.java | 3 +-- .../awslambdasink/CamelAwslambdasinkSinkConnectorConfig.java | 3 +-- .../camel/kafkaconnector/awslambdasink/CamelAwslambdasinkSinkTask.java | 3 +-- .../awsredshiftsink/CamelAwsredshiftsinkSinkConnector.java | 3 +-- .../awsredshiftsink/CamelAwsredshiftsinkSinkConnectorConfig.java | 3 +-- .../kafkaconnector/awsredshiftsink/CamelAwsredshiftsinkSinkTask.java | 3 +-- .../awsredshiftsource/CamelAwsredshiftsourceSourceConnector.java | 3 +-- .../awsredshiftsource/CamelAwsredshiftsourceSourceConnectorConfig.java | 3 +-- .../awsredshiftsource/CamelAwsredshiftsourceSourceTask.java| 3 +-- .../awss3cdcsource/CamelAwss3cdcsourceSourceConnector.java | 3 +-- .../awss3cdcsource/CamelAwss3cdcsourceSourceConnectorConfig.java | 3 +-- .../kafkaconnector/awss3cdcsource/CamelAwss3cdcsourceSourceTask.java | 3 +-- .../camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkConnector.java| 3 +-- .../kafkaconnector/awss3sink/CamelAwss3sinkSinkConnectorConfig.java| 3 +-- .../apache/camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkTask.java | 3 +-- .../kafkaconnector/awss3source/CamelAwss3sourceSourceConnector.java| 3 +-- .../awss3source/CamelAwss3sourceSourceConnectorConfig.java | 3 +-- .../camel/kafkaconnector/awss3source/CamelAwss3sourceSourceTask.java | 3 +-- .../CamelAwss3streaminguploadsinkSinkConnector.java| 3 +-- .../CamelAwss3streaminguploadsinkSinkConnectorConfig.java | 3 +-- .../CamelAwss3streaminguploadsinkSinkTask.java | 3 +-- .../awssecretsmanagersink/CamelAwssecretsmanagersinkSinkConnector.java | 3 +-- .../CamelAwssecretsmanagersinkSinkConnectorConfig.java | 3 +-- .../awssecretsmanagersink/CamelAwssecretsmanagersinkSinkTask.java | 3 +-- .../camel/kafkaconnector/awssessink/CamelAwssessinkSinkConnector.java | 3 +-- .../kafkaconnector/awssessink/CamelAwssessinkSinkConnectorConfig.java | 3 +-- .../camel/kafkaconnector/awssessink/CamelAwssessinkSinkTask.java | 3 +-- .../awssnsfifosink/CamelAwssnsfifosinkSinkConnector.java | 3 +-- .../awssnsfifosink/CamelAwssnsfifosinkSinkConnectorConfig.java | 3 +-- .../kafkaconnector/awssnsfifosink/CamelAwssnsfifosinkSinkTask.java | 3 +-- .../camel/kafkaconnector/awssnssink/CamelAwssnssinkSinkConnector.java | 3 +-- .../kafkaconnector/awssnssink
(camel-kafka-connector) branch rrf created (now b64307b8da)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch rrf in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git at b64307b8da Regen This branch includes the following new commits: new 989cb09432 #1618: Block atlassian maven repo so build is faster new b64307b8da Regen The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel-kafka-connector) 01/02: #1618: Block atlassian maven repo so build is faster
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch rrf
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 989cb09432f76de84ad67f1e0099c00d4c5be0f6
Author: Claus Ibsen
AuthorDate: Mon May 6 16:31:22 2024 +0200
#1618: Block atlassian maven repo so build is faster
---
.mvn/maven.config | 2 ++
.mvn/rrf/groupId-B_shibboleth.txt | 3 +++
.mvn/rrf/groupId-atlassian.txt| 7 +++
3 files changed, 12 insertions(+)
diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 00..7408098dbe
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1,2 @@
+-Daether.remoteRepositoryFilter.groupId=true
+-Daether.remoteRepositoryFilter.groupId.basedir=${session.rootDirectory}/.mvn/rrf/
diff --git a/.mvn/rrf/groupId-B_shibboleth.txt
b/.mvn/rrf/groupId-B_shibboleth.txt
new file mode 100644
index 00..0a64483308
--- /dev/null
+++ b/.mvn/rrf/groupId-B_shibboleth.txt
@@ -0,0 +1,3 @@
+net.shibboleth
+net.shibboleth.utilities
+org.opensaml
diff --git a/.mvn/rrf/groupId-atlassian.txt b/.mvn/rrf/groupId-atlassian.txt
new file mode 100644
index 00..45b48708ed
--- /dev/null
+++ b/.mvn/rrf/groupId-atlassian.txt
@@ -0,0 +1,7 @@
+com.atlassian.event
+com.atlassian.httpclient
+com.atlassian.jira
+com.atlassian.platform
+com.atlassian.pom
+com.atlassian.sal
+io.atlassian.fugue
(camel-kafka-connector) branch main updated: Bump org.postgresql:postgresql (#1601)
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-kafka-connector.git The following commit(s) were added to refs/heads/main by this push: new f077205d43 Bump org.postgresql:postgresql (#1601) f077205d43 is described below commit f077205d43498c41218eb4a55f03327e376e306d Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 6 16:29:05 2024 +0200 Bump org.postgresql:postgresql (#1601) Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.1 to 42.7.2. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/commits) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- connectors/camel-postgresql-sink-kafka-connector/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connectors/camel-postgresql-sink-kafka-connector/pom.xml b/connectors/camel-postgresql-sink-kafka-connector/pom.xml index d2caca7b9e..19c32bcfec 100644 --- a/connectors/camel-postgresql-sink-kafka-connector/pom.xml +++ b/connectors/camel-postgresql-sink-kafka-connector/pom.xml @@ -56,7 +56,7 @@ org.postgresql postgresql - 42.7.1 + 42.7.2 org.apache.commons
(camel-kafka-connector) branch main updated: Bump actions/checkout from 4.1.1 to 4.1.4 (#1616)
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-kafka-connector.git
The following commit(s) were added to refs/heads/main by this push:
new 4703001716 Bump actions/checkout from 4.1.1 to 4.1.4 (#1616)
4703001716 is described below
commit 4703001716795064c3766a9a0650b6c1c3519a55
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon May 6 16:29:26 2024 +0200
Bump actions/checkout from 4.1.1 to 4.1.4 (#1616)
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to
4.1.4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.1...v4.1.4)
---
updated-dependencies:
- dependency-name: actions/checkout
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
---
.github/workflows/asf-snapshots-deploy.yml | 4 ++--
.github/workflows/automatic-changelog-update.yml | 2 +-
.github/workflows/automatic-sync-camel-main.yml | 4 ++--
.github/workflows/backport.yml | 2 +-
.github/workflows/ci-build.yml | 2 +-
.github/workflows/daily-java-next.yml| 2 +-
.github/workflows/depsreview.yaml| 2 +-
.github/workflows/maven-it.yaml | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/asf-snapshots-deploy.yml
b/.github/workflows/asf-snapshots-deploy.yml
index f4c3475f89..c4df927759 100644
--- a/.github/workflows/asf-snapshots-deploy.yml
+++ b/.github/workflows/asf-snapshots-deploy.yml
@@ -32,7 +32,7 @@ jobs:
matrix:
java: [ '11' ]
steps:
- - uses: actions/checkout@v4.1.1
+ - uses: actions/checkout@v4.1.4
- name: Set up JDK ${{ matrix.java }}
uses: AdoptOpenJDK/install-jdk@v1
with:
@@ -52,7 +52,7 @@ jobs:
NEXUS_DEPLOY_USERNAME: ${{ secrets.NEXUS_USER }}
NEXUS_DEPLOY_PASSWORD: ${{ secrets.NEXUS_PW }}
steps:
-- uses: actions/checkout@v4.1.1
+- uses: actions/checkout@v4.1.4
- name: Set up JDK 11
uses: AdoptOpenJDK/install-jdk@v1
with:
diff --git a/.github/workflows/automatic-changelog-update.yml
b/.github/workflows/automatic-changelog-update.yml
index b554ded493..7178b85162 100644
--- a/.github/workflows/automatic-changelog-update.yml
+++ b/.github/workflows/automatic-changelog-update.yml
@@ -30,7 +30,7 @@ jobs:
if: github.ref == 'refs/heads/main' && github.repository ==
'apache/camel-kafka-connector'
steps:
- name: "Checkout camel-kafka-connector"
-uses: actions/checkout@v4.1.1
+uses: actions/checkout@v4.1.4
with:
persist-credentials: false
submodules: recursive
diff --git a/.github/workflows/automatic-sync-camel-main.yml
b/.github/workflows/automatic-sync-camel-main.yml
index 155f5d2dd7..aecbc421b0 100644
--- a/.github/workflows/automatic-sync-camel-main.yml
+++ b/.github/workflows/automatic-sync-camel-main.yml
@@ -34,7 +34,7 @@ jobs:
java: [ '11' ]
steps:
- name: Checkout Camel project
-uses: actions/checkout@v4.1.1
+uses: actions/checkout@v4.1.4
with:
repository: apache/camel
ref: main
@@ -57,7 +57,7 @@ jobs:
clean install
working-directory: ${{ github.workspace }}/camel
- name: Checkout camel-kafka-connector project
-uses: actions/checkout@v4.1.1
+uses: actions/checkout@v4.1.4
with:
ref: main
fetch-depth: 0
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 74e7bcf002..2b82a83509 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -28,7 +28,7 @@ jobs:
name: Backport
steps:
- name: "Checkout camel-kafka-connector"
-uses: actions/checkout@v4.1.1
+uses: actions/checkout@v4.1.4
with:
persist-credentials: false
submodules: recursive
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index 8531ed6a05..f4382cdc82 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -41,7 +41,7 @@ jobs:
matrix:
java: [ '17' ]
steps:
- - uses: actions/checkout@v4.1.1
+ - uses: actions/checkout@v4.1.4
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
with:
diff --git a/.github/workflows/daily-java-next.yml
b/.github/workflows/daily-java-next.yml
index 79324996a8..e0f5220e09 100644
--- a/.github/wor
(camel-kafka-connector) branch main updated: Bump org.postgresql:postgresql (#1599)
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-kafka-connector.git The following commit(s) were added to refs/heads/main by this push: new 65764f1c5c Bump org.postgresql:postgresql (#1599) 65764f1c5c is described below commit 65764f1c5c30157a083a2687d815c6fc0e1fad31 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 6 16:28:55 2024 +0200 Bump org.postgresql:postgresql (#1599) Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.7.1 to 42.7.2. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/commits) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- connectors/camel-postgresql-source-kafka-connector/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connectors/camel-postgresql-source-kafka-connector/pom.xml b/connectors/camel-postgresql-source-kafka-connector/pom.xml index 574bc53049..013fe5b59f 100644 --- a/connectors/camel-postgresql-source-kafka-connector/pom.xml +++ b/connectors/camel-postgresql-source-kafka-connector/pom.xml @@ -56,7 +56,7 @@ org.postgresql postgresql - 42.7.1 + 42.7.2 org.apache.commons
(camel-kafka-connector) branch 442 deleted (was eafb2851f8)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch 442 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git was eafb2851f8 Upgrade to Camel 4.4.2 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-kafka-connector) branch main updated: Bump org.postgresql:postgresql from 42.4.3 to 42.4.4 in /parent (#1617)
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-kafka-connector.git The following commit(s) were added to refs/heads/main by this push: new e70a6e188a Bump org.postgresql:postgresql from 42.4.3 to 42.4.4 in /parent (#1617) e70a6e188a is described below commit e70a6e188a31ebcb9bfeba2d69c0653ea263d21b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 6 16:16:36 2024 +0200 Bump org.postgresql:postgresql from 42.4.3 to 42.4.4 in /parent (#1617) Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.4.3 to 42.4.4. - [Release notes](https://github.com/pgjdbc/pgjdbc/releases) - [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md) - [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.4.3...REL42.4.4) --- updated-dependencies: - dependency-name: org.postgresql:postgresql dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 83182af4d3..1ffc578a30 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -35,7 +35,7 @@ 17 20.0 1.3.2 -42.4.3 +42.4.4 3.3.0 3.8.1
(camel-kafka-connector) branch 442 created (now f65c520e4a)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch 442 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git at f65c520e4a Upgrade to Camel 4.4.2 This branch includes the following new commits: new f65c520e4a Upgrade to Camel 4.4.2 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel-spring-boot) branch camel-spring-boot-4.4.x updated: cherry-pick CAMEL-20738 Make Jasypt beans conditional so that can be overridden (#1141)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-spring-boot-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/camel-spring-boot-4.4.x by
this push:
new 1ab1ecd4edb cherry-pick CAMEL-20738 Make Jasypt beans conditional so
that can be overridden (#1141)
1ab1ecd4edb is described below
commit 1ab1ecd4edb7863223abc84b306123711cb13856
Author: Federico Mariani <34543311+cro...@users.noreply.github.com>
AuthorDate: Mon May 6 13:39:03 2024 +0200
cherry-pick CAMEL-20738 Make Jasypt beans conditional so that can be
overridden (#1141)
* Make Jasypt beans conditional so that can be overridden
* Avoid clashes with default parser defined in CamelAutoConfiguration
---
.../JasyptEncryptedPropertiesAutoconfiguration.java | 12 +---
.../springboot/JasyptSpringEncryptedPropertiesParser.java| 11 ---
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git
a/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptEncryptedPropertiesAutoconfiguration.java
b/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptEncryptedPropertiesAutoconfiguration.java
index 550195a85cd..bf1f2a2ec90 100644
---
a/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptEncryptedPropertiesAutoconfiguration.java
+++
b/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptEncryptedPropertiesAutoconfiguration.java
@@ -39,6 +39,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.core.ResolvableType;
import org.springframework.core.convert.ConversionService;
import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.Environment;
import org.springframework.core.env.MutablePropertySources;
import org.springframework.core.env.PropertyResolver;
@@ -60,7 +61,9 @@ public class JasyptEncryptedPropertiesAutoconfiguration {
@Bean
-public JasyptEncryptedPropertiesConfiguration
JasyptEncryptedPropertiesAutoconfiguration(final ConfigurableEnvironment
environment) {
+@ConditionalOnMissingBean(JasyptEncryptedPropertiesConfiguration.class)
+public JasyptEncryptedPropertiesConfiguration
JasyptEncryptedPropertiesAutoconfiguration(
+final ConfigurableEnvironment environment) {
JasyptEncryptedPropertiesConfiguration config = new
JasyptEncryptedPropertiesConfiguration();
final BindHandler handler = new
IgnoreErrorsBindHandler(BindHandler.DEFAULT);
final MutablePropertySources propertySources =
environment.getPropertySources();
@@ -97,6 +100,7 @@ public class JasyptEncryptedPropertiesAutoconfiguration {
}
@Bean
+
@ConditionalOnMissingBean(EncryptablePropertySourcesPlaceholderConfigurer.class)
public EncryptablePropertySourcesPlaceholderConfigurer
propertyConfigurer(StringEncryptor stringEncryptor) {
return new
EncryptablePropertySourcesPlaceholderConfigurer(stringEncryptor);
}
@@ -106,8 +110,10 @@ public class JasyptEncryptedPropertiesAutoconfiguration {
and allow the use of encrypted properties inside the camel context.
*/
@Bean
-public PropertiesParser encryptedPropertiesParser(PropertyResolver
propertyResolver, StringEncryptor stringEncryptor) {
-return new JasyptSpringEncryptedPropertiesParser(propertyResolver,
stringEncryptor);
+@ConditionalOnMissingBean(PropertiesParser.class)
+public PropertiesParser encryptedPropertiesParser(PropertyResolver
propertyResolver,
+ StringEncryptor stringEncryptor, Environment env) {
+return new JasyptSpringEncryptedPropertiesParser(propertyResolver,
stringEncryptor, env);
}
public SaltGenerator
getSaltGenerator(JasyptEncryptedPropertiesConfiguration configuration) {
diff --git
a/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptSpringEncryptedPropertiesParser.java
b/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptSpringEncryptedPropertiesParser.java
index ad684495ca5..0f7a5590a00 100644
---
a/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptSpringEncryptedPropertiesParser.java
+++
b/components-starter/camel-jasypt-starter/src/main/java/org/apache/camel/component/jasypt/springboot/JasyptSpringEncryptedPropertiesParser.java
@@ -16,24 +16,29 @@
*/
package org.apache.camel.component.jasypt.springboot;
-import org.apache.camel.component.properties.DefaultPropertiesParser;
import org.apache.camel.component.properties.PropertiesLookup;
+import org.apache.camel.spring.boot.SpringProperties
(camel-website) branch new46 created (now 6d5b6eb4)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch new46 in repository https://gitbox.apache.org/repos/asf/camel-website.git at 6d5b6eb4 Whats new 4.6 blog WIP This branch includes the following new commits: new b07e3439 Whats new 4.6 blog WIP new 24d5f832 Whats new 4.6 blog WIP new 6d5b6eb4 Whats new 4.6 blog WIP The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel-website) 01/03: Whats new 4.6 blog WIP
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch new46 in repository https://gitbox.apache.org/repos/asf/camel-website.git commit b07e3439a2b8006f3cf2a428354cdc7561ee01cf Author: Claus Ibsen AuthorDate: Mon May 6 09:43:14 2024 +0200 Whats new 4.6 blog WIP --- content/blog/2024/05/camel46-whatsnew/featured.png | Bin 0 -> 243818 bytes content/blog/2024/05/camel46-whatsnew/index.md | 50 + 2 files changed, 50 insertions(+) diff --git a/content/blog/2024/05/camel46-whatsnew/featured.png b/content/blog/2024/05/camel46-whatsnew/featured.png new file mode 100644 index ..a9a95d3b Binary files /dev/null and b/content/blog/2024/05/camel46-whatsnew/featured.png differ diff --git a/content/blog/2024/05/camel46-whatsnew/index.md b/content/blog/2024/05/camel46-whatsnew/index.md new file mode 100644 index ..56bd7676 --- /dev/null +++ b/content/blog/2024/05/camel46-whatsnew/index.md @@ -0,0 +1,50 @@ +--- +title: "Apache Camel 4.6 What's New" +date: 2024-05-10 +authors: [davsclaus] +categories: ["Releases"] +preview: Summary of what's new and improved in the Camel 4.6 release. +--- + +Apache Camel 4.6 has just been [released](/blog/2024/05/RELEASE-4.6.0/). + +This release introduces a set of new features and noticeable improvements that we will cover in this blog post. + +## Camel Core + +## Camel Main + +## Camel JBang + +We fixed some issues using Camel JBang with Windows, but we would still like more feedback from Windows users. + +## Rest DSL with contract first + +## Miscellaneous + +Upgraded many third-party dependencies to the latest releases at the time of release. + +## New Components + +This release only brings two new components: + +- `camel-google-pubsub-lite` - Send and receive messages to/from Google Cloud Platform PubSub Lite Service. +- `camel-pinecone` - Perform operations on the Pinecone Vector Database. + +## Upgrading + +Make sure to read the [upgrade guide](/manual/camel-4x-upgrade-guide-4_6.html) if you are upgrading from a previous Camel version. + +If you are upgrading from, for example, 4.0 to 4.4, then make sure to follow the upgrade guides for each release in-between, i.e. +4.0 -> 4.1, 4.1 -> 4.2, and so forth. + +## Release Notes + +You can find more information about this release in the list of JIRA tickets resolved in the release: + +- [Release notes 4.6](/releases/release-4.6.0/) + +## Roadmap + +The following 4.7 release (non LTS) is planned to upgrade to Spring Boot 3.3, and to be released in July. +
(camel-website) 02/03: Whats new 4.6 blog WIP
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch new46 in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 24d5f832e8ff881ad96af69eb6f115e7a58e01e0 Author: Claus Ibsen AuthorDate: Mon May 6 09:57:54 2024 +0200 Whats new 4.6 blog WIP --- content/blog/2024/05/camel46-whatsnew/index.md | 34 ++ 1 file changed, 34 insertions(+) diff --git a/content/blog/2024/05/camel46-whatsnew/index.md b/content/blog/2024/05/camel46-whatsnew/index.md index 56bd7676..f55bf5ad 100644 --- a/content/blog/2024/05/camel46-whatsnew/index.md +++ b/content/blog/2024/05/camel46-whatsnew/index.md @@ -12,24 +12,58 @@ This release introduces a set of new features and noticeable improvements that w ## Camel Core +TODO: + ## Camel Main +TODO: + ## Camel JBang We fixed some issues using Camel JBang with Windows, but we would still like more feedback from Windows users. +TODO: Run with runtime +TODO: logging level in application.properties +TODO: datasource spring-boot style + + +## DSL + +The XML and YAML DSL now have harmonized defining `beans` in both routes and kamelets to be the _same_ which +makes it possible to define beans using constructors, properties, builders, factory beans, scripts and much more, all in the same way. + +Added `setVariables` EIP to make it possible to set multiple variables from a single EIP. + ## Rest DSL with contract first +TODO: + ## Miscellaneous Upgraded many third-party dependencies to the latest releases at the time of release. +The `camel-azure-eventbus` component has been refactored to use high-level client which is more robust and +have better failover and reconnection support. + +The `camel-sql` component can now use variables in the SQL queries. + +The `camel-kafka` component is upgraded to Kafka 3.7 client. Added `JMSDeserializer` to `camel-kafka` that users can use to +let Kafka handle serializing/de-serializing JMS headers correct by their expected types (long, int, string etc.) + +The Rest DSL `clientRequestValidation` now supports validating for allowed values as well. + +The `@PropertyInject` can inject as an array/list type where the string value is splitted by a separator (such as a comma) + +Camel Spring Boot has been upgraded to Spring Boot 3.2.5. + + ## New Components This release only brings two new components: - `camel-google-pubsub-lite` - Send and receive messages to/from Google Cloud Platform PubSub Lite Service. - `camel-pinecone` - Perform operations on the Pinecone Vector Database. +- `camel-rest-openapi` - Refactored to use another json validator library that is Jakarta EE compatible. ## Upgrading
(camel-website) 03/03: Whats new 4.6 blog WIP
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch new46
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit 6d5b6eb4fd8f50fc67474a54c65c788a362ef9ec
Author: Claus Ibsen
AuthorDate: Mon May 6 10:42:39 2024 +0200
Whats new 4.6 blog WIP
---
content/blog/2024/05/camel46-whatsnew/index.md | 60 +-
1 file changed, 49 insertions(+), 11 deletions(-)
diff --git a/content/blog/2024/05/camel46-whatsnew/index.md
b/content/blog/2024/05/camel46-whatsnew/index.md
index f55bf5ad..aeea5314 100644
--- a/content/blog/2024/05/camel46-whatsnew/index.md
+++ b/content/blog/2024/05/camel46-whatsnew/index.md
@@ -10,22 +10,40 @@ Apache Camel 4.6 has just been
[released](/blog/2024/05/RELEASE-4.6.0/).
This release introduces a set of new features and noticeable improvements that
we will cover in this blog post.
-## Camel Core
+## Camel JBang
-TODO:
+We fixed some issues using Camel JBang with Windows, but we would still like
more feedback from Windows users.
-## Camel Main
+Camel JBang is __primary__ intended to be Camel standalone only. However, we
added
+support for running with Spring Boot or Quarkus directly.
-TODO:
+You use the `--runtime` option to specify which platform to use, as shown
below:
-## Camel JBang
+$ camel run foo.camel.yaml --runtime=spring-boot
-We fixed some issues using Camel JBang with Windows, but we would still like
more feedback from Windows users.
+And for Quarkus:
+
+$ camel run foo.camel.yaml --runtime=quarkus
+
+There are several limitations, one would be that Spring Boot and Quarkus
cannot automatically detect new components and download JARs.
+(you can stop and run again to update dependencies).
+
+You can now also configure logging levels per package name in
`application.properties` as shown below:
+
+logging.level.org.apache.kafka = DEBUG
+logging.level.com.foo.something = TRACE
+
+You can also do this using Quarkus _style_:
-TODO: Run with runtime
-TODO: logging level in application.properties
-TODO: datasource spring-boot style
+quarkus.log.category."org.apache.kafka".level = DEBUG
+quarkus.log.category."com.foo.something".level = TRACE
+And we also made it possible to define JDBC `DataSource` using Spring Boot
_style_ directly in `application.properties` as follows:
+
+spring.datasource.url=
jdbc:sqlserver://db.example.net:1433;databaseName=test_db
+spring.datasource.username=user
+spring.datasource.password=password
+
spring.datasource.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
## DSL
@@ -36,7 +54,28 @@ Added `setVariables` EIP to make it possible to set multiple
variables from a si
## Rest DSL with contract first
-TODO:
+The Rest DSL has been improved with a _contract first_ approach using vanilla
OpenAPI specification.
+
+The _contract first_ approach requires you to have an existing OpenAPI v3
specification file.
+This contract is a standard OpenAPI contract, and you can use any existing API
design tool to build such contracts.
+
+This makes it super easy to define Rest DSL in Camel from an existing OpenAPI
specification file, all you do
+is to declare this small piece of Rest DSL code:
+
+For example in Java DSL:
+
+public void configure() throws Exception {
+rest().openApi("petstore-v3.json");
+}
+
+The `petstore-v3.json` is the OpenAPI specification file, and Camel will
automatically parse and map each API endpoint
+to a Camel route with the `direct:operationId` convention.
+
+During development of these API endpoints in Camel you can tell Camel to
ignore missing routes, so you can build, run, and test
+this one API at a time.
+
+Here is an example for Camel Spring Boot:
https://github.com/apache/camel-spring-boot-examples/tree/main/openapi-contract-first
+And here is an example for YAML DSL with JBang:
https://github.com/apache/camel-kamelets-examples/tree/main/jbang/open-api-contract-first
## Miscellaneous
@@ -56,7 +95,6 @@ The `@PropertyInject` can inject as an array/list type where
the string value is
Camel Spring Boot has been upgraded to Spring Boot 3.2.5.
-
## New Components
This release only brings two new components:
(camel) branch main updated: CAMEL-20722 - changed timeout to 10 sec from 3 in more tests after random & sporadic failures during local testing (#14052)
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 3a13a0c61e5 CAMEL-20722 - changed timeout to 10 sec from 3 in more
tests after random & sporadic failures during local testing (#14052)
3a13a0c61e5 is described below
commit 3a13a0c61e5feac0635582082c771b2743e95c67
Author: Jang-Vijay Singh
AuthorDate: Mon May 6 08:58:43 2024 +0100
CAMEL-20722 - changed timeout to 10 sec from 3 in more tests after random &
sporadic failures during local testing (#14052)
* CAMEL-20722: changed timeout to 10 sec from 3 in
KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT
* CAMEL-20722 - changed timeout to 10 sec from 3 (sporadic timeout failures
on local tests)
---
.../KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java| 2 +-
.../component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java
index 8778256fc16..8ac1817eec1 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT.java
@@ -96,7 +96,7 @@ class KafkaBreakOnFirstErrorWithBatchUsingSyncCommitManagerIT
extends BaseKafkaT
contextExtension.getContext().getRouteController().startRoute(ROUTE_ID);
Awaitility.await()
-.atMost(3, TimeUnit.SECONDS)
+.atMost(10, TimeUnit.SECONDS) // changed to 10 sec for
CAMEL-20722
.until(() -> errorPayloads.size() > 3);
to.assertIsSatisfied();
diff --git
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java
index 2100e4640b9..d76bf88567d 100644
---
a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java
+++
b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/integration/KafkaConsumerAsyncManualCommitIT.java
@@ -127,7 +127,7 @@ public class KafkaConsumerAsyncManualCommitIT extends
BaseKafkaTestSupport {
producer.send(data);
}
-Awaitility.await().atMost(3, TimeUnit.SECONDS).untilAsserted(() ->
to.assertIsSatisfied());
+Awaitility.await().atMost(10, TimeUnit.SECONDS).untilAsserted(() ->
to.assertIsSatisfied()); // changed to 10 sec for CAMEL-20722
List exchangeList = to.getExchanges();
assertEquals(5, exchangeList.size());
(camel) branch main updated: Bump org.apache.maven.plugin-tools:maven-plugin-annotations (#14054)
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 41055cd9872 Bump org.apache.maven.plugin-tools:maven-plugin-annotations (#14054) 41055cd9872 is described below commit 41055cd98726d6f0ed32c913940867bd8770c43c Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon May 6 09:31:05 2024 +0200 Bump org.apache.maven.plugin-tools:maven-plugin-annotations (#14054) Bumps [org.apache.maven.plugin-tools:maven-plugin-annotations](https://github.com/apache/maven-plugin-tools) from 3.12.0 to 3.13.0. - [Release notes](https://github.com/apache/maven-plugin-tools/releases) - [Commits](https://github.com/apache/maven-plugin-tools/compare/maven-plugin-tools-3.12.0...maven-plugin-tools-3.13.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugin-tools:maven-plugin-annotations dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml | 2 +- components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml | 2 +- tooling/maven/camel-api-component-maven-plugin/pom.xml | 2 +- tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml | 2 +- tooling/parent/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml index 9dd009bf99a..e45cff34775 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml @@ -100,7 +100,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations -3.12.0 +3.13.0 provided diff --git a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml index a2029e85c68..7914e8e6012 100644 --- a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml +++ b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml @@ -100,7 +100,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations -3.12.0 +3.13.0 provided diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml index 08f3d9422de..ae7591d72a9 100644 --- a/tooling/maven/camel-api-component-maven-plugin/pom.xml +++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml @@ -91,7 +91,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations -3.12.0 +3.13.0 provided diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml index b70df46a377..825524fd26e 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml @@ -73,7 +73,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations -3.12.0 +3.13.0 provided diff --git a/tooling/parent/pom.xml b/tooling/parent/pom.xml index 09e9c2de031..ba923b082c2 100644 --- a/tooling/parent/pom.xml +++ b/tooling/parent/pom.xml @@ -37,7 +37,7 @@ 2.2.1 2.2.1 3.2.1 - 3.12.0 + 3.13.0 3.1.1 3.2.0 1.2.0
(camel) branch main updated (e5d44101002 -> d8d0a5510d2)
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 e5d44101002 Bump aws-java-sdk2-version from 2.25.43 to 2.25.45 (#14053) add d8d0a5510d2 Bump com.googlecode.libphonenumber:libphonenumber (#14055) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (819854f5f64 -> e5d44101002)
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 819854f5f64 CAMEL-20735: camel-jbang - Add support for spring-boot datasource add e5d44101002 Bump aws-java-sdk2-version from 2.25.43 to 2.25.45 (#14053) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated: CAMEL-20735: camel-jbang - Add support for spring-boot datasource
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 819854f5f64 CAMEL-20735: camel-jbang - Add support for spring-boot datasource 819854f5f64 is described below commit 819854f5f64ea684450c9eb292c45d6964908b70 Author: Claus Ibsen AuthorDate: Mon May 6 09:22:18 2024 +0200 CAMEL-20735: camel-jbang - Add support for spring-boot datasource --- .../modules/ROOT/pages/camel-jbang.adoc| 28 +- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index 836d4d897e3..1829fc23105 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -2141,9 +2141,28 @@ That's it - Camel context will then look up for the instances of `org.apache.cam When using SQL databases, then you would often need to configure a JDBC connection pool. You can do this: -- Manually by adding 3rd party JAR dependency on a connection pool, and configure this from Java code. +- Manually by adding 3rd party JAR dependency for the data source (and connection pool), and configure this from Java or XML/YAML DSL. - *Camel 4.6* Spring Boot style with `spring.datasource.` configuration in `application.properties` (uses Hikari connection-pool) + Defining datasource in YAML DSL as a bean + +Here is a snippet how you can declare a bean as the `DataSource` for a Postgres database in YAML DSL: + +[source,yaml] + +- beans: +- name: PostgresqlDataSource + properties: +databaseName: "postgres" +password: "postgres" +portNumber: "5432" +serverName: localhost +user: postgres + type: org.postgresql.ds.PGSimpleDataSource + + +You would then also need to add the JAR dependency with Maven coordinates: `org.postgresql:postgresql:42.7.3`. + Using Spring Boot JDBC data source In `application.properties` you can set up the datasource such as: @@ -2156,6 +2175,13 @@ spring.datasource.password=password spring.datasource.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver +The name of the `DataSource` will be registered with `springDataSource`, however you can configure the name via: + +[source,properties] + +spring.datasource.name=myDataSourceNameHere + + TIP: Some JDBC drivers are automatic detected by camel-jbang. If not then you need to add the JAR dependency manually. And you can configure the Hikari connection-pool (if needed) such as:
(camel) branch main updated: Update known releases in camel-catalog
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 d82c7a3ff29 Update known releases in camel-catalog
d82c7a3ff29 is described below
commit d82c7a3ff29f8d70d05edb371b45d38e55f6a7d8
Author: Claus Ibsen
AuthorDate: Sun May 5 18:02:24 2024 +0200
Update known releases in camel-catalog
---
.../org/apache/camel/catalog/releases/camel-releases.json | 7 +++
1 file changed, 7 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-releases.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-releases.json
index b444295225d..07f43a1308d 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-releases.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-releases.json
@@ -646,6 +646,13 @@
"kind": "lts",
"jdk": "11,17"
},
+{
+"version": "3.22.2",
+"date": "2024-05-05",
+"eol": "2024-12-31",
+"kind": "lts",
+"jdk": "11,17"
+},
{
"version": "3.3.0",
"date": "2020-05-15",
(camel-website) branch main updated: Move XSD in correct folder
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/main by this push: new 2b3c5a29 Move XSD in correct folder 2b3c5a29 is described below commit 2b3c5a2958fd774100d752e3972527edc6755507 Author: Claus Ibsen AuthorDate: Sun May 5 18:01:02 2024 +0200 Move XSD in correct folder --- .../camel-spring-xml-3.22.2.xsd => spring/camel-spring-3.22.2.xsd}| 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/static/schema/spring-xml/camel-spring-xml-3.22.2.xsd b/static/schema/spring/camel-spring-3.22.2.xsd similarity index 100% rename from static/schema/spring-xml/camel-spring-xml-3.22.2.xsd rename to static/schema/spring/camel-spring-3.22.2.xsd
(camel) branch main updated: CAMEL-20681: camel-jbang - Detect quarkus jdbc extension via configuration to make JARs automatic downloaded.
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 da81e4d1eb9 CAMEL-20681: camel-jbang - Detect quarkus jdbc extension
via configuration to make JARs automatic downloaded.
da81e4d1eb9 is described below
commit da81e4d1eb91eee44257b54c083ac6ee11201c84
Author: Claus Ibsen
AuthorDate: Sun May 5 09:15:32 2024 +0200
CAMEL-20681: camel-jbang - Detect quarkus jdbc extension via configuration
to make JARs automatic downloaded.
---
.../main/download/DependencyDownloaderPropertiesComponent.java | 7 ++-
.../main/resources/camel-main-known-dependencies.properties| 10 +-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderPropertiesComponent.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderPropertiesComponent.java
index db35c74990e..b348bb97013 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderPropertiesComponent.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/DependencyDownloaderPropertiesComponent.java
@@ -78,7 +78,7 @@ public class DependencyDownloaderPropertiesComponent extends
ServiceSupport {
protected void resolveKnownDependencies() {
for (String key : properties.stringPropertyNames()) {
-// check both key and values
+// check both key and values (and combined)
String value = properties.getProperty(key);
MavenGav gav = knownDependenciesResolver.mavenGavForClass(key);
if (gav != null) {
@@ -88,6 +88,11 @@ public class DependencyDownloaderPropertiesComponent extends
ServiceSupport {
if (gav != null) {
downloadLoader(gav.getGroupId(), gav.getArtifactId(),
gav.getVersion());
}
+String line = key + "=" + value;
+gav = knownDependenciesResolver.mavenGavForClass(line);
+if (gav != null) {
+downloadLoader(gav.getGroupId(), gav.getArtifactId(),
gav.getVersion());
+}
}
}
diff --git
a/dsl/camel-kamelet-main/src/main/resources/camel-main-known-dependencies.properties
b/dsl/camel-kamelet-main/src/main/resources/camel-main-known-dependencies.properties
index 940b4cd9cc3..01201793cfb 100644
---
a/dsl/camel-kamelet-main/src/main/resources/camel-main-known-dependencies.properties
+++
b/dsl/camel-kamelet-main/src/main/resources/camel-main-known-dependencies.properties
@@ -35,4 +35,12 @@ META-INF/services/org/apache/camel/micrometer-prometheus =
camel:micrometer-prom
META-INF/services/org/apache/camel/cron/cron-service = camel:quartz
META-INF/services/org/apache/camel/platform-http/jolokia =
camel:camel-platform-http-jolokia
org.apache.camel.component.activemq.ActiveMQComponent\:embedded\=true =
org.apache.activemq:activemq-broker:5.18.4
-spring.datasource.url =
org.springframework.boot:spring-boot-starter-jdbc:${spring-boot-version}
\ No newline at end of file
+spring.datasource.url =
org.springframework.boot:spring-boot-starter-jdbc:${spring-boot-version}
+quarkus.datasource.db-kind\=db2 =
io.quarkus:quarkus-jdbc-db2:${quarkus-version}
+quarkus.datasource.db-kind\=derby =
io.quarkus:quarkus-jdbc-derby:${quarkus-version}
+quarkus.datasource.db-kind\=h2 = io.quarkus:quarkus-jdbc-h2:${quarkus-version}
+quarkus.datasource.db-kind\=mariadb =
io.quarkus:quarkus-jdbc-mariadb:${quarkus-version}
+quarkus.datasource.db-kind\=mssql =
io.quarkus:quarkus-jdbc-mssql:${quarkus-version}
+quarkus.datasource.db-kind\=mysql =
io.quarkus:quarkus-jdbc-mysql:${quarkus-version}
+quarkus.datasource.db-kind\=oracle =
io.quarkus:quarkus-jdbc-oracle:${quarkus-version}
+quarkus.datasource.db-kind\=postgresql =
io.quarkus:quarkus-jdbc-postgresql:${quarkus-version}
\ No newline at end of file
(camel) branch main updated: CAMEL-20737: camel-jbang - Export with fresh does not work. Export should read application.properties if present.
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 166156ebdef CAMEL-20737: camel-jbang - Export with fresh does not
work. Export should read application.properties if present.
166156ebdef is described below
commit 166156ebdefd00a6446fccc314479d154ea60311
Author: Claus Ibsen
AuthorDate: Sat May 4 14:01:10 2024 +0200
CAMEL-20737: camel-jbang - Export with fresh does not work. Export should
read application.properties if present.
---
.../org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java| 4
1 file changed, 4 insertions(+)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index 948b4c6d2df..2b0086cf477 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -233,6 +233,10 @@ class ExportSpringBoot extends Export {
gav.setVersion(camelVersion);
}
}
+// use spring-boot version from BOM
+if ("org.springframework.boot".equals(gid)) {
+gav.setVersion(null); // uses BOM so version should not be
included
+}
gavs.add(gav);
}
(camel) branch main updated: CAMEL-20737: camel-jbang - Export with fresh does not work. Export should read application.properties if present.
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 1d2000b0298 CAMEL-20737: camel-jbang - Export with fresh does not
work. Export should read application.properties if present.
1d2000b0298 is described below
commit 1d2000b0298941f0fcfa9c4bf3bb3ea4ce0fd8df
Author: Claus Ibsen
AuthorDate: Sat May 4 13:57:30 2024 +0200
CAMEL-20737: camel-jbang - Export with fresh does not work. Export should
read application.properties if present.
---
.../org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java | 2 +-
.../java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java | 2 +-
.../org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java| 2 +-
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
index 782589666ea..d833f666416 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
@@ -59,7 +59,7 @@ class ExportCamelMain extends Export {
// the settings file has information what to export
File settings = new File(CommandLineHelper.getWorkDir(),
Run.RUN_SETTINGS_FILE);
-if (fresh || files != null || !settings.exists()) {
+if (fresh || !files.isEmpty() || !settings.exists()) {
// allow to automatic build
if (!quiet && fresh) {
printer().println("Generating fresh run data");
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
index c736b920bfb..1e481b29b33 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java
@@ -62,7 +62,7 @@ class ExportQuarkus extends Export {
// the settings file has information what to export
File settings = new File(CommandLineHelper.getWorkDir(),
Run.RUN_SETTINGS_FILE);
-if (fresh || files != null || !settings.exists()) {
+if (fresh || !files.isEmpty() || !settings.exists()) {
// allow to automatic build
if (!quiet) {
printer().println("Generating fresh run data");
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index e7d8165bd6f..948b4c6d2df 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -63,7 +63,7 @@ class ExportSpringBoot extends Export {
// the settings file has information what to export
File settings = new File(CommandLineHelper.getWorkDir(),
Run.RUN_SETTINGS_FILE);
-if (fresh || files != null || !settings.exists()) {
+if (fresh || !files.isEmpty() || !settings.exists()) {
// allow to automatic build
if (!quiet) {
printer().println("Generating fresh run data");
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 35acf9e6b57..07420806a1a 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -455,8 +455,8 @@ public class Run extends CamelCommand {
+ " because application.properties
file does not exist or camel.main.routesIncludePattern is not configured");
return 1;
} else {
-// silent-run then auto-detect all files (except
properties as they are loaded explicit)
-String[] allFiles = new File(".").list((dir, name) ->
!name.endsWith(".properties"));
+/
(camel) branch main updated: CAMEL-20735: camel-jbang - Add support for spring-boot datasource
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 0c13dff431f CAMEL-20735: camel-jbang - Add support for spring-boot
datasource
0c13dff431f is described below
commit 0c13dff431f807593beab748c4051178cfa20f0d
Author: Claus Ibsen
AuthorDate: Sat May 4 13:27:18 2024 +0200
CAMEL-20735: camel-jbang - Add support for spring-boot datasource
---
.../src/main/resources/auto-configure/spring.datasource.url.java| 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git
a/dsl/camel-kamelet-main/src/main/resources/auto-configure/spring.datasource.url.java
b/dsl/camel-kamelet-main/src/main/resources/auto-configure/spring.datasource.url.java
index b4cfd8fee19..2629262b273 100644
---
a/dsl/camel-kamelet-main/src/main/resources/auto-configure/spring.datasource.url.java
+++
b/dsl/camel-kamelet-main/src/main/resources/auto-configure/spring.datasource.url.java
@@ -15,9 +15,7 @@
* limitations under the License.
*/
-var answer = "";
var registry = context.getRegistry();
-answer = "Auto-configuring spring-datasource";
var p = new org.springframework.boot.autoconfigure.jdbc.DataSourceProperties();
p.setBeanClassLoader(context.getApplicationContextClassLoader());
@@ -41,6 +39,6 @@
org.apache.camel.main.MainHelper.setPropertiesOnTarget(context, ds, hikari, "spr
registry.bind(name, ds);
// log summary to see what was configured
-org.apache.camel.main.MainHelper.logConfigurationSummary(null, set, "Spring
DataSource (" + name + ")", null);
+org.apache.camel.main.MainHelper.logConfigurationSummary(null, set,
"Auto-configuration Spring Datasource: " + name + " summary", null);
-return answer;
\ No newline at end of file
+return null;
\ No newline at end of file
(camel) branch main updated: CAMEL-20736: camel-jbang - Catalog downloaded should not start CamelContext
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 7eda1e622bb CAMEL-20736: camel-jbang - Catalog downloaded should not
start CamelContext
7eda1e622bb is described below
commit 7eda1e622bb647a81a2139f65375fc8c7d64fa45
Author: Claus Ibsen
AuthorDate: Sat May 4 13:22:17 2024 +0200
CAMEL-20736: camel-jbang - Catalog downloaded should not start CamelContext
---
.../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 2 --
1 file changed, 2 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index a582a9204fb..e01a9fc7622 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -423,8 +423,6 @@ abstract class ExportBaseCommand extends CamelCommand {
}
answer.removeAll(toBeRemoved);
-System.out.println(answer);
-
return answer;
}
(camel) branch main updated: CAMEL-20736: camel-jbang - Catalog downloaded should not start CamelContext
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 742646f730b CAMEL-20736: camel-jbang - Catalog downloaded should not
start CamelContext
742646f730b is described below
commit 742646f730bfad654204972b99d869fab3ebe370
Author: Claus Ibsen
AuthorDate: Sat May 4 13:19:08 2024 +0200
CAMEL-20736: camel-jbang - Catalog downloaded should not start CamelContext
---
.../dsl/jbang/core/commands/ExportBaseCommand.java | 2 +
.../dsl/jbang/core/commands/ExportSpringBoot.java | 2 +
.../camel/dsl/jbang/core/common/CatalogLoader.java | 105 ++---
3 files changed, 53 insertions(+), 56 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index e01a9fc7622..a582a9204fb 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -423,6 +423,8 @@ abstract class ExportBaseCommand extends CamelCommand {
}
answer.removeAll(toBeRemoved);
+System.out.println(answer);
+
return answer;
}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index d5070320abf..e7d8165bd6f 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -104,9 +104,11 @@ class ExportSpringBoot extends Export {
srcKameletsResourcesDir.mkdirs();
// copy application properties files
copyApplicationPropertiesFiles(srcResourcesDir);
+
// copy source files
copySourceFiles(settings, profile, srcJavaDirRoot, srcJavaDir,
srcResourcesDir, srcCamelResourcesDir,
srcKameletsResourcesDir, srcPackageName);
+
// copy from settings to profile
copySettingsAndProfile(settings, profile, srcResourcesDir, prop -> {
if (!hasModeline(settings)) {
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CatalogLoader.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CatalogLoader.java
index d10bb13826d..d06539af851 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CatalogLoader.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CatalogLoader.java
@@ -31,10 +31,10 @@ import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
import org.apache.camel.catalog.RuntimeProvider;
import org.apache.camel.catalog.VersionManager;
-import org.apache.camel.main.KameletMain;
import org.apache.camel.main.download.DependencyDownloaderClassLoader;
import org.apache.camel.main.download.DownloadException;
import org.apache.camel.main.download.MavenDependencyDownloader;
+import org.apache.camel.support.ObjectHelper;
import org.apache.camel.tooling.maven.MavenArtifact;
public final class CatalogLoader {
@@ -49,27 +49,21 @@ public final class CatalogLoader {
}
public static CamelCatalog loadCatalog(String repos, String version)
throws Exception {
+CamelCatalog answer = new DefaultCamelCatalog();
if (version == null) {
-CamelCatalog answer = new DefaultCamelCatalog();
+answer = new DefaultCamelCatalog();
answer.enableCache();
return answer;
}
-// use kamelet-main to dynamic download dependency via maven
-KameletMain main = new KameletMain();
+DependencyDownloaderClassLoader cl = new
DependencyDownloaderClassLoader(null);
+MavenDependencyDownloader downloader = new MavenDependencyDownloader();
+downloader.setClassLoader(cl);
+downloader.setRepos(repos);
try {
-main.setRepos(repos);
-// enable stub in silent mode so we do not use real components
-main.setSilent(true);
-main.setStubPattern("*");
-main.start();
-
-// wrap downloaded catalog files in an isolated classloader
-DependencyDownloaderClassLoader cl
-= new DependencyDownloaderClassLoader(null);
+downloader.start();
// download
(camel) branch main updated: CAMEL-20735: camel-jbang - Add support for spring-boot datasource
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 d2ef0d979bf CAMEL-20735: camel-jbang - Add support for spring-boot
datasource
d2ef0d979bf is described below
commit d2ef0d979bfc4d54d4841831c8229bdb788752ca
Author: Claus Ibsen
AuthorDate: Sat May 4 12:22:01 2024 +0200
CAMEL-20735: camel-jbang - Add support for spring-boot datasource
---
.../org/apache/camel/spi/PropertiesComponent.java | 9 ++
.../component/properties/PropertiesComponent.java | 16 +++
.../org/apache/camel/main/BaseMainSupport.java | 52 +
.../java/org/apache/camel/main/MainHelper.java | 57 +
.../modules/ROOT/pages/camel-jbang.adoc| 40 +++
.../apache/camel/dsl/jbang/core/commands/Run.java | 4 +
.../java/org/apache/camel/main/KameletMain.java| 8 +-
.../download/AutoConfigureDownloadListener.java| 4 +-
.../DependencyDownloaderPropertiesComponent.java | 128 +
.../main/download/KnownDependenciesResolver.java | 19 ++-
.../auto-configure/spring.datasource.url.java | 46
.../camel-main-known-dependencies.properties | 1 +
12 files changed, 330 insertions(+), 54 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
index 00edeab3834..ef725a8ec01 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java
@@ -114,6 +114,15 @@ public interface PropertiesComponent extends StaticService
{
*/
Properties loadProperties(Predicate filter);
+/**
+ * Loads the properties from the default locations and extract properties
by the given prefix.
+ *
+ * @param optionPrefix prefix to filter
+ * @param nested whether to include nested properties
+ * @return the properties loaded with option prefix removed.
+ */
+Properties extractProperties(String optionPrefix, boolean nested);
+
/**
* Loads the properties from the default locations and sources filtering
them out according to a predicate, and maps
* the key using the key mapper.
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
index bf708f58a22..3ca2daee9ba 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
@@ -47,6 +47,7 @@ import org.apache.camel.util.FilePathResolver;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.OrderedLocationProperties;
import org.apache.camel.util.OrderedProperties;
+import org.apache.camel.util.PropertiesHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -236,6 +237,21 @@ public class PropertiesComponent extends ServiceSupport
return loadProperties(filter, k -> k);
}
+@Override
+public Properties extractProperties(String optionPrefix, boolean nested) {
+Properties answer = new Properties();
+var map = loadPropertiesAsMap(k -> {
+boolean accept = k.startsWith(optionPrefix);
+if (accept && !nested) {
+int pos = k.lastIndexOf('.');
+accept = pos == -1 || pos <= optionPrefix.length();
+}
+return accept;
+});
+answer.putAll(PropertiesHelper.extractProperties(map, optionPrefix));
+return answer;
+}
+
@Override
public Properties loadProperties(Predicate filter,
Function keyMapper) {
OrderedLocationProperties prop = new OrderedLocationProperties();
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 645cd0d2638..90a833951f5 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
@@ -33,7 +33,6 @@ import java.util.Properties;
import java.util.Set;
import java.util.TreeMap;
import java.util.function.Function;
-import java.util.function.Predicate;
import java.util.stream.Collectors;
import org.apache.camel.CamelConfiguration;
@@ -503,37 +502,10 @@ public abstract class BaseMainSupport extends BaseService
{
private static void logConfigurationSummary(OrderedLocationProperties
autoConfiguredProperties) {
// first log variables
-doLogConfigurationSummary(autoConfiguredPrope
(camel) branch main updated (52f9f503b04 -> 80573c56973)
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 52f9f503b04 typo fix with property placeholder (#14047) add 80573c56973 Exclude ws-java-sdk-core in camel-aws-xray to avoid conflict (#14048) No new revisions were added by this update. Summary of changes: components/camel-aws/camel-aws-xray/pom.xml | 7 +++ 1 file changed, 7 insertions(+)
(camel) branch main updated: typo fix with property placeholder (#14047)
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 52f9f503b04 typo fix with property placeholder (#14047)
52f9f503b04 is described below
commit 52f9f503b04f86cbd05c338f617c0c2d67d2a7aa
Author: Vladislav Botvin
AuthorDate: Fri May 3 15:33:11 2024 +0300
typo fix with property placeholder (#14047)
* typo fix with property placeholder
* typo fix with property placeholder
---
core/camel-base/src/main/docs/properties-component.adoc | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/core/camel-base/src/main/docs/properties-component.adoc
b/core/camel-base/src/main/docs/properties-component.adoc
index ba6c6397793..f69486fdfb4 100644
--- a/core/camel-base/src/main/docs/properties-component.adoc
+++ b/core/camel-base/src/main/docs/properties-component.adoc
@@ -46,7 +46,7 @@ For example:
[source]
-location=file:${karaf.home}/etc/foo.properties
+location=file:{{sys:karaf.home}}/etc/foo.properties
In the location above we defined a location using the file scheme using the
JVM system property with key `karaf.home`.
@@ -57,7 +57,7 @@ You can also prefix with `env.`, however this style is not
recommended because a
[source]
-location=file:${env:APP_HOME}/etc/foo.properties
+location=file:{{env:APP_HOME}}/etc/foo.properties
Where `APP_HOME` is an OS environment.
@@ -72,7 +72,7 @@ You can have multiple placeholders in the same location, such
as:
[source]
-location=file:${env:APP_HOME}/etc/${prop.name}.properties
+location=file:{{env:APP_HOME}}/etc/{{prop.name}}.properties
=== Defining location of properties files in Spring XML
@@ -113,7 +113,7 @@ For fine grained configuration of the location, then this
can be done as follows
optional = "false"/>
(camel-spring-boot) branch main updated: CAMEL-20733: camel-catalog - Make log eip and component name more easier to see difference
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 4d3641dd008 CAMEL-20733: camel-catalog - Make log eip and component
name more easier to see difference
4d3641dd008 is described below
commit 4d3641dd008f51db0b9810a02e6d51b4452d40bb
Author: Claus Ibsen
AuthorDate: Fri May 3 14:32:12 2024 +0200
CAMEL-20733: camel-catalog - Make log eip and component name more easier to
see difference
---
.../resources/org/apache/camel/springboot/catalog/components/log.json | 4 ++--
.../camel/component/log/springboot/LogComponentConfiguration.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/log.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/log.json
index b8af23f2ca7..a000c213a8d 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/log.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/log.json
@@ -2,8 +2,8 @@
"component": {
"kind": "component",
"name": "log",
-"title": "Log",
-"description": "Log messages to the underlying logging mechanism.",
+"title": "Log Data",
+"description": "Prints data form the routed message (such as body and
headers) to the logger.",
"deprecated": false,
"firstVersion": "1.1.0",
"label": "core,monitoring",
diff --git
a/components-starter/camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentConfiguration.java
b/components-starter/camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentConfiguration.java
index 6abe70bc468..937a528c056 100644
---
a/components-starter/camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentConfiguration.java
+++
b/components-starter/camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentConfiguration.java
@@ -21,7 +21,7 @@ import
org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
- * Log messages to the underlying logging mechanism.
+ * Prints data form the routed message (such as body and headers) to the
logger.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
(camel) branch main updated (dcd3ff6e575 -> 994222731c0)
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 dcd3ff6e575 CAMEL-20731: mvn camel-report:route-coverage fails on routes with multiple doCatch blocks add 994222731c0 CAMEL-20733: camel-catalog - Make log eip and component name more easier to see difference No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/components/log.json | 4 ++-- .../resources/org/apache/camel/catalog/models/log.json | 4 ++-- .../org/apache/camel/catalog/schemas/camel-spring.xsd| 2 +- .../META-INF/org/apache/camel/component/log/log.json | 4 ++-- components/camel-log/src/main/docs/log-component.adoc| 6 +++--- .../java/org/apache/camel/component/log/LogEndpoint.java | 6 ++ .../src/main/docs/modules/eips/nav.adoc | 2 +- .../src/main/docs/modules/eips/pages/log-eip.adoc| 6 +++--- .../resources/META-INF/org/apache/camel/model/log.json | 4 ++-- .../main/java/org/apache/camel/model/LogDefinition.java | 4 ++-- docs/components/modules/ROOT/nav.adoc| 2 +- .../builder/component/ComponentsBuilderFactory.java | 5 +++-- .../component/dsl/LogComponentBuilderFactory.java| 9 + .../camel/builder/endpoint/StaticEndpointBuilders.java | 10 ++ .../builder/endpoint/dsl/LogEndpointBuilderFactory.java | 16 +--- .../org/apache/camel/kotlin/components/LogUriDsl.kt | 2 +- .../camel/dsl/yaml/deserializers/ModelDeserializers.java | 4 ++-- .../src/generated/resources/schema/camelYamlDsl.json | 4 ++-- 18 files changed, 49 insertions(+), 45 deletions(-)
(camel) branch camel-4.0.x updated: CAMEL-20731: mvn camel-report:route-coverage fails on routes with multiple doCatch blocks
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.0.x by this push:
new 204a6d56268 CAMEL-20731: mvn camel-report:route-coverage fails on
routes with multiple doCatch blocks
204a6d56268 is described below
commit 204a6d56268e50bd76c3e60cb193aff414c88b1c
Author: Claus Ibsen
AuthorDate: Fri May 3 11:42:42 2024 +0200
CAMEL-20731: mvn camel-report:route-coverage fails on routes with multiple
doCatch blocks
---
.../main/java/org/apache/camel/maven/RouteCoverageMojo.java | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
index be9f9328229..b2cb7454c7f 100644
---
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
+++
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
@@ -472,11 +472,6 @@ public class RouteCoverageMojo extends AbstractExecMojo {
return;
}
-// end block to make doTry .. doCatch .. doFinally aligned
-if ("doCatch".equals(node.getName()) ||
"doFinally".equals(node.getName())) {
-level.decrementAndGet();
-}
-
RouteCoverageNode data = new RouteCoverageNode();
data.setName(node.getName());
data.setLineNumber(Integer.parseInt(node.getLineNumber()));
@@ -507,7 +502,11 @@ public class RouteCoverageMojo extends AbstractExecMojo {
}
private static String padString(int level) {
-return " ".repeat(level);
+if (level > 0) {
+return " ".repeat(level);
+} else {
+return "";
+}
}
private boolean matchFile(File file) {
(camel) branch camel-4.4.x updated: CAMEL-20731: mvn camel-report:route-coverage fails on routes with multiple doCatch blocks
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.4.x by this push:
new b8f369c9396 CAMEL-20731: mvn camel-report:route-coverage fails on
routes with multiple doCatch blocks
b8f369c9396 is described below
commit b8f369c93960aa30a52d47b439eb8d441434bdce
Author: Claus Ibsen
AuthorDate: Fri May 3 11:42:42 2024 +0200
CAMEL-20731: mvn camel-report:route-coverage fails on routes with multiple
doCatch blocks
---
.../main/java/org/apache/camel/maven/RouteCoverageMojo.java | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
index fc3af32c3c2..09cb718e8a8 100644
---
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
+++
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
@@ -542,11 +542,6 @@ public class RouteCoverageMojo extends AbstractExecMojo {
return;
}
-// end block to make doTry .. doCatch .. doFinally aligned
-if ("doCatch".equals(node.getName()) ||
"doFinally".equals(node.getName())) {
-level.decrementAndGet();
-}
-
RouteCoverageNode data = new RouteCoverageNode();
data.setName(node.getName());
data.setLineNumber(Integer.parseInt(node.getLineNumber()));
@@ -577,7 +572,11 @@ public class RouteCoverageMojo extends AbstractExecMojo {
}
private static String padString(int level) {
-return " ".repeat(level);
+if (level > 0) {
+return " ".repeat(level);
+} else {
+return "";
+}
}
private boolean matchFile(File file) {
(camel) branch main updated: CAMEL-20731: mvn camel-report:route-coverage fails on routes with multiple doCatch blocks
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 dcd3ff6e575 CAMEL-20731: mvn camel-report:route-coverage fails on
routes with multiple doCatch blocks
dcd3ff6e575 is described below
commit dcd3ff6e5754aed0508332e5810ffdf4ace3fc0d
Author: Claus Ibsen
AuthorDate: Fri May 3 11:42:42 2024 +0200
CAMEL-20731: mvn camel-report:route-coverage fails on routes with multiple
doCatch blocks
---
.../main/java/org/apache/camel/maven/RouteCoverageMojo.java | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
index 276f60c5f33..f6edcfaddb7 100644
---
a/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
+++
b/catalog/camel-report-maven-plugin/src/main/java/org/apache/camel/maven/RouteCoverageMojo.java
@@ -555,11 +555,6 @@ public class RouteCoverageMojo extends AbstractMojo {
return;
}
-// end block to make doTry .. doCatch .. doFinally aligned
-if ("doCatch".equals(node.getName()) ||
"doFinally".equals(node.getName())) {
-level.decrementAndGet();
-}
-
RouteCoverageNode data = new RouteCoverageNode();
data.setName(node.getName());
data.setLineNumber(Integer.parseInt(node.getLineNumber()));
@@ -590,7 +585,11 @@ public class RouteCoverageMojo extends AbstractMojo {
}
private static String padString(int level) {
-return " ".repeat(level);
+if (level > 0) {
+return " ".repeat(level);
+} else {
+return "";
+}
}
private boolean matchFile(File file) {
(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 d1fe79979aa Regen d1fe79979aa is described below commit d1fe79979aa705ff8c37d554ed45d2ef798b72bf Author: Claus Ibsen AuthorDate: Fri May 3 10:06:30 2024 +0200 Regen --- tooling/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index ae59493c0cf..0899dc2ff49 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -4317,7 +4317,7 @@ org.xmlunit xmlunit-assertj3 -2.9.1 +2.10.0
(camel) branch main updated: Bump elasticsearch-java-client-version from 8.13.2 to 8.13.3 (#14029)
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 8c4eeeae5c7 Bump elasticsearch-java-client-version from 8.13.2 to 8.13.3 (#14029) 8c4eeeae5c7 is described below commit 8c4eeeae5c731be310790c97893aa473a2fee959 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri May 3 09:58:44 2024 +0200 Bump elasticsearch-java-client-version from 8.13.2 to 8.13.3 (#14029) Bumps `elasticsearch-java-client-version` from 8.13.2 to 8.13.3. Updates `co.elastic.clients:elasticsearch-java` from 8.13.2 to 8.13.3 - [Release notes](https://github.com/elastic/elasticsearch-java/releases) - [Changelog](https://github.com/elastic/elasticsearch-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch-java/commits) Updates `org.elasticsearch.client:elasticsearch-rest-client` from 8.13.2 to 8.13.3 - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/commits) --- updated-dependencies: - dependency-name: co.elastic.clients:elasticsearch-java dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.elasticsearch.client:elasticsearch-rest-client dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index a3f1a9db8be..d9706c95069 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -145,7 +145,7 @@ 0.3.0 2.1.5 3.10.8 - 8.13.2 + 8.13.3 8.13.3 4.1.0.Final 3.2.0
(camel) branch main updated: Bump com.google.apis:google-api-services-sheets (#14036)
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 7c54108bdcb Bump com.google.apis:google-api-services-sheets (#14036) 7c54108bdcb is described below commit 7c54108bdcbf624b134b752a92ad193ea9fabd1e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri May 3 09:34:13 2024 +0200 Bump com.google.apis:google-api-services-sheets (#14036) Bumps com.google.apis:google-api-services-sheets from v4-rev20240416-2.0.0 to v4-rev20240423-2.0.0. --- updated-dependencies: - dependency-name: com.google.apis:google-api-services-sheets dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7aec58d9ed5..a3f1a9db8be 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -185,7 +185,7 @@ 2.4.1 v3-rev20240327-2.0.0 v3-rev20240419-2.0.0 - v4-rev20240416-2.0.0 + v4-rev20240423-2.0.0 v1-rev20240422-2.0.0 1.35.0 26.38.0
(camel) branch camel-4.4.x updated: CAMEL-20732: fix parsing primitive array types in RestDefinition (#14043)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.4.x by this push:
new ad39fdc3cc6 CAMEL-20732: fix parsing primitive array types in
RestDefinition (#14043)
ad39fdc3cc6 is described below
commit ad39fdc3cc64b928872c345418e87c576aef5a4f
Author: Stefan Kalscheuer
AuthorDate: Fri May 3 09:33:02 2024 +0200
CAMEL-20732: fix parsing primitive array types in RestDefinition (#14043)
Generation of string representation for arrays relies on getName() as
a workaround to properly support nested classes. However, this results
in "null[]" for array of primitives.
Rework the logic and introduce a unit test, so we can handle such types
properly again.
---
core/camel-core-model/pom.xml | 7 +++
.../apache/camel/model/rest/RestDefinition.java| 14 ++---
.../camel/model/rest/RestDefinitionTest.java | 68 ++
3 files changed, 79 insertions(+), 10 deletions(-)
diff --git a/core/camel-core-model/pom.xml b/core/camel-core-model/pom.xml
index a975d5a9013..c09a6931ad0 100644
--- a/core/camel-core-model/pom.xml
+++ b/core/camel-core-model/pom.xml
@@ -67,6 +67,13 @@
camel-util
+
+
+org.junit.jupiter
+junit-jupiter
+test
+
+
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
index 0f82d3d3bb5..eab503c1d0d 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/rest/RestDefinition.java
@@ -827,23 +827,17 @@ public class RestDefinition extends
OptionalIdentifiedDefinition
//
// The VerbDefinition::setType and VerbDefinition::setOutType require
// the class to be expressed as canonical with an optional [] to mark
-// the type is an array but this i wrong as the canonical name can not
+// the type is an array but this is wrong as the canonical name can not
// be dynamically be loaded by the classloader thus this workaround
// that for nested classes generates a class name that does not respect
// any JLS convention.
-//
-// TODO: this probably need to be revisited
String type;
-if (!classType.isPrimitive()) {
-if (classType.isArray()) {
-type = StringHelper.between(classType.getName(), "[L", ";") +
"[]";
-} else {
-type = classType.getName();
-}
+if (classType.isArray()) {
+type = classType.getComponentType().getName() + "[]";
} else {
-type = classType.getCanonicalName();
+type = classType.getName();
}
return type;
diff --git
a/core/camel-core-model/src/test/java/org/apache/camel/model/rest/RestDefinitionTest.java
b/core/camel-core-model/src/test/java/org/apache/camel/model/rest/RestDefinitionTest.java
new file mode 100644
index 000..86c5676a31c
--- /dev/null
+++
b/core/camel-core-model/src/test/java/org/apache/camel/model/rest/RestDefinitionTest.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.model.rest;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class RestDefinitionTest {
+
+@Test
+void typeClassTest() {
+RestDefinition rest = new RestDefinition().get();
+VerbDefinition verb = rest.getVerbs().get(0);
+
+// Plain classes
+rest.outType(String.class);
+assertEquals(String.class, verb.getOutTypeClass());
+assertEquals("java.lang.String", verb.getOutType());
+
+rest.outType(RestDefinitionTest.class);
+asser
(camel) branch main updated (657fa86769c -> d0cd37c291c)
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 657fa86769c Bump com.dropbox.core:dropbox-core-sdk from 6.1.0 to 7.0.0 (#14026) add d0cd37c291c CAMEL-20732: fix parsing primitive array types in RestDefinition (#14043) No new revisions were added by this update. Summary of changes: core/camel-core-model/pom.xml | 7 +++ .../apache/camel/model/rest/RestDefinition.java| 14 ++--- .../camel/model/rest/RestDefinitionTest.java | 68 ++ 3 files changed, 79 insertions(+), 10 deletions(-) create mode 100644 core/camel-core-model/src/test/java/org/apache/camel/model/rest/RestDefinitionTest.java
(camel) branch main updated (eb2d43a59db -> 657fa86769c)
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 eb2d43a59db Bump commons-logging:commons-logging from 1.3.0 to 1.3.1 (#14041) add 657fa86769c Bump com.dropbox.core:dropbox-core-sdk from 6.1.0 to 7.0.0 (#14026) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (c050d8a17af -> 272117e4949)
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 c050d8a17af Bump org.cometd.java:cometd-java-client-http-jetty (#14038) add 272117e4949 Bump org.kiwiproject:consul-client from 1.3.1 to 1.3.2 (#14039) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (2cd1133a8d0 -> c050d8a17af)
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 2cd1133a8d0 Bump org.l2x6.cq:cq-alias-fastinstall-quickly-extension (#14037) add c050d8a17af Bump org.cometd.java:cometd-java-client-http-jetty (#14038) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (272117e4949 -> eb2d43a59db)
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 272117e4949 Bump org.kiwiproject:consul-client from 1.3.1 to 1.3.2 (#14039) add eb2d43a59db Bump commons-logging:commons-logging from 1.3.0 to 1.3.1 (#14041) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated: Bump org.l2x6.cq:cq-alias-fastinstall-quickly-extension (#14037)
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 2cd1133a8d0 Bump org.l2x6.cq:cq-alias-fastinstall-quickly-extension (#14037) 2cd1133a8d0 is described below commit 2cd1133a8d0d0366929c852960ba125dbfcec3d8 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri May 3 09:15:34 2024 +0200 Bump org.l2x6.cq:cq-alias-fastinstall-quickly-extension (#14037) Bumps [org.l2x6.cq:cq-alias-fastinstall-quickly-extension](https://github.com/l2x6/cq-maven-plugin) from 4.7.0 to 4.8.0. - [Commits](https://github.com/l2x6/cq-maven-plugin/compare/4.7.0...4.8.0) --- updated-dependencies: - dependency-name: org.l2x6.cq:cq-alias-fastinstall-quickly-extension dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .mvn/extensions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index c2440cb0c0d..8b8f10eccc2 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,7 +3,7 @@ org.l2x6.cq cq-alias-fastinstall-quickly-extension -4.7.0 +4.8.0 kr.motd.maven
(camel) branch main updated (5c120a18ffd -> 2ca5be6adb8)
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 5c120a18ffd Bump jooq-version from 3.19.7 to 3.19.8 (#14033) add 2ca5be6adb8 Bump com.couchbase.client:java-client from 3.6.1 to 3.6.2 (#14035) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (bfab10e2ccb -> 5c120a18ffd)
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 bfab10e2ccb Bump org.xmlunit:xmlunit-assertj3 from 2.9.1 to 2.10.0 (#14032) add 5c120a18ffd Bump jooq-version from 3.19.7 to 3.19.8 (#14033) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (edebdcc5780 -> bfab10e2ccb)
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 edebdcc5780 Bump com.google.apis:google-api-services-calendar (#14031) add bfab10e2ccb Bump org.xmlunit:xmlunit-assertj3 from 2.9.1 to 2.10.0 (#14032) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated: Bump com.google.apis:google-api-services-calendar (#14031)
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 edebdcc5780 Bump com.google.apis:google-api-services-calendar (#14031) edebdcc5780 is described below commit edebdcc578046b34dd017d003c294fcf2330b5b1 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri May 3 09:14:35 2024 +0200 Bump com.google.apis:google-api-services-calendar (#14031) Bumps com.google.apis:google-api-services-calendar from v3-rev20240111-2.0.0 to v3-rev20240419-2.0.0. --- updated-dependencies: - dependency-name: com.google.apis:google-api-services-calendar dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9a6e6135c14..56ed9c19e45 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -184,7 +184,7 @@ 1.23.0 2.4.1 v3-rev20240327-2.0.0 - v3-rev20240111-2.0.0 + v3-rev20240419-2.0.0 v4-rev20240416-2.0.0 v1-rev20240422-2.0.0 1.35.0
(camel) branch main updated (b8c3e0ece09 -> ccaca557985)
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 b8c3e0ece09 Bump com.github.spullara.mustache.java:compiler from 0.9.11 to 0.9.13 (#14028) add ccaca557985 Bump com.prowidesoftware:pw-iso20022 (#14030) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (acf18e575c5 -> b8c3e0ece09)
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 acf18e575c5 Bump org.slf4j:slf4j-api from 2.0.12 to 2.0.13 (#14027) add b8c3e0ece09 Bump com.github.spullara.mustache.java:compiler from 0.9.11 to 0.9.13 (#14028) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated (67f01a02c27 -> acf18e575c5)
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 67f01a02c27 Bump org.elasticsearch.client:elasticsearch-rest-client-sniffer (#14025) add acf18e575c5 Bump org.slf4j:slf4j-api from 2.0.12 to 2.0.13 (#14027) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated: Bump org.elasticsearch.client:elasticsearch-rest-client-sniffer (#14025)
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 67f01a02c27 Bump org.elasticsearch.client:elasticsearch-rest-client-sniffer (#14025) 67f01a02c27 is described below commit 67f01a02c278d398e84a69b54c942bea75dfebff Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri May 3 09:13:36 2024 +0200 Bump org.elasticsearch.client:elasticsearch-rest-client-sniffer (#14025) Bumps [org.elasticsearch.client:elasticsearch-rest-client-sniffer](https://github.com/elastic/elasticsearch) from 8.13.2 to 8.13.3. - [Release notes](https://github.com/elastic/elasticsearch/releases) - [Changelog](https://github.com/elastic/elasticsearch/blob/main/CHANGELOG.md) - [Commits](https://github.com/elastic/elasticsearch/commits) --- updated-dependencies: - dependency-name: org.elasticsearch.client:elasticsearch-rest-client-sniffer dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 1fea9009481..19efac79387 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -146,7 +146,7 @@ 2.1.5 3.10.8 8.13.2 - 8.13.2 + 8.13.3 4.1.0.Final 3.2.0 2.0.49
(camel) branch main updated (0b89ed3ba46 -> 08672f9cb0d)
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 0b89ed3ba46 Bump org.mybatis:mybatis from 3.5.15 to 3.5.16 (#14023) add 08672f9cb0d Bump com.google.cloud:google-cloud-functions-bom from 2.43.0 to 2.44.0 (#14024) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch main updated: Bump org.mybatis:mybatis from 3.5.15 to 3.5.16 (#14023)
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 0b89ed3ba46 Bump org.mybatis:mybatis from 3.5.15 to 3.5.16 (#14023) 0b89ed3ba46 is described below commit 0b89ed3ba46ce0dfe690925497a3c832d8a0e52b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri May 3 09:12:54 2024 +0200 Bump org.mybatis:mybatis from 3.5.15 to 3.5.16 (#14023) Bumps [org.mybatis:mybatis](https://github.com/mybatis/mybatis-3) from 3.5.15 to 3.5.16. - [Release notes](https://github.com/mybatis/mybatis-3/releases) - [Commits](https://github.com/mybatis/mybatis-3/compare/mybatis-3.5.15...mybatis-3.5.16) --- updated-dependencies: - dependency-name: org.mybatis:mybatis dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9d0f5f3c10b..879db30e1c2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -368,7 +368,7 @@ 1.15.0 0.9.11 2.5.2.Final -3.5.15 +3.5.16 5.13.1.Final 0.4.0 4.1.109.Final
(camel) branch main updated: CAMEL-20514: camel-model - Add support for bean constructors for beans in route templates or kamelets
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 2fd1ad6f497 CAMEL-20514: camel-model - Add support for bean
constructors for beans in route templates or kamelets
2fd1ad6f497 is described below
commit 2fd1ad6f4973179581ccdd6e3be7a37d6d3856e5
Author: Claus Ibsen
AuthorDate: Fri May 3 09:09:31 2024 +0200
CAMEL-20514: camel-model - Add support for bean constructors for beans in
route templates or kamelets
---
.../org/apache/camel/catalog/models.properties | 1 +
.../apache/camel/catalog/models/beanFactory.json | 28 +
.../apache/camel/catalog/schemas/camel-spring.xsd | 136 +++--
.../org/apache/camel/model/beanFactory.json| 28 +
.../services/org/apache/camel/model.properties | 1 +
.../apache/camel/model/BeanFactoryDefinition.java | 4 +-
.../java/org/apache/camel/xml/out/ModelWriter.java | 3 +
.../org/apache/camel/yaml/out/ModelWriter.java | 3 +
.../dsl/yaml/deserializers/ModelDeserializers.java | 31 +++--
.../deserializers/ModelDeserializersResolver.java | 2 +
.../generated/resources/schema/camelYamlDsl.json | 51 ++--
11 files changed, 250 insertions(+), 38 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
index fa06cb94ce5..bc094223ff6 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
@@ -7,6 +7,7 @@ base64
basicAuth
batchConfig
bean
+beanFactory
beanio
bearerToken
bindy
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/beanFactory.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/beanFactory.json
new file mode 100644
index 000..c65c44d2cf6
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/beanFactory.json
@@ -0,0 +1,28 @@
+{
+ "model": {
+"kind": "model",
+"name": "beanFactory",
+"title": "Bean Factory",
+"description": "Define custom beans that can be used in your Camel routes
and in general.",
+"deprecated": false,
+"label": "configuration",
+"javaType": "org.apache.camel.model.BeanFactoryDefinition",
+"abstract": false,
+"input": false,
+"output": false
+ },
+ "properties": {
+"name": { "index": 0, "kind": "attribute", "displayName": "Name", "group":
"common", "required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
name of the bean (bean id)" },
+"type": { "index": 1, "kind": "attribute", "displayName": "Type", "group":
"common", "required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
class name (fully qualified) of the bean" },
+"initMethod": { "index": 2, "kind": "attribute", "displayName": "Init
Method", "group": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The name of the custom initialization method to invoke after
setting bean properties. The method must have no arguments, but may throw any
exception." },
+"destroyMethod": { "index": 3, "kind": "attribute", "displayName":
"Destroy Method", "group": "common", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "The name of the custom destroy method to
invoke on bean shutdown, such as when Camel is shutting down. The method must
have no arguments, but may throw any exception." },
+"f
(camel) branch kamelet-ctr3 deleted (was f8c158299cd)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch kamelet-ctr3 in repository https://gitbox.apache.org/repos/asf/camel.git was f8c158299cd CAMEL-20514: camel-model - Add support for bean constructors for beans in route templates or kamelets The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch kamelet-ctr5 deleted (was acbb1e6f936)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch kamelet-ctr5 in repository https://gitbox.apache.org/repos/asf/camel.git was acbb1e6f936 CAMEL-20514: camel-model - Add support for bean constructors for beans in route templates or kamelets The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch kamelet-ctr4 deleted (was ab0b868bc49)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch kamelet-ctr4 in repository https://gitbox.apache.org/repos/asf/camel.git was ab0b868bc49 CAMEL-20514: camel-model - Add support for bean constructors for beans in route templates or kamelets The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated (291d028752d -> 3f1ee046db9)
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 291d028752d Bump com.google.cloud:libraries-bom from 26.37.0 to
26.38.0 (#14034)
add 3f1ee046db9 Kamelet ctr5 (#14046)
No new revisions were added by this update.
Summary of changes:
.../org/apache/camel/catalog/models-app/beans.json | 2 +-
.../org/apache/camel/catalog/models-app/camel.json | 2 +-
.../org/apache/camel/catalog/models.properties | 2 -
.../apache/camel/catalog/models/routeTemplate.json | 2 +-
.../apache/camel/catalog/models/templateBean.json | 28 ---
.../camel/catalog/models/templatedRoute.json | 2 +-
.../camel/catalog/models/templatedRouteBean.json | 28 ---
.../apache/camel/catalog/schemas/camel-spring.xsd | 173 +++--
.../org/apache/camel/spi/ModelToXMLDumper.java | 2 +-
.../org/apache/camel/spi/ModelToYAMLDumper.java| 2 +-
.../org/apache/camel/impl/DefaultCamelContext.java | 10 +-
.../camel/impl/DefaultDumpRoutesStrategy.java | 26 +--
.../java/org/apache/camel/impl/DefaultModel.java | 16 +-
.../META-INF/org/apache/camel/model/app/beans.json | 2 +-
.../META-INF/org/apache/camel/model/app/camel.json | 2 +-
.../org/apache/camel/model/routeTemplate.json | 2 +-
.../org/apache/camel/model/templateBean.json | 28 ---
.../org/apache/camel/model/templatedRoute.json | 2 +-
.../org/apache/camel/model/templatedRouteBean.json | 28 ---
.../services/org/apache/camel/model.properties | 2 -
.../org/apache/camel/model/app/jaxb.index | 1 -
.../resources/org/apache/camel/model/jaxb.index| 3 +-
.../org/apache/camel/builder/RouteBuilder.java | 12 +-
.../apache/camel/model/BeanFactoryDefinition.java | 81
.../org/apache/camel/model/BeanModelHelper.java| 5 +-
.../main/java/org/apache/camel/model/Model.java| 5 +-
.../camel/model/RouteTemplateBeanDefinition.java | 33
.../camel/model/RouteTemplateDefinition.java | 22 +--
.../camel/model/TemplatedRouteBeanDefinition.java | 33
.../camel/model/TemplatedRouteDefinition.java | 22 +--
.../apache/camel/model/app/BeansDefinition.java| 7 +-
.../camel/model/app/RegistryBeanDefinition.java| 34
.../java/org/apache/camel/xml/in/ModelParser.java | 80
.../java/org/apache/camel/xml/out/ModelWriter.java | 40 +---
.../org/apache/camel/xml/LwModelToXMLDumper.java | 26 ++-
.../org/apache/camel/xml/in/ModelParserTest.java | 14 +-
.../camel/xml/jaxb/JaxbModelToXMLDumper.java | 26 ++-
.../org/apache/camel/yaml/out/ModelWriter.java | 40 +---
.../org/apache/camel/yaml/LwModelToYAMLDumper.java | 31 ++--
.../ROOT/pages/camel-4x-upgrade-guide-4_6.adoc | 6 +
.../xml/blueprint/BlueprintXmlBeansHandler.java| 42 ++---
.../main/xml/spring/SpringXmlBeansHandler.java | 24 +--
.../{RegistryBeanDsl.kt => BeanFactoryDsl.kt} | 8 +-
.../main/kotlin/org/apache/camel/kotlin/RootDsl.kt | 8 +-
.../camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 14 +-
.../camel-yaml-dsl-deserializers/pom.xml | 2 -
.../dsl/yaml/deserializers/ModelDeserializers.java | 204 ++---
.../deserializers/ModelDeserializersResolver.java | 2 +-
.../BeanFactoryDefinitionDeserializer.java | 115
.../dsl/yaml/deserializers/BeansDeserializer.java | 24 +--
.../dsl/yaml/deserializers/CustomResolver.java | 4 -
.../RouteTemplateBeanDefinitionDeserializer.java | 63 ---
.../RouteTemplateDefinitionDeserializer.java | 8 +-
.../TemplatedRouteBeanDefinitionDeserializer.java | 63 ---
.../TemplatedRouteDefinitionDeserializer.java | 7 +-
.../generated/resources/schema/camelYamlDsl.json | 178 +-
.../apache/camel/dsl/yaml/KameletLoaderTest.groovy | 10 +-
57 files changed, 446 insertions(+), 1212 deletions(-)
delete mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateBean.json
delete mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templatedRouteBean.json
delete mode 100644
core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/templateBean.json
delete mode 100644
core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/templatedRouteBean.json
delete mode 100644
core/camel-core-model/src/main/java/org/apache/camel/model/RouteTemplateBeanDefinition.java
delete mode 100644
core/camel-core-model/src/main/java/org/apache/camel/model/TemplatedRouteBeanDefinition.java
delete mode 100644
core/camel-core-model/src/main/java/org/apache/camel/model/app/RegistryBeanDefinition.java
rename
dsl/camel-kotlin-api/src/main/kotlin/org/apache/camel/kotlin/{RegistryBeanDsl.kt
=> BeanFactoryDsl.kt} (88%)
delete mode 100644
dsl/camel-yaml-dsl/came
(camel) 08/09: CAMEL-20514: camel-model - Add support for bean constructors for beans in route templates or kamelets
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch kamelet-ctr5
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f41f3fc3d200f5acc27222ff34b524abbf27dd54
Author: Claus Ibsen
AuthorDate: Fri May 3 08:03:23 2024 +0200
CAMEL-20514: camel-model - Add support for bean constructors for beans in
route templates or kamelets
---
.../main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
index 0b668ff1e8e..49028290c6c 100644
---
a/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
+++
b/dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlRoutesBuilderLoader.java
@@ -366,7 +366,7 @@ public class XmlRoutesBuilderLoader extends
RouteBuilderLoaderSupport {
// register bean in model
Model model =
getCamelContext().getCamelContextExtension().getContextPlugin(Model.class);
-model.addRegistryBean(def);
+model.addCustomBean(def);
}
protected void destroyBean(String name, boolean remove) {
(camel) 03/09: CAMEL-20514: camel-model - Add support for bean constructors for beans in route templates or kamelets
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch kamelet-ctr5
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0c3c70eb45db1ade0fd0e2646ef9c6663b055110
Author: Claus Ibsen
AuthorDate: Fri May 3 07:27:53 2024 +0200
CAMEL-20514: camel-model - Add support for bean constructors for beans in
route templates or kamelets
---
.../META-INF/org/apache/camel/model/app/beans.json | 2 +-
.../META-INF/org/apache/camel/model/app/camel.json | 2 +-
.../org/apache/camel/model/routeTemplate.json | 2 +-
.../org/apache/camel/model/templatedRoute.json | 2 +-
.../resources/org/apache/camel/model/jaxb.index| 1 +
.../apache/camel/model/app/BeansDefinition.java| 2 +-
.../java/org/apache/camel/xml/in/ModelParser.java | 74 ++
.../java/org/apache/camel/xml/out/ModelWriter.java | 22 ++-
.../org/apache/camel/xml/in/ModelParserTest.java | 2 +-
.../camel/xml/jaxb/JaxbModelToXMLDumper.java | 2 +-
.../org/apache/camel/yaml/out/ModelWriter.java | 22 ++-
11 files changed, 52 insertions(+), 81 deletions(-)
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/app/beans.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/app/beans.json
index 6ad9426c225..dd801661b8a 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/app/beans.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/app/beans.json
@@ -13,7 +13,7 @@
},
"properties": {
"component-scan": { "index": 0, "kind": "element", "displayName":
"Component-scan", "group": "common", "required": false, "type": "array",
"javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description":
"Component scanning that can auto-discover Camel route builders from the
classpath." },
-"bean": { "index": 1, "kind": "element", "displayName": "Bean", "group":
"common", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description": "List
of bean" },
+"bean": { "index": 1, "kind": "element", "displayName": "Bean", "group":
"common", "required": false, "type": "array", "javaType":
"java.util.List", "deprecated":
false, "autowired": false, "secret": false, "description": "List of bean" },
"restConfiguration": { "index": 2, "kind": "element", "displayName": "Rest
Configuration", "group": "common", "required": false, "type": "array",
"javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description": "Camel
Rest DSL Configuration" },
"rest": { "index": 3, "kind": "element", "displayName": "Rest", "group":
"common", "required": false, "type": "array", "javaType":
"java.util.List", "deprecated":
false, "autowired": false, "secret": false, "description": "Camel Rest DSL" },
"routeConfiguration": { "index": 4, "kind": "element", "displayName":
"Route Configuration", "group": "common", "required": false, "type": "array",
"javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description": "Camel
route configurations" },
diff --git
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/app/camel.json
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/app/camel.json
index 27ba4be86f7..6e1d82aef40 100644
---
a/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/app/camel.json
+++
b/core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/model/app/camel.json
@@ -13,7 +13,7 @@
},
"properties": {
"component-scan": { "index": 0, "kind": "element", "disp
(camel) 04/09: CAMEL-20514: camel-model - Add support for bean constructors for beans in route templates or kamelets
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch kamelet-ctr5
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d37e3815244b694a60f10734c5bc74c949a669f5
Author: Claus Ibsen
AuthorDate: Fri May 3 07:44:24 2024 +0200
CAMEL-20514: camel-model - Add support for bean constructors for beans in
route templates or kamelets
---
.../org/apache/camel/catalog/models-app/beans.json | 2 +-
.../org/apache/camel/catalog/models-app/camel.json | 2 +-
.../apache/camel/catalog/models/routeTemplate.json | 2 +-
.../camel/catalog/models/templatedRoute.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 13 +-
.../xml/blueprint/BlueprintXmlBeansHandler.java| 40 ++--
.../main/xml/spring/SpringXmlBeansHandler.java | 24 +--
.../{RegistryBeanDsl.kt => BeanFactoryDsl.kt} | 6 +-
.../main/kotlin/org/apache/camel/kotlin/RootDsl.kt | 8 +-
.../camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 12 +-
.../dsl/yaml/deserializers/ModelDeserializers.java | 204 ++---
.../deserializers/ModelDeserializersResolver.java | 2 +-
.../BeanFactoryDefinitionDeserializer.java | 2 +-
.../dsl/yaml/deserializers/BeansDeserializer.java | 22 +--
.../RouteTemplateDefinitionDeserializer.java | 8 +-
.../TemplatedRouteDefinitionDeserializer.java | 8 +-
.../generated/resources/schema/camelYamlDsl.json | 92 +-
17 files changed, 221 insertions(+), 228 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/beans.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/beans.json
index 6ad9426c225..dd801661b8a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/beans.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/beans.json
@@ -13,7 +13,7 @@
},
"properties": {
"component-scan": { "index": 0, "kind": "element", "displayName":
"Component-scan", "group": "common", "required": false, "type": "array",
"javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description":
"Component scanning that can auto-discover Camel route builders from the
classpath." },
-"bean": { "index": 1, "kind": "element", "displayName": "Bean", "group":
"common", "required": false, "type": "array", "javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description": "List
of bean" },
+"bean": { "index": 1, "kind": "element", "displayName": "Bean", "group":
"common", "required": false, "type": "array", "javaType":
"java.util.List", "deprecated":
false, "autowired": false, "secret": false, "description": "List of bean" },
"restConfiguration": { "index": 2, "kind": "element", "displayName": "Rest
Configuration", "group": "common", "required": false, "type": "array",
"javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description": "Camel
Rest DSL Configuration" },
"rest": { "index": 3, "kind": "element", "displayName": "Rest", "group":
"common", "required": false, "type": "array", "javaType":
"java.util.List", "deprecated":
false, "autowired": false, "secret": false, "description": "Camel Rest DSL" },
"routeConfiguration": { "index": 4, "kind": "element", "displayName":
"Route Configuration", "group": "common", "required": false, "type": "array",
"javaType":
"java.util.List",
"deprecated": false, "autowired": false, "secret": false, "description": "Camel
route configurations" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/camel.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models-app/camel.json
index 27ba4be
(camel) 02/09: CAMEL-20514: camel-model - Add support for bean constructors for beans in route templates or kamelets
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch kamelet-ctr5
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3861d43c20ab415eaa8ad6d70ce0209d4268e480
Author: Claus Ibsen
AuthorDate: Fri May 3 07:15:16 2024 +0200
CAMEL-20514: camel-model - Add support for bean constructors for beans in
route templates or kamelets
---
.../org/apache/camel/spi/ModelToXMLDumper.java | 2 +-
.../org/apache/camel/spi/ModelToYAMLDumper.java| 2 +-
.../org/apache/camel/model/app/jaxb.index | 1 -
.../camel/model/app/RegistryBeanDefinition.java| 35 --
.../org/apache/camel/xml/LwModelToXMLDumper.java | 12
.../camel/xml/jaxb/JaxbModelToXMLDumper.java | 12
.../org/apache/camel/yaml/LwModelToYAMLDumper.java | 12
7 files changed, 20 insertions(+), 56 deletions(-)
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/ModelToXMLDumper.java
b/core/camel-api/src/main/java/org/apache/camel/spi/ModelToXMLDumper.java
index 47ee821349a..4c41645a4d1 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/ModelToXMLDumper.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/ModelToXMLDumper.java
@@ -59,7 +59,7 @@ public interface ModelToXMLDumper {
* Dumps the beans as XML
*
* @param context the CamelContext
- * @param beans list of beans (RegistryBeanDefinition)
+ * @param beans list of beans (BeanFactoryDefinition)
* @return the output in XML (is formatted)
* @throws Exception is throw if error marshalling to XML
*/
diff --git
a/core/camel-api/src/main/java/org/apache/camel/spi/ModelToYAMLDumper.java
b/core/camel-api/src/main/java/org/apache/camel/spi/ModelToYAMLDumper.java
index e4139b1a089..d6bda7e689b 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/ModelToYAMLDumper.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/ModelToYAMLDumper.java
@@ -61,7 +61,7 @@ public interface ModelToYAMLDumper {
* Dumps the beans as YAML
*
* @param context the CamelContext
- * @param beans list of beans (RegistryBeanDefinition)
+ * @param beans list of beans (BeanFactoryDefinition)
* @return the output in YAML (is formatted)
* @throws Exception is throw if error marshalling to YAML
*/
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/app/jaxb.index
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/app/jaxb.index
index d5d2a547b9d..4a07d359a8c 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/app/jaxb.index
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/app/jaxb.index
@@ -6,4 +6,3 @@ BeanPropertiesDefinition
BeanPropertyDefinition
BeansDefinition
ComponentScanDefinition
-RegistryBeanDefinition
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/app/RegistryBeanDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/app/RegistryBeanDefinition.java
deleted file mode 100644
index c3c3bc4fea0..000
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/app/RegistryBeanDefinition.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.model.app;
-
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlType;
-
-import org.apache.camel.model.BeanFactoryDefinition;
-import org.apache.camel.spi.Metadata;
-
-/**
- * Define custom beans that can be used in your Camel routes and in general.
- */
-@Metadata(label = "configuration")
-@XmlType
-@XmlAccessorType(XmlAccessType.FIELD)
-@Deprecated
-public class RegistryBeanDefinition extends BeanFactoryDefinition {
-
-}
diff --git
a/core/camel-xml-io/src/main/java/org/apache/camel/xml/LwModelToXMLDumper.java
b/core/camel-xml-io/src/main/java/org/apache/camel/xml/LwModelToXMLDumper.java
index 2a3afe62958..0e8279d5b1c 100644
---
a/core/camel-xml-io/src/
