(camel) branch eh created (now e32c96ed9b8)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch eh in repository https://gitbox.apache.org/repos/asf/camel.git at e32c96ed9b8 CAMEL-20932: camel-core - Route templates parameters should be supported in error handler configuration This branch includes the following new commits: new e32c96ed9b8 CAMEL-20932: camel-core - Route templates parameters should be supported in error handler configuration The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) 01/01: CAMEL-20932: camel-core - Route templates parameters should be supported in error handler configuration
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch eh
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e32c96ed9b8756dd769656ad1f3cd60e654f69da
Author: Claus Ibsen
AuthorDate: Tue Jul 2 07:45:18 2024 +0200
CAMEL-20932: camel-core - Route templates parameters should be supported in
error handler configuration
---
.../org/apache/camel/reifier/AbstractReifier.java | 4 ++
.../errorhandler/DeadLetterChannelReifier.java | 8 +--
.../errorhandler/DefaultErrorHandlerReifier.java | 4 ++
.../errorhandler/ErrorHandlerRefReifier.java | 3 +-
.../reifier/errorhandler/ErrorHandlerReifier.java | 28 +++
.../camel/builder/RouteTemplateRedeliveryTest.java | 58 ++
.../OnExceptionRedeliveryPlaceholderTest.java | 58 ++
7 files changed, 148 insertions(+), 15 deletions(-)
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractReifier.java
index 21d87d2e026..f0c9da843ba 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/AbstractReifier.java
@@ -144,6 +144,8 @@ public abstract class AbstractReifier implements
BeanRepository {
}
public T mandatoryLookup(String name, Class type) {
+name = parseString(name);
+
Object obj = lookupByNameAndType(name, type);
if (obj == null) {
throw new NoSuchBeanException(name, type.getName());
@@ -156,6 +158,7 @@ public abstract class AbstractReifier implements
BeanRepository {
if (name == null) {
return null;
}
+name = parseString(name);
if (EndpointHelper.isReferenceParameter(name)) {
return EndpointHelper.resolveReferenceParameter(camelContext,
name, Object.class, false);
@@ -168,6 +171,7 @@ public abstract class AbstractReifier implements
BeanRepository {
if (name == null) {
return null;
}
+name = parseString(name);
if (EndpointHelper.isReferenceParameter(name)) {
return EndpointHelper.resolveReferenceParameter(camelContext,
name, type, false);
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
index 31becf55359..cda1f50a235 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/errorhandler/DeadLetterChannelReifier.java
@@ -45,19 +45,19 @@ public class DeadLetterChannelReifier extends
ErrorHandlerReifier extends
Processor onRedelivery = getProcessor(def.getOnRedelivery(),
def.getOnRedeliveryRef());
Processor onExceptionOccurred =
getProcessor(def.getOnExceptionOccurred(), def.getOnExceptionOccurredRef());
return new ExceptionPolicy(
-def.getId(), CamelContextHelper.getRouteId(def),
+parseString(def.getId()), CamelContextHelper.getRouteId(def),
parseBoolean(def.getUseOriginalMessage(), false),
parseBoolean(def.getUseOriginalBody(), false),
ObjectHelper.isNotEmpty(def.getOutputs()), handled,
continued, retryWhile, onRedelivery,
-onExceptionOccurred, def.getRedeliveryPolicyRef(),
+onExceptionOccurred, parseString(def.getRedeliveryPolicyRef()),
createRedeliveryPolicyOptions(def.getRedeliveryPolicyType()),
def.getExceptions());
}
-public static RedeliveryPolicy
createRedeliveryPolicy(RedeliveryPolicyDefinition definition, CamelContext
context) {
+@Deprecated
+public RedeliveryPolicy createRedeliveryPolicy(RedeliveryPolicyDefinition
definition, CamelContext context) {
Map options =
createRedeliveryPolicyOptions(definition);
return createRedeliveryPolicy(options, context, null);
}
-private static RedeliveryPolicy createRedeliveryPolicy(
+@Deprecated
+private RedeliveryPolicy createRedeliveryPolicy(
Map definition, CamelContext context,
RedeliveryPolicy parentPolicy) {
RedeliveryPolicy answer;
if (parentPolicy != null) {
@@ -240,7 +242,7 @@ public abstract class ErrorHandlerReifier extends
return answer;
}
-private static Map
createRedeliveryPolicyOptions(RedeliveryPolicyDefinition definition) {
+private Map
createRedeliveryPolicyOptions(RedeliveryPolicyDefinition definition) {
if (definition == null) {
return null;
}
@@ -272,16 +274,16 @@ public abstract class ErrorHandlerReifier extends
return
(camel) branch main updated: CAMEL-20905: camel-djl - Support more model applications for zoo models
This is an automated email from the ASF dual-hosted git repository.
tsato 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 942f3c4ec4e CAMEL-20905: camel-djl - Support more model applications
for zoo models
942f3c4ec4e is described below
commit 942f3c4ec4e16a18529d41256ef57fb414d819ac
Author: Tadayoshi Sato
AuthorDate: Tue Jul 2 12:53:07 2024 +0900
CAMEL-20905: camel-djl - Support more model applications for zoo models
Added support for:
* `cv/semantic_segmentation`
* `cv/instance_segmentation`
* `cv/pose_estimation`
* `cv/action_recognition`
* `cv/word_recognition`
* `cv/image_generation`
* `cv/image_enhancement`
* `nlp/fill_mask`
* `nlp/question_answer`
* `nlp/text_classification`
* `nlp/sentiment_analysis`
* `nlp/token_classification`
* `nlp/word_embedding`
* `nlp/text_generation`
* `nlp/machine_translation`
* `nlp/multiple_choice`
* `nlp/text_embedding`
* `tabular/linear_regression`
* `tabular/softmax_regression`
* `audio`
* `timeseries/forecasting`
---
components/camel-ai/camel-djl/pom.xml | 8 ++
.../apache/camel/component/djl/DJLConstants.java | 27 +
.../apache/camel/component/djl/DJLProducer.java| 12 +--
.../djl/model/ModelPredictorProducer.java | 109 -
.../djl/model/ZooObjectDetectionPredictor.java | 98 --
.../audio/ZooAudioClassificationPredictor.java}| 22 ++---
.../AbstractCvZooPredictor.java} | 64 +---
.../CustomImageClassificationPredictor.java| 4 +-
.../{ => cv}/CustomObjectDetectionPredictor.java | 3 +-
.../model/cv/ZooActionRecognitionPredictor.java| 41
.../model/cv/ZooImageClassificationPredictor.java | 42
.../djl/model/cv/ZooImageEnhancementPredictor.java | 41
.../djl/model/cv/ZooImageGenerationPredictor.java | 70 +
.../model/cv/ZooInstanceSegmentationPredictor.java | 42
.../djl/model/cv/ZooObjectDetectionPredictor.java | 41
.../djl/model/cv/ZooPoseEstimationPredictor.java | 40
.../model/cv/ZooSemanticSegmentationPredictor.java | 42
.../djl/model/cv/ZooWordRecognitionPredictor.java | 41
.../djl/model/nlp/AbstractNlpZooPredictor.java | 50 ++
.../djl/model/nlp/ZooFillMaskPredictor.java| 39
.../model/nlp/ZooMachineTranslationPredictor.java | 40
.../djl/model/nlp/ZooMultipleChoicePredictor.java | 40
.../djl/model/nlp/ZooQuestionAnswerPredictor.java | 78 +++
.../model/nlp/ZooSentimentAnalysisPredictor.java | 41
.../model/nlp/ZooTextClassificationPredictor.java | 41
.../djl/model/nlp/ZooTextEmbeddingPredictor.java | 41
.../djl/model/nlp/ZooTextGenerationPredictor.java | 40
.../model/nlp/ZooTokenClassificationPredictor.java | 41
.../djl/model/nlp/ZooWordEmbeddingPredictor.java | 50 ++
.../tabular/ZooLinearRegressionPredictor.java} | 22 ++---
.../tabular/ZooSoftmaxRegressionPredictor.java}| 22 ++---
.../model/timeseries/ZooForecastingPredictor.java | 70 +
...ctionTest.java => CvActionRecognitionTest.java} | 12 +--
...st.java => CvImageClassificationLocalTest.java} | 4 +-
...ionTest.java => CvImageClassificationTest.java} | 5 +-
...tectionTest.java => CvImageGenerationTest.java} | 27 +++--
...onTest.java => CvInstanceSegmentationTest.java} | 8 +-
...tectionTest.java => CvObjectDetectionTest.java} | 5 +-
...etectionTest.java => CvPoseEstimationTest.java} | 28 --
...onTest.java => CvSemanticSegmentationTest.java} | 8 +-
...icationTest.java => NlpQuestionAnswerTest.java} | 19 ++--
...tionTest.java => NlpSentimentAnalysisTest.java} | 20 ++--
...etectionTest.java => NlpWordEmbeddingTest.java} | 19 ++--
.../component/djl/TimeSeriesForecastingTest.java | 75 ++
.../djl/model/ModelPredictorProducerTest.java | 94 ++
.../resources/data/action/action_discus_throw.png | Bin 0 -> 150725 bytes
.../src/test/resources/data/pose/pose_soccer.png | Bin 0 -> 1598682 bytes
47 files changed, 1423 insertions(+), 263 deletions(-)
diff --git a/components/camel-ai/camel-djl/pom.xml
b/components/camel-ai/camel-djl/pom.xml
index 973f1b4eab2..41737c0396d 100644
--- a/components/camel-ai/camel-djl/pom.xml
+++ b/components/camel-ai/camel-djl/pom.xml
@@ -54,10 +54,18 @@
api
${djl-version}
+
+ai.djl.timeseries
+timeseries
+${djl-version}
+
+
+
ai.djl
model-zoo
${djl-version}
+test
diff --git
(camel-quarkus) branch quarkus-main updated (331e29ed16 -> 0162014e44)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 331e29ed16 Upgrade Quarkus to 3.13.0.CR1 add e342e4e4c6 Fix Gradle dev mode execution for gRPC extension new 0162014e44 Upgrade Quarkus to 3.13.0.CR1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (331e29ed16) \ N -- N -- N refs/heads/quarkus-main (0162014e44) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 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. Summary of changes: extensions/grpc/deployment/pom.xml | 10 -- extensions/grpc/runtime/pom.xml| 4 2 files changed, 14 deletions(-)
(camel-quarkus) 01/01: Upgrade Quarkus to 3.13.0.CR1
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 0162014e4466311481418c264cf79b5609c29237
Author: James Netherton
AuthorDate: Mon Jun 24 11:24:38 2024 +0100
Upgrade Quarkus to 3.13.0.CR1
---
docs/antora.yml | 2 +-
.../camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java | 8
pom.xml | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index ba98deb2fa..bf5513271d 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -36,7 +36,7 @@ asciidoc:
graalvm-docs-version: jdk21 # replace ${graalvm-docs.version}
mapstruct-version: 1.5.5.Final # replace ${mapstruct.version}
min-maven-version: 3.8.2 # replace ${min-maven-version}
-target-maven-version: 3.9.7 # replace ${target-maven-version}
+target-maven-version: 3.9.8 # replace ${target-maven-version}
# Attributes used in xrefs to other Antora components
cq-camel-components: next@components
diff --git
a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java
b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java
index 3e700f5f1d..dcbeada712 100644
---
a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java
+++
b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/KafkaKeycloakTestResource.java
@@ -125,21 +125,21 @@ public class KafkaKeycloakTestResource implements
QuarkusTestResourceLifecycleMa
}
private String getPlainSaslJaasConfig(String keycloakInternalUrl, String
keycloakServerUrl) {
-return "'org.apache.kafka.common.security.plain.PlainLoginModule
required " +
+return "org.apache.kafka.common.security.plain.PlainLoginModule
required " +
"oauth.jwks.endpoint.uri=\"" + keycloakInternalUrl +
"/realms/kafka-authz/protocol/openid-connect/certs\" " +
"oauth.valid.issuer.uri=\"" + keycloakServerUrl +
"/realms/kafka-authz\" " +
"oauth.token.endpoint.uri=\"" + keycloakInternalUrl +
"/realms/kafka-authz/protocol/openid-connect/token\" " +
"oauth.client.id=\"kafka\" " +
"oauth.client.secret=\"kafka-secret\" " +
-"unsecuredLoginStringClaim_sub=\"admin\";'";
+"unsecuredLoginStringClaim_sub=\"admin\";";
}
private String getOauthSaslJaasConfig(String keycloakInternalUrl, String
keycloakServerUrl) {
-return
"'org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule required
" +
+return
"org.apache.kafka.common.security.oauthbearer.OAuthBearerLoginModule required "
+
"oauth.jwks.endpoint.uri=\"" + keycloakInternalUrl +
"/realms/kafka-authz/protocol/openid-connect/certs\" " +
"oauth.valid.issuer.uri=\"" + keycloakServerUrl +
"/realms/kafka-authz\" " +
"oauth.token.endpoint.uri=\"" + keycloakInternalUrl +
"/realms/kafka-authz/protocol/openid-connect/token\" " +
"oauth.client.id=\"kafka\" " +
-"oauth.client.secret=\"kafka-secret\";'";
+"oauth.client.secret=\"kafka-secret\";";
}
}
diff --git a/pom.xml b/pom.xml
index e6aa7807ce..8ffe045d6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
2.2.3
2.4.0
2.0.2
-3.12.0
+999-SNAPSHOT
4.0.0
2.6.1
@@ -267,7 +267,7 @@
3.8.2
-3.9.7
+3.9.8
[${min-maven-version},)
(camel-kamelets) branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git The following commit(s) were added to refs/heads/main by this push: new 82de39a6 Updated CHANGELOG.md 82de39a6 is described below commit 82de39a6d809f0d9c6c813818b58a4138072d098 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Jul 2 03:08:29 2024 + Updated CHANGELOG.md --- CHANGELOG.md | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b288ec49..37cd74b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,15 @@ ## [Unreleased](https://github.com/apache/camel-kamelets/tree/HEAD) -[Full Changelog](https://github.com/apache/camel-kamelets/compare/v4.6.0...HEAD) +[Full Changelog](https://github.com/apache/camel-kamelets/compare/v4.4.3...HEAD) + +**Closed issues:** + +- Upgrade to Camel 4.4.3 [\#2091](https://github.com/apache/camel-kamelets/issues/2091) + +## [v4.4.3](https://github.com/apache/camel-kamelets/tree/v4.4.3) (2024-07-01) + +[Full Changelog](https://github.com/apache/camel-kamelets/compare/v4.6.0...v4.4.3) **Closed issues:**
(camel-k) branch release-2.2.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.2.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.2.x by this push: new a6d17c9a7 chore: changelog automatic update a6d17c9a7 is described below commit a6d17c9a70d2983342e8e04ebee137c0cb2e295a Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Jul 2 01:05:12 2024 + chore: changelog automatic update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03e4f0190..206c24201 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- `make uninstall` should consider lease [\#5671](https://github.com/apache/camel-k/issues/5671) - Jolokia trait failure [\#5666](https://github.com/apache/camel-k/issues/5666) - Add TimeoutSeconds to knative-service trait [\#5652](https://github.com/apache/camel-k/issues/5652) - Explain how to clean registry [\#5645](https://github.com/apache/camel-k/issues/5645)
(camel-k) branch release-2.3.x updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.3.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.3.x by this push: new 06b5a9fbe chore: nightly automatic updates 06b5a9fbe is described below commit 06b5a9fbeba878e440a73dd3bdcfdd8251cbc7f0 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Jul 2 00:25:01 2024 + chore: nightly automatic updates --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03e4f0190..206c24201 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- `make uninstall` should consider lease [\#5671](https://github.com/apache/camel-k/issues/5671) - Jolokia trait failure [\#5666](https://github.com/apache/camel-k/issues/5666) - Add TimeoutSeconds to knative-service trait [\#5652](https://github.com/apache/camel-k/issues/5652) - Explain how to clean registry [\#5645](https://github.com/apache/camel-k/issues/5645)
(camel-k) branch main updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 59aca7bce chore: nightly automatic updates 59aca7bce is described below commit 59aca7bce81235473a490778dd21341659aa19e7 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Jul 1 23:43:10 2024 + chore: nightly automatic updates --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d27d856a4..7d0d550ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- `make uninstall` should consider lease [\#5671](https://github.com/apache/camel-k/issues/5671) - Jolokia trait failure [\#5666](https://github.com/apache/camel-k/issues/5666) - Add TimeoutSeconds to knative-service trait [\#5652](https://github.com/apache/camel-k/issues/5652) - Explain how to clean registry [\#5645](https://github.com/apache/camel-k/issues/5645) @@ -41,6 +42,7 @@ **Merged pull requests:** +- fix\(ci\): delete deployment before other resources [\#5679](https://github.com/apache/camel-k/pull/5679) ([squakez](https://github.com/squakez)) - chore\(deps\): bump github.com/container-tools/spectrum from 0.6.46 to 0.6.47 [\#5676](https://github.com/apache/camel-k/pull/5676) ([dependabot[bot]](https://github.com/apps/dependabot)) - feat: default resources for Operator and Integration Pods [\#5675](https://github.com/apache/camel-k/pull/5675) ([squakez](https://github.com/squakez)) - chore\(deps\): bump github.com/prometheus/common from 0.54.0 to 0.55.0 [\#5673](https://github.com/apache/camel-k/pull/5673) ([dependabot[bot]](https://github.com/apps/dependabot))
(camel) branch main updated: CAMEL-20885 - deprecate Kotlin
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 773a421291f CAMEL-20885 - deprecate Kotlin 773a421291f is described below commit 773a421291fb72383294949ff69099a1264e9d32 Author: Claus Ibsen AuthorDate: Mon Jul 1 21:50:53 2024 +0200 CAMEL-20885 - deprecate Kotlin --- .../resources/org/apache/camel/catalog/others/kotlin-api.json | 4 ++-- .../resources/org/apache/camel/catalog/others/kotlin-dsl.json | 4 ++-- dsl/camel-kotlin-api/pom.xml | 4 ++-- .../resources/META-INF/services/org/apache/camel/other.properties | 4 ++-- dsl/camel-kotlin-api/src/generated/resources/kotlin-api.json | 4 ++-- dsl/camel-kotlin-api/src/main/docs/kotlin-api.adoc | 7 --- dsl/camel-kotlin-dsl/pom.xml | 4 ++-- .../resources/META-INF/services/org/apache/camel/other.properties | 4 ++-- dsl/camel-kotlin-dsl/src/generated/resources/kotlin-dsl.json | 4 ++-- dsl/camel-kotlin-dsl/src/main/docs/kotlin-dsl.adoc | 7 --- 10 files changed, 24 insertions(+), 22 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-api.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-api.json index 1200b6be992..40f4a09e525 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-api.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-api.json @@ -3,8 +3,8 @@ "kind": "other", "name": "kotlin-api", "title": "Kotlin API", -"description": "Camel Kotlin API (Deprecated)", -"deprecated": false, +"description": "Camel Kotlin API (deprecated)", +"deprecated": true, "firstVersion": "4.4.0", "label": "dsl", "supportLevel": "Experimental", diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-dsl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-dsl.json index 4d77f25a936..7485c69f931 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-dsl.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kotlin-dsl.json @@ -3,8 +3,8 @@ "kind": "other", "name": "kotlin-dsl", "title": "Kotlin DSL", -"description": "Camel DSL with Kotlin (Deprecated)", -"deprecated": false, +"description": "Camel DSL with Kotlin (deprecated)", +"deprecated": true, "firstVersion": "3.9.0", "label": "dsl", "supportLevel": "Experimental", diff --git a/dsl/camel-kotlin-api/pom.xml b/dsl/camel-kotlin-api/pom.xml index d79a7aa406f..5f34cdd8edd 100644 --- a/dsl/camel-kotlin-api/pom.xml +++ b/dsl/camel-kotlin-api/pom.xml @@ -29,8 +29,8 @@ camel-kotlin-api jar -Camel :: Kotlin API (Deprecated) -Camel Kotlin API (Deprecated) +Camel :: Kotlin API (deprecated) +Camel Kotlin API (deprecated) 4.4.0 diff --git a/dsl/camel-kotlin-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/dsl/camel-kotlin-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties index ac35b8c05c6..2bcc2b79cba 100644 --- a/dsl/camel-kotlin-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ b/dsl/camel-kotlin-api/src/generated/resources/META-INF/services/org/apache/camel/other.properties @@ -3,5 +3,5 @@ name=kotlin-api groupId=org.apache.camel artifactId=camel-kotlin-api version=4.7.0-SNAPSHOT -projectName=Camel :: Kotlin API (Deprecated) -projectDescription=Camel Kotlin API (Deprecated) +projectName=Camel :: Kotlin API (deprecated) +projectDescription=Camel Kotlin API (deprecated) diff --git a/dsl/camel-kotlin-api/src/generated/resources/kotlin-api.json b/dsl/camel-kotlin-api/src/generated/resources/kotlin-api.json index 1200b6be992..40f4a09e525 100644 --- a/dsl/camel-kotlin-api/src/generated/resources/kotlin-api.json +++ b/dsl/camel-kotlin-api/src/generated/resources/kotlin-api.json @@ -3,8 +3,8 @@ "kind": "other", "name": "kotlin-api", "title": "Kotlin API", -"description": "Camel Kotlin API (Deprecated)", -"deprecated": false, +"description": "Camel Kotlin API (deprecated)", +"deprecated": true, "firstVersion": "4.4.0", "label": "dsl", "supportLevel": "Experimental", diff --git a/dsl/camel-kotlin-api/src/main/docs/kotlin-api.adoc b/dsl/camel-kotlin-api/src/main/docs/kotlin-api.adoc index 13c22a0bcf2..065914dfb76 100644 --- a/dsl/camel-kotlin-api/src/main/docs/kotlin-api.adoc +++ b/dsl/camel-kotlin-api/src/main/docs/kotlin-api.adoc @@ -1,10 +1,11 @@ -= Kotlin API
(camel-spring-boot) branch main updated: CAMEL-20885 - deprecate Kotlin
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 3e4d4127928 CAMEL-20885 - deprecate Kotlin 3e4d4127928 is described below commit 3e4d4127928756bda42f78d822045ef4e2e4f29d Author: Claus Ibsen AuthorDate: Mon Jul 1 21:52:42 2024 +0200 CAMEL-20885 - deprecate Kotlin --- .../org/apache/camel/springboot/catalog/others/kotlin-api.json| 4 ++-- .../org/apache/camel/springboot/catalog/others/kotlin-dsl.json| 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/kotlin-api.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/kotlin-api.json index db6651e6e32..090922383d8 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/kotlin-api.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/kotlin-api.json @@ -3,8 +3,8 @@ "kind": "other", "name": "kotlin-api", "title": "Kotlin API", -"description": "Camel Kotlin API (Deprecated)", -"deprecated": false, +"description": "Camel Kotlin API (deprecated)", +"deprecated": true, "firstVersion": "4.4.0", "label": "dsl", "supportLevel": "Experimental", diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/kotlin-dsl.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/kotlin-dsl.json index b5c23522e99..cead3cc5f12 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/kotlin-dsl.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/kotlin-dsl.json @@ -3,8 +3,8 @@ "kind": "other", "name": "kotlin-dsl", "title": "Kotlin DSL", -"description": "Camel DSL with Kotlin (Deprecated)", -"deprecated": false, +"description": "Camel DSL with Kotlin (deprecated)", +"deprecated": true, "firstVersion": "3.9.0", "label": "dsl", "supportLevel": "Experimental",
(camel) branch beans deleted (was f806d68782e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch beans in repository https://gitbox.apache.org/repos/asf/camel.git was f806d68782e Regen The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: CAMEL-20930: camel-core - Bean DSL dev console (#14692)
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 d20428ae23a CAMEL-20930: camel-core - Bean DSL dev console (#14692)
d20428ae23a is described below
commit d20428ae23a0dd363a4c4ae3678410dde8253598
Author: Claus Ibsen
AuthorDate: Mon Jul 1 21:42:01 2024 +0200
CAMEL-20930: camel-core - Bean DSL dev console (#14692)
CAMEL-20930: camel-core - Bean DSL dev console
Regen
---
.../apache/camel/catalog/dev-consoles.properties | 1 +
.../camel/catalog/dev-consoles/bean-model.json | 15 ++
components/camel-spring-xml/pom.xml| 2 +-
.../apache/camel/impl/console/BeanDevConsole.java | 132 ++-
.../camel/impl/console/VariablesDevConsole.java| 4 +-
.../org/apache/camel/dev-console/bean-model.json | 15 ++
.../org/apache/camel/dev-console/bean-model| 2 +
.../org/apache/camel/dev-consoles.properties | 7 +
.../camel/model/console/BeanModelDevConsole.java | 217 +++
.../java/org/apache/camel/util/ObjectHelper.java | 2 +-
.../camel/cli/connector/LocalCliConnector.java | 34 ++-
.../dsl/jbang/core/commands/CamelJBangMain.java| 1 +
.../jbang/core/commands/action/CamelBeanDump.java | 241 +
.../jbang/core/commands/process/ListVariable.java | 6 +-
14 files changed, 661 insertions(+), 18 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dev-consoles.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dev-consoles.properties
index 68e2314bd3f..ecd2d10d672 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dev-consoles.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dev-consoles.properties
@@ -2,6 +2,7 @@ aws-secrets
aws2-s3
azure-secrets
bean
+bean-model
blocked
circuit-breaker
consumer
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dev-consoles/bean-model.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dev-consoles/bean-model.json
new file mode 100644
index 000..76e6cae37bf
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dev-consoles/bean-model.json
@@ -0,0 +1,15 @@
+{
+ "console": {
+"kind": "console",
+"group": "camel",
+"name": "bean-model",
+"title": "Bean Model",
+"description": "Displays beans from the DSL model",
+"deprecated": false,
+"javaType": "org.apache.camel.model.console.BeanModelDevConsole",
+"groupId": "org.apache.camel",
+"artifactId": "camel-core-model",
+"version": "4.7.0-SNAPSHOT"
+ }
+}
+
diff --git a/components/camel-spring-xml/pom.xml
b/components/camel-spring-xml/pom.xml
index 0ae78b19c16..bd5ceaabad1 100644
--- a/components/camel-spring-xml/pom.xml
+++ b/components/camel-spring-xml/pom.xml
@@ -323,7 +323,7 @@
sources
true
**/*
-**/*Configurer.java
+
**/*Configurer.java,**/console/*
target/sources/camel-core-model
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java
index ad74cb0c332..1c0ec76b95f 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java
@@ -17,11 +17,17 @@
package org.apache.camel.impl.console;
import java.util.Map;
+import java.util.TreeMap;
import java.util.stream.Stream;
+import org.apache.camel.spi.BeanIntrospection;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.PatternHelper;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.console.AbstractDevConsole;
+import org.apache.camel.util.json.JsonArray;
import org.apache.camel.util.json.JsonObject;
+import org.apache.camel.util.json.Jsoner;
@DevConsole(name = "bean", description = "Displays Java beans from the
registry")
public class BeanDevConsole extends AbstractDevConsole {
@@ -30,15 +36,66 @@ public class BeanDevConsole extends AbstractDevConsole {
super("camel", "bean", "Bean", "Displays Java beans from the
registry");
}
+/**
+ * Filters the beans matching by name
+ */
+public static final String FILTER = "filter";
+
+/**
+ * Whether to include bean properties
+ */
+public static final String PROPERTIES =
(camel) branch dependabot/maven/org.wiremock-wiremock-3.8.0 deleted (was 725478c8387)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch dependabot/maven/org.wiremock-wiremock-3.8.0 in repository https://gitbox.apache.org/repos/asf/camel.git was 725478c8387 chore(deps): Bump org.wiremock:wiremock from 3.7.0 to 3.8.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: chore(deps): Bump org.wiremock:wiremock from 3.7.0 to 3.8.0 (#14688)
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 b65d075bc83 chore(deps): Bump org.wiremock:wiremock from 3.7.0 to 3.8.0 (#14688) b65d075bc83 is described below commit b65d075bc83496fe925414e0ec240864e7f9e59d Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 1 21:33:14 2024 +0200 chore(deps): Bump org.wiremock:wiremock from 3.7.0 to 3.8.0 (#14688) Bumps [org.wiremock:wiremock](https://github.com/wiremock/wiremock) from 3.7.0 to 3.8.0. - [Release notes](https://github.com/wiremock/wiremock/releases) - [Commits](https://github.com/wiremock/wiremock/compare/3.7.0...3.8.0) --- updated-dependencies: - dependency-name: org.wiremock:wiremock dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index d785871c4af..e687c7f9c06 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -479,7 +479,7 @@ 5.0.0 4.10.0 2.2.2.Final -3.7.0 +3.8.0 4.4.1 7.0.0 4.25
(camel) branch beans updated (2851a6e07c0 -> f806d68782e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch beans in repository https://gitbox.apache.org/repos/asf/camel.git from 2851a6e07c0 CAMEL-20930: camel-core - Bean DSL dev console add f806d68782e Regen No new revisions were added by this update. Summary of changes: docs/components/modules/dataformats/pages/pgp-dataformat.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch beans updated (338a5fe4510 -> 2851a6e07c0)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch beans
in repository https://gitbox.apache.org/repos/asf/camel.git
from 338a5fe4510 CAMEL-20930: camel-core - Bean DSL dev console
add 30aecfe8737 CAMEL-20930: camel-core - Bean DSL dev console
add 770d43cf444 CAMEL-20930: camel-core - Bean DSL dev console
add b2974a4302c CAMEL-20930: camel-core - Bean DSL dev console
add 10bccfcf96c CAMEL-20930: camel-core - Bean DSL dev console
add 2851a6e07c0 CAMEL-20930: camel-core - Bean DSL dev console
No new revisions were added by this update.
Summary of changes:
.../apache/camel/catalog/dev-consoles.properties | 1 +
.../camel/catalog/dev-consoles}/bean-model.json| 2 +-
components/camel-spring-xml/pom.xml| 2 +-
.../apache/camel/impl/console/BeanDevConsole.java | 157 ++
.../org/apache/camel/dev-console/bean-model.json | 2 +-
.../org/apache/camel/dev-console/bean-model| 2 +-
.../model/{ => console}/BeanModelDevConsole.java | 92 ++--
.../modules/dataformats/pages/pgp-dataformat.adoc | 2 +-
.../camel/cli/connector/LocalCliConnector.java | 30 ++-
.../dsl/jbang/core/commands/CamelJBangMain.java| 1 +
.../jbang/core/commands/action/CamelBeanDump.java | 241 +
11 files changed, 455 insertions(+), 77 deletions(-)
copy
{core/camel-core-model/src/generated/resources/META-INF/org/apache/camel/dev-console
=>
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/dev-consoles}/bean-model.json
(81%)
rename core/camel-core-model/src/main/java/org/apache/camel/model/{ =>
console}/BeanModelDevConsole.java (69%)
create mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelBeanDump.java
(camel-k) branch main updated (233b93608 -> 330b9ef12)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from 233b93608 chore: nightly automatic updates add 330b9ef12 fix(ci): delete deployment before other resources No new revisions were added by this update. Summary of changes: docs/modules/ROOT/pages/installation/uninstalling.adoc | 7 +-- script/Makefile| 6 -- 2 files changed, 9 insertions(+), 4 deletions(-)
(camel-quarkus) branch 3.8.x updated: Fix Gradle dev mode execution for gRPC extension
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 3.8.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/3.8.x by this push: new 9074e47d49 Fix Gradle dev mode execution for gRPC extension 9074e47d49 is described below commit 9074e47d4989847f20b0ff0167e268013fe23c00 Author: James Netherton AuthorDate: Mon Jul 1 08:28:19 2024 +0100 Fix Gradle dev mode execution for gRPC extension Fixes #6239 --- extensions/grpc/deployment/pom.xml | 10 -- extensions/grpc/runtime/pom.xml| 4 2 files changed, 14 deletions(-) diff --git a/extensions/grpc/deployment/pom.xml b/extensions/grpc/deployment/pom.xml index 80b6e602fa..4f4f225bc0 100644 --- a/extensions/grpc/deployment/pom.xml +++ b/extensions/grpc/deployment/pom.xml @@ -34,10 +34,6 @@ io.quarkus quarkus-grpc-common - -io.quarkus -quarkus-vertx - io.vertx vertx-grpc @@ -55,12 +51,6 @@ io.quarkus quarkus-grpc-common-deployment - - -io.quarkus -quarkus-vertx-deployment - - io.quarkus diff --git a/extensions/grpc/runtime/pom.xml b/extensions/grpc/runtime/pom.xml index 5ef58759f1..526071f2e9 100644 --- a/extensions/grpc/runtime/pom.xml +++ b/extensions/grpc/runtime/pom.xml @@ -39,10 +39,6 @@ io.quarkus quarkus-grpc-common - -io.quarkus -quarkus-vertx - io.vertx vertx-grpc
(camel-quarkus) branch camel-main updated: fixes in type convertors (because of CAMEL-19897)x
This is an automated email from the ASF dual-hosted git repository.
jiriondrusek pushed a commit to branch camel-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/camel-main by this push:
new 0a09d982a7 fixes in type convertors (because of CAMEL-19897)x
0a09d982a7 is described below
commit 0a09d982a76dc39f69fd42cd0985713c18ebe605
Author: JiriOndrusek
AuthorDate: Mon Jul 1 10:16:23 2024 +0200
fixes in type convertors (because of CAMEL-19897)x
---
.../ROOT/pages/reference/extensions/core.adoc | 6 ++
.../quarkus/core/deployment/CamelProcessor.java| 4 +-
.../org/apache/camel/quarkus/core/CamelConfig.java | 16 ++
.../apache/camel/quarkus/core/CamelRecorder.java | 4 +-
.../camel/quarkus/core/FastTypeConverter.java | 4 +-
.../core/converter/it/ConverterResource.java | 11 ++--
.../quarkus/core/converter/it/ConverterTest.java | 35 ---
.../core/converter/it/ConverterTestBase.java | 6 +-
.../converter/it/ConverterWithStatisticsIT.java| 23
...rTest.java => ConverterWithStatisticsTest.java} | 67 --
pom.xml| 2 +-
.../quarkus/k/tooling/maven/GenerateRestXML.java | 24 ++--
12 files changed, 88 insertions(+), 114 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/core.adoc
b/docs/modules/ROOT/pages/reference/extensions/core.adoc
index f3a3328c80..672ec106df 100644
--- a/docs/modules/ROOT/pages/reference/extensions/core.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/core.adoc
@@ -395,6 +395,12 @@ Filter for tracing messages.
| `string`
|
+|icon:lock[title=Fixed at build time]
[[quarkus.camel.type-converter.statistics-enabled]]`link:#quarkus.camel.type-converter.statistics-enabled[quarkus.camel.type-converter.statistics-enabled]`
+
+Build time configuration options for enable/disable type converter statistics.
+| `boolean`
+| `true`
+
|icon:lock[title=Fixed at build time]
[[quarkus.camel.main.shutdown.timeout]]`link:#quarkus.camel.main.shutdown.timeout[quarkus.camel.main.shutdown.timeout]`
A timeout (with millisecond precision) to wait for `CamelMain++#++stop()` to
finish
diff --git
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
index cec76d1c94..e8184cf160 100644
---
a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
+++
b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
@@ -249,6 +249,7 @@ class CamelProcessor {
@BuildStep
CamelTypeConverterRegistryBuildItem typeConverterRegistry(
CamelRecorder recorder,
+CamelConfig camelConfig,
ApplicationArchivesBuildItem applicationArchives,
List additionalLoaders,
CombinedIndexBuildItem combinedIndex,
@@ -256,7 +257,8 @@ class CamelProcessor {
IndexView index = combinedIndex.getIndex();
-RuntimeValue typeConverterRegistry =
recorder.createTypeConverterRegistry();
+RuntimeValue typeConverterRegistry = recorder
+
.createTypeConverterRegistry(camelConfig.typeConverter.statisticsEnabled);
//
// This should be simplified by searching for classes implementing
TypeConverterLoader but that
diff --git
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
index fb1b2a8f30..796283117a 100644
---
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
+++
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelConfig.java
@@ -91,6 +91,12 @@ public class CamelConfig {
@ConfigItem
public TraceConfig trace;
+/**
+ * Build time configuration options for the Camel type converter.
+ */
+@ConfigItem
+public TypeConverterConfig typeConverter;
+
@ConfigGroup
public static class BootstrapConfig {
/**
@@ -504,4 +510,14 @@ public class CamelConfig {
@ConfigItem
public Optional traceFilter;
}
+
+@ConfigGroup
+public static class TypeConverterConfig {
+
+/**
+ * Build time configuration options for enable/disable type converter
statistics.
+ */
+@ConfigItem(defaultValue = "true")
+public boolean statisticsEnabled;
+}
}
diff --git
a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/CamelRecorder.java
index 95b77d2c6a..3dc39f6953 100644
---
(camel) 17/19: (chores) camel-test-infra-pulsar: upgrade container to 3.3.0
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 5d519d2206043694ebcaffd70e013183911a111e Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:54:29 2024 +0200 (chores) camel-test-infra-pulsar: upgrade container to 3.3.0 --- .../org/apache/camel/test/infra/pulsar/services/container.properties| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-pulsar/src/test/resources/org/apache/camel/test/infra/pulsar/services/container.properties b/test-infra/camel-test-infra-pulsar/src/test/resources/org/apache/camel/test/infra/pulsar/services/container.properties index 76d1d4af05b..f126b143ff3 100644 --- a/test-infra/camel-test-infra-pulsar/src/test/resources/org/apache/camel/test/infra/pulsar/services/container.properties +++ b/test-infra/camel-test-infra-pulsar/src/test/resources/org/apache/camel/test/infra/pulsar/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -pulsar.container=apachepulsar/pulsar:3.2.3 \ No newline at end of file +pulsar.container=apachepulsar/pulsar:3.3.0 \ No newline at end of file
(camel) 05/19: (chores) camel-test-infra-kafka: upgrade Strimzi container to 3.7.0
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 1724eb1f928d0d2f439d84c93292c148095090e0 Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:30:08 2024 +0200 (chores) camel-test-infra-kafka: upgrade Strimzi container to 3.7.0 --- .../org/apache/camel/test/infra/kafka/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-kafka/src/test/resources/org/apache/camel/test/infra/kafka/services/container.properties b/test-infra/camel-test-infra-kafka/src/test/resources/org/apache/camel/test/infra/kafka/services/container.properties index f428a3ca2c2..aeac1025c92 100644 --- a/test-infra/camel-test-infra-kafka/src/test/resources/org/apache/camel/test/infra/kafka/services/container.properties +++ b/test-infra/camel-test-infra-kafka/src/test/resources/org/apache/camel/test/infra/kafka/services/container.properties @@ -17,4 +17,4 @@ kafka3.container=confluentinc/cp-kafka:7.4.5 kafka2.container=confluentinc/cp-kafka:5.5.12 redpanda.container.image=docker.redpanda.com/vectorized/redpanda:v23.3.18 -strimzi.container.image=quay.io/strimzi/kafka:latest-kafka-3.5.1 +strimzi.container.image=quay.io/strimzi/kafka:latest-kafka-3.7.0
(camel) 07/19: (chores) camel-test-infra-infinispan: upgrade container to 15.0.5.Final
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 354cc86b9fc3723f16e661b414e01119fbe273de Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:32:45 2024 +0200 (chores) camel-test-infra-infinispan: upgrade container to 15.0.5.Final --- .../apache/camel/test/infra/infinispan/services/container.properties| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-infinispan/src/test/resources/org/apache/camel/test/infra/infinispan/services/container.properties b/test-infra/camel-test-infra-infinispan/src/test/resources/org/apache/camel/test/infra/infinispan/services/container.properties index 8ce335601d8..e7290635eff 100644 --- a/test-infra/camel-test-infra-infinispan/src/test/resources/org/apache/camel/test/infra/infinispan/services/container.properties +++ b/test-infra/camel-test-infra-infinispan/src/test/resources/org/apache/camel/test/infra/infinispan/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -infinispan.container=quay.io/infinispan/server:15.0.4.Final +infinispan.container=quay.io/infinispan/server:15.0.5.Final
(camel) 09/19: (chores) camel-test-infra-qdrant: upgrade container to 1.9.7
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 526faf6da407243cc525bda39da5726ecfb2e0db Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:38:07 2024 +0200 (chores) camel-test-infra-qdrant: upgrade container to 1.9.7 --- .../org/apache/camel/test/infra/qdrant/services/container.properties| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-qdrant/src/test/resources/org/apache/camel/test/infra/qdrant/services/container.properties b/test-infra/camel-test-infra-qdrant/src/test/resources/org/apache/camel/test/infra/qdrant/services/container.properties index 4e99e7c76cc..219cd646cf3 100644 --- a/test-infra/camel-test-infra-qdrant/src/test/resources/org/apache/camel/test/infra/qdrant/services/container.properties +++ b/test-infra/camel-test-infra-qdrant/src/test/resources/org/apache/camel/test/infra/qdrant/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -qdrant.container=qdrant/qdrant:v1.7.4-unprivileged \ No newline at end of file +qdrant.container=qdrant/qdrant:v1.9.7-unprivileged \ No newline at end of file
(camel) 08/19: (chores) camel-test-infra-cassandra: upgrade container to 4.1.5
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 3744120d6546aca09228ea90b6abc2100b229bba Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:33:46 2024 +0200 (chores) camel-test-infra-cassandra: upgrade container to 4.1.5 --- .../org/apache/camel/test/infra/cassandra/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-cassandra/src/test/resources/org/apache/camel/test/infra/cassandra/services/container.properties b/test-infra/camel-test-infra-cassandra/src/test/resources/org/apache/camel/test/infra/cassandra/services/container.properties index 0a70afbe0d9..19778acff6d 100644 --- a/test-infra/camel-test-infra-cassandra/src/test/resources/org/apache/camel/test/infra/cassandra/services/container.properties +++ b/test-infra/camel-test-infra-cassandra/src/test/resources/org/apache/camel/test/infra/cassandra/services/container.properties @@ -15,4 +15,4 @@ ## limitations under the License. ## --- ## tested against 2.1.2, 2.2.0 & 2.3.1 -cassandra.container=cassandra:4.1.3 \ No newline at end of file +cassandra.container=cassandra:4.1.5 \ No newline at end of file
(camel) 10/19: (chores) camel-test-infra-aws-v2: upgrade container to 3.5.0
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 7fb7d34399f5e3f4dbc18aeab31559c29510cda0 Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:41:58 2024 +0200 (chores) camel-test-infra-aws-v2: upgrade container to 3.5.0 --- .../org/apache/camel/test/infra/aws2/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-aws-v2/src/test/resources/org/apache/camel/test/infra/aws2/services/container.properties b/test-infra/camel-test-infra-aws-v2/src/test/resources/org/apache/camel/test/infra/aws2/services/container.properties index 2f619927cc0..e14fb95d806 100644 --- a/test-infra/camel-test-infra-aws-v2/src/test/resources/org/apache/camel/test/infra/aws2/services/container.properties +++ b/test-infra/camel-test-infra-aws-v2/src/test/resources/org/apache/camel/test/infra/aws2/services/container.properties @@ -15,4 +15,4 @@ ## limitations under the License. ## --- -aws.container=localstack/localstack:3.4.0 +aws.container=localstack/localstack:3.5.0
(camel) 12/19: (chores) camel-test-infra-nats: upgrade container to 2.10.17
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 3515c7a4bef0660c5787c21f86127219eb01ca61 Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:45:28 2024 +0200 (chores) camel-test-infra-nats: upgrade container to 2.10.17 --- .../org/apache/camel/test/infra/nats/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-nats/src/test/resources/org/apache/camel/test/infra/nats/services/container.properties b/test-infra/camel-test-infra-nats/src/test/resources/org/apache/camel/test/infra/nats/services/container.properties index a79c3b62a1f..42c3198bb7f 100644 --- a/test-infra/camel-test-infra-nats/src/test/resources/org/apache/camel/test/infra/nats/services/container.properties +++ b/test-infra/camel-test-infra-nats/src/test/resources/org/apache/camel/test/infra/nats/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -nats.container=nats:2.10.16 +nats.container=nats:2.10.17
(camel) 15/19: (chores) camel-test-infra-elasticsearch: upgrade container to 8.11.4
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit fbd24183f88631d3d83dcd7fc2bff140fb64b490 Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:52:41 2024 +0200 (chores) camel-test-infra-elasticsearch: upgrade container to 8.11.4 --- .../apache/camel/test/infra/elasticsearch/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-elasticsearch/src/test/resources/org/apache/camel/test/infra/elasticsearch/services/container.properties b/test-infra/camel-test-infra-elasticsearch/src/test/resources/org/apache/camel/test/infra/elasticsearch/services/container.properties index 6cd6f498e85..23e2f9db8c6 100644 --- a/test-infra/camel-test-infra-elasticsearch/src/test/resources/org/apache/camel/test/infra/elasticsearch/services/container.properties +++ b/test-infra/camel-test-infra-elasticsearch/src/test/resources/org/apache/camel/test/infra/elasticsearch/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -elasticsearch.container=docker.elastic.co/elasticsearch/elasticsearch:8.11.1 \ No newline at end of file +elasticsearch.container=docker.elastic.co/elasticsearch/elasticsearch:8.11.4 \ No newline at end of file
(camel) 19/19: (chores) camel-test-infra-azure: upgrade container to 3.31.0
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 9b37abb2a09ddb4dae336cb3b1eaf3cad1408bcf Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:56:53 2024 +0200 (chores) camel-test-infra-azure: upgrade container to 3.31.0 --- .../apache/camel/test/infra/azure/common/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-azure-common/src/test/resources/org/apache/camel/test/infra/azure/common/services/container.properties b/test-infra/camel-test-infra-azure-common/src/test/resources/org/apache/camel/test/infra/azure/common/services/container.properties index a7d61c3f6e9..bfd0dc1a5e6 100644 --- a/test-infra/camel-test-infra-azure-common/src/test/resources/org/apache/camel/test/infra/azure/common/services/container.properties +++ b/test-infra/camel-test-infra-azure-common/src/test/resources/org/apache/camel/test/infra/azure/common/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -azure.container=mcr.microsoft.com/azure-storage/azurite:3.30.0 +azure.container=mcr.microsoft.com/azure-storage/azurite:3.31.0
(camel) 16/19: (chores) camel-test-infra-ollama: upgrade container to 0.1.48
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit c808eacc5f9e3b08da8751c2ea64797427e2180d Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:53:41 2024 +0200 (chores) camel-test-infra-ollama: upgrade container to 0.1.48 --- .../org/apache/camel/test/infra/ollama/services/container.properties| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-ollama/src/test/resources/org/apache/camel/test/infra/ollama/services/container.properties b/test-infra/camel-test-infra-ollama/src/test/resources/org/apache/camel/test/infra/ollama/services/container.properties index 1a8f0f63bcb..ac27e25d488 100644 --- a/test-infra/camel-test-infra-ollama/src/test/resources/org/apache/camel/test/infra/ollama/services/container.properties +++ b/test-infra/camel-test-infra-ollama/src/test/resources/org/apache/camel/test/infra/ollama/services/container.properties @@ -15,5 +15,5 @@ ## limitations under the License. ## --- ollama.port=11434 -ollama.container=ollama/ollama:0.1.27 +ollama.container=ollama/ollama:0.1.48 ollama.model=orca-mini \ No newline at end of file
(camel) 06/19: (chores) camel-test-infra-postgres: upgrade container to 13.15
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit b4b056d1cda1227314c40bbe781d0dbdc771efee Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:31:28 2024 +0200 (chores) camel-test-infra-postgres: upgrade container to 13.15 --- .../org/apache/camel/test/infra/postgres/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-postgres/src/test/resources/org/apache/camel/test/infra/postgres/services/container.properties b/test-infra/camel-test-infra-postgres/src/test/resources/org/apache/camel/test/infra/postgres/services/container.properties index c03b84d98b6..e059958ba9e 100644 --- a/test-infra/camel-test-infra-postgres/src/test/resources/org/apache/camel/test/infra/postgres/services/container.properties +++ b/test-infra/camel-test-infra-postgres/src/test/resources/org/apache/camel/test/infra/postgres/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -postgres.container=postgres:13.13 \ No newline at end of file +postgres.container=postgres:13.15 \ No newline at end of file
(camel) 13/19: (chores) camel-test-infra-milvus: upgrade container to 2.4.5
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 12950976ead97c3868a4e2ee21741724e70d7786 Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:46:59 2024 +0200 (chores) camel-test-infra-milvus: upgrade container to 2.4.5 --- .../org/apache/camel/test/infra/milvus/services/container.properties| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-milvus/src/test/resources/org/apache/camel/test/infra/milvus/services/container.properties b/test-infra/camel-test-infra-milvus/src/test/resources/org/apache/camel/test/infra/milvus/services/container.properties index 33e9761266a..761be677ba7 100644 --- a/test-infra/camel-test-infra-milvus/src/test/resources/org/apache/camel/test/infra/milvus/services/container.properties +++ b/test-infra/camel-test-infra-milvus/src/test/resources/org/apache/camel/test/infra/milvus/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -milvus.container=milvusdb/milvus:v2.4.0 +milvus.container=milvusdb/milvus:v2.4.5
(camel) 01/19: (chores) camel-test-infra-mongodb: upgrade container to MongoDB 7.0.12
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 7bc1f24855eb9cb67f085871e3bdb7964230f51d Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:19:35 2024 +0200 (chores) camel-test-infra-mongodb: upgrade container to MongoDB 7.0.12 --- .../org/apache/camel/test/infra/mongodb/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties b/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties index 237841dc45b..c888a16d58d 100644 --- a/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties +++ b/test-infra/camel-test-infra-mongodb/src/test/resources/org/apache/camel/test/infra/mongodb/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -mongodb.container=mongo:7.0.11-jammy \ No newline at end of file +mongodb.container=mongo:7.0.12-jammy \ No newline at end of file
(camel) 03/19: (chores) camel-test-infra-kafka: upgrade Kafka3 container to 7.4.5
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 170941d6a415a844b0ecd5d210e2fa693b0a16e0 Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:25:34 2024 +0200 (chores) camel-test-infra-kafka: upgrade Kafka3 container to 7.4.5 --- .../org/apache/camel/test/infra/kafka/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-kafka/src/test/resources/org/apache/camel/test/infra/kafka/services/container.properties b/test-infra/camel-test-infra-kafka/src/test/resources/org/apache/camel/test/infra/kafka/services/container.properties index dba01260994..3b473dde9c1 100644 --- a/test-infra/camel-test-infra-kafka/src/test/resources/org/apache/camel/test/infra/kafka/services/container.properties +++ b/test-infra/camel-test-infra-kafka/src/test/resources/org/apache/camel/test/infra/kafka/services/container.properties @@ -14,7 +14,7 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -kafka3.container=confluentinc/cp-kafka:7.4.0 +kafka3.container=confluentinc/cp-kafka:7.4.5 kafka2.container=confluentinc/cp-kafka:5.5.12 redpanda.container.image=docker.redpanda.com/vectorized/redpanda:v23.1.1 strimzi.container.image=quay.io/strimzi/kafka:latest-kafka-3.5.1 \ No newline at end of file
(camel) 18/19: (chores) camel-test-infra-hashicorp-vault: upgrade container to 1.17.1
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 29b3071c510d1ec4ed56e8e4abac71448963fdab Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:58:32 2024 +0200 (chores) camel-test-infra-hashicorp-vault: upgrade container to 1.17.1 --- .../camel/test/infra/hashicorp/vault/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-hashicorp-vault/src/test/resources/org/apache/camel/test/infra/hashicorp/vault/services/container.properties b/test-infra/camel-test-infra-hashicorp-vault/src/test/resources/org/apache/camel/test/infra/hashicorp/vault/services/container.properties index 1354c467edd..e11dce14e5d 100644 --- a/test-infra/camel-test-infra-hashicorp-vault/src/test/resources/org/apache/camel/test/infra/hashicorp/vault/services/container.properties +++ b/test-infra/camel-test-infra-hashicorp-vault/src/test/resources/org/apache/camel/test/infra/hashicorp/vault/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -hashicorp.vault.container=hashicorp/vault:1.16.2 +hashicorp.vault.container=hashicorp/vault:1.17.1
(camel) 11/19: (chores) camel-test-infra-consul: upgrade container to 1.19 and adjusted to use the official image
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 07b08ca2efa9a91a891bf14382956fffb9ae48b1 Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:43:53 2024 +0200 (chores) camel-test-infra-consul: upgrade container to 1.19 and adjusted to use the official image --- .../org/apache/camel/test/infra/consul/services/container.properties| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-consul/src/test/resources/org/apache/camel/test/infra/consul/services/container.properties b/test-infra/camel-test-infra-consul/src/test/resources/org/apache/camel/test/infra/consul/services/container.properties index e79431f3d74..5c1b4bf5343 100644 --- a/test-infra/camel-test-infra-consul/src/test/resources/org/apache/camel/test/infra/consul/services/container.properties +++ b/test-infra/camel-test-infra-consul/src/test/resources/org/apache/camel/test/infra/consul/services/container.properties @@ -15,4 +15,4 @@ ## limitations under the License. ## --- ## tested against 2.1.2, 2.2.0 & 2.3.1 -consul.container=consul:1.15.4 \ No newline at end of file +consul.container=hashicorp/consul:1.19 \ No newline at end of file
(camel) 14/19: (chores) camel-test-infra-rabbitmq: upgrade container to 3.13
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit cd33e941f384b523fe6730a3108b1c6fe545494a Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:48:13 2024 +0200 (chores) camel-test-infra-rabbitmq: upgrade container to 3.13 --- .../org/apache/camel/test/infra/rabbitmq/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-rabbitmq/src/test/resources/org/apache/camel/test/infra/rabbitmq/services/container.properties b/test-infra/camel-test-infra-rabbitmq/src/test/resources/org/apache/camel/test/infra/rabbitmq/services/container.properties index 31fa794bb21..35b454f686c 100644 --- a/test-infra/camel-test-infra-rabbitmq/src/test/resources/org/apache/camel/test/infra/rabbitmq/services/container.properties +++ b/test-infra/camel-test-infra-rabbitmq/src/test/resources/org/apache/camel/test/infra/rabbitmq/services/container.properties @@ -14,4 +14,4 @@ ## See the License for the specific language governing permissions and ## limitations under the License. ## --- -rabbitmq.container=rabbitmq:3.12-management \ No newline at end of file +rabbitmq.container=rabbitmq:3.13-management \ No newline at end of file
(camel) 02/19: (chores) camel-test-infra-couchbase: upgrade container to 7.2.5
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit f26b34317953889381c8bd000740f36c3862c875 Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:24:14 2024 +0200 (chores) camel-test-infra-couchbase: upgrade container to 7.2.5 --- .../org/apache/camel/test/infra/couchbase/services/container.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-infra/camel-test-infra-couchbase/src/test/resources/org/apache/camel/test/infra/couchbase/services/container.properties b/test-infra/camel-test-infra-couchbase/src/test/resources/org/apache/camel/test/infra/couchbase/services/container.properties index 4b410d92875..26d9cb91af2 100644 --- a/test-infra/camel-test-infra-couchbase/src/test/resources/org/apache/camel/test/infra/couchbase/services/container.properties +++ b/test-infra/camel-test-infra-couchbase/src/test/resources/org/apache/camel/test/infra/couchbase/services/container.properties @@ -15,4 +15,4 @@ ## limitations under the License. ## --- ## tested against 2.1.2, 2.2.0 & 2.3.1 -couchbase.container=couchbase/server:7.2.3 \ No newline at end of file +couchbase.container=couchbase/server:7.2.5 \ No newline at end of file
(camel) 04/19: (chores) camel-test-infra-kafka: upgrade Redpanda container to 23.3.18
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit eda0b0c4f3f21d48937f27683d91d4f27abf3559 Author: Otavio Rodolfo Piske AuthorDate: Sun Jun 30 08:29:15 2024 +0200 (chores) camel-test-infra-kafka: upgrade Redpanda container to 23.3.18 --- .../org/apache/camel/test/infra/kafka/services/container.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-infra/camel-test-infra-kafka/src/test/resources/org/apache/camel/test/infra/kafka/services/container.properties b/test-infra/camel-test-infra-kafka/src/test/resources/org/apache/camel/test/infra/kafka/services/container.properties index 3b473dde9c1..f428a3ca2c2 100644 --- a/test-infra/camel-test-infra-kafka/src/test/resources/org/apache/camel/test/infra/kafka/services/container.properties +++ b/test-infra/camel-test-infra-kafka/src/test/resources/org/apache/camel/test/infra/kafka/services/container.properties @@ -16,5 +16,5 @@ ## --- kafka3.container=confluentinc/cp-kafka:7.4.5 kafka2.container=confluentinc/cp-kafka:5.5.12 -redpanda.container.image=docker.redpanda.com/vectorized/redpanda:v23.1.1 -strimzi.container.image=quay.io/strimzi/kafka:latest-kafka-3.5.1 \ No newline at end of file +redpanda.container.image=docker.redpanda.com/vectorized/redpanda:v23.3.18 +strimzi.container.image=quay.io/strimzi/kafka:latest-kafka-3.5.1
(camel) branch main updated (2e1e369be82 -> 9b37abb2a09)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 2e1e369be82 chore(deps-dev): Bump eslint-plugin-promise from 6.2.0 to 6.4.0 in /docs new 7bc1f24855e (chores) camel-test-infra-mongodb: upgrade container to MongoDB 7.0.12 new f26b3431795 (chores) camel-test-infra-couchbase: upgrade container to 7.2.5 new 170941d6a41 (chores) camel-test-infra-kafka: upgrade Kafka3 container to 7.4.5 new eda0b0c4f3f (chores) camel-test-infra-kafka: upgrade Redpanda container to 23.3.18 new 1724eb1f928 (chores) camel-test-infra-kafka: upgrade Strimzi container to 3.7.0 new b4b056d1cda (chores) camel-test-infra-postgres: upgrade container to 13.15 new 354cc86b9fc (chores) camel-test-infra-infinispan: upgrade container to 15.0.5.Final new 3744120d654 (chores) camel-test-infra-cassandra: upgrade container to 4.1.5 new 526faf6da40 (chores) camel-test-infra-qdrant: upgrade container to 1.9.7 new 7fb7d34399f (chores) camel-test-infra-aws-v2: upgrade container to 3.5.0 new 07b08ca2efa (chores) camel-test-infra-consul: upgrade container to 1.19 and adjusted to use the official image new 3515c7a4bef (chores) camel-test-infra-nats: upgrade container to 2.10.17 new 12950976ead (chores) camel-test-infra-milvus: upgrade container to 2.4.5 new cd33e941f38 (chores) camel-test-infra-rabbitmq: upgrade container to 3.13 new fbd24183f88 (chores) camel-test-infra-elasticsearch: upgrade container to 8.11.4 new c808eacc5f9 (chores) camel-test-infra-ollama: upgrade container to 0.1.48 new 5d519d22060 (chores) camel-test-infra-pulsar: upgrade container to 3.3.0 new 29b3071c510 (chores) camel-test-infra-hashicorp-vault: upgrade container to 1.17.1 new 9b37abb2a09 (chores) camel-test-infra-azure: upgrade container to 3.31.0 The 19 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/camel/test/infra/aws2/services/container.properties | 2 +- .../camel/test/infra/azure/common/services/container.properties | 2 +- .../apache/camel/test/infra/cassandra/services/container.properties | 2 +- .../apache/camel/test/infra/consul/services/container.properties| 2 +- .../apache/camel/test/infra/couchbase/services/container.properties | 2 +- .../camel/test/infra/elasticsearch/services/container.properties| 2 +- .../camel/test/infra/hashicorp/vault/services/container.properties | 2 +- .../camel/test/infra/infinispan/services/container.properties | 2 +- .../org/apache/camel/test/infra/kafka/services/container.properties | 6 +++--- .../apache/camel/test/infra/milvus/services/container.properties| 2 +- .../apache/camel/test/infra/mongodb/services/container.properties | 2 +- .../org/apache/camel/test/infra/nats/services/container.properties | 2 +- .../apache/camel/test/infra/ollama/services/container.properties| 2 +- .../apache/camel/test/infra/postgres/services/container.properties | 2 +- .../apache/camel/test/infra/pulsar/services/container.properties| 2 +- .../apache/camel/test/infra/qdrant/services/container.properties| 2 +- .../apache/camel/test/infra/rabbitmq/services/container.properties | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-)
(camel) branch dependabot/npm_and_yarn/docs/gulp-5.0.0 updated (ceea3f2c121 -> 0d3c3653cc4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/docs/gulp-5.0.0 in repository https://gitbox.apache.org/repos/asf/camel.git discard ceea3f2c121 chore(deps-dev): Bump gulp from 4.0.2 to 5.0.0 in /docs add 44c2167fd36 Refresh camel-smb add 520541a0196 CAMEL-20679 Make buffer size configurable, file creation HashSets out of process add 942dc647681 CAMEL-20790: prevent an NPE under high concurrency add 46e003c436c CAMEL-20840: fixed incomplete/incorrect implementation of resume adapter add 3e2c677d363 CAMEL-20798: EndpointServiceLocation on components to make it possible to know which remote system Camel connects to to assist for monitoring and observability - AWS Eventbridge and EKS (#14535) add e4df09a2053 CAMEL-19659 - reactivate FHIR Integration tests (#14536) add d795d931f11 camel-jbang: docs add 9b8f3c2da02 CAMEL-20877: camel-jbang export shold set jkube/jib versions with values from application.properties. add caa849538a9 camel-jbang: sb gradle add 3ff27a3740f camel-core: polished add 225db9009b4 Fixed test after rest-dsl inline fix add e8265f72c85 CAMEL-20617: rest dev console add c550a0097e9 CAMEL-20878: camel-jbang - get rest add ae2f650ff52 CAMEL-20500: camel-jbang - Move generate commands to its own plugin (#14538) add a6a4ecd5a9c File confirm (#14539) add fce449c5ae2 Regen SBOM from commit a6a4ecd5a9c72878502688a02dff5fb5c3171cc1 (#14540) add 844cf0d4b7b chore(deps): Bump huaweicloud-sdk-version from 3.1.100 to 3.1.101 add 94b7fb109f7 chore(deps): Bump aws-java-sdk2-version from 2.26.1 to 2.26.3 (#14542) add 06f420f2e78 chore(deps): Bump flink-version from 1.19.0 to 1.19.1 (#14544) add 00603f37d18 chore: do not call yarn install for doc on unsupported platforms add 00f9f078ef1 chore(deps): Bump activemq-artemis-version from 2.34.0 to 2.35.0 (#14543) add 0d363348b7e chore(deps): Bump maven-surefire-plugin-version from 3.2.5 to 3.3.0 (#14545) add 2f64ecc07c5 CAMEL-20880 - Move AI related component to camel-ai middle folder - C… (#14546) add 2058e3c2184 Regen add 3fb6c7c6b80 CAMEL-20880 - Move AI related component to camel-ai middle folder - Camel Qdrant add b16a0bc4174 CAMEL-20835: camel-core - Multicast/RecipientList use LRUCache with configurable cacheSize for internal errorHandler cache to avoid OOM. Thanks to Arthur Naseef for reproducer. (#14553) add debcd081f3b CAMEL-20880 - Move AI related component to camel-ai middle folder - M… (#14554) add 85fd35e18a7 chore(deps): Bump maven-version from 3.9.7 to 3.9.8 (#14548) add 13365caedea chore: upgrade Maven used by the wrapper to 3.9.8 (#14550) add 73a3529e75d chore(deps): Bump org.apache.maven.plugins:maven-release-plugin (#14549) add ca88b201f1d chore(deps): Bump org.apache.maven.plugins:maven-surefire-report-plugin (#14552) add 27cfa7bbc9c chore: Do not fetch full Git history on PR jobs add 784613d119c Add an assertion predicate after calling as AssertJ method. add 07c502761c4 CAMEL-20881: Only create DefaultPollingConsumerPollStrategy when needed. (#14558) add 1485b2b691f CAMEL-20880 - Move AI related component to camel-ai middle folder - Pinecone (#14559) add 3705a5a7aca CAMEL-20722 - ensure concurrent processing from multiple kafka partitions (#14556) add b179491952c camel-jbang - Fixed deadline when doing camel version list add 6d55bbd24ba Updated information about Camel COmmercial Offering (#14560) add 632e5ece55a CAMEL-20884 - Replace this call to "replaceAll()" by a call to the "replace()" method. add 1d0a0ce5bd4 CAMEL-20884 - Use already-defined constant 'PARSER_PACKAGE' instead of duplicating its value add 94f8a2f3372 CAMEL-20884: remove unused variable add 89c09456048 CAMEL-20884 - remove unused import add e82b6ee288b CAMEL-20884 - Immediately return this expression instead of assigning it to the temporary variable "parser". add e685d9a8e12 chore(deps): Bump curator-version from 5.6.0 to 5.7.0 add 8e44be33858 CAMEL-20838: avoid unnecessarily overriding the restricted methods add 4fd8467b1e3 CAMEL-20838: do not use overrides when JUnit's annotations suffice (camel-jpa) add 2d41a8727b6 CAMEL-20838: use appropriate methods for setting up/cleaning up resources (camel-jdbc) add 086e4dea2aa CAMEL-20838: avoid usages of restricted methods (camel-http) add 4ab3a53534e CAMEL-20838: do not use overrides when JUnit's annotations suffice (camel-ftp) add 00751d016fe CAMEL-20838: do not use overrides when JUnit's annotations suffice (camel-mongodb) add 7cd4d78ff4e CAMEL-20838: do not use overrides when JUnit's annotations suffice (camel-spring-ws) add f55b836cd17 CAMEL-20838: use appropriate methods for setting up/cleaning up resources (camel-aws-xray) add f2431e1adc3
(camel) branch dependabot/npm_and_yarn/docs/eslint-plugin-promise-6.4.0 deleted (was a2233fe07e7)
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a change to branch dependabot/npm_and_yarn/docs/eslint-plugin-promise-6.4.0 in repository https://gitbox.apache.org/repos/asf/camel.git was a2233fe07e7 chore(deps-dev): Bump eslint-plugin-promise from 6.2.0 to 6.4.0 in /docs The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: chore(deps-dev): Bump eslint-plugin-promise from 6.2.0 to 6.4.0 in /docs
This is an automated email from the ASF dual-hosted git repository.
zregvart 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 2e1e369be82 chore(deps-dev): Bump eslint-plugin-promise from 6.2.0 to
6.4.0 in /docs
2e1e369be82 is described below
commit 2e1e369be82b2268d0009bc88d650d66168e4ea0
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Jul 1 06:16:31 2024 +
chore(deps-dev): Bump eslint-plugin-promise from 6.2.0 to 6.4.0 in /docs
Bumps
[eslint-plugin-promise](https://github.com/eslint-community/eslint-plugin-promise)
from 6.2.0 to 6.4.0.
- [Release
notes](https://github.com/eslint-community/eslint-plugin-promise/releases)
-
[Changelog](https://github.com/eslint-community/eslint-plugin-promise/blob/main/CHANGELOG.md)
-
[Commits](https://github.com/eslint-community/eslint-plugin-promise/compare/v6.2.0...v6.4.0)
---
updated-dependencies:
- dependency-name: eslint-plugin-promise
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot]
---
docs/.pnp.cjs | 18 +-
docs/package.json | 2 +-
docs/yarn.lock| 10 +-
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/docs/.pnp.cjs b/docs/.pnp.cjs
index c6e8d6cd76a..309b7055c5c 100644
--- a/docs/.pnp.cjs
+++ b/docs/.pnp.cjs
@@ -39,7 +39,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["eslint-plugin-import",
"virtual:2c610f76f644a633eeb9dfdbedcfce0166801ee59e3837f66b2054b454dac8d45ae1806a247a932c013c07d243b2c1e84fbe9998428676d783c2454982c011e5#npm:2.29.1"],\
["eslint-plugin-n",
"virtual:2c610f76f644a633eeb9dfdbedcfce0166801ee59e3837f66b2054b454dac8d45ae1806a247a932c013c07d243b2c1e84fbe9998428676d783c2454982c011e5#npm:15.3.0"],\
["eslint-plugin-node",
"virtual:2c610f76f644a633eeb9dfdbedcfce0166801ee59e3837f66b2054b454dac8d45ae1806a247a932c013c07d243b2c1e84fbe9998428676d783c2454982c011e5#npm:11.1.0"],\
-["eslint-plugin-promise",
"virtual:2c610f76f644a633eeb9dfdbedcfce0166801ee59e3837f66b2054b454dac8d45ae1806a247a932c013c07d243b2c1e84fbe9998428676d783c2454982c011e5#npm:6.2.0"],\
+["eslint-plugin-promise",
"virtual:2c610f76f644a633eeb9dfdbedcfce0166801ee59e3837f66b2054b454dac8d45ae1806a247a932c013c07d243b2c1e84fbe9998428676d783c2454982c011e5#npm:6.4.0"],\
["gulp", "npm:4.0.2"],\
["gulp-cli", "npm:3.0.0"],\
["gulp-inject", "npm:5.0.5"],\
@@ -73,7 +73,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["eslint-plugin-import",
"virtual:2c610f76f644a633eeb9dfdbedcfce0166801ee59e3837f66b2054b454dac8d45ae1806a247a932c013c07d243b2c1e84fbe9998428676d783c2454982c011e5#npm:2.29.1"],\
["eslint-plugin-n",
"virtual:2c610f76f644a633eeb9dfdbedcfce0166801ee59e3837f66b2054b454dac8d45ae1806a247a932c013c07d243b2c1e84fbe9998428676d783c2454982c011e5#npm:15.3.0"],\
["eslint-plugin-node",
"virtual:2c610f76f644a633eeb9dfdbedcfce0166801ee59e3837f66b2054b454dac8d45ae1806a247a932c013c07d243b2c1e84fbe9998428676d783c2454982c011e5#npm:11.1.0"],\
-["eslint-plugin-promise",
"virtual:2c610f76f644a633eeb9dfdbedcfce0166801ee59e3837f66b2054b454dac8d45ae1806a247a932c013c07d243b2c1e84fbe9998428676d783c2454982c011e5#npm:6.2.0"],\
+["eslint-plugin-promise",
"virtual:2c610f76f644a633eeb9dfdbedcfce0166801ee59e3837f66b2054b454dac8d45ae1806a247a932c013c07d243b2c1e84fbe9998428676d783c2454982c011e5#npm:6.4.0"],\
["gulp", "npm:4.0.2"],\
["gulp-cli", "npm:3.0.0"],\
["gulp-inject", "npm:5.0.5"],\
@@ -2389,7 +2389,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["eslint", "npm:8.44.0"],\
["eslint-plugin-import",
"virtual:2c610f76f644a633eeb9dfdbedcfce0166801ee59e3837f66b2054b454dac8d45ae1806a247a932c013c07d243b2c1e84fbe9998428676d783c2454982c011e5#npm:2.29.1"],\
["eslint-plugin-n",
"virtual:2c610f76f644a633eeb9dfdbedcfce0166801ee59e3837f66b2054b454dac8d45ae1806a247a932c013c07d243b2c1e84fbe9998428676d783c2454982c011e5#npm:15.3.0"],\
-["eslint-plugin-promise",
"virtual:2c610f76f644a633eeb9dfdbedcfce0166801ee59e3837f66b2054b454dac8d45ae1806a247a932c013c07d243b2c1e84fbe9998428676d783c2454982c011e5#npm:6.2.0"]\
+["eslint-plugin-promise",
"virtual:2c610f76f644a633eeb9dfdbedcfce0166801ee59e3837f66b2054b454dac8d45ae1806a247a932c013c07d243b2c1e84fbe9998428676d783c2454982c011e5#npm:6.4.0"]\
],\
"packagePeers": [\
"@types/eslint-plugin-import",\
@@ -2603,17 +2603,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
}]\
]],\
["eslint-plugin-promise", [\
-["npm:6.2.0", {\
- "packageLocation":
(camel) branch dependabot/maven/groovy-version-4.0.22 deleted (was 275683aa747)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/groovy-version-4.0.22 in repository https://gitbox.apache.org/repos/asf/camel.git was 275683aa747 chore(deps): Bump groovy-version from 4.0.21 to 4.0.22 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: chore(deps): Bump groovy-version from 4.0.21 to 4.0.22 (#14689)
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 b4e0260a7d3 chore(deps): Bump groovy-version from 4.0.21 to 4.0.22 (#14689) b4e0260a7d3 is described below commit b4e0260a7d3db89a024104673426b5b58bdd6284 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 1 12:26:51 2024 +0200 chore(deps): Bump groovy-version from 4.0.21 to 4.0.22 (#14689) Bumps `groovy-version` from 4.0.21 to 4.0.22. Updates `org.apache.groovy:groovy` from 4.0.21 to 4.0.22 - [Commits](https://github.com/apache/groovy/commits) Updates `org.apache.groovy:groovy-ant` from 4.0.21 to 4.0.22 - [Commits](https://github.com/apache/groovy/commits) Updates `org.apache.groovy:groovy-test-junit5` from 4.0.21 to 4.0.22 - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.apache.groovy:groovy dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.groovy:groovy-ant dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: org.apache.groovy:groovy-test-junit5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0ec52b512e7..d785871c4af 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -195,7 +195,7 @@ 22.1 2.0.1 2.4.4 -4.0.21 +4.0.22 1.64.0 1.23.0
(camel) branch main updated: CAMEL-20931: cleanup duplicated code
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 24d1d50295f CAMEL-20931: cleanup duplicated code
24d1d50295f is described below
commit 24d1d50295f5a02c973d7df9b0f62abdc0289206
Author: Otavio Rodolfo Piske
AuthorDate: Mon Jul 1 10:36:39 2024 +0200
CAMEL-20931: cleanup duplicated code
---
.../camel/language/csimple/CSimpleHelper.java | 26 +---
.../camel/support/builder/ExpressionBuilder.java | 20 +++-
.../java/org/apache/camel/util/StringHelper.java | 28 ++
3 files changed, 37 insertions(+), 37 deletions(-)
diff --git
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
index a540d1eabd6..45dad64ea19 100644
---
a/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
+++
b/core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java
@@ -52,6 +52,8 @@ import org.apache.camel.util.StringHelper;
import org.apache.camel.util.json.Jsoner;
import org.apache.camel.util.xml.pretty.XmlPrettyPrinter;
+import static org.apache.camel.util.StringHelper.between;
+
/**
* A set of helper as static imports for the Camel compiled simple language.
*/
@@ -128,7 +130,7 @@ public final class CSimpleHelper {
List keys = OgnlHelper.splitOgnl(key);
for (String k : keys) {
if (k.startsWith("[") && k.endsWith("]")) {
-k = StringHelper.between(k, "[", "]");
+k = between(k, "[", "]");
}
obj = doObjectAsIndex(context, obj, k);
}
@@ -154,7 +156,7 @@ public final class CSimpleHelper {
List keys = OgnlHelper.splitOgnl(key);
for (String k : keys) {
if (k.startsWith("[") && k.endsWith("]")) {
-k = StringHelper.between(k, "[", "]");
+k = between(k, "[", "]");
}
obj = doObjectAsIndex(exchange.getContext(), obj, k);
}
@@ -180,7 +182,7 @@ public final class CSimpleHelper {
List keys = OgnlHelper.splitOgnl(key);
for (String k : keys) {
if (k.startsWith("[") && k.endsWith("]")) {
-k = StringHelper.between(k, "[", "]");
+k = between(k, "[", "]");
}
obj = doObjectAsIndex(exchange.getContext(), obj, k);
}
@@ -497,23 +499,7 @@ public final class CSimpleHelper {
if (text == null) {
return null;
}
-int len = text.length();
-if (head > 0) {
-if (head <= len) {
-text = text.substring(head);
-} else {
-text = "";
-}
-len = text.length();
-}
-if (tail > 0) {
-if (tail <= len) {
-text = text.substring(0, len - tail);
-} else {
-text = "";
-}
-}
-return text;
+return between(text, head, tail);
}
public static int random(Exchange exchange, Object min, Object max) {
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
index 19a0fdfe4d5..ac696463421 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java
@@ -61,6 +61,8 @@ import org.apache.camel.util.StringHelper;
import org.apache.camel.util.json.Jsoner;
import org.apache.camel.util.xml.pretty.XmlPrettyPrinter;
+import static org.apache.camel.util.StringHelper.between;
+
/**
* A helper class for working with http://camel.apache.org/expression.html;>expressions.
*/
@@ -1854,23 +1856,7 @@ public class ExpressionBuilder {
if (text == null) {
return null;
}
-int len = text.length();
-if (head > 0) {
-if (head <= len) {
-text = text.substring(head);
-} else {
-text = "";
-}
-len = text.length();
-}
-if (tail > 0) {
-if (tail <= len) {
-text = text.substring(0, len - tail);
-} else {
-text = "";
-}
-}
-return text;
+return between(text, head, tail);
}
@Override
diff --git
(camel-quarkus) branch main updated: Fix Gradle dev mode execution for gRPC extension
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new e342e4e4c6 Fix Gradle dev mode execution for gRPC extension e342e4e4c6 is described below commit e342e4e4c67fc0c19a1a380ff3774543713bcc3f Author: James Netherton AuthorDate: Mon Jul 1 08:28:19 2024 +0100 Fix Gradle dev mode execution for gRPC extension Fixes #6239 --- extensions/grpc/deployment/pom.xml | 10 -- extensions/grpc/runtime/pom.xml| 4 2 files changed, 14 deletions(-) diff --git a/extensions/grpc/deployment/pom.xml b/extensions/grpc/deployment/pom.xml index a434151c5d..2083715248 100644 --- a/extensions/grpc/deployment/pom.xml +++ b/extensions/grpc/deployment/pom.xml @@ -34,10 +34,6 @@ io.quarkus quarkus-grpc-common - -io.quarkus -quarkus-vertx - io.vertx vertx-grpc @@ -59,12 +55,6 @@ io.quarkus quarkus-grpc-common-deployment - - -io.quarkus -quarkus-vertx-deployment - - io.quarkus diff --git a/extensions/grpc/runtime/pom.xml b/extensions/grpc/runtime/pom.xml index 868e7ef2ac..2526c016de 100644 --- a/extensions/grpc/runtime/pom.xml +++ b/extensions/grpc/runtime/pom.xml @@ -39,10 +39,6 @@ io.quarkus quarkus-grpc-common - -io.quarkus -quarkus-vertx - io.vertx vertx-grpc
(camel) 01/01: CAMEL-20930: camel-core - Bean DSL dev console
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch beans
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 338a5fe45107add83e711d021eb09d08c8149bea
Author: Claus Ibsen
AuthorDate: Mon Jul 1 10:56:33 2024 +0200
CAMEL-20930: camel-core - Bean DSL dev console
---
.../apache/camel/impl/console/BeanDevConsole.java | 49 ++-
.../camel/impl/console/VariablesDevConsole.java| 4 +-
.../org/apache/camel/dev-console/bean-model.json | 15 ++
.../org/apache/camel/dev-console/bean-model| 2 +
.../org/apache/camel/dev-consoles.properties | 7 +
.../apache/camel/model/BeanModelDevConsole.java| 161 +
.../java/org/apache/camel/util/ObjectHelper.java | 2 +-
.../camel/cli/connector/LocalCliConnector.java | 20 +++
.../jbang/core/commands/process/ListVariable.java | 6 +-
9 files changed, 258 insertions(+), 8 deletions(-)
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java
index ad74cb0c332..f5827b4d39a 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java
@@ -16,12 +16,17 @@
*/
package org.apache.camel.impl.console;
+import java.util.HashMap;
import java.util.Map;
import java.util.stream.Stream;
+import org.apache.camel.spi.BeanIntrospection;
import org.apache.camel.spi.annotations.DevConsole;
+import org.apache.camel.support.PluginHelper;
import org.apache.camel.support.console.AbstractDevConsole;
+import org.apache.camel.util.json.JsonArray;
import org.apache.camel.util.json.JsonObject;
+import org.apache.camel.util.json.Jsoner;
@DevConsole(name = "bean", description = "Displays Java beans from the
registry")
public class BeanDevConsole extends AbstractDevConsole {
@@ -50,11 +55,51 @@ public class BeanDevConsole extends AbstractDevConsole {
JsonObject jo = new JsonObject();
root.put("beans", jo);
+
+BeanIntrospection bi =
PluginHelper.getBeanIntrospection(getCamelContext());
Map beans =
getCamelContext().getRegistry().findByTypeWithName(Object.class);
Stream keys =
beans.keySet().stream().sorted(String::compareToIgnoreCase);
+
keys.forEach(k -> {
-String v = beans.getOrDefault(k, "null").getClass().getName();
-beans.put(k, v);
+Object b = beans.get(k);
+if (b != null) {
+Map values = new HashMap<>();
+try {
+bi.getProperties(b, values, null);
+} catch (Exception e) {
+// ignore
+}
+JsonObject jb = new JsonObject();
+jb.put("name", k);
+jb.put("type", b.getClass().getName());
+jo.put(k, jb);
+
+if (!values.isEmpty()) {
+JsonArray arr = new JsonArray();
+values.forEach((pk, pv) -> {
+Object value = pv;
+String type = pv != null ? pv.getClass().getName() :
null;
+if (type != null) {
+value = Jsoner.trySerialize(pv);
+if (value == null) {
+// cannot serialize so escape
+value = Jsoner.escape(pv.toString());
+} else {
+// okay so use the value as-s
+value = pv;
+}
+}
+JsonObject jp = new JsonObject();
+jp.put("name", pk);
+if (type != null) {
+jp.put("type", type);
+}
+jp.put("value", value);
+arr.add(jp);
+});
+jb.put("properties", arr);
+}
+}
});
return root;
diff --git
a/core/camel-console/src/main/java/org/apache/camel/impl/console/VariablesDevConsole.java
b/core/camel-console/src/main/java/org/apache/camel/impl/console/VariablesDevConsole.java
index 95260395237..bb36068f931 100644
---
a/core/camel-console/src/main/java/org/apache/camel/impl/console/VariablesDevConsole.java
+++
b/core/camel-console/src/main/java/org/apache/camel/impl/console/VariablesDevConsole.java
@@ -76,10 +76,10 @@ public class VariablesDevConsole extends AbstractDevConsole
{
String t = v != null ? v.getClass().getName() : null;
JsonObject e = new JsonObject();
e.put("key", k);
-e.put("value", v);
if (t != null) {
-e.put("className",
(camel) branch beans created (now 338a5fe4510)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch beans in repository https://gitbox.apache.org/repos/asf/camel.git at 338a5fe4510 CAMEL-20930: camel-core - Bean DSL dev console This branch includes the following new commits: new 338a5fe4510 CAMEL-20930: camel-core - Bean DSL dev console The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) branch main updated: CAMEL-20900: Add --integration-profile run command option on Camel K JBang plugin
This is an automated email from the ASF dual-hosted git repository.
cdeppisch 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 f902895626d CAMEL-20900: Add --integration-profile run command option
on Camel K JBang plugin
f902895626d is described below
commit f902895626d3f9b92b11332f9efc7f94f6ab1d71
Author: Christoph Deppisch
AuthorDate: Mon Jul 1 09:35:09 2024 +0200
CAMEL-20900: Add --integration-profile run command option on Camel K JBang
plugin
---
.../dsl/jbang/core/commands/k/IntegrationRun.java | 15 ++
.../dsl/jbang/core/commands/k/KubeCommand.java | 3 ++
.../jbang/core/commands/k/IntegrationRunTest.java | 55 ++
3 files changed, 73 insertions(+)
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-k/src/main/java/org/apache/camel/dsl/jbang/core/commands/k/IntegrationRun.java
b/dsl/camel-jbang/camel-jbang-plugin-k/src/main/java/org/apache/camel/dsl/jbang/core/commands/k/IntegrationRun.java
index e9cb06b6e86..4be01d53fd9 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-k/src/main/java/org/apache/camel/dsl/jbang/core/commands/k/IntegrationRun.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-k/src/main/java/org/apache/camel/dsl/jbang/core/commands/k/IntegrationRun.java
@@ -79,6 +79,9 @@ public class IntegrationRun extends KubeBaseCommand {
@CommandLine.Option(names = { "--profile" }, description = "The trait
profile to use for the deployment.")
String profile;
+@CommandLine.Option(names = { "--integration-profile" }, description =
"The integration profile to use for the deployment.")
+String integrationProfile;
+
@CommandLine.Option(names = { "--service-account" }, description = "The
service account used to run this Integration.")
String serviceAccount;
@@ -223,6 +226,18 @@ public class IntegrationRun extends KubeBaseCommand {
// --operator-id={id} is a syntax sugar for '--annotation
camel.apache.org/operator.id={id}'
integration.getMetadata().getAnnotations().put(KubeCommand.OPERATOR_ID_LABEL,
operatorId);
+// --integration-profile={id} is a syntax sugar for '--annotation
camel.apache.org/integration-profile.id={id}'
+if (integrationProfile != null) {
+if (integrationProfile.contains("/")) {
+String[] namespacedName = integrationProfile.split("/", 2);
+
integration.getMetadata().getAnnotations().put(KubeCommand.INTEGRATION_PROFILE_NAMESPACE_ANNOTATION,
+namespacedName[0]);
+
integration.getMetadata().getAnnotations().put(KubeCommand.INTEGRATION_PROFILE_ANNOTATION,
namespacedName[1]);
+} else {
+
integration.getMetadata().getAnnotations().put(KubeCommand.INTEGRATION_PROFILE_ANNOTATION,
integrationProfile);
+}
+}
+
if (labels != null && labels.length > 0) {
integration.getMetadata().setLabels(Arrays.stream(labels)
.filter(it -> it.contains("="))
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-k/src/main/java/org/apache/camel/dsl/jbang/core/commands/k/KubeCommand.java
b/dsl/camel-jbang/camel-jbang-plugin-k/src/main/java/org/apache/camel/dsl/jbang/core/commands/k/KubeCommand.java
index 4bfc5202f74..f624be9f645 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-k/src/main/java/org/apache/camel/dsl/jbang/core/commands/k/KubeCommand.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-k/src/main/java/org/apache/camel/dsl/jbang/core/commands/k/KubeCommand.java
@@ -27,6 +27,9 @@ public class KubeCommand extends KubeBaseCommand {
public static final String INTEGRATION_LABEL =
"camel.apache.org/integration";
public static final String INTEGRATION_CONTAINER_NAME = "integration";
+public static final String INTEGRATION_PROFILE_ANNOTATION =
"camel.apache.org/integration-profile.id";
+public static final String INTEGRATION_PROFILE_NAMESPACE_ANNOTATION =
"camel.apache.org/integration-profile.namespace";
+
public KubeCommand(CamelJBangMain main) {
super(main);
}
diff --git
a/dsl/camel-jbang/camel-jbang-plugin-k/src/test/java/org/apache/camel/dsl/jbang/core/commands/k/IntegrationRunTest.java
b/dsl/camel-jbang/camel-jbang-plugin-k/src/test/java/org/apache/camel/dsl/jbang/core/commands/k/IntegrationRunTest.java
index 3ecce4c0c51..4719a595a18 100644
---
a/dsl/camel-jbang/camel-jbang-plugin-k/src/test/java/org/apache/camel/dsl/jbang/core/commands/k/IntegrationRunTest.java
+++
b/dsl/camel-jbang/camel-jbang-plugin-k/src/test/java/org/apache/camel/dsl/jbang/core/commands/k/IntegrationRunTest.java
@@ -339,6 +339,61 @@ class IntegrationRunTest extends KubeBaseTest {
traits: {}""", printer.getOutput());
}
+@Test
+public void shouldUseIntegrationProfile() throws Exception {
+IntegrationRun command = createCommand();
+command.filePaths
(camel-karaf) branch remove-hard-coded-versions-in-poms deleted (was cf322fba)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch remove-hard-coded-versions-in-poms in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was cf322fba chores(pom): Remove hard coded versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch main updated: chore(pom): Remove hard coded versions (#401)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 1739e5c5 chore(pom): Remove hard coded versions (#401)
1739e5c5 is described below
commit 1739e5c5ba067817d5cdb5f96ec3d9e6de2bd4c1
Author: Nicolas Filotto
AuthorDate: Mon Jul 1 10:16:48 2024 +0200
chore(pom): Remove hard coded versions (#401)
---
components/camel-blueprint/pom.xml | 6 +++---
features/pom.xml | 4 ++--
pom.xml| 4
tests/features/camel-influxdb2/pom.xml | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/components/camel-blueprint/pom.xml
b/components/camel-blueprint/pom.xml
index 8f8bb8e8..c37ff1c1 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -158,7 +158,7 @@
org.apache.maven.plugins
maven-resources-plugin
-3.3.1
+${maven-resources-plugin-version}
copy-generated-resources-jaxb
@@ -199,7 +199,7 @@
org.codehaus.mojo
jaxb2-maven-plugin
-3.2.0
+${maven-jaxb2-plugin-version}
generate-schema
@@ -306,7 +306,7 @@
org.apache.maven.plugins
maven-antrun-plugin
-3.1.0
+${maven-antrun-plugin-version}
true
diff --git a/features/pom.xml b/features/pom.xml
index 6a4bba14..fe8aadbd 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -58,7 +58,7 @@
org.apache.maven.plugins
maven-resources-plugin
-3.3.1
+${maven-resources-plugin-version}
@@ -116,7 +116,7 @@
org.codehaus.mojo
build-helper-maven-plugin
-3.6.0
+${maven-build-helper-plugin-version}
attach-artifact
diff --git a/pom.xml b/pom.xml
index b8591dc7..18ba0836 100644
--- a/pom.xml
+++ b/pom.xml
@@ -562,10 +562,14 @@
3.1.6
+3.1.0
+
3.6.0
5.1.9
3.13.0
3.7.1
3.4.2
+3.2.0
+3.3.1
3.6.0
diff --git a/tests/features/camel-influxdb2/pom.xml
b/tests/features/camel-influxdb2/pom.xml
index 22a789fe..b9a222db 100644
--- a/tests/features/camel-influxdb2/pom.xml
+++ b/tests/features/camel-influxdb2/pom.xml
@@ -40,7 +40,7 @@
com.influxdb
influxdb-client-java
-7.0.0
+${influx-client-java-driver-version}
compile
(camel) branch dependabot/maven/org.skyscreamer-jsonassert-1.5.3 deleted (was 66b5fda1744)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.skyscreamer-jsonassert-1.5.3 in repository https://gitbox.apache.org/repos/asf/camel.git was 66b5fda1744 chore(deps): Bump org.skyscreamer:jsonassert from 1.5.1 to 1.5.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 (6ebbe2d6592 -> a3c578475ef)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 6ebbe2d6592 chore(deps): Bump org.apache.kafka:kafka-clients from 3.7.0 to 3.7.1 (#14687) add a3c578475ef chore(deps): Bump org.skyscreamer:jsonassert from 1.5.1 to 1.5.3 (#14683) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch dependabot/maven/org.apache.kafka-kafka-clients-3.7.1 deleted (was 1e91e8e4814)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.kafka-kafka-clients-3.7.1 in repository https://gitbox.apache.org/repos/asf/camel.git was 1e91e8e4814 chore(deps): Bump org.apache.kafka:kafka-clients from 3.7.0 to 3.7.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch dependabot/maven/aws-java-sdk2-version-2.26.12 deleted (was 49d49523945)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/aws-java-sdk2-version-2.26.12 in repository https://gitbox.apache.org/repos/asf/camel.git was 49d49523945 chore(deps): Bump aws-java-sdk2-version from 2.26.11 to 2.26.12 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: chore(deps): Bump aws-java-sdk2-version from 2.26.11 to 2.26.12 (#14685)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new f20c4f52326 chore(deps): Bump aws-java-sdk2-version from 2.26.11 to 2.26.12 (#14685) f20c4f52326 is described below commit f20c4f523265ad2b2c8d5ea49259eec8bf4b93fc Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Jul 1 10:06:31 2024 +0200 chore(deps): Bump aws-java-sdk2-version from 2.26.11 to 2.26.12 (#14685) Bumps `aws-java-sdk2-version` from 2.26.11 to 2.26.12. Updates `software.amazon.awssdk:sqs` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:kinesis` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:s3` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:sns` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:cloudwatch` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:ec2` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:eventbridge` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:iam` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:kms` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:lambda` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:secretsmanager` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:sts` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:dynamodb` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:config` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:apache-client` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:athena` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:bedrock` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:bedrockruntime` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:bedrockagent` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:bedrockagentruntime` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:cloudtrail` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:ecs` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:eks` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:netty-nio-client` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:firehose` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:kafka` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:mq` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:redshiftdata` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:ses` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:sfn` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:timestreamquery` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:timestreamwrite` from 2.26.11 to 2.26.12 Updates `software.amazon.awssdk:translate` from 2.26.11 to 2.26.12 --- updated-dependencies: - dependency-name: software.amazon.awssdk:sqs dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:kinesis dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:s3 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sns dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:cloudwatch dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:ec2 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:eventbridge dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:iam dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:kms dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:lambda dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:secretsmanager dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sts dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:dynamodb dependency-type: direct:production update-type:
(camel) branch main updated (f20c4f52326 -> 6ebbe2d6592)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from f20c4f52326 chore(deps): Bump aws-java-sdk2-version from 2.26.11 to 2.26.12 (#14685) add 6ebbe2d6592 chore(deps): Bump org.apache.kafka:kafka-clients from 3.7.0 to 3.7.1 (#14687) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
svn commit: r70075 [1/3] - /dev/camel/camel-kamelets/4.4.3/
Author: acosentino Date: Mon Jul 1 07:56:25 2024 New Revision: 70075 Log: Import camel-kamelets release Added: dev/camel/camel-kamelets/4.4.3/ dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.json (with props) dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.json.asc (with props) dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.json.sha512 dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.xml dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.xml.asc (with props) dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.xml.sha512 dev/camel/camel-kamelets/4.4.3/camel-kamelets-sources-4.4.3.tar.gz (with props) dev/camel/camel-kamelets/4.4.3/camel-kamelets-sources-4.4.3.tar.gz.asc (with props) dev/camel/camel-kamelets/4.4.3/camel-kamelets-sources-4.4.3.tar.gz.sha512 Added: dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.json == Binary file - no diff available. Propchange: dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.json -- svn:mime-type = application/json Added: dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.json.asc == Binary file - no diff available. Propchange: dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.json.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.json.sha512 == --- dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.json.sha512 (added) +++ dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.json.sha512 Mon Jul 1 07:56:25 2024 @@ -0,0 +1 @@ +eb1006f64e4d738126f95387042775a5af819aba0a48451f39919adc4b2d9b30e0713acb8b6e9151df2ec99c83d69e75fa2f6214d2b2c6abad9bf94d6442eaae *camel-kamelets-4.4.3-sbom.json
svn commit: r70075 [3/3] - /dev/camel/camel-kamelets/4.4.3/
Added: dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.xml.asc == Binary file - no diff available. Propchange: dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.xml.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.xml.sha512 == --- dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.xml.sha512 (added) +++ dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.xml.sha512 Mon Jul 1 07:56:25 2024 @@ -0,0 +1 @@ +77fa87728ba66056ef94c798740f1c60a01b2c34e4a12359caacfe567283d3545f60b0b45129ff48b2ed280cc4bf14a3d8fa839ca7cba47a13e93551a73f57ca *camel-kamelets-4.4.3-sbom.xml Added: dev/camel/camel-kamelets/4.4.3/camel-kamelets-sources-4.4.3.tar.gz == Binary file - no diff available. Propchange: dev/camel/camel-kamelets/4.4.3/camel-kamelets-sources-4.4.3.tar.gz -- svn:mime-type = application/gzip Added: dev/camel/camel-kamelets/4.4.3/camel-kamelets-sources-4.4.3.tar.gz.asc == Binary file - no diff available. Propchange: dev/camel/camel-kamelets/4.4.3/camel-kamelets-sources-4.4.3.tar.gz.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-kamelets/4.4.3/camel-kamelets-sources-4.4.3.tar.gz.sha512 == --- dev/camel/camel-kamelets/4.4.3/camel-kamelets-sources-4.4.3.tar.gz.sha512 (added) +++ dev/camel/camel-kamelets/4.4.3/camel-kamelets-sources-4.4.3.tar.gz.sha512 Mon Jul 1 07:56:25 2024 @@ -0,0 +1 @@ +f2ae71667026cdae99359d6825f2c5854e436755afa1b928933d33535ef37e2f7fa408d8bbead0b215010e1dfe4e06491b36aee66b9422fb660fea3f530b863a *camel-kamelets-sources-4.4.3.tar.gz
svn commit: r70075 [2/3] - /dev/camel/camel-kamelets/4.4.3/
Added: dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.xml == --- dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.xml (added) +++ dev/camel/camel-kamelets/4.4.3/camel-kamelets-4.4.3-sbom.xml Mon Jul 1 07:56:25 2024 @@ -0,0 +1,5503 @@ + +http://cyclonedx.org/schema/bom/1.4;> + + + +OWASP Foundation +CycloneDX Maven plugin +2.7.11 + + a70e8b649ab4a2bb7922d360173c8237 + 4c3c0878c15561639076e5be7a48ffcd6111c5ee + 70997d52dbffd4e797c467b2062c6ba9b8b5a7380ff2884779f2743b6172ebb5 + bc1ce91190c642f68fd3571939d7668def3b879ec8e5a87a213a9710a106e0290f60f9e0414593d19cca958c4fcb5d4450bd2793bcd609948419c8a2a6a7f5c8 + 3c8421bdafd1754fb424f16dccc83bfe0827648c1cadfffc98bdf1c7da65475dfe48d2f4b16d233bb8819e155ba6a4f3 + ad88cf6a0e0a5d51df49a4dab5530a28de9df7eec8460c045dff3e1f9316b82a244a125d52b937fe9d4ee72e44f5d01a + b4d9c3ef07c34517fd9f33178ba95ffc9618eb84a3671e71b0c82991ec3717e5 + 935b43aba8999dc7d95d93288a251c97b6b32852841b7bef31516c27c8d65c8de7f8411f1829f765ee760f25930c766db6a49df68e5994e18721c0a71f606f1e + + + + + The Apache Software Foundation + org.apache.camel.kamelets + camel-kamelets-parent + 4.4.3 + Camel Kamelets Library Parent + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.kamelets/camel-kamelets-parent@4.4.3?type=pom + https://camel.apache.org/camel-kamelets-parenthttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-kamelets/issuesdev-subscr...@camel.apache.orghttps://gitbox.apache.org/repos/asf?p=camel-kamelets.git;a=summary + + + makeAggregateBom + compile,provided,runtime,system + enabled + + + + + The Apache Software Foundation + org.apache.camel.kamelets + camel-kamelets + 4.4.3 + Camel Kamelets + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.kamelets/camel-kamelets@4.4.3?type=jar + https://camel.apache.org/camel-kamelets-parent/library/camel-kameletshttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-kamelets/issuesdev-subscr...@camel.apache.orghttps://gitbox.apache.org/repos/asf?p=camel-kamelets.git;a=summary/library/camel-kamelets + + + The Apache Software Foundation + org.apache.camel.kamelets + camel-kamelets-catalog + 4.4.3 + Camel Kamelets Catalog + + + Apache-2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + pkg:maven/org.apache.camel.kamelets/camel-kamelets-catalog@4.4.3?type=jar + https://camel.apache.org/camel-kamelets-parent/library/camel-kamelets-cataloghttps://repository.apache.org/service/local/staging/deploy/maven2https://github.com/apache/camel-kamelets/issuesdev-subscr...@camel.apache.orghttps://gitbox.apache.org/repos/asf?p=camel-kamelets.git;a=summary/library/camel-kamelets-catalog + + + QOS.ch + org.slf4j + slf4j-api + 2.0.12 + The slf4j API + required + +86eb051f2e2d6497a3a57810c963a9d6 +48f109a2a6d8f446c794f3e3fa0d86df0cdfa312 +a79502b8abdfbd722846a27691226a4088682d6d35654f9b80e2a9ccacf7ed47 +5bc0a61bd32b63ab7d44e210f1dcc3e4dc7417186ab8a2297f22edfa631513cc55b7fe3bb15eb0124b9a30dcfd4d168932bf3262cf6491feb2facbdfbe661e72 +7c8d503d37899b577f39e5a3517b69034cad655e31d4b783313533bf49054f25b0ae87f8c32e4eb40677a53011e6bbce +9bf58592bbf1d21ec6a6a55a084ea21a16d5d5c38dbadcded450ef6af8717b364beae497fdb600d9d3695e62fb26fe4b +72000cfd589a16b4eb81e4ac648a2781847aafe0dd464fa260fdd79196ccc693 +1f91affc70ce6fdfa69be146d9f23835702a22c3a47b6c495b6964b3ea80d901bb1517b26e9fc973a3e6c7f38c25b74397856ae236519bf3d2ea96148c3118e2 + + + + MIT + https://opensource.org/licenses/MIT + + + pkg:maven/org.slf4j/slf4j-api@2.0.12?type=jar + http://www.slf4j.orghttps://oss.sonatype.org/service/local/staging/deploy/maven2/https://github.com/qos-ch/slf4j/slf4j-parent/slf4j-api + + + FasterXML + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + 2.16.1 + Support for reading and writing YAML-encoded data via Jackson abstractions. + required + +f08a64b0e8a224690e774ea3d5dcd00f +8e4f1923d73cd55f2b4c0d56ee4ed80419297354 +fd67e0fafe368ad3dfc1b545eb8fe084a5c64628fb71ef70bd94a4dab27aefff +773490a5e0b0d8d197137813278469e3cade4255903769877b73c2af78fbbfba598dec0fc4e3044b3af40c6987c89447b18d08dcbd26f8a48c2a1bd13da364ea +
(camel-karaf) branch dependabot/maven/testcontainers-version-1.19.8 deleted (was 93ff4224)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch dependabot/maven/testcontainers-version-1.19.8 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 93ff4224 Bump testcontainers-version from 1.19.7 to 1.19.8 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-karaf) branch dependabot/maven/junit-jupiter-version-5.10.3 deleted (was 64fff7f4)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch dependabot/maven/junit-jupiter-version-5.10.3 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 64fff7f4 Bump junit-jupiter-version from 5.10.2 to 5.10.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-karaf) branch dependabot/maven/com.influxdb-influxdb-client-java-7.1.0 deleted (was 4666bfc5)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch dependabot/maven/com.influxdb-influxdb-client-java-7.1.0 in repository https://gitbox.apache.org/repos/asf/camel-karaf.git was 4666bfc5 Bump com.influxdb:influxdb-client-java from 7.0.0 to 7.1.0 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-kamelets) branch 4.4.x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 4.4.x in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git The following commit(s) were added to refs/heads/4.4.x by this push: new af799c65 [maven-release-plugin] prepare for next development iteration af799c65 is described below commit af799c653255b4dcd9447672d2e1e83bf1f5154c Author: Andrea Cosentino AuthorDate: Mon Jul 1 09:53:23 2024 +0200 [maven-release-plugin] prepare for next development iteration --- library/camel-kamelets-bom/pom.xml | 2 +- library/camel-kamelets-catalog/pom.xml | 2 +- library/camel-kamelets-utils/pom.xml | 2 +- library/camel-kamelets/pom.xml | 2 +- library/kamelets-maven-plugin/pom.xml | 2 +- pom.xml| 4 ++-- tests/camel-kamelets-itest/pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/library/camel-kamelets-bom/pom.xml b/library/camel-kamelets-bom/pom.xml index 73123b6f..a7198ebe 100644 --- a/library/camel-kamelets-bom/pom.xml +++ b/library/camel-kamelets-bom/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -4.4.3 +4.4.4-SNAPSHOT ../../pom.xml diff --git a/library/camel-kamelets-catalog/pom.xml b/library/camel-kamelets-catalog/pom.xml index b0fccb0f..6ed35f87 100644 --- a/library/camel-kamelets-catalog/pom.xml +++ b/library/camel-kamelets-catalog/pom.xml @@ -35,7 +35,7 @@ org.apache.camel.kamelets camel-kamelets-parent -4.4.3 +4.4.4-SNAPSHOT ../../pom.xml diff --git a/library/camel-kamelets-utils/pom.xml b/library/camel-kamelets-utils/pom.xml index 9be8a3e6..66da80d2 100644 --- a/library/camel-kamelets-utils/pom.xml +++ b/library/camel-kamelets-utils/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -4.4.3 +4.4.4-SNAPSHOT ../../pom.xml diff --git a/library/camel-kamelets/pom.xml b/library/camel-kamelets/pom.xml index 64a78228..010f3dad 100644 --- a/library/camel-kamelets/pom.xml +++ b/library/camel-kamelets/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -4.4.3 +4.4.4-SNAPSHOT ../../pom.xml diff --git a/library/kamelets-maven-plugin/pom.xml b/library/kamelets-maven-plugin/pom.xml index 07f86244..3f190629 100644 --- a/library/kamelets-maven-plugin/pom.xml +++ b/library/kamelets-maven-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -4.4.3 +4.4.4-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index 0722270b..afcccbe4 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.camel.kamelets camel-kamelets-parent pom -4.4.3 +4.4.4-SNAPSHOT Camel Kamelets Parent Camel Kamelets Library Parent @@ -121,7 +121,7 @@ scm:git:http://gitbox.apache.org/repos/asf/camel-kamelets.git scm:git:https://gitbox.apache.org/repos/asf/camel-kamelets.git https://gitbox.apache.org/repos/asf?p=camel-kamelets.git;a=summary -v4.4.3 +v4.4.0 diff --git a/tests/camel-kamelets-itest/pom.xml b/tests/camel-kamelets-itest/pom.xml index d084f0f8..b49df4bf 100644 --- a/tests/camel-kamelets-itest/pom.xml +++ b/tests/camel-kamelets-itest/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -4.4.3 +4.4.4-SNAPSHOT ../../pom.xml
(camel-kamelets) annotated tag v4.4.3 created (now 4cd869e8)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to annotated tag v4.4.3 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git at 4cd869e8 (tag) tagging a99fc62114b03ac8f6ac1d7e2ad8cc0770cf1113 (commit) replaces v4.4.2 by Andrea Cosentino on Mon Jul 1 09:53:20 2024 +0200 - Log - [maven-release-plugin] copy for tag v4.4.3 --- No new revisions were added by this update.
(camel-kamelets) branch 4.4.x updated: [maven-release-plugin] prepare release v4.4.3
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 4.4.x in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git The following commit(s) were added to refs/heads/4.4.x by this push: new a99fc621 [maven-release-plugin] prepare release v4.4.3 a99fc621 is described below commit a99fc62114b03ac8f6ac1d7e2ad8cc0770cf1113 Author: Andrea Cosentino AuthorDate: Mon Jul 1 09:53:15 2024 +0200 [maven-release-plugin] prepare release v4.4.3 --- library/camel-kamelets-bom/pom.xml | 2 +- library/camel-kamelets-catalog/pom.xml | 2 +- library/camel-kamelets-utils/pom.xml | 2 +- library/camel-kamelets/pom.xml | 2 +- library/kamelets-maven-plugin/pom.xml | 2 +- pom.xml| 4 ++-- tests/camel-kamelets-itest/pom.xml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/library/camel-kamelets-bom/pom.xml b/library/camel-kamelets-bom/pom.xml index b29e2ad5..73123b6f 100644 --- a/library/camel-kamelets-bom/pom.xml +++ b/library/camel-kamelets-bom/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -4.4.3-SNAPSHOT +4.4.3 ../../pom.xml diff --git a/library/camel-kamelets-catalog/pom.xml b/library/camel-kamelets-catalog/pom.xml index 1674be96..b0fccb0f 100644 --- a/library/camel-kamelets-catalog/pom.xml +++ b/library/camel-kamelets-catalog/pom.xml @@ -35,7 +35,7 @@ org.apache.camel.kamelets camel-kamelets-parent -4.4.3-SNAPSHOT +4.4.3 ../../pom.xml diff --git a/library/camel-kamelets-utils/pom.xml b/library/camel-kamelets-utils/pom.xml index c7272721..9be8a3e6 100644 --- a/library/camel-kamelets-utils/pom.xml +++ b/library/camel-kamelets-utils/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -4.4.3-SNAPSHOT +4.4.3 ../../pom.xml diff --git a/library/camel-kamelets/pom.xml b/library/camel-kamelets/pom.xml index c0321d57..64a78228 100644 --- a/library/camel-kamelets/pom.xml +++ b/library/camel-kamelets/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -4.4.3-SNAPSHOT +4.4.3 ../../pom.xml diff --git a/library/kamelets-maven-plugin/pom.xml b/library/kamelets-maven-plugin/pom.xml index 7c07e425..07f86244 100644 --- a/library/kamelets-maven-plugin/pom.xml +++ b/library/kamelets-maven-plugin/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -4.4.3-SNAPSHOT +4.4.3 ../../pom.xml diff --git a/pom.xml b/pom.xml index 45c6da04..0722270b 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.camel.kamelets camel-kamelets-parent pom -4.4.3-SNAPSHOT +4.4.3 Camel Kamelets Parent Camel Kamelets Library Parent @@ -121,7 +121,7 @@ scm:git:http://gitbox.apache.org/repos/asf/camel-kamelets.git scm:git:https://gitbox.apache.org/repos/asf/camel-kamelets.git https://gitbox.apache.org/repos/asf?p=camel-kamelets.git;a=summary -v4.4.0 +v4.4.3 diff --git a/tests/camel-kamelets-itest/pom.xml b/tests/camel-kamelets-itest/pom.xml index 7e282d63..d084f0f8 100644 --- a/tests/camel-kamelets-itest/pom.xml +++ b/tests/camel-kamelets-itest/pom.xml @@ -23,7 +23,7 @@ org.apache.camel.kamelets camel-kamelets-parent -4.4.3-SNAPSHOT +4.4.3 ../../pom.xml
(camel-karaf) branch remove-hard-coded-versions-in-poms created (now cf322fba)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch remove-hard-coded-versions-in-poms in repository https://gitbox.apache.org/repos/asf/camel-karaf.git at cf322fba chores(pom): Remove hard coded versions This branch includes the following new commits: new cf322fba chores(pom): Remove hard coded versions 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-karaf) 01/01: chores(pom): Remove hard coded versions
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch remove-hard-coded-versions-in-poms
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
commit cf322fbac48985035926465acc81ebc4a899182a
Author: Nicolas Filotto
AuthorDate: Mon Jul 1 09:50:20 2024 +0200
chores(pom): Remove hard coded versions
---
components/camel-blueprint/pom.xml | 6 +++---
features/pom.xml | 4 ++--
pom.xml| 4
tests/features/camel-influxdb2/pom.xml | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/components/camel-blueprint/pom.xml
b/components/camel-blueprint/pom.xml
index 8f8bb8e8..c37ff1c1 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -158,7 +158,7 @@
org.apache.maven.plugins
maven-resources-plugin
-3.3.1
+${maven-resources-plugin-version}
copy-generated-resources-jaxb
@@ -199,7 +199,7 @@
org.codehaus.mojo
jaxb2-maven-plugin
-3.2.0
+${maven-jaxb2-plugin-version}
generate-schema
@@ -306,7 +306,7 @@
org.apache.maven.plugins
maven-antrun-plugin
-3.1.0
+${maven-antrun-plugin-version}
true
diff --git a/features/pom.xml b/features/pom.xml
index 6a4bba14..fe8aadbd 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -58,7 +58,7 @@
org.apache.maven.plugins
maven-resources-plugin
-3.3.1
+${maven-resources-plugin-version}
@@ -116,7 +116,7 @@
org.codehaus.mojo
build-helper-maven-plugin
-3.6.0
+${maven-build-helper-plugin-version}
attach-artifact
diff --git a/pom.xml b/pom.xml
index b8591dc7..18ba0836 100644
--- a/pom.xml
+++ b/pom.xml
@@ -562,10 +562,14 @@
3.1.6
+3.1.0
+
3.6.0
5.1.9
3.13.0
3.7.1
3.4.2
+3.2.0
+3.3.1
3.6.0
diff --git a/tests/features/camel-influxdb2/pom.xml
b/tests/features/camel-influxdb2/pom.xml
index 22a789fe..b9a222db 100644
--- a/tests/features/camel-influxdb2/pom.xml
+++ b/tests/features/camel-influxdb2/pom.xml
@@ -40,7 +40,7 @@
com.influxdb
influxdb-client-java
-7.0.0
+${influx-client-java-driver-version}
compile
(camel-kamelets) branch 4.4.3-upgrade deleted (was 37e610a1)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 4.4.3-upgrade in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git was 37e610a1 Upgrade Camel to version 4.4.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-kamelets) branch 4.4.x updated: Upgrade Camel to version 4.4.3 (#2094)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 4.4.x in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git The following commit(s) were added to refs/heads/4.4.x by this push: new 682ff1b5 Upgrade Camel to version 4.4.3 (#2094) 682ff1b5 is described below commit 682ff1b513fe15bdae5f8bc8d9a9e17edc29b67f Author: Andrea Cosentino AuthorDate: Mon Jul 1 09:49:16 2024 +0200 Upgrade Camel to version 4.4.3 (#2094) Signed-off-by: Andrea Cosentino --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 338a71f3..45c6da04 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies -4.4.2 +4.4.3 org.apache.camel.kamelets @@ -62,7 +62,7 @@ 0.16.1 2.7.11 -4.4.2 +4.4.3 2.2.0 4.2.0
(camel-kamelets) 01/01: Upgrade Camel to version 4.4.3
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 4.4.3-upgrade in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit 37e610a1bfaac42e3f49b015e79a7c388267a220 Author: Andrea Cosentino AuthorDate: Mon Jul 1 09:37:55 2024 +0200 Upgrade Camel to version 4.4.3 Signed-off-by: Andrea Cosentino --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 338a71f3..45c6da04 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies -4.4.2 +4.4.3 org.apache.camel.kamelets @@ -62,7 +62,7 @@ 0.16.1 2.7.11 -4.4.2 +4.4.3 2.2.0 4.2.0
(camel-kamelets) branch 4.4.3-upgrade created (now 37e610a1)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 4.4.3-upgrade in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git at 37e610a1 Upgrade Camel to version 4.4.3 This branch includes the following new commits: new 37e610a1 Upgrade Camel to version 4.4.3 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(camel) branch dependabot/maven/debezium-version-2.7.0.Final deleted (was bba1dde8e9a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/debezium-version-2.7.0.Final in repository https://gitbox.apache.org/repos/asf/camel.git was bba1dde8e9a chore(deps): Bump debezium-version from 2.6.2.Final to 2.7.0.Final 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-kamelets) branch regen_bot updated (d4cbeeb3 -> 49ff6910)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from d4cbeeb3 Regen SBOM from commit 6ea8c4fe0327ffc19cbf339c872a0efab5dc820b (#2087) add acfe23f7 Add Support for Kinesis KCL Consumers to Kinesis Source Kamelet (#2090) add fe03e31f Updated CHANGELOG.md add 49ff6910 Regen SBOM from commit fe03e31f56222fdb8e4692696c2899e72545ca2e (#2093) No new revisions were added by this update. Summary of changes: CHANGELOG.md |1 + camel-kamelets-sbom/camel-kamelets-sbom.json | 1406 ++-- camel-kamelets-sbom/camel-kamelets-sbom.xml| 1398 +-- kamelets/aws-kinesis-source.kamelet.yaml | 12 + .../kamelets/aws-kinesis-source.kamelet.yaml | 12 + pom.xml|4 +- 6 files changed, 1477 insertions(+), 1356 deletions(-)
(camel) branch dependabot/maven/groovy-version-4.0.22 created (now 275683aa747)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/groovy-version-4.0.22 in repository https://gitbox.apache.org/repos/asf/camel.git at 275683aa747 chore(deps): Bump groovy-version from 4.0.21 to 4.0.22 No new revisions were added by this update.
(camel) branch dependabot/maven/org.wiremock-wiremock-3.8.0 created (now 725478c8387)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.wiremock-wiremock-3.8.0 in repository https://gitbox.apache.org/repos/asf/camel.git at 725478c8387 chore(deps): Bump org.wiremock:wiremock from 3.7.0 to 3.8.0 No new revisions were added by this update.
(camel) branch dependabot/maven/org.apache.kafka-kafka-clients-3.7.1 created (now 1e91e8e4814)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.kafka-kafka-clients-3.7.1 in repository https://gitbox.apache.org/repos/asf/camel.git at 1e91e8e4814 chore(deps): Bump org.apache.kafka:kafka-clients from 3.7.0 to 3.7.1 No new revisions were added by this update.
(camel) branch dependabot/maven/debezium-version-2.7.0.Final created (now bba1dde8e9a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/debezium-version-2.7.0.Final in repository https://gitbox.apache.org/repos/asf/camel.git at bba1dde8e9a chore(deps): Bump debezium-version from 2.6.2.Final to 2.7.0.Final No new revisions were added by this update.
(camel) branch dependabot/maven/aws-java-sdk2-version-2.26.12 created (now 49d49523945)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/aws-java-sdk2-version-2.26.12 in repository https://gitbox.apache.org/repos/asf/camel.git at 49d49523945 chore(deps): Bump aws-java-sdk2-version from 2.26.11 to 2.26.12 No new revisions were added by this update.
(camel-k) branch dependabot/go_modules/knative.dev/eventing-0.41.4 deleted (was 27663eb9f)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/knative.dev/eventing-0.41.4 in repository https://gitbox.apache.org/repos/asf/camel-k.git was 27663eb9f chore(deps): bump knative.dev/eventing from 0.40.3 to 0.41.4 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch dependabot/npm_and_yarn/docs/eslint-plugin-promise-6.4.0 created (now a2233fe07e7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/docs/eslint-plugin-promise-6.4.0 in repository https://gitbox.apache.org/repos/asf/camel.git at a2233fe07e7 chore(deps-dev): Bump eslint-plugin-promise from 6.2.0 to 6.4.0 in /docs No new revisions were added by this update.
(camel) branch dependabot/maven/org.skyscreamer-jsonassert-1.5.3 created (now 66b5fda1744)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.skyscreamer-jsonassert-1.5.3 in repository https://gitbox.apache.org/repos/asf/camel.git at 66b5fda1744 chore(deps): Bump org.skyscreamer:jsonassert from 1.5.1 to 1.5.3 No new revisions were added by this update.
(camel) branch ss deleted (was 5837fbe066b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch ss in repository https://gitbox.apache.org/repos/asf/camel.git was 5837fbe066b CAMEL-20931: camel-core - Add substring function to simple language 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-20931: camel-core - Add substring function to simple language (#14682)
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 91e74cd7c51 CAMEL-20931: camel-core - Add substring function to simple
language (#14682)
91e74cd7c51 is described below
commit 91e74cd7c517e412c83a691a7114c9d16b682a3e
Author: Claus Ibsen
AuthorDate: Mon Jul 1 08:02:35 2024 +0200
CAMEL-20931: camel-core - Add substring function to simple language (#14682)
---
.../language/csimple/joor/OriginalSimpleTest.java | 26 +++
.../modules/languages/pages/simple-language.adoc | 40 +
.../camel/language/csimple/CSimpleHelper.java | 33 ++
.../language/simple/SimpleExpressionBuilder.java | 40 +
.../simple/ast/SimpleFunctionExpression.java | 52 ++
.../apache/camel/language/simple/SimpleTest.java | 51 +
.../camel/support/builder/ExpressionBuilder.java | 45 +++
7 files changed, 287 insertions(+)
diff --git
a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
index 3477bb46cf2..4c55bfb9b0b 100644
---
a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
+++
b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java
@@ -249,6 +249,32 @@ public class OriginalSimpleTest extends
LanguageTestSupport {
assertExpression("${replace(,)}", "{foo: cheese}");
}
+@Test
+public void testSubstringExpression() {
+exchange.getMessage().setBody("ABCDEFGHIJK");
+// head
+assertExpression("${substring(0)}", "ABCDEFGHIJK");
+assertExpression("${substring(1)}", "BCDEFGHIJK");
+assertExpression("${substring(3)}", "DEFGHIJK");
+assertExpression("${substring(99)}", "");
+// tail
+assertExpression("${substring(0)}", "ABCDEFGHIJK");
+assertExpression("${substring(-1)}", "ABCDEFGHIJ");
+assertExpression("${substring(-3)}", "ABCDEFGH");
+assertExpression("${substring(-99)}", "");
+// head and tail
+assertExpression("${substring(1,-1)}", "BCDEFGHIJ");
+assertExpression("${substring(3,-3)}", "DEFGH");
+assertExpression("${substring(1,-3)}", "BCDEFGH");
+assertExpression("${substring(3,-1)}", "DEFGHIJ");
+assertExpression("${substring(0,-1)}", "ABCDEFGHIJ");
+assertExpression("${substring(1,0)}", "BCDEFGHIJK");
+assertExpression("${substring(99,-99)}", "");
+assertExpression("${substring(0,-99)}", "");
+assertExpression("${substring(99,0)}", "");
+assertExpression("${substring(0,0)}", "ABCDEFGHIJK");
+}
+
@Test
public void testTrimSimpleExpressions() {
assertExpression(" \t${exchangeId}\n".trim(),
exchange.getExchangeId());
diff --git
a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
index 55782cdaf81..b4ffc73e284 100644
---
a/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
+++
b/core/camel-core-languages/src/main/docs/modules/languages/pages/simple-language.adoc
@@ -246,6 +246,18 @@ To make it easier to replace single and double quotes,
then you can use XML esca
|replace(from,to,exp) |String |replace all the string values in the given
expression.
To make it easier to replace single and double quotes, then you can use XML
escaped values `\` as double quote, `\` as single quote, and
`\` as empty value.
+|substring(num1) |String |returns a substring of the message body.
+If the number is positive then the returned string is clipped from the
beginning.
+If the number is negative then the returned string is clipped from the ending.
+
+|substring(num1,num2) |String |returns a substring of the message body.
+If the number is positive then the returned string is clipped from the
beginning.
+If the number is negative then the returned string is clipped from the ending.
+
+|substring(num1,num2,exp) |String |replace all the string values in the given
expression.
+If the number is positive then the returned string is clipped from the
beginning.
+If the number is negative then the returned string is clipped from the ending.
+
|collate(group) |List |The collate function iterates the message body and
groups
the data into sub lists of specified size. This can be used with the
Splitter EIP to split a message body and group/batch
@@ -854,6 +866,34 @@ You can nest functions, such as shown below:
+=== Substring
+
+You can use the `substring` function to more
