(camel-kamelets-examples) branch main updated: Update README.adoc
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets-examples.git The following commit(s) were added to refs/heads/main by this push: new d5ab480 Update README.adoc d5ab480 is described below commit d5ab480d8af17d62e3b8b6eb11e079fd4f7cb7c9 Author: Claus Ibsen AuthorDate: Thu Mar 14 06:47:09 2024 +0100 Update README.adoc --- jbang/main-profile/README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jbang/main-profile/README.adoc b/jbang/main-profile/README.adoc index 2e1f5e1..735cab1 100644 --- a/jbang/main-profile/README.adoc +++ b/jbang/main-profile/README.adoc @@ -40,7 +40,7 @@ You can run in another profile with: [source,sh] -$ camel run hello.camel.yaml --profile=production +$ camel run hello.camel.yaml --profile=prod And if you want to turn off profile, you can use an empty value (or none)
(camel) branch regen_bot updated (409a8c6c2fd -> 7f0c3971cde)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 409a8c6c2fd CAMEL-20341: refactored ContextTestSupport to work like CamelTestSupport add 7f0c3971cde CAMEL-20654: camel-xslt: Make variables available as xsl:param (#13467) No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/component/xslt/XsltBuilder.java | 1 + 1 file changed, 1 insertion(+)
(camel-spring-boot) branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 169d17b6a3c Regen
169d17b6a3c is described below
commit 169d17b6a3c21f6eec3357b18cc95c434b9447e8
Author: Claus Ibsen
AuthorDate: Thu Mar 14 06:27:24 2024 +0100
Regen
---
.../apache/camel/springboot/catalog/components/aws-secrets-manager.json | 1 +
.../org/apache/camel/springboot/catalog/components/azure-key-vault.json | 1 +
.../camel/springboot/catalog/components/google-secret-manager.json | 1 +
.../org/apache/camel/springboot/catalog/components/hashicorp-vault.json | 1 +
4 files changed, 4 insertions(+)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-secrets-manager.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-secrets-manager.json
index 118bc96d879..67c155e73a3 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-secrets-manager.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-secrets-manager.json
@@ -9,6 +9,7 @@
"label": "cloud,management",
"javaType":
"org.apache.camel.component.aws.secretsmanager.SecretsManagerComponent",
"supportLevel": "Stable",
+"metadata": { "vault": "aws-secrets-manager" },
"groupId": "org.apache.camel.springboot",
"artifactId": "camel-aws-secrets-manager-starter",
"version": "4.5.0-SNAPSHOT",
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-key-vault.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-key-vault.json
index b109db85f10..11250439182 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-key-vault.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-key-vault.json
@@ -9,6 +9,7 @@
"label": "cloud,cloud",
"javaType": "org.apache.camel.component.azure.key.vault.KeyVaultComponent",
"supportLevel": "Stable",
+"metadata": { "vault": "azure-key-vault" },
"groupId": "org.apache.camel.springboot",
"artifactId": "camel-azure-key-vault-starter",
"version": "4.5.0-SNAPSHOT",
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-secret-manager.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-secret-manager.json
index 2bad0016cfa..aa25d2796ae 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-secret-manager.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-secret-manager.json
@@ -9,6 +9,7 @@
"label": "cloud",
"javaType":
"org.apache.camel.component.google.secret.manager.GoogleSecretManagerComponent",
"supportLevel": "Stable",
+"metadata": { "vault": "google-secret-manager" },
"groupId": "org.apache.camel.springboot",
"artifactId": "camel-google-secret-manager-starter",
"version": "4.5.0-SNAPSHOT",
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hashicorp-vault.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hashicorp-vault.json
index b5eacfc31c8..b0b81ecb0a7 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hashicorp-vault.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hashicorp-vault.json
@@ -9,6 +9,7 @@
"label": "cloud,cloud",
"javaType":
"org.apache.camel.component.hashicorp.vault.HashicorpVaultComponent",
"supportLevel": "Stable",
+"metadata": { "vault": "hashicorp-vault" },
"groupId": "org.apache.camel.springboot",
"artifactId": "camel-hashicorp-vault-starter",
"version": "4.5.0-SNAPSHOT",
Re: [PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
davsclaus closed pull request #1106: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) URL: https://github.com/apache/camel-spring-boot/pull/1106 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: CAMEL-20654: camel-xslt: Make variables available as xsl:param (#13467)
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 7f0c3971cde CAMEL-20654: camel-xslt: Make variables available as
xsl:param (#13467)
7f0c3971cde is described below
commit 7f0c3971cde719186e57ae1d9b0bca7f0c4c73bd
Author: Tomohisa Igarashi
AuthorDate: Thu Mar 14 01:20:49 2024 -0400
CAMEL-20654: camel-xslt: Make variables available as xsl:param (#13467)
---
.../src/main/java/org/apache/camel/component/xslt/XsltBuilder.java | 1 +
1 file changed, 1 insertion(+)
diff --git
a/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XsltBuilder.java
b/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XsltBuilder.java
index 4b0195b85c7..f3f65867bc8 100644
---
a/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XsltBuilder.java
+++
b/components/camel-xslt/src/main/java/org/apache/camel/component/xslt/XsltBuilder.java
@@ -478,6 +478,7 @@ public class XsltBuilder implements Processor {
transformer.clearParameters();
addParameters(transformer, exchange.getProperties());
addParameters(transformer, exchange.getIn().getHeaders());
+addParameters(transformer, exchange.getVariables());
addParameters(transformer, getParameters());
transformer.setParameter("exchange", exchange);
transformer.setParameter("in", exchange.getIn());
Re: [PR] CAMEL-20654: camel-xslt: Make variables available as xsl:param [camel]
davsclaus merged PR #13467: URL: https://github.com/apache/camel/pull/13467 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-kamelets) branch regen_bot updated (4442fac2 -> 789e92dc)
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 4442fac2 Spring RabbitMQ Sink Kamelet: Support autoDeclareProducer as parameter (#1944) add 6d7a8091 Updated CHANGELOG.md add 789e92dc Bump google.golang.org/protobuf in /script/validator (#1946) No new revisions were added by this update. Summary of changes: CHANGELOG.md| 2 ++ script/validator/go.mod | 2 +- script/validator/go.sum | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-)
(camel-kamelets) branch main updated: Bump google.golang.org/protobuf in /script/validator (#1946)
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-kamelets.git The following commit(s) were added to refs/heads/main by this push: new 789e92dc Bump google.golang.org/protobuf in /script/validator (#1946) 789e92dc is described below commit 789e92dc33bb203da2e7f4d274b86a9d4620b690 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Mar 14 06:17:59 2024 +0100 Bump google.golang.org/protobuf in /script/validator (#1946) Bumps google.golang.org/protobuf from 1.31.0 to 1.33.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- script/validator/go.mod | 2 +- script/validator/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/script/validator/go.mod b/script/validator/go.mod index c10286a6..e7bd200f 100644 --- a/script/validator/go.mod +++ b/script/validator/go.mod @@ -89,7 +89,7 @@ require ( google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect google.golang.org/grpc v1.56.3 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/api v0.25.6 // indirect diff --git a/script/validator/go.sum b/script/validator/go.sum index 0e1952e5..9ed862be 100644 --- a/script/validator/go.sum +++ b/script/validator/go.sum @@ -1082,8 +1082,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
(camel-kamelets) branch dependabot/go_modules/script/validator/google.golang.org/protobuf-1.33.0 deleted (was cdba0e47)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/script/validator/google.golang.org/protobuf-1.33.0 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git was cdba0e47 Bump google.golang.org/protobuf in /script/validator The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] Bump google.golang.org/protobuf from 1.31.0 to 1.33.0 in /script/validator [camel-kamelets]
oscerd merged PR #1946: URL: https://github.com/apache/camel-kamelets/pull/1946 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1996355201 Build fixed with: * Camel Quarkus Commit: b9a37388f5bce663e999cb389966af7facff8c57 * Quarkus Main Commit: 57adf97dd61f613d16b741039e2491dd6821e757 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8274432997 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] closed issue #2926: [CI] - Quarkus Main Branch Build Failure URL: https://github.com/apache/camel-quarkus/issues/2926 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
github-actions[bot] opened a new pull request, #1106: URL: https://github.com/apache/camel-spring-boot/pull/1106 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) 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 21fc7a25c chore: nightly automatic updates 21fc7a25c is described below commit 21fc7a25c66248f595f782737003bbe88c7effb1 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Mar 13 23:45:53 2024 + chore: nightly automatic updates --- CHANGELOG.md | 3 + coverage.out | 322 +-- 2 files changed, 164 insertions(+), 161 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c516a810..5652261d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,8 +58,11 @@ **Merged pull requests:** +- chore: propagate capabilities to Kit [\#5247](https://github.com/apache/camel-k/pull/5247) ([squakez](https://github.com/squakez)) - Azure Key Vault Trait: Support Azure Identity as authentication method [\#5244](https://github.com/apache/camel-k/pull/5244) ([oscerd](https://github.com/oscerd)) +- chore\(ci\): Upgrade setup-kubectl action [\#5243](https://github.com/apache/camel-k/pull/5243) ([gansheer](https://github.com/gansheer)) - chore\(e2e\): Fix smoke tests [\#5240](https://github.com/apache/camel-k/pull/5240) ([christophd](https://github.com/christophd)) +- chore\(e2e\): Separate common-it E2E tests, so they run more efficient [\#5239](https://github.com/apache/camel-k/pull/5239) ([christophd](https://github.com/christophd)) - fix\(cmd\): delete KameletBinding until they exists [\#5237](https://github.com/apache/camel-k/pull/5237) ([squakez](https://github.com/squakez)) - fix\(ctrl\): message digest change [\#5236](https://github.com/apache/camel-k/pull/5236) ([squakez](https://github.com/squakez)) - fix\(build\): Upgrade container image to golang 1.21 [\#5235](https://github.com/apache/camel-k/pull/5235) ([gansheer](https://github.com/gansheer)) diff --git a/coverage.out b/coverage.out index 0f0157fa1..216031e03 100644 --- a/coverage.out +++ b/coverage.out @@ -410,154 +410,154 @@ github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1194: github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1208: DeepCopy 0.0% github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1218: DeepCopyObject 0.0% github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1226: DeepCopyInto 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1254: DeepCopy 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1264: DeepCopyInto 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1286: DeepCopy 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1296: DeepCopyInto 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1328: DeepCopy 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1338: DeepCopyInto 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1352: DeepCopy 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1362: DeepCopyObject 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1370: DeepCopyInto 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1379: DeepCopy 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1389: DeepCopyObject 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1397: DeepCopyInto 0.0% -github.com/apache/camel-k/v2/pkg/apis/camel/v1/zz_generated.deepcopy.go:1422: DeepCopy 0.0%
(camel-kamelets) branch dependabot/go_modules/script/validator/google.golang.org/protobuf-1.33.0 created (now cdba0e47)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/script/validator/google.golang.org/protobuf-1.33.0 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git at cdba0e47 Bump google.golang.org/protobuf in /script/validator No new revisions were added by this update.
[PR] Bump google.golang.org/protobuf from 1.31.0 to 1.33.0 in /script/validator [camel-kamelets]
dependabot[bot] opened a new pull request, #1946: URL: https://github.com/apache/camel-kamelets/pull/1946 Bumps google.golang.org/protobuf from 1.31.0 to 1.33.0. [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/apache/camel-kamelets/network/alerts). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Feature: helm chart [camel-karavan]
mgubaidullin commented on issue #1172: URL: https://github.com/apache/camel-karavan/issues/1172#issuecomment-1996014106 @spoletum Appreciate your interest. Contributions are welcome -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[I] Feature: helm chart [camel-karavan]
spoletum opened a new issue, #1172: URL: https://github.com/apache/camel-karavan/issues/1172 It would be ideal to have an Helm Chart to install Karavan on Kubernetes. Happy to contribute. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20095 : add langchain component [camel]
oscerd commented on PR #13341: URL: https://github.com/apache/camel/pull/13341#issuecomment-1995944202 Ready to go. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20095 : add langchain component [camel]
zbendhiba commented on PR #13341: URL: https://github.com/apache/camel/pull/13341#issuecomment-199517 thanks @orpiske -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Running integrations fail when the used registry has a port other than default 80 [camel-k]
bvahdat commented on issue #5141: URL: https://github.com/apache/camel-k/issues/5141#issuecomment-1995873819 >... there is no need to provide the --registry option during installation as it will be discovered by the tooling. Thanks @squakez, that did the trick -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch regen_bot updated (2bdfab1548a -> 409a8c6c2fd)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 2bdfab1548a CAMEL-18090: camel-main - Make it possible to know the configured profile. add 409a8c6c2fd CAMEL-20341: refactored ContextTestSupport to work like CamelTestSupport No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/ContextTestSupport.java | 822 ++--- .../test/java/org/apache/camel/TestSupport.java| 15 + .../camel/builder/NotifyBuilderFromRouteTest.java | 14 +- .../camel/builder/ThreadPoolBuilderTest.java | 4 +- ...seMethodWithMatchingTypeAndSkipSettersTest.java | 4 +- .../bean/BeanComponentMissingParenthesisTest.java | 4 +- ...entWithPropertiesLookupSetFromEndpointTest.java | 4 +- .../camel/component/bean/BeanConcurrentTest.java | 4 +- .../camel/component/bean/BeanEndpointTest.java | 4 +- .../BeanExchangeAsReturnTypeNotAllowedTest.java| 4 +- .../bean/BeanExplicitMethodAmbiguousTest.java | 4 +- .../component/bean/BeanExplicitMethodTest.java | 4 +- .../bean/BeanExpressionConcurrentTest.java | 4 +- .../component/bean/BeanImplicitMethodTest.java | 4 +- .../camel/component/bean/BeanInPipelineTest.java | 4 +- .../component/bean/BeanInfoSelectMethodTest.java | 4 +- .../component/bean/BeanInvokeWithNullBodyTest.java | 4 +- .../camel/component/bean/BeanLifecycleTest.java| 4 +- .../camel/component/bean/BeanMapPutTest.java | 4 +- .../bean/BeanMethodValueWithCommaTest.java | 4 +- .../bean/BeanMethodValueWithExchangeTest.java | 4 +- ...rameterAndNoMethodWithNoParameterIssueTest.java | 4 +- .../bean/BeanMethodWithStringParameterTest.java| 4 +- .../component/bean/BeanOgnlPerformanceTest.java| 4 +- .../bean/BeanParameterInvalidSyntaxTest.java | 4 +- .../bean/BeanParameterInvalidValueTest.java| 4 +- .../BeanParameterMethodCallThreeBodyOgnlTest.java | 4 +- .../bean/BeanParameterNoBeanBindingTest.java | 4 +- .../bean/BeanParameterThreeBodyOgnlTest.java | 4 +- .../component/bean/BeanParameterValueOgnlTest.java | 4 +- .../bean/BeanParameterValueOverloadedTest.java | 4 +- .../component/bean/BeanParameterValueTest.java | 4 +- .../camel/component/bean/BeanPipelineTest.java | 4 +- .../component/bean/BeanPipelineVariablesTest.java | 4 +- .../component/bean/BeanPropagateHeaderTest.java| 4 +- .../component/bean/BeanPropertiesFunctionTest.java | 4 +- .../component/bean/BeanRefMethodNotFoundTest.java | 4 +- .../camel/component/bean/BeanRefNotFoundTest.java | 4 +- .../bean/BeanReturnCallableReturnNullTest.java | 4 +- .../component/bean/BeanReturnCallableTest.java | 4 +- .../bean/BeanWithAnnotationAndExchangeTest.java| 4 +- .../bean/BeanWithAnnotationInheritedTest.java | 4 +- .../BeanWithExchangeExceptionAnnotationTest.java | 4 +- .../BeanWithExpressionInjectionPredicateTest.java | 4 +- .../bean/BeanWithExpressionInjectionTest.java | 4 +- .../camel/component/bean/BeanWithHeaderTest.java | 4 +- .../bean/BeanWithHeadersAndBodyInject2Test.java| 4 +- .../bean/BeanWithHeadersAndBodyInject3Test.java| 4 +- .../bean/BeanWithHeadersAndBodyInjectionTest.java | 4 +- .../bean/BeanWithInputStreamBodyTest.java | 4 +- .../component/bean/BeanWithMethodHeaderTest.java | 4 +- ...thPropertiesAndHeadersAndBodyInjectionTest.java | 4 +- .../BeanWithPropertiesAndHeadersInjectionTest.java | 4 +- ...eanWithPropertiesAndVariablesInjectionTest.java | 4 +- .../bean/BeanWithVariablesAndBodyInject3Test.java | 4 +- .../BeanWithVariablesAndBodyInjectionTest.java | 4 +- ...BeanWithXPathInjectionUsingHeaderValueTest.java | 4 +- .../BeanWithXPathInjectionUsingResultTypeTest.java | 4 +- .../BodyAnnotationToDisambiguateMethodsTest.java | 4 +- ...entWithPropertiesLookupSetFromEndpointTest.java | 4 +- .../bean/CustomParameterMappingStrategyTest.java | 4 +- .../bean/DefaultParameterMappingStrategyTest.java | 4 +- ...ressionAnnotationToDisambiguateMethodsTest.java | 4 +- .../bean/FileBeanParameterBindingTest.java | 4 +- .../bean/MethodCallBeanRefMethodNotFoundTest.java | 4 +- .../bean/MethodCallBeanRefNotFoundTest.java| 4 +- .../bean/MethodCallByTypeRefExistingBeanTest.java | 4 +- .../MethodCallRefOrBeanPrefixPredicateTest.java| 4 +- .../bean/MethodCallRefOrBeanPrefixTest.java| 4 +- .../component/bean/MockitoMockForClassTest.java| 4 +- .../bean/MockitoMockForInterfaceTest.java | 4 +- .../component/bean/MockitoSpyForClassTest.java | 4 +- .../camel/component/bean/MyCurrencyBeanTest.java | 4 +- .../camel/component/bean/NewInstanceTest.java | 2 +-
Re: [PR] Camel 20341 [camel]
orpiske merged PR #13447: URL: https://github.com/apache/camel/pull/13447 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20095 : add langchain component [camel]
orpiske commented on PR #13341: URL: https://github.com/apache/camel/pull/13341#issuecomment-1995750951 > I don't know what the CI error is about It's my fault. I gave you the wrong annotation. In the file `LangchainChatIT` (and others using the same annotation), the code should be: ```@DisabledIfSystemProperty(named = "ci.env.name", matches = ".*", disabledReason = "Requires too much network resources")``` Note the dot `.` before the star `*`. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20654: camel-xslt: Make variables available as xsl:param [camel]
github-actions[bot] commented on PR #13467: URL: https://github.com/apache/camel/pull/13467#issuecomment-1995667487 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20095 : add langchain component [camel]
zbendhiba commented on PR #13341: URL: https://github.com/apache/camel/pull/13341#issuecomment-1995669339 I don't know what the CI error is about -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] CAMEL-20654: camel-xslt: Make variables available as xsl:param [camel]
igarashitm opened a new pull request, #13467: URL: https://github.com/apache/camel/pull/13467 # Description # Target - [x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [x] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue] https://issues.apache.org/jira/browse/CAMEL-20564 # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20095 : add langchain component [camel]
zbendhiba commented on PR #13341: URL: https://github.com/apache/camel/pull/13341#issuecomment-1995615384 @orpiske @aldettinger thanks again for the reviews. I pushed the changed and rebased from main -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20095 : add langchain component [camel]
zbendhiba commented on code in PR #13341:
URL: https://github.com/apache/camel/pull/13341#discussion_r1523824726
##
components/camel-ai/camel-langchain-chat/src/test/java/org/apache/camel/component/chat/OllamaTestSupport.java:
##
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.chat;
+
+import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.ollama.OllamaChatModel;
+import org.apache.camel.test.infra.ollama.services.OllamaService;
+import org.apache.camel.test.infra.ollama.services.OllamaServiceFactory;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import static java.time.Duration.ofSeconds;
+
+public class OllamaTestSupport extends CamelTestSupport {
+
+protected ChatLanguageModel chatLanguageModel;
+
+@RegisterExtension
+static OllamaService OLLAMA = OllamaServiceFactory.createService();
+
+@Override
+protected void setupResources() throws Exception {
+super.setupResources();
+
+chatLanguageModel = createModel();
+}
+
+public ChatLanguageModel createModel() {
+return OllamaChatModel.builder()
+.baseUrl(OLLAMA.getBaseUrl())
+.modelName(OLLAMA.getModel())
+.temperature(0.5)
Review Comment:
Moved it to 0.3
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] CAMEL-20095 : add langchain component [camel]
zbendhiba commented on code in PR #13341:
URL: https://github.com/apache/camel/pull/13341#discussion_r1523800836
##
components/camel-ai/camel-langchain-chat/src/main/java/org/apache/camel/component/chat/LangchainChatProducer.java:
##
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.chat;
+
+import java.util.List;
+import java.util.Map;
+
+import dev.langchain4j.data.message.AiMessage;
+import dev.langchain4j.data.message.ChatMessage;
+import dev.langchain4j.model.chat.ChatLanguageModel;
+import dev.langchain4j.model.input.Prompt;
+import dev.langchain4j.model.input.PromptTemplate;
+import dev.langchain4j.model.output.Response;
+import org.apache.camel.Exchange;
+import org.apache.camel.InvalidPayloadException;
+import org.apache.camel.NoSuchHeaderException;
+import org.apache.camel.support.DefaultProducer;
+import org.apache.camel.util.ObjectHelper;
+
+public class LangchainChatProducer extends DefaultProducer {
+
+private final LangchainChatEndpoint endpoint;
+
+private ChatLanguageModel chatLanguageModel;
+
+public LangchainChatProducer(LangchainChatEndpoint endpoint) {
+super(endpoint);
+this.endpoint = endpoint;
+}
+
+@Override
+public void process(Exchange exchange) throws Exception {
+
+var operation = this.endpoint.getConfiguration().getChatOperation();
+
+if (LangchainChatOperations.CHAT_SINGLE_MESSAGE.equals(operation)) {
+processSingleMessage(exchange);
+} else if
(LangchainChatOperations.CHAT_SINGLE_MESSAGE_WITH_PROMPT.equals(operation)) {
+processSingleMessageWithPrompt(exchange);
+} else if
(LangchainChatOperations.CHAT_MULTIPLE_MESSAGES.equals(operation)) {
+processMultipleMessages(exchange);
+}
+}
+
+@SuppressWarnings("unchecked")
+private void processSingleMessageWithPrompt(Exchange exchange) throws
NoSuchHeaderException, InvalidPayloadException {
+final String promptTemplate =
exchange.getIn().getHeader(LangchainChat.Headers.PROMPT_TEMPLATE, String.class);
+if (promptTemplate == null) {
+throw new NoSuchHeaderException("The action is a required header",
exchange, LangchainChat.Headers.PROMPT_TEMPLATE);
Review Comment:
yes nice catch
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] CAMEL-20095 : add langchain component [camel]
zbendhiba commented on code in PR #13341:
URL: https://github.com/apache/camel/pull/13341#discussion_r1523792287
##
components/camel-ai/camel-langchain-chat/pom.xml:
##
@@ -0,0 +1,72 @@
+
+
+http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+ 4.0.0
+
+camel-ai-parent
+org.apache.camel
+4.5.0-SNAPSHOT
+
+
+ camel-langchain-chat
+ jar
+
+ Camel Langchain
+ Langchain4j Chat component
+
+
+4.5.0
+Preview
+ai
+
+
+
+
+ org.apache.camel
+ camel-support
+
+
+
+ org.apache.camel
+ camel-test-spring-junit5
+ test
+
+
+
+ dev.langchain4j
+ langchain4j-embeddings-all-minilm-l6-v2
+ ${langchain4j.version}
+ test
+
+
+ dev.langchain4j
+ langchain4j-ollama
+ ${langchain4j.version}
+
Review Comment:
oh yes, nice catch
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
(camel-quarkus) 01/01: Upgrade Quarkus to 3.10.0.CR1
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit b9a37388f5bce663e999cb389966af7facff8c57 Author: James Netherton AuthorDate: Wed Mar 13 19:00:20 2024 + Upgrade Quarkus to 3.10.0.CR1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c7663811cb..8be21f089e 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.2.2 2.3.1 2.0.2 -3.9.0.CR1 +999-SNAPSHOT 4.0.0 2.6.0
(camel-quarkus) branch quarkus-main updated (6378105a18 -> b9a37388f5)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 6378105a18 Disable Infinispan tests due to #5844 discard bcf2d3be64 Upgrade Quarkus to 3.9.0.CR1 add da33a221c4 Remove obsolete vertx-grpc exclusions since they potentially cause issues if quarkus-grpc is present add 7302bea731 Upgrade Quarkus to 3.9.0.CR1 add 814df84465 Disable Infinispan tests due to #5844 add b0a09d3a4e Disable git native integration test due to #5870 add 0e7617ba29 Disable java-joor-dsl tests on Windows due to #5872 add 57adf97dd6 Disable jsh-dsl tests on Windows due to #5873 new b9a37388f5 Upgrade Quarkus to 3.10.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 (6378105a18) \ N -- N -- N refs/heads/quarkus-main (b9a37388f5) 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: docs/antora.yml| 2 +- extensions/google-bigquery/deployment/pom.xml | 32 +- extensions/google-bigquery/runtime/pom.xml | 16 --- extensions/google-pubsub/deployment/pom.xml| 32 +- extensions/google-pubsub/runtime/pom.xml | 16 --- extensions/salesforce/deployment/pom.xml | 32 -- extensions/salesforce/runtime/pom.xml | 22 --- .../camel/quarkus/component/git/it/GitIT.java | 2 ++ .../quarkus/dsl/java/joor/JavaJoorDslTest.java | 3 ++ .../apache/camel/quarkus/dsl/jsh/JshDslTest.java | 3 ++ 10 files changed, 11 insertions(+), 149 deletions(-)
Re: [PR] Speed up Windows, quarkus-main & camel-main builds [camel-quarkus]
jamesnetherton commented on PR #5871: URL: https://github.com/apache/camel-quarkus/pull/5871#issuecomment-1995357846 Seems that had the desired effect for Windows. Caching the font listing shaves 20+ minutes off the build time. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) 01/05: Upgrade Quarkus to 3.9.0.CR1
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
commit 7302bea731e4b51ed3d7c8309c1af54743fa4dbb
Author: James Netherton
AuthorDate: Wed Feb 28 08:13:46 2024 +
Upgrade Quarkus to 3.9.0.CR1
---
docs/antora.yml| 4 ++--
extensions/google-bigquery/deployment/pom.xml | 4
extensions/google-bigquery/runtime/pom.xml | 4
extensions/google-pubsub/deployment/pom.xml| 4
extensions/google-pubsub/runtime/pom.xml | 4
extensions/grpc/deployment/pom.xml | 4
extensions/grpc/runtime/pom.xml| 8 +++
extensions/js-dsl/runtime/pom.xml | 4
extensions/opentelemetry/deployment/pom.xml| 5 +
.../smallrye-reactive-messaging/deployment/pom.xml | 2 +-
.../smallrye-reactive-messaging/runtime/pom.xml| 2 +-
.../resources/container-license-acceptance.txt | 2 +-
pom.xml| 12 +--
poms/bom/pom.xml | 8 ++-
poms/bom/src/main/generated/flattened-full-pom.xml | 25 --
.../src/main/generated/flattened-reduced-pom.xml | 16 +-
.../generated/flattened-reduced-verbose-pom.xml| 16 +-
.../camel/quarkus/test/AfterEachCallback.java | 1 +
.../camel/quarkus/test/BeforeEachCallback.java | 1 +
.../AdviceInDoBeforeEachMethodsTest.java | 6 +++---
20 files changed, 100 insertions(+), 32 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 3bb969c940..f62a00e75b 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,8 +31,8 @@ asciidoc:
camel-version: 4.4.0 # replace ${camel.version}
camel-docs-version: 4.4.x
camel-quarkus-version: 3.9.0 # replace ${camel-quarkus.version}
-quarkus-version: 3.8.2 # replace ${quarkus.version}
-graalvm-version: 23.0.1 # replace ${graalvm.version}
+quarkus-version: 3.9.0.CR1 # replace ${quarkus.version}
+graalvm-version: 23.1.2 # replace ${graalvm.version}
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}
diff --git a/extensions/google-bigquery/deployment/pom.xml
b/extensions/google-bigquery/deployment/pom.xml
index e4ee089cfd..e241c48c8a 100644
--- a/extensions/google-bigquery/deployment/pom.xml
+++ b/extensions/google-bigquery/deployment/pom.xml
@@ -38,6 +38,10 @@
com.google.code.findbugs
jsr305
+
+org.checkerframework
+checker-qual
+
diff --git a/extensions/google-bigquery/runtime/pom.xml
b/extensions/google-bigquery/runtime/pom.xml
index 0042508e06..c0478cec8b 100644
--- a/extensions/google-bigquery/runtime/pom.xml
+++ b/extensions/google-bigquery/runtime/pom.xml
@@ -74,6 +74,10 @@
io.grpc
grpc-netty
+
+com.google.code.findbugs
+jsr305
+
com.google.android
annotations
diff --git a/extensions/google-pubsub/deployment/pom.xml
b/extensions/google-pubsub/deployment/pom.xml
index 60285e5c24..cafa0fe6d0 100644
--- a/extensions/google-pubsub/deployment/pom.xml
+++ b/extensions/google-pubsub/deployment/pom.xml
@@ -42,6 +42,10 @@
com.google.code.findbugs
jsr305
+
+org.checkerframework
+checker-qual
+
diff --git a/extensions/google-pubsub/runtime/pom.xml
b/extensions/google-pubsub/runtime/pom.xml
index 5fc0994cb7..fc867c6eff 100644
--- a/extensions/google-pubsub/runtime/pom.xml
+++ b/extensions/google-pubsub/runtime/pom.xml
@@ -97,6 +97,10 @@
com.google.android
annotations
+
+com.google.code.findbugs
+jsr305
+
commons-logging
commons-logging
diff --git a/extensions/grpc/deployment/pom.xml
b/extensions/grpc/deployment/pom.xml
index db1b712e67..e606eeb03e 100644
--- a/extensions/grpc/deployment/pom.xml
+++ b/extensions/grpc/deployment/pom.xml
@@ -50,6 +50,10 @@
io.vertx
vertx-grpc-server
+
+org.checkerframework
+checker-qual
+
diff --git a/extensions/grpc/runtime/pom.xml
(camel-quarkus) 02/05: Disable Infinispan tests due to #5844
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
commit 814df84465ac90a4761935ecde6af2ad97dca019
Author: James Netherton
AuthorDate: Wed Mar 6 16:06:31 2024 +
Disable Infinispan tests due to #5844
---
integration-tests/infinispan-quarkus-client/pom.xml | 2 ++
integration-tests/infinispan/pom.xml | 2 ++
.../apache/camel/quarkus/component/infinispan/InfinispanIT.java | 2 ++
.../camel/quarkus/component/infinispan/InfinispanTest.java | 1 +
poms/bom/pom.xml | 9 +
poms/bom/src/main/generated/flattened-full-pom.xml | 8
poms/bom/src/main/generated/flattened-reduced-pom.xml| 8
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml| 8
8 files changed, 40 insertions(+)
diff --git a/integration-tests/infinispan-quarkus-client/pom.xml
b/integration-tests/infinispan-quarkus-client/pom.xml
index a87b90409d..d77f674203 100644
--- a/integration-tests/infinispan-quarkus-client/pom.xml
+++ b/integration-tests/infinispan-quarkus-client/pom.xml
@@ -70,6 +70,7 @@
+
virtualDependencies
diff --git a/integration-tests/infinispan/pom.xml
b/integration-tests/infinispan/pom.xml
index 90f2f30fc9..e5514af2dd 100644
--- a/integration-tests/infinispan/pom.xml
+++ b/integration-tests/infinispan/pom.xml
@@ -82,6 +82,7 @@
+
virtualDependencies
diff --git
a/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanIT.java
b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanIT.java
index 25a4208dc0..f63f2c078d 100644
---
a/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanIT.java
+++
b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanIT.java
@@ -17,7 +17,9 @@
package org.apache.camel.quarkus.component.infinispan;
import io.quarkus.test.junit.QuarkusIntegrationTest;
+import org.junit.jupiter.api.Disabled;
+@Disabled("https://github.com/apache/camel-quarkus/issues/5844;)
@QuarkusIntegrationTest
public class InfinispanIT extends InfinispanTest {
}
diff --git
a/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanTest.java
b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanTest.java
index 637fa714a2..b469e343c3 100644
---
a/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanTest.java
+++
b/integration-tests/infinispan/src/test/java/org/apache/camel/quarkus/component/infinispan/InfinispanTest.java
@@ -26,6 +26,7 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.Matchers.is;
+@Disabled("https://github.com/apache/camel-quarkus/issues/5844;)
@QuarkusTest
@QuarkusTestResource(InfinispanServerTestResource.class)
public class InfinispanTest extends InfinispanCommonTest {
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index dfcdbb219c..b610de81dc 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -1426,6 +1426,15 @@
camel-infinispan
${camel.version}
+
+
+org.infinispan
+infinispan-commons-jakarta
+
+
+org.infinispan
+
infinispan-client-hotrod-jakarta
+
org.slf4j
jcl-over-slf4j
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index b57dde5256..e00b7fb008 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -1364,6 +1364,14 @@
camel-infinispan
4.4.0
+
+org.infinispan
+infinispan-commons-jakarta
+
+
+org.infinispan
+infinispan-client-hotrod-jakarta
+
org.slf4j
jcl-over-slf4j
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml
b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 783cdfe03d..abd56a068a 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -1364,6 +1364,14 @@
camel-infinispan
4.4.0
+
+org.infinispan
+infinispan-commons-jakarta
+
+
+org.infinispan
+
(camel-quarkus) 05/05: Disable jsh-dsl tests on Windows due to #5873
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
commit 57adf97dd61f613d16b741039e2491dd6821e757
Author: James Netherton
AuthorDate: Wed Mar 13 16:18:23 2024 +
Disable jsh-dsl tests on Windows due to #5873
---
.../src/test/java/org/apache/camel/quarkus/dsl/jsh/JshDslTest.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/integration-tests/jsh-dsl/src/test/java/org/apache/camel/quarkus/dsl/jsh/JshDslTest.java
b/integration-tests/jsh-dsl/src/test/java/org/apache/camel/quarkus/dsl/jsh/JshDslTest.java
index 62a3c27b91..3b00a31128 100644
---
a/integration-tests/jsh-dsl/src/test/java/org/apache/camel/quarkus/dsl/jsh/JshDslTest.java
+++
b/integration-tests/jsh-dsl/src/test/java/org/apache/camel/quarkus/dsl/jsh/JshDslTest.java
@@ -21,7 +21,10 @@ import io.restassured.RestAssured;
import org.apache.camel.dsl.jsh.JshRoutesBuilderLoader;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
+@DisabledOnOs(value = OS.WINDOWS, disabledReason =
"https://github.com/apache/camel-quarkus/issues/5873;)
@QuarkusTest
class JshDslTest {
(camel-quarkus) branch main updated (da33a221c4 -> 57adf97dd6)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from da33a221c4 Remove obsolete vertx-grpc exclusions since they potentially cause issues if quarkus-grpc is present new 7302bea731 Upgrade Quarkus to 3.9.0.CR1 new 814df84465 Disable Infinispan tests due to #5844 new b0a09d3a4e Disable git native integration test due to #5870 new 0e7617ba29 Disable java-joor-dsl tests on Windows due to #5872 new 57adf97dd6 Disable jsh-dsl tests on Windows due to #5873 The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: docs/antora.yml| 4 +-- extensions/google-bigquery/deployment/pom.xml | 4 +++ extensions/google-bigquery/runtime/pom.xml | 4 +++ extensions/google-pubsub/deployment/pom.xml| 4 +++ extensions/google-pubsub/runtime/pom.xml | 4 +++ extensions/grpc/deployment/pom.xml | 4 +++ extensions/grpc/runtime/pom.xml| 8 ++ extensions/js-dsl/runtime/pom.xml | 4 +++ extensions/opentelemetry/deployment/pom.xml| 5 .../smallrye-reactive-messaging/deployment/pom.xml | 2 +- .../smallrye-reactive-messaging/runtime/pom.xml| 2 +- .../resources/container-license-acceptance.txt | 2 +- .../camel/quarkus/component/git/it/GitIT.java | 2 ++ .../infinispan-quarkus-client/pom.xml | 2 ++ integration-tests/infinispan/pom.xml | 2 ++ .../quarkus/component/infinispan/InfinispanIT.java | 2 ++ .../component/infinispan/InfinispanTest.java | 1 + .../quarkus/dsl/java/joor/JavaJoorDslTest.java | 3 ++ .../apache/camel/quarkus/dsl/jsh/JshDslTest.java | 3 ++ pom.xml| 12 poms/bom/pom.xml | 17 ++- poms/bom/src/main/generated/flattened-full-pom.xml | 33 +- .../src/main/generated/flattened-reduced-pom.xml | 24 .../generated/flattened-reduced-verbose-pom.xml| 24 .../camel/quarkus/test/AfterEachCallback.java | 1 + .../camel/quarkus/test/BeforeEachCallback.java | 1 + .../AdviceInDoBeforeEachMethodsTest.java | 6 ++-- 27 files changed, 148 insertions(+), 32 deletions(-)
(camel-quarkus) 03/05: Disable git native integration test due to #5870
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
commit b0a09d3a4edc170d2229087f05a7687151e7f8c4
Author: James Netherton
AuthorDate: Wed Mar 13 13:35:53 2024 +
Disable git native integration test due to #5870
---
.../src/test/java/org/apache/camel/quarkus/component/git/it/GitIT.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/integration-tests/git/src/test/java/org/apache/camel/quarkus/component/git/it/GitIT.java
b/integration-tests/git/src/test/java/org/apache/camel/quarkus/component/git/it/GitIT.java
index fced3bc4dd..3841dbecdd 100644
---
a/integration-tests/git/src/test/java/org/apache/camel/quarkus/component/git/it/GitIT.java
+++
b/integration-tests/git/src/test/java/org/apache/camel/quarkus/component/git/it/GitIT.java
@@ -17,7 +17,9 @@
package org.apache.camel.quarkus.component.git.it;
import io.quarkus.test.junit.QuarkusIntegrationTest;
+import org.junit.jupiter.api.Disabled;
+@Disabled("https://github.com/apache/camel-quarkus/issues/5870;)
@QuarkusIntegrationTest
class GitIT extends GitTest {
(camel-quarkus) 04/05: Disable java-joor-dsl tests on Windows due to #5872
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
commit 0e7617ba2999d7671521e7dc89cb75f42c58f7be
Author: James Netherton
AuthorDate: Wed Mar 13 16:18:07 2024 +
Disable java-joor-dsl tests on Windows due to #5872
---
.../java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/integration-tests/java-joor-dsl/src/test/java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java
b/integration-tests/java-joor-dsl/src/test/java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java
index 767196aeaf..526fdb133c 100644
---
a/integration-tests/java-joor-dsl/src/test/java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java
+++
b/integration-tests/java-joor-dsl/src/test/java/org/apache/camel/quarkus/dsl/java/joor/JavaJoorDslTest.java
@@ -21,9 +21,12 @@ import io.restassured.RestAssured;
import org.apache.camel.dsl.java.joor.JavaRoutesBuilderLoader;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledOnOs;
+import org.junit.jupiter.api.condition.OS;
import static org.hamcrest.CoreMatchers.equalTo;
+@DisabledOnOs(value = OS.WINDOWS, disabledReason =
"https://github.com/apache/camel-quarkus/issues/5872;)
@QuarkusTest
class JavaJoorDslTest {
Re: [PR] Upgrade Quarkus to 3.9.0.CR1 [camel-quarkus]
jamesnetherton merged PR #5869: URL: https://github.com/apache/camel-quarkus/pull/5869 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Infrastructure selector (k8s secrets, docker, etc) doen not work correctly [camel-karavan]
mgubaidullin closed issue #1171: Infrastructure selector (k8s secrets, docker, etc) doen not work correctly URL: https://github.com/apache/camel-karavan/issues/1171 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karavan) branch main updated: Fix #1171
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 24cef873 Fix #1171
24cef873 is described below
commit 24cef8732da63930cf685f204ec05704d0a53d18
Author: Marat Gubaidullin
AuthorDate: Wed Mar 13 14:32:18 2024 -0400
Fix #1171
---
.../webui/src/designer/property/property/ComponentPropertyField.tsx| 2 ++
.../src/main/webui/src/designer/property/property/DslPropertyField.tsx | 3 +++
.../main/webui/src/designer/property/property/KameletPropertyField.tsx | 1 +
.../src/designer/property/property/ComponentPropertyField.tsx | 2 ++
karavan-designer/src/designer/property/property/DslPropertyField.tsx | 3 +++
.../src/designer/property/property/KameletPropertyField.tsx| 1 +
.../src/designer/property/property/ComponentPropertyField.tsx | 2 ++
karavan-space/src/designer/property/property/DslPropertyField.tsx | 3 +++
karavan-space/src/designer/property/property/KameletPropertyField.tsx | 1 +
9 files changed, 18 insertions(+)
diff --git
a/karavan-app/src/main/webui/src/designer/property/property/ComponentPropertyField.tsx
b/karavan-app/src/main/webui/src/designer/property/property/ComponentPropertyField.tsx
index 925ab18b..e7460847 100644
---
a/karavan-app/src/main/webui/src/designer/property/property/ComponentPropertyField.tsx
+++
b/karavan-app/src/main/webui/src/designer/property/property/ComponentPropertyField.tsx
@@ -226,6 +226,7 @@ export function ComponentPropertyField(props: Props) {
const propertyName = infrastructureSelectorProperty;
if (propertyName) {
if (value.startsWith("config") || value.startsWith("secret"))
value = "{{" + value + "}}";
+setTextValue(value);
parametersChanged(propertyName, value);
setInfrastructureSelector(false);
setInfrastructureSelectorProperty(undefined);
@@ -287,6 +288,7 @@ export function ComponentPropertyField(props: Props) {
title={property.displayName}
onClose={() => setShowEditor(false)}
onSave={(fieldId, value1) => {
+ setTextValue(value1);
parametersChanged(property.name, value1,
property.kind === 'path')
setShowEditor(false);
setCheckChanges(false);
diff --git
a/karavan-app/src/main/webui/src/designer/property/property/DslPropertyField.tsx
b/karavan-app/src/main/webui/src/designer/property/property/DslPropertyField.tsx
index 7fc8733d..cd137961 100644
---
a/karavan-app/src/main/webui/src/designer/property/property/DslPropertyField.tsx
+++
b/karavan-app/src/main/webui/src/designer/property/property/DslPropertyField.tsx
@@ -248,6 +248,7 @@ export function DslPropertyField(props: Props) {
const propertyName = infrastructureSelectorProperty;
if (propertyName) {
if (value.startsWith("config") || value.startsWith("secret"))
value = "{{" + value + "}}";
+setTextValue(value);
propertyChanged(propertyName, value);
setInfrastructureSelector(false);
setInfrastructureSelectorProperty(undefined);
@@ -402,6 +403,7 @@ export function DslPropertyField(props: Props) {
onClose={() => setShowEditor(false)}
onSave={(fieldId, value1) => {
propertyChanged(property.name, value1)
+ setTextValue(value1);
setShowEditor(false);
}}/>
}
@@ -498,6 +500,7 @@ export function DslPropertyField(props: Props) {
onClose={() => setShowEditor(false)}
onSave={(fieldId, value1) => {
propertyChanged(fieldId, value1);
+ setTextValue(value1);
setShowEditor(false);
}}/>
}
diff --git
a/karavan-app/src/main/webui/src/designer/property/property/KameletPropertyField.tsx
b/karavan-app/src/main/webui/src/designer/property/property/KameletPropertyField.tsx
index 06392ad3..bfe5543c 100644
---
a/karavan-app/src/main/webui/src/designer/property/property/KameletPropertyField.tsx
+++
b/karavan-app/src/main/webui/src/designer/property/property/KameletPropertyField.tsx
@@ -99,6 +99,7 @@ export function KameletPropertyField(props: Props) {
const propertyId = infrastructureSelectorProperty;
if (propertyId){
if (value.startsWith("config") || value.startsWith("secret"))
value = "{{" + value + "}}";
+
(camel) branch regen_bot updated (feff3159315 -> 2bdfab1548a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from feff3159315 Main profile (#13466) add 2bdfab1548a CAMEL-18090: camel-main - Make it possible to know the configured profile. No new revisions were added by this update. Summary of changes: .../component/platform/http/main/MainHttpServer.java | 6 ++ .../main/java/org/apache/camel/ExtendedCamelContext.java | 12 .../camel/impl/engine/DefaultCamelContextExtension.java | 11 +++ .../org/apache/camel/impl/console/ContextDevConsole.java | 12 +--- .../apache/camel/impl/ExtendedCamelContextConfigurer.java | 6 ++ .../java/org/apache/camel/main/ProfileConfigurer.java | 3 +++ .../api/management/mbean/ManagedCamelContextMBean.java| 3 +++ .../camel/management/mbean/ManagedCamelContext.java | 5 + .../jbang/core/commands/process/CamelContextStatus.java | 11 +++ .../dsl/jbang/core/commands/process/ListProcess.java | 15 ++- 10 files changed, 80 insertions(+), 4 deletions(-)
Re: [PR] fix(#5242): Disable noErrorHandler setting for Camel 4.4.0 [camel-k]
github-actions[bot] commented on PR #5245: URL: https://github.com/apache/camel-k/pull/5245#issuecomment-1995291920 :heavy_check_mark: Unit test coverage report - coverage increased from 37.2% to 37.3% (**+0.1%**) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated (feff3159315 -> 2bdfab1548a)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from feff3159315 Main profile (#13466) add 2bdfab1548a CAMEL-18090: camel-main - Make it possible to know the configured profile. No new revisions were added by this update. Summary of changes: .../component/platform/http/main/MainHttpServer.java | 6 ++ .../main/java/org/apache/camel/ExtendedCamelContext.java | 12 .../camel/impl/engine/DefaultCamelContextExtension.java | 11 +++ .../org/apache/camel/impl/console/ContextDevConsole.java | 12 +--- .../apache/camel/impl/ExtendedCamelContextConfigurer.java | 6 ++ .../java/org/apache/camel/main/ProfileConfigurer.java | 3 +++ .../api/management/mbean/ManagedCamelContextMBean.java| 3 +++ .../camel/management/mbean/ManagedCamelContext.java | 5 + .../jbang/core/commands/process/CamelContextStatus.java | 11 +++ .../dsl/jbang/core/commands/process/ListProcess.java | 15 ++- 10 files changed, 80 insertions(+), 4 deletions(-)
(camel-k) branch main updated (d2ec89c9e -> 834d4694b)
This is an automated email from the ASF dual-hosted git repository. cdeppisch pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from d2ec89c9e chore: propagate capabilities to Kit new 89a71fa7c chore(e2e): Add option to set base image and runtime version in E2E tests new 1e255ff7f chore(e2e): Use new context instance for each E2E test new 0c353adc5 chore(e2e): Use UpdatePlatform func as it is more stable new e1da60771 chore(e2e): Improve Integration logs waiting for container created new 8793fa3e7 chore(e2e): Use a shared context in E2E tests new 834d4694b chore(e2e): Do not run fast setup locally The 6 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: .github/workflows/common.yml | 2 +- e2e/advanced/build_order_strategy_test.go| 190 +++--- e2e/advanced/builder_test.go | 49 +- e2e/advanced/catalog_builder_test.go | 97 ++- e2e/advanced/debug_test.go | 50 +- e2e/advanced/deployment_test.go | 19 +- e2e/advanced/dump_test.go| 21 +- e2e/advanced/environment_test.go | 62 +- e2e/advanced/incremental_build_test.go | 238 +++ e2e/advanced/integration_profile_test.go | 111 ++-- e2e/advanced/kamelet_repo_test.go| 37 +- e2e/advanced/local_platform_test.go | 39 +- e2e/advanced/main_test.go| 51 +- e2e/advanced/maven_http_proxy_test.go| 61 +- e2e/advanced/operator_id_filtering_test.go | 105 ++- e2e/advanced/operator_metrics_test.go| 35 +- e2e/advanced/platform_traits_test.go | 40 +- e2e/advanced/promote_test.go | 137 ++-- e2e/advanced/reset_test.go | 63 +- e2e/advanced/synthetic_test.go | 59 +- e2e/advanced/tekton_test.go | 15 +- e2e/builder/build_test.go| 161 ++--- e2e/builder/registry_test.go | 47 +- e2e/common/cli/bind_test.go | 29 +- e2e/common/cli/config_test.go| 21 +- e2e/common/cli/delete_test.go| 61 +- e2e/common/cli/describe_test.go | 20 +- e2e/common/cli/dev_mode_test.go | 22 +- e2e/common/cli/duplicate_parameters_test.go | 2 +- e2e/common/cli/get_test.go | 49 +- e2e/common/cli/help_test.go | 7 +- e2e/common/cli/log_test.go | 22 +- e2e/common/cli/main_test.go | 13 +- e2e/common/cli/offline_commands_test.go | 8 +- e2e/common/cli/run_test.go | 153 ++--- e2e/common/cli/version_test.go | 2 +- e2e/common/config/config_reload_test.go | 153 ++--- e2e/common/config/config_test.go | 290 + e2e/common/config/kamelet_config_test.go | 275 e2e/common/config/pipe_config_test.go| 125 ++-- e2e/common/languages/groovy_test.go | 21 +- e2e/common/languages/java_test.go| 21 +- e2e/common/languages/js_test.go | 21 +- e2e/common/languages/kotlin_test.go | 21 +- e2e/common/languages/polyglot_test.go| 23 +- e2e/common/languages/xml_test.go | 21 +- e2e/common/languages/yaml_test.go| 21 +- e2e/common/main_test.go | 34 +- e2e/common/misc/client_test.go | 14 +- e2e/common/misc/cron_test.go | 53 +- e2e/common/misc/integration_fail_test.go | 144 ++--- e2e/common/misc/integration_trait_update_test.go | 23 +- e2e/common/misc/kamelet_test.go | 30 +- e2e/common/misc/kamelet_update_test.go | 29 +- e2e/common/misc/maven_repository_test.go | 27 +- e2e/common/misc/pipe_test.go | 70 +- e2e/common/misc/pipe_with_image_test.go | 57 +- e2e/common/misc/registry_maven_wagon_test.go | 82 ++- e2e/common/misc/rest_test.go | 33 +- e2e/common/misc/scale_binding_test.go| 63 +- e2e/common/misc/scale_integration_test.go| 79 +-- e2e/common/misc/structured_logs_test.go | 29 +- e2e/common/runtimes/runtimes_test.go | 51 +- e2e/common/traits/affinity_test.go | 72 +-- e2e/common/traits/builder_test.go| 253 e2e/common/traits/camel_test.go | 48 +- e2e/common/traits/container_test.go | 51 +- e2e/common/traits/deployment_test.go |
(camel-k) 06/06: chore(e2e): Do not run fast setup locally
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-k.git
commit 834d4694b905e2bd7acd0ac57180d9c2a9d4817d
Author: Christoph Deppisch
AuthorDate: Wed Mar 13 16:52:23 2024 +0100
chore(e2e): Do not run fast setup locally
- Only run main_test.go fast setup optimizations when env var is set
(usually on GitHub CI workflow)
---
e2e/advanced/main_test.go | 52 +++
e2e/common/main_test.go | 35 ---
2 files changed, 44 insertions(+), 43 deletions(-)
diff --git a/e2e/advanced/main_test.go b/e2e/advanced/main_test.go
index 65dbc5afc..dd14d866d 100644
--- a/e2e/advanced/main_test.go
+++ b/e2e/advanced/main_test.go
@@ -43,34 +43,32 @@ func TestMain(m *testing.M) {
}
fastSetup := GetEnvOrDefault("CAMEL_K_E2E_FAST_SETUP", "false")
- if fastSetup != "true" {
- os.Exit(m.Run())
+ if fastSetup == "true" {
+ operatorID := platform.DefaultPlatformName
+ ns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS",
TestDefaultNamespace)
+
+ g := NewGomega(func(message string, callerSkip ...int) {
+ fmt.Printf("Test fast setup failed! - %s\n", message)
+ })
+
+ var t *testing.T
+ g.Expect(TestClient(t)).ShouldNot(BeNil())
+ ctx := TestContext()
+ g.Expect(KamelRunWithID(t, ctx, operatorID, ns,
"files/Java.java").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ctx, ns, "java"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns, "java",
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ctx, ns, "java"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ g.Expect(KamelRunWithID(t, ctx, operatorID, ns,
"files/yaml.yaml").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ctx, ns, "yaml"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns, "yaml",
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ctx, ns, "yaml"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
+
+ g.Expect(KamelRunWithID(t, ctx, operatorID, ns,
"files/timer-source.groovy").Execute()).To(Succeed())
+ g.Eventually(IntegrationPodPhase(t, ctx, ns, "timer-source"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
+ g.Eventually(IntegrationConditionStatus(t, ctx, ns,
"timer-source", v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
+ g.Eventually(IntegrationLogs(t, ctx, ns, "timer-source"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
}
- operatorID := platform.DefaultPlatformName
- ns := GetEnvOrDefault("CAMEL_K_GLOBAL_OPERATOR_NS",
TestDefaultNamespace)
-
- g := NewGomega(func(message string, callerSkip ...int) {
- fmt.Printf("Test fast setup failed! - %s\n", message)
- })
-
- var t *testing.T
- g.Expect(TestClient(t)).ShouldNot(BeNil())
- ctx := TestContext()
- g.Expect(KamelRunWithID(t, ctx, operatorID, ns,
"files/Java.java").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns, "java"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns, "java",
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns, "java"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- g.Expect(KamelRunWithID(t, ctx, operatorID, ns,
"files/yaml.yaml").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns, "yaml"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns, "yaml",
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns, "yaml"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
- g.Expect(KamelRunWithID(t, ctx, operatorID, ns,
"files/timer-source.groovy").Execute()).To(Succeed())
- g.Eventually(IntegrationPodPhase(t, ctx, ns, "timer-source"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
- g.Eventually(IntegrationConditionStatus(t, ctx, ns, "timer-source",
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
- g.Eventually(IntegrationLogs(t, ctx, ns, "timer-source"),
TestTimeoutShort).Should(ContainSubstring("Magicstring!"))
-
Re: [PR] chore(e2e): Separate common-it E2E tests, so they run more efficient [camel-k]
christophd merged PR #5239: URL: https://github.com/apache/camel-k/pull/5239 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) 01/06: chore(e2e): Add option to set base image and runtime version in E2E tests
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-k.git
commit 89a71fa7cc9bcf4a6d1e49c24cad046b7d987665
Author: Christoph Deppisch
AuthorDate: Mon Mar 11 09:55:07 2024 +0100
chore(e2e): Add option to set base image and runtime version in E2E tests
- Useful when running native tests on a macOS arm64 machine (e.g.
CAMEL_K_TEST_BASE_IMAGE=arm64v8/eclipse-temurin:17)
- Useful when running tests with SNAPSHOT runtime version (e.g.
CAMEL_K_TEST_RUNTIME_VERSION=3.8.0-SNAPSHOT)
---
e2e/support/test_support.go | 10 ++
script/Makefile | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index cce80567d..db23f7814 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -308,6 +308,16 @@ func kamelInstallWithContext(t *testing.T, ctx
context.Context, operatorID strin
}
}
+ runtimeVersion := os.Getenv("CAMEL_K_TEST_RUNTIME_VERSION")
+ if runtimeVersion != "" {
+ fmt.Printf("Setting runtime version to %s\n", runtimeVersion)
+ installArgs = append(installArgs, "--runtime-version",
runtimeVersion)
+ }
+ baseImage := os.Getenv("CAMEL_K_TEST_BASE_IMAGE")
+ if baseImage != "" {
+ fmt.Printf("Setting base image to %s\n", baseImage)
+ installArgs = append(installArgs, "--base-image", baseImage)
+ }
opImage := os.Getenv("CAMEL_K_TEST_OPERATOR_IMAGE")
if opImage != "" {
fmt.Printf("Setting operator image to %s\n", opImage)
diff --git a/script/Makefile b/script/Makefile
index f281adcdc..c4f33d261 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -362,7 +362,7 @@ endif
build-compile-integration-tests:
@echo "### Compiling integration tests..."
- export CAMEL_K_E2E_JUST_COMPILE="true" ;\
+ export CAMEL_K_E2E_JUST_COMPILE="true"; \
go test -run nope -tags="integration" ./e2e/...
clean:
(camel-k) 03/06: chore(e2e): Use UpdatePlatform func as it is more stable
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-k.git
commit 0c353adc5cc29e829902befbfc8e81c0c941b469
Author: Christoph Deppisch
AuthorDate: Wed Mar 13 08:24:42 2024 +0100
chore(e2e): Use UpdatePlatform func as it is more stable
---
e2e/advanced/platform_traits_test.go | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/e2e/advanced/platform_traits_test.go
b/e2e/advanced/platform_traits_test.go
index 827064001..662d1f4e1 100644
--- a/e2e/advanced/platform_traits_test.go
+++ b/e2e/advanced/platform_traits_test.go
@@ -48,12 +48,9 @@ func TestTraitOnIntegrationPlatform(t *testing.T) {
containerTestName := "testname"
g.Eventually(PlatformPhase(t, ctx, ns),
TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
- ip := Platform(t, ctx, ns)()
- ip.Spec.Traits = v1.Traits{Logging: {Level:
"DEBUG"}, Container: {Name: containerTestName}}
-
- if err := TestClient(t).Update(ctx, ip); err != nil {
- t.Fatal("Can't create IntegrationPlatform", err)
- }
+ g.Expect(UpdatePlatform(t, ctx, ns, operatorID, func(ip
*v1.IntegrationPlatform) {
+ ip.Spec.Traits = v1.Traits{Logging:
{Level: "DEBUG"}, Container: {Name:
containerTestName}}
+ })).To(Succeed())
g.Eventually(PlatformPhase(t, ctx, ns),
TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
name := RandomizedSuffixName("java")
(camel-k) 05/06: chore(e2e): Use a shared context in E2E tests
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-k.git
commit 8793fa3e7c883d515574ead5601d6fd721ceb5ed
Author: Christoph Deppisch
AuthorDate: Wed Mar 13 15:38:19 2024 +0100
chore(e2e): Use a shared context in E2E tests
---
e2e/advanced/main_test.go | 3 +--
e2e/common/cli/duplicate_parameters_test.go | 2 +-
e2e/common/cli/help_test.go | 3 +--
e2e/common/cli/main_test.go | 3 +--
e2e/common/cli/offline_commands_test.go | 12
e2e/common/cli/version_test.go | 4 +---
e2e/common/main_test.go | 3 +--
e2e/install/kustomize/operator_test.go | 6 +++---
e2e/install/kustomize/setup_test.go | 4 ++--
e2e/install/kustomize/uninstall_test.go | 4 ++--
e2e/install/upgrade/helm_upgrade_test.go| 2 +-
e2e/knative/kamelet_test.go | 3 +--
e2e/knative/knative_test.go | 2 +-
e2e/knative/openapi_test.go | 3 +--
e2e/knative/pod_test.go | 3 +--
e2e/support/test_nexus_hooks.go | 3 +--
e2e/support/test_support.go | 25 ++---
17 files changed, 37 insertions(+), 48 deletions(-)
diff --git a/e2e/advanced/main_test.go b/e2e/advanced/main_test.go
index ca701cf4f..65dbc5afc 100644
--- a/e2e/advanced/main_test.go
+++ b/e2e/advanced/main_test.go
@@ -23,7 +23,6 @@ limitations under the License.
package advanced
import (
- "context"
"fmt"
"os"
"testing"
@@ -55,9 +54,9 @@ func TestMain(m *testing.M) {
fmt.Printf("Test fast setup failed! - %s\n", message)
})
- ctx := context.TODO()
var t *testing.T
g.Expect(TestClient(t)).ShouldNot(BeNil())
+ ctx := TestContext()
g.Expect(KamelRunWithID(t, ctx, operatorID, ns,
"files/Java.java").Execute()).To(Succeed())
g.Eventually(IntegrationPodPhase(t, ctx, ns, "java"),
TestTimeoutLong).Should(Equal(corev1.PodRunning))
g.Eventually(IntegrationConditionStatus(t, ctx, ns, "java",
v1.IntegrationConditionReady),
TestTimeoutShort).Should(Equal(corev1.ConditionTrue))
diff --git a/e2e/common/cli/duplicate_parameters_test.go
b/e2e/common/cli/duplicate_parameters_test.go
index 44f6de40d..4882d96aa 100644
--- a/e2e/common/cli/duplicate_parameters_test.go
+++ b/e2e/common/cli/duplicate_parameters_test.go
@@ -35,7 +35,7 @@ import (
func TestDuplicateParameters(t *testing.T) {
g := NewWithT(t)
- ctx, cancel := context.WithCancel(context.TODO())
+ ctx, cancel := context.WithCancel(TestContext())
defer cancel()
// run kamel to output the traits/configuration structure in json
format to check the processed values
diff --git a/e2e/common/cli/help_test.go b/e2e/common/cli/help_test.go
index 968d2efac..c51dd91e4 100644
--- a/e2e/common/cli/help_test.go
+++ b/e2e/common/cli/help_test.go
@@ -23,7 +23,6 @@ limitations under the License.
package cli
import (
- "context"
"testing"
. "github.com/onsi/gomega"
@@ -32,7 +31,7 @@ import (
)
func TestKamelCLIHelp(t *testing.T) {
- ctx := context.TODO()
+ ctx := TestContext()
g := NewWithT(t)
t.Run("default help message", func(t *testing.T) {
diff --git a/e2e/common/cli/main_test.go b/e2e/common/cli/main_test.go
index 4a2ae1916..fafad4f13 100644
--- a/e2e/common/cli/main_test.go
+++ b/e2e/common/cli/main_test.go
@@ -23,7 +23,6 @@ limitations under the License.
package cli
import (
- "context"
"fmt"
"os"
"testing"
@@ -44,10 +43,10 @@ func TestMain(m *testing.M) {
fmt.Printf("Test setup failed! - %s\n", message)
})
- ctx := context.TODO()
var t *testing.T
g.Expect(TestClient(t)).ShouldNot(BeNil())
+ ctx := TestContext()
// Install global operator for tests in this package, all tests must
use this operatorID
g.Expect(NewNamedTestNamespace(t, ctx, operatorNS,
false)).ShouldNot(BeNil())
diff --git a/e2e/common/cli/offline_commands_test.go
b/e2e/common/cli/offline_commands_test.go
index f482a6d8e..a6d506e40 100644
--- a/e2e/common/cli/offline_commands_test.go
+++ b/e2e/common/cli/offline_commands_test.go
@@ -23,7 +23,6 @@ limitations under the License.
package cli
import (
- "context"
"io"
"testing"
@@ -32,27 +31,24 @@ import (
)
func TestKamelVersionWorksOffline(t *testing.T) {
- ctx := context.TODO()
g := NewWithT(t)
- g.Expect(Kamel(t, ctx, "version", "--kube-config",
"non-existent-kubeconfig-file").Execute()).To(Succeed())
+ g.Expect(Kamel(t, TestContext(), "version", "--kube-config",
"non-existent-kubeconfig-file").Execute()).To(Succeed())
}
func TestKamelHelpOptionWorksOffline(t *testing.T) {
- ctx :=
(camel-k) 04/06: chore(e2e): Improve Integration logs waiting for container created
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-k.git
commit e1da60771dfe6e826e96a12d21aa1fe31cad56e1
Author: Christoph Deppisch
AuthorDate: Wed Mar 13 12:52:07 2024 +0100
chore(e2e): Improve Integration logs waiting for container created
- Avoid logs watch errors when container is still creating
---
e2e/support/test_support.go | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index 03cb2094f..ddda64af5 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -485,6 +485,13 @@ func IntegrationLogs(t *testing.T, ctx context.Context,
ns, name string) func()
TailLines: pointer.Int64(100),
}
+ for _, container := range pod.Status.ContainerStatuses {
+ if !container.Ready || container.State.Waiting != nil {
+ // avoid logs watch fail due to container
creating state
+ return ""
+ }
+ }
+
if len(pod.Spec.Containers) > 1 {
options.Container = pod.Spec.Containers[0].Name
}
@@ -493,7 +500,7 @@ func IntegrationLogs(t *testing.T, ctx context.Context, ns,
name string) func()
}
}
-// Retrieve the Logs from the Pod defined by its name in the given namespace
ns. The number of lines numLines from the end of the logs to show.
+// TailedLogs Retrieve the Logs from the Pod defined by its name in the given
namespace ns. The number of lines numLines from the end of the logs to show.
func TailedLogs(t *testing.T, ctx context.Context, ns, name string, numLines
int64) func() string {
return func() string {
options := corev1.PodLogOptions{
@@ -517,12 +524,12 @@ func Logs(t *testing.T, ctx context.Context, ns, podName
string, options corev1.
}
}()
- bytes, err := io.ReadAll(byteReader)
+ logBytes, err := io.ReadAll(byteReader)
if err != nil {
log.Error(err, "Error while reading container logs")
return ""
}
- return string(bytes)
+ return string(logBytes)
}
}
@@ -760,7 +767,7 @@ func HealthCheckData(r *v1.HealthCheckResponse)
(map[string]interface{}, error)
}
var data map[string]interface{}
- if err := json.Unmarshal(r.Data, data); err != nil {
+ if err := json.Unmarshal(r.Data, ); err != nil {
return nil, err
}
@@ -873,7 +880,7 @@ func ServiceType(t *testing.T, ctx context.Context, ns
string, name string) func
}
}
-// Find the service in the given namespace with the given type
+// ServicesByType Find the service in the given namespace with the given type
func ServicesByType(t *testing.T, ctx context.Context, ns string, svcType
corev1.ServiceType) func() []corev1.Service {
return func() []corev1.Service {
svcs := []corev1.Service{}
(camel) branch regen_bot updated (69930cbaac6 -> feff3159315)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 69930cbaac6 CAMEL-20504 - Google Pubsub CloudEvent Transformer (#13465) add feff3159315 Main profile (#13466) No new revisions were added by this update. Summary of changes: .../properties/ClasspathPropertiesSource.java | 9 ++- .../component/properties/FilePropertiesSource.java | 9 ++- .../component/properties/PropertiesComponent.java | 12 +-- .../component/properties/RefPropertiesSource.java | 15 +++- .../org/apache/camel/main/BaseMainSupport.java | 24 +- .../apache/camel/main/MainCommandLineSupport.java | 15 .../java/org/apache/camel/main/MainConstants.java | 5 ++ .../org/apache/camel/main/ProfileConfigurer.java | 6 +- .../test/java/org/apache/camel/main/MainTest.java | 15 .../src/test/resources/application-prod.properties | 3 +- .../modules/ROOT/pages/camel-jbang.adoc| 10 +++ .../modules/ROOT/pages/camel-maven-plugin.adoc | 2 + .../camel/dsl/jbang/core/commands/Export.java | 63 .../dsl/jbang/core/commands/ExportBaseCommand.java | 33 + .../dsl/jbang/core/commands/ExportCamelMain.java | 2 + .../dsl/jbang/core/commands/ExportSpringBoot.java | 2 + .../apache/camel/dsl/jbang/core/commands/Run.java | 86 +++--- .../src/main/docs/camel-maven-plugin.adoc | 2 + .../main/java/org/apache/camel/maven/DevMojo.java | 4 +- .../main/java/org/apache/camel/maven/RunMojo.java | 10 +++ 20 files changed, 258 insertions(+), 69 deletions(-) copy components/camel-cxf/camel-cxf-spring-rest/src/test/resources/org/apache/camel/component/cxf/jaxrs/testEndpoint.properties => core/camel-main/src/test/resources/application-prod.properties (91%)
(camel) branch main-profile deleted (was da4b2a07ae9)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main-profile in repository https://gitbox.apache.org/repos/asf/camel.git was da4b2a07ae9 CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel) branch main updated: Main profile (#13466)
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 feff3159315 Main profile (#13466)
feff3159315 is described below
commit feff3159315eb3b8608ddbf2fa58cc7cd935c6f2
Author: Claus Ibsen
AuthorDate: Wed Mar 13 18:48:22 2024 +0100
Main profile (#13466)
CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test
---
.../properties/ClasspathPropertiesSource.java | 9 ++-
.../component/properties/FilePropertiesSource.java | 9 ++-
.../component/properties/PropertiesComponent.java | 12 +--
.../component/properties/RefPropertiesSource.java | 15 +++-
.../org/apache/camel/main/BaseMainSupport.java | 24 +-
.../apache/camel/main/MainCommandLineSupport.java | 15
.../java/org/apache/camel/main/MainConstants.java | 5 ++
.../org/apache/camel/main/ProfileConfigurer.java | 6 +-
.../test/java/org/apache/camel/main/MainTest.java | 15
.../src/test/resources/application-prod.properties | 19 +
.../modules/ROOT/pages/camel-jbang.adoc| 10 +++
.../modules/ROOT/pages/camel-maven-plugin.adoc | 2 +
.../camel/dsl/jbang/core/commands/Export.java | 63
.../dsl/jbang/core/commands/ExportBaseCommand.java | 33 +
.../dsl/jbang/core/commands/ExportCamelMain.java | 2 +
.../dsl/jbang/core/commands/ExportSpringBoot.java | 2 +
.../apache/camel/dsl/jbang/core/commands/Run.java | 86 +++---
.../src/main/docs/camel-maven-plugin.adoc | 2 +
.../main/java/org/apache/camel/maven/DevMojo.java | 4 +-
.../main/java/org/apache/camel/maven/RunMojo.java | 10 +++
20 files changed, 275 insertions(+), 68 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
index 264628995c3..d897f61135d 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
@@ -31,8 +31,15 @@ import org.apache.camel.util.OrderedProperties;
public class ClasspathPropertiesSource extends
AbstractLocationPropertiesSource implements Ordered {
+private final int order;
+
public ClasspathPropertiesSource(PropertiesComponent propertiesComponent,
PropertiesLocation location) {
+this(propertiesComponent, location, 400);
+}
+
+public ClasspathPropertiesSource(PropertiesComponent propertiesComponent,
PropertiesLocation location, int order) {
super(propertiesComponent, location);
+this.order = order;
}
@Override
@@ -71,6 +78,6 @@ public class ClasspathPropertiesSource extends
AbstractLocationPropertiesSource
@Override
public int getOrder() {
-return 300;
+return order;
}
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
index 88cc980c2d9..3fb197cfb2a 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
@@ -32,8 +32,15 @@ import org.apache.camel.util.OrderedProperties;
public class FilePropertiesSource extends AbstractLocationPropertiesSource
implements Ordered {
+private final int order;
+
protected FilePropertiesSource(PropertiesComponent propertiesComponent,
PropertiesLocation location) {
+this(propertiesComponent, location, 300);
+}
+
+protected FilePropertiesSource(PropertiesComponent propertiesComponent,
PropertiesLocation location, int order) {
super(propertiesComponent, location);
+this.order = order;
}
@Override
@@ -69,6 +76,6 @@ public class FilePropertiesSource extends
AbstractLocationPropertiesSource imple
@Override
public int getOrder() {
-return 100;
+return order;
}
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
index 4a13c4e0e4a..bf708f58a22 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
@@ -353,8 +353,10 @@ public class PropertiesComponent extends ServiceSupport
// we need to re-create the property sources which may have already
been created from locations
Re: [PR] Main profile [camel]
davsclaus merged PR #13466: URL: https://github.com/apache/camel/pull/13466 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch camel-main updated: Fixed micrometer in JVM because of CAMEL-20525
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 cb1c70fdeb Fixed micrometer in JVM because of CAMEL-20525
cb1c70fdeb is described below
commit cb1c70fdeb4928469125131d320f37ca195aaa7e
Author: JiriOndrusek
AuthorDate: Wed Mar 13 17:47:03 2024 +0100
Fixed micrometer in JVM because of CAMEL-20525
---
integration-tests/micrometer/pom.xml | 5 +++
.../micrometer/it/MicrometerResource.java | 33 ---
.../component/micrometer/it/MicrometerRoutes.java | 3 ++
.../component/micrometer/it/MicrometerTest.java| 48 ++
4 files changed, 47 insertions(+), 42 deletions(-)
diff --git a/integration-tests/micrometer/pom.xml
b/integration-tests/micrometer/pom.xml
index fa4c4e6f00..b7a972ad81 100644
--- a/integration-tests/micrometer/pom.xml
+++ b/integration-tests/micrometer/pom.xml
@@ -82,6 +82,11 @@
rest-assured
test
+
+org.awaitility
+awaitility
+test
+
diff --git
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
index 4eafe512bf..4ea2d11460 100644
---
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
+++
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
@@ -20,14 +20,11 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.NoSuchElementException;
-import java.util.Optional;
import java.util.concurrent.TimeUnit;
-import io.micrometer.core.instrument.Meter;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.core.instrument.Tag;
import io.micrometer.core.instrument.Tags;
-import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
import io.micrometer.core.instrument.search.Search;
import io.micrometer.prometheus.PrometheusMeterRegistry;
import jakarta.inject.Inject;
@@ -177,29 +174,6 @@ public class MicrometerResource {
public Response statistics() {
MicrometerEventNotifierService service =
camelContext.hasService(MicrometerEventNotifierService.class);
String json = service.dumpStatisticsAsJson();
-
-//todo debug logging
-LOG.info("json is " + json);
-LOG.info("Service.started(): " + service.isStarted());
-LOG.info("meter registry is " + service.getMeterRegistry());
-if (service.getMeterRegistry() instanceof CompositeMeterRegistry) {
-LOG.info("composite registry from " + ((CompositeMeterRegistry)
service.getMeterRegistry()).getRegistries());
-}
-LOG.info("Searching for the `camel.routes.added` in single
registries.");
-((CompositeMeterRegistry)
service.getMeterRegistry()).getRegistries().forEach(mr -> {
-Optional o = mr.getMeters().stream().filter(m ->
m.getId().getName().equals("camel.routes.added")).findAny();
-LOG.info("`camel.routes.added` present in " + mr + ": " +
o.isPresent());
-if (o.isPresent()) {
-LOG.info(" with value " +
o.get().measure().iterator().next());
-}
-});
-
-Optional om = service.getMeterRegistry().getMeters().stream()
-.filter(m ->
m.getId().getName().contains("camel.routes.added")).findFirst();
-LOG.info("meter `camel.routes.added` " + om.get());
-if (om.isPresent()) {
-LOG.info("value is " +
om.get().measure().iterator().next().getValue());
-}
return Response.ok().entity(json).build();
}
@@ -250,4 +224,11 @@ public class MicrometerResource {
}
return Response.ok().build();
}
+
+@Path("/sendDumpAsJson")
+@GET
+public Response sendDumpAsJson() {
+producerTemplate.sendBody("direct:dumpAsJson", "hello");
+return Response.ok().build();
+}
}
diff --git
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerRoutes.java
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerRoutes.java
index 64d50941e3..611527f714 100644
---
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerRoutes.java
+++
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerRoutes.java
@@ -55,5 +55,8 @@ public class MicrometerRoutes extends RouteBuilder {
.id("jmxHistory")
.log("log:
Re: [PR] Camel 20341 [camel]
cziesman commented on code in PR #13447:
URL: https://github.com/apache/camel/pull/13447#discussion_r1523619877
##
components/camel-lucene/src/main/docs/lucene-component.adoc:
##
@@ -108,7 +108,7 @@ RouteBuilder builder = new RouteBuilder() {
[source,java]
-
-CamelContext context = new DefaultCamelContext(createRegistry());
+CamelContext context = new DefaultCamelContext(createCamelRegistry());
Review Comment:
Fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
(camel-kamelets-examples) branch main updated: CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets-examples.git
The following commit(s) were added to refs/heads/main by this push:
new 09b274f CAMEL-18090: camel-main - Loading properties with profiles
for prod/dev/test
09b274f is described below
commit 09b274f1905fde1c9ee27ffbef5195936b8d832e
Author: Claus Ibsen
AuthorDate: Wed Mar 13 17:49:24 2024 +0100
CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test
---
jbang/main-profile/README.adoc | 65 ++
jbang/main-profile/application-dev.properties | 2 +
jbang/main-profile/application-prod.properties | 2 +
jbang/main-profile/application.properties | 2 +
jbang/main-profile/hello.camel.yaml| 11 +
5 files changed, 82 insertions(+)
diff --git a/jbang/main-profile/README.adoc b/jbang/main-profile/README.adoc
new file mode 100644
index 000..2e1f5e1
--- /dev/null
+++ b/jbang/main-profile/README.adoc
@@ -0,0 +1,65 @@
+== Main Profile
+
+This example shows how you can use Camel JBang with profiles
+to run for development, testing or production.
+
+=== Install JBang
+
+First install JBang according to https://www.jbang.dev
+
+When JBang is installed then you should be able to run from a shell:
+
+[source,sh]
+
+$ jbang --version
+
+
+This will output the version of JBang.
+
+To run this example you can either install Camel on JBang via:
+
+[source,sh]
+
+$ jbang app install camel@apache/camel
+
+
+Which allows to run CamelJBang with `camel` as shown below.
+
+=== How to run
+
+Then you can run this example using:
+
+[source,sh]
+
+$ camel run hello.camel.yaml
+
+
+This will run in developer mode by deafult (default in Camel JBang)
+
+You can run in another profile with:
+
+[source,sh]
+
+$ camel run hello.camel.yaml --profile=production
+
+
+And if you want to turn off profile, you can use an empty value (or none)
+
+[source,sh]
+
+$ camel run hello.camel.yaml --profile=
+
+
+Notice how the application prints different message depending on the selected
profile.
+This is due to the loaded properties file that is profile specific.
+
+
+=== Help and contributions
+
+If you hit any problem using Camel or have some feedback, then please
+https://camel.apache.org/community/support/[let us know].
+
+We also love contributors, so
+https://camel.apache.org/community/contributing/[get involved] :-)
+
+The Camel riders!
diff --git a/jbang/main-profile/application-dev.properties
b/jbang/main-profile/application-dev.properties
new file mode 100644
index 000..b54f92c
--- /dev/null
+++ b/jbang/main-profile/application-dev.properties
@@ -0,0 +1,2 @@
+# configuration of value
+me = I am a developer
diff --git a/jbang/main-profile/application-prod.properties
b/jbang/main-profile/application-prod.properties
new file mode 100644
index 000..52a3c22
--- /dev/null
+++ b/jbang/main-profile/application-prod.properties
@@ -0,0 +1,2 @@
+# configuration of value
+me = We are in production
diff --git a/jbang/main-profile/application.properties
b/jbang/main-profile/application.properties
new file mode 100644
index 000..3b6a4d5
--- /dev/null
+++ b/jbang/main-profile/application.properties
@@ -0,0 +1,2 @@
+# configuration of value
+me = no profile in use
diff --git a/jbang/main-profile/hello.camel.yaml
b/jbang/main-profile/hello.camel.yaml
new file mode 100644
index 000..48e5673
--- /dev/null
+++ b/jbang/main-profile/hello.camel.yaml
@@ -0,0 +1,11 @@
+# camel-k: language=yaml
+
+# Write your routes here, for example:
+- from:
+uri: "timer:yaml"
+parameters:
+ period: "1000"
+steps:
+ - setBody:
+ simple: "Hello Camel from {{me}}"
+ - log: "${body}"
Re: [PR] Main profile [camel]
github-actions[bot] commented on PR #13466: URL: https://github.com/apache/camel/pull/13466#issuecomment-1994966539 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Main profile [camel]
davsclaus opened a new pull request, #13466: URL: https://github.com/apache/camel/pull/13466 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main-profile updated: CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main-profile
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main-profile by this push:
new da4b2a07ae9 CAMEL-18090: camel-main - Loading properties with profiles
for prod/dev/test
da4b2a07ae9 is described below
commit da4b2a07ae987794a73e338cccdd11441be9c701
Author: Claus Ibsen
AuthorDate: Wed Mar 13 17:39:45 2024 +0100
CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test
---
.../component/properties/PropertiesComponent.java | 4 +---
.../src/test/java/org/apache/camel/main/MainTest.java | 15 +++
.../src/test/resources/application-prod.properties| 19 +++
3 files changed, 35 insertions(+), 3 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
index d7acf6218b9..bf708f58a22 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
@@ -353,7 +353,7 @@ public class PropertiesComponent extends ServiceSupport
// we need to re-create the property sources which may have already
been created from locations
this.sources.removeIf(s -> s instanceof LocationPropertiesSource);
-// ensure order we want as given in the locations
+// ensure the locations are in the same order as here, and therefore
we provide the order number
int order = 100;
for (PropertiesLocation loc : locations) {
addPropertiesLocationsAsPropertiesSource(loc, order++);
@@ -388,8 +388,6 @@ public class PropertiesComponent extends ServiceSupport
public void addLocation(String location) {
if (location != null) {
List newLocations = new ArrayList<>();
-// add in reverse order as
-
for (String loc : location.split(",")) {
newLocations.add(new PropertiesLocation(loc));
}
diff --git a/core/camel-main/src/test/java/org/apache/camel/main/MainTest.java
b/core/camel-main/src/test/java/org/apache/camel/main/MainTest.java
index fb9935da4eb..3b4d5de4578 100644
--- a/core/camel-main/src/test/java/org/apache/camel/main/MainTest.java
+++ b/core/camel-main/src/test/java/org/apache/camel/main/MainTest.java
@@ -140,6 +140,21 @@ public class MainTest {
main.stop();
}
+@Test
+public void testProfile() throws Exception {
+// lets make a simple route
+Main main = new Main();
+main.configure().addRoutesBuilder(new MyRouteBuilder());
+main.configure().withProfile("prod");
+main.start();
+
+CamelContext camelContext = main.getCamelContext();
+// should load application-prod.properties from classpath
+assertEquals("Production World",
camelContext.resolvePropertyPlaceholders("{{hello}}"));
+
+main.stop();
+}
+
@Test
public void testDisableTracing() throws Exception {
Main main = new Main();
diff --git a/core/camel-main/src/test/resources/application-prod.properties
b/core/camel-main/src/test/resources/application-prod.properties
new file mode 100644
index 000..7be4cfa5d50
--- /dev/null
+++ b/core/camel-main/src/test/resources/application-prod.properties
@@ -0,0 +1,19 @@
+## ---
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---
+
+# this should override the value from application.properties
+hello=Production World
(camel) 03/06: CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main-profile in repository https://gitbox.apache.org/repos/asf/camel.git commit 35f691c231ba4a913a39d76db7a519e168f1054d Author: Claus Ibsen AuthorDate: Wed Mar 13 15:54:46 2024 +0100 CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test --- docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 10 ++ 1 file changed, 10 insertions(+) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index fb287b02931..9031ef4a580 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -547,6 +547,14 @@ However, you may want to run Camel JBang in a more production like situation, wh camel run hello.java --profile=prod +You can have profile specific configuration in configuration files using the naming style `application-.properties`, +such as in the following: + +- `application.properties` - Common configuration that is always in use (default). +- `application-dev.properties` - Developer specific configuration for the `dev` profile. +- `application-prod.properties` - Developer specific configuration for the `prod` profile. + +The profile specific configuration will override values in the common configuration. === Downloading JARs over the internet @@ -3112,6 +3120,8 @@ camel export --runtime=quarkus --gav=com.foo:acme:1.0-SNAPSHOT --directory=../my TIP: See the possible options by running: `camel export --help` for more details. +NOTE: You cannot use `--profile` option when exporting to Camel Quarkus. + === Exporting to Camel Main The command `export --runtime=camel-main` will export your current Camel JBang file(s) to a Maven based
(camel) 04/06: CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main-profile
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6d32de13a2376d63973e0b8072a825a2177aea22
Author: Claus Ibsen
AuthorDate: Wed Mar 13 16:55:40 2024 +0100
CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test
---
.../java/org/apache/camel/main/MainCommandLineSupport.java | 8
.../camel-maven-plugin/src/main/docs/camel-maven-plugin.adoc | 1 +
.../src/main/java/org/apache/camel/maven/DevMojo.java | 3 +--
.../src/main/java/org/apache/camel/maven/RunMojo.java | 10 ++
4 files changed, 20 insertions(+), 2 deletions(-)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/MainCommandLineSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/MainCommandLineSupport.java
index 7e1322d7dc0..0c092f7b02e 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/MainCommandLineSupport.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/MainCommandLineSupport.java
@@ -169,6 +169,14 @@ public abstract class MainCommandLineSupport extends
MainSupport {
configure().withCompileWorkDir(parameter);
}
});
+addOption(new ParameterOption(
+"pro", "profile",
+"Camel profile to use when running. (dev,test,prod)",
+"profile") {
+protected void doProcess(String arg, String parameter,
LinkedList remainingArgs) {
+configure().withProfile(parameter);
+}
+});
}
/**
diff --git
a/tooling/maven/camel-maven-plugin/src/main/docs/camel-maven-plugin.adoc
b/tooling/maven/camel-maven-plugin/src/main/docs/camel-maven-plugin.adoc
index a2b0ab8fa7b..07692fd818d 100644
--- a/tooling/maven/camel-maven-plugin/src/main/docs/camel-maven-plugin.adoc
+++ b/tooling/maven/camel-maven-plugin/src/main/docs/camel-maven-plugin.adoc
@@ -36,6 +36,7 @@ The maven plugin *run* goal supports the following options
which can be configur
| durationMaxMessages | -1 | Sets the duration of maximum number of messages
that the application will process before terminating.
| logClasspath | false | Whether to log the classpath when starting
| loggingLevel | OFF | Whether to use built-in console logging (uses log4j),
which does not require to add any logging dependency to your project. However,
the logging is fixed to log to the console, with a color style that is similar
to Spring Boot. You can change the root logging level to: FATAL, ERROR, WARN,
INFO, DEBUG, TRACE, OFF
+| profile | | To run with a specific Camel Main profile (dev,test,prod)
|===
diff --git
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DevMojo.java
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DevMojo.java
index 7842d44af72..6d05ad46631 100644
---
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DevMojo.java
+++
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DevMojo.java
@@ -35,8 +35,6 @@ public class DevMojo extends RunMojo {
/**
* Enable routes reloading
- *
- * @throws Exception
*/
@Override
protected void beforeBootstrapCamel() throws Exception {
@@ -52,6 +50,7 @@ public class DevMojo extends RunMojo {
// use absolute path for dir
dir = new File(dir).getAbsolutePath();
+System.setProperty("camel.main.profile", "dev");
System.setProperty("camel.main.routesReloadEnabled", "true");
System.setProperty("camel.main.routesReloadDirectory", dir);
System.setProperty("camel.main.routesReloadDirectoryRecursive",
"true");
diff --git
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index 76f6b986f5c..e1a347441c9 100644
---
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -138,6 +138,12 @@ public class RunMojo extends AbstractExecMojo {
@Parameter(property = "camel.useKamelet")
protected Boolean useKamelet;
+/**
+ * To run with a specific Camel Main profile (dev,test,prod)
+ */
+@Parameter(property = "camel.profile")
+protected String profile;
+
protected String extendedPluginDependencyArtifactId;
@Component
@@ -342,6 +348,10 @@ public class RunMojo extends AbstractExecMojo {
if (arguments != null) {
args.addAll(Arrays.asList(arguments));
}
+if (profile != null) {
+args.add("-profile");
+args.add(profile);
+}
if (mainClass == null && usingKameletMain) {
mainClass = "org.apache.camel.main.KameletMain";
(camel) 02/06: CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main-profile
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 32c683b0284de9057eeedf6330b1f68fd7d5e2ac
Author: Claus Ibsen
AuthorDate: Wed Mar 13 15:46:46 2024 +0100
CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test
---
.../dsl/jbang/core/commands/ExportBaseCommand.java | 29
.../dsl/jbang/core/commands/ExportCamelMain.java | 32 --
.../dsl/jbang/core/commands/ExportSpringBoot.java | 2 ++
3 files changed, 31 insertions(+), 32 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index c6c97e189d3..d7463f2977a 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -858,6 +858,35 @@ abstract class ExportBaseCommand extends CamelCommand {
}
}
+protected void copyApplicationPropertiesFiles(File srcResourcesDir) throws
Exception {
+File[] files = new File(".").listFiles(f -> {
+if (!f.isFile()) {
+return false;
+}
+String ext = FileUtil.onlyExt(f.getName());
+String name = FileUtil.onlyName(f.getName());
+if (!"properties".equals(ext)) {
+return false;
+}
+if (name.equals("application")) {
+// skip generic as its handled specially
+return false;
+}
+if (profile == null) {
+// accept all kind of configuration files
+return name.startsWith("application");
+} else {
+// only accept the configuration file that matches the profile
+return name.equals("application-" + profile);
+}
+});
+if (files != null) {
+for (File f : files) {
+safeCopy(f, new File(srcResourcesDir, f.getName()), true);
+}
+}
+}
+
private MavenDownloader getDownloader() {
if (downloader == null) {
init();
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
index d632644ef34..6e5fdd58e10 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
@@ -17,7 +17,6 @@
package org.apache.camel.dsl.jbang.core.commands;
import java.io.File;
-import java.io.FileFilter;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.util.ArrayList;
@@ -101,7 +100,6 @@ class ExportCamelMain extends Export {
File srcKameletsResourcesDir = new File(BUILD_DIR,
"src/main/resources/kamelets");
srcKameletsResourcesDir.mkdirs();
// copy application properties files
-// TODO: spring boot
copyApplicationPropertiesFiles(srcResourcesDir);
// copy source files
copySourceFiles(settings, profile, srcJavaDirRoot, srcJavaDir,
srcResourcesDir, srcCamelResourcesDir,
@@ -155,35 +153,6 @@ class ExportCamelMain extends Export {
return 0;
}
-protected void copyApplicationPropertiesFiles(File srcResourcesDir) throws
Exception {
-File[] files = new File(".").listFiles(f -> {
-if (!f.isFile()) {
-return false;
-}
-String ext = FileUtil.onlyExt(f.getName());
-String name = FileUtil.onlyName(f.getName());
-if (!"properties".equals(ext)) {
-return false;
-}
-if (name.equals("application")) {
-// skip generic as its handled specially
-return false;
-}
-if (profile == null) {
-// accept all kind of configuration files
-return name.startsWith("application");
-} else {
-// only accept the configuration file that matches the profile
-return name.equals("application-" + profile);
-}
-});
-if (files != null) {
-for (File f : files) {
-safeCopy(f, new File(srcResourcesDir, f.getName()), true);
-}
-}
-}
-
private void createMavenPom(File settings, File profile, File pom,
Set deps, String packageName) throws Exception {
String[] ids =
(camel) 05/06: CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main-profile
in repository https://gitbox.apache.org/repos/asf/camel.git
commit dedea474ab9b64a857760448254453bb0ae7055d
Author: Claus Ibsen
AuthorDate: Wed Mar 13 17:00:25 2024 +0100
CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test
---
docs/user-manual/modules/ROOT/pages/camel-maven-plugin.adoc| 2 ++
tooling/maven/camel-maven-plugin/src/main/docs/camel-maven-plugin.adoc | 1 +
.../src/main/java/org/apache/camel/maven/DevMojo.java | 3 ++-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/docs/user-manual/modules/ROOT/pages/camel-maven-plugin.adoc
b/docs/user-manual/modules/ROOT/pages/camel-maven-plugin.adoc
index a2b0ab8fa7b..0c0284b0d0c 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-maven-plugin.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-maven-plugin.adoc
@@ -36,6 +36,7 @@ The maven plugin *run* goal supports the following options
which can be configur
| durationMaxMessages | -1 | Sets the duration of maximum number of messages
that the application will process before terminating.
| logClasspath | false | Whether to log the classpath when starting
| loggingLevel | OFF | Whether to use built-in console logging (uses log4j),
which does not require to add any logging dependency to your project. However,
the logging is fixed to log to the console, with a color style that is similar
to Spring Boot. You can change the root logging level to: FATAL, ERROR, WARN,
INFO, DEBUG, TRACE, OFF
+| profile | | To run with a specific Camel Main profile (dev,test,prod)
|===
@@ -96,6 +97,7 @@ The maven plugin *dev* goal supports the following options
which can be configur
| durationMaxMessages | -1 | Sets the duration of maximum number of messages
that the application will process before terminating.
| logClasspath | false | Whether to log the classpath when starting
| loggingLevel | OFF | Whether to use built-in console logging (uses log4j),
which does not require to add any logging dependency to your project. However,
the logging is fixed to log to the console, with a color style that is similar
to Spring Boot. You can change the root logging level to: FATAL, ERROR, WARN,
INFO, DEBUG, TRACE, OFF
+| profile | dev | To run with a specific Camel Main profile (dev,test,prod)
|===
== camel:debug
diff --git
a/tooling/maven/camel-maven-plugin/src/main/docs/camel-maven-plugin.adoc
b/tooling/maven/camel-maven-plugin/src/main/docs/camel-maven-plugin.adoc
index 07692fd818d..0c0284b0d0c 100644
--- a/tooling/maven/camel-maven-plugin/src/main/docs/camel-maven-plugin.adoc
+++ b/tooling/maven/camel-maven-plugin/src/main/docs/camel-maven-plugin.adoc
@@ -97,6 +97,7 @@ The maven plugin *dev* goal supports the following options
which can be configur
| durationMaxMessages | -1 | Sets the duration of maximum number of messages
that the application will process before terminating.
| logClasspath | false | Whether to log the classpath when starting
| loggingLevel | OFF | Whether to use built-in console logging (uses log4j),
which does not require to add any logging dependency to your project. However,
the logging is fixed to log to the console, with a color style that is similar
to Spring Boot. You can change the root logging level to: FATAL, ERROR, WARN,
INFO, DEBUG, TRACE, OFF
+| profile | dev | To run with a specific Camel Main profile (dev,test,prod)
|===
== camel:debug
diff --git
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DevMojo.java
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DevMojo.java
index 6d05ad46631..82d1dd18d65 100644
---
a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DevMojo.java
+++
b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/DevMojo.java
@@ -50,7 +50,8 @@ public class DevMojo extends RunMojo {
// use absolute path for dir
dir = new File(dir).getAbsolutePath();
-System.setProperty("camel.main.profile", "dev");
+// use dev profile by default
+System.setProperty("camel.main.profile", profile == null ? "dev" :
profile);
System.setProperty("camel.main.routesReloadEnabled", "true");
System.setProperty("camel.main.routesReloadDirectory", dir);
System.setProperty("camel.main.routesReloadDirectoryRecursive",
"true");
(camel) 01/06: CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main-profile
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5a14e5ab3d6b47c34a9aa4e47bcc9fd055e47e51
Author: Claus Ibsen
AuthorDate: Wed Mar 13 15:38:23 2024 +0100
CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test
---
.../properties/ClasspathPropertiesSource.java | 9 ++-
.../component/properties/FilePropertiesSource.java | 9 ++-
.../component/properties/PropertiesComponent.java | 14 ++--
.../component/properties/RefPropertiesSource.java | 15 +++-
.../org/apache/camel/main/BaseMainSupport.java | 13 +++-
.../apache/camel/main/MainCommandLineSupport.java | 7 ++
.../java/org/apache/camel/main/MainConstants.java | 5 ++
.../org/apache/camel/main/ProfileConfigurer.java | 6 +-
.../camel/dsl/jbang/core/commands/Export.java | 63
.../dsl/jbang/core/commands/ExportBaseCommand.java | 4 +
.../dsl/jbang/core/commands/ExportCamelMain.java | 34 +
.../apache/camel/dsl/jbang/core/commands/Run.java | 86 +++---
12 files changed, 199 insertions(+), 66 deletions(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
index 264628995c3..d897f61135d 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/ClasspathPropertiesSource.java
@@ -31,8 +31,15 @@ import org.apache.camel.util.OrderedProperties;
public class ClasspathPropertiesSource extends
AbstractLocationPropertiesSource implements Ordered {
+private final int order;
+
public ClasspathPropertiesSource(PropertiesComponent propertiesComponent,
PropertiesLocation location) {
+this(propertiesComponent, location, 400);
+}
+
+public ClasspathPropertiesSource(PropertiesComponent propertiesComponent,
PropertiesLocation location, int order) {
super(propertiesComponent, location);
+this.order = order;
}
@Override
@@ -71,6 +78,6 @@ public class ClasspathPropertiesSource extends
AbstractLocationPropertiesSource
@Override
public int getOrder() {
-return 300;
+return order;
}
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
index 88cc980c2d9..3fb197cfb2a 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/FilePropertiesSource.java
@@ -32,8 +32,15 @@ import org.apache.camel.util.OrderedProperties;
public class FilePropertiesSource extends AbstractLocationPropertiesSource
implements Ordered {
+private final int order;
+
protected FilePropertiesSource(PropertiesComponent propertiesComponent,
PropertiesLocation location) {
+this(propertiesComponent, location, 300);
+}
+
+protected FilePropertiesSource(PropertiesComponent propertiesComponent,
PropertiesLocation location, int order) {
super(propertiesComponent, location);
+this.order = order;
}
@Override
@@ -69,6 +76,6 @@ public class FilePropertiesSource extends
AbstractLocationPropertiesSource imple
@Override
public int getOrder() {
-return 100;
+return order;
}
}
diff --git
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
index 4a13c4e0e4a..d7acf6218b9 100644
---
a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
+++
b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java
@@ -353,8 +353,10 @@ public class PropertiesComponent extends ServiceSupport
// we need to re-create the property sources which may have already
been created from locations
this.sources.removeIf(s -> s instanceof LocationPropertiesSource);
+// ensure order we want as given in the locations
+int order = 100;
for (PropertiesLocation loc : locations) {
-addPropertiesLocationsAsPropertiesSource(loc);
+addPropertiesLocationsAsPropertiesSource(loc, order++);
}
}
@@ -386,6 +388,8 @@ public class PropertiesComponent extends ServiceSupport
public void addLocation(String location) {
if (location != null) {
List newLocations = new ArrayList<>();
+// add in reverse order as
+
for (String loc : location.split(",")) {
(camel) 06/06: CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main-profile
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5972fe23e7fe9fddace9133160749c48b46e7dd0
Author: Claus Ibsen
AuthorDate: Wed Mar 13 17:25:59 2024 +0100
CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test
---
.../src/main/java/org/apache/camel/main/BaseMainSupport.java | 11 +++
1 file changed, 11 insertions(+)
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index 52065f24cde..da315a53a79 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -363,9 +363,20 @@ public abstract class BaseMainSupport extends BaseService {
if (pc.getLocations().isEmpty()) {
String locations = propertyPlaceholderLocations;
if (locations == null) {
+// ENV/SYS takes precedence, then java configured value
String profile =
MainHelper.lookupPropertyFromSysOrEnv(MainConstants.PROFILE)
.orElse(mainConfigurationProperties.getProfile());
+if (profile == null) {
+// fallback to check if application.properties has a
profile
+Properties prop = new Properties();
+try (InputStream is
+=
ResourceHelper.resolveMandatoryResourceAsInputStream(camelContext,
"application.properties")) {
+prop.load(is);
+}
+profile = prop.getProperty("camel.main.profile");
+}
if (profile != null) {
+mainConfigurationProperties.setProfile(profile);
String loc = profilePropertyPlaceholderLocation(profile);
defaultPropertyPlaceholderLocation = loc + "," +
defaultPropertyPlaceholderLocation;
}
(camel) branch main-profile created (now 5972fe23e7f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main-profile in repository https://gitbox.apache.org/repos/asf/camel.git at 5972fe23e7f CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test This branch includes the following new commits: new 5a14e5ab3d6 CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test new 32c683b0284 CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test new 35f691c231b CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test new 6d32de13a23 CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test new dedea474ab9 CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test new 5972fe23e7f CAMEL-18090: camel-main - Loading properties with profiles for prod/dev/test The 6 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.
[I] jsh-dsl integration test fails on Windows [camel-quarkus]
jamesnetherton opened a new issue, #5873:
URL: https://github.com/apache/camel-quarkus/issues/5873
### Bug description
After upgrade to Quarkus 3.9.0.CR1 we see:
```
2024-03-13T13:33:55.8285280Z [INFO]
---
2024-03-13T13:33:55.8286197Z [INFO] T E S T S
2024-03-13T13:33:55.8288101Z [INFO]
---
2024-03-13T13:33:56.9470611Z [INFO] Running
org.apache.camel.quarkus.dsl.jsh.JshDslTest
2024-03-13T13:34:03.5918681Z 2024-03-13 13:34:03,539 INFO
[org.apa.cam.qua.cor.dep.mai.CamelMainHotDeploymentProcessor] (build-41)
HotDeployment files:
2024-03-13T13:34:03.6933977Z 2024-03-13 13:34:03,604 INFO
[org.apa.cam.qua.cor.dep.mai.CamelMainHotDeploymentProcessor] (build-41) -
routes/*.jsh
2024-03-13T13:34:06.0448215Z 2024-03-13 13:34:06,033 INFO
[org.apa.cam.qua.cor.CamelBootstrapRecorder] (main) Bootstrap runtime:
org.apache.camel.quarkus.main.CamelMainRuntime
2024-03-13T13:34:06.0455230Z 2024-03-13 13:34:06,036 INFO
[org.apa.cam.mai.MainSupport] (main) Apache Camel (Main) 4.4.0 is starting
2024-03-13T13:34:06.1473027Z 2024-03-13 13:34:06,092 INFO
[org.apa.cam.mai.BaseMainSupport] (main) Auto-configuration summary
2024-03-13T13:34:06.1474853Z 2024-03-13 13:34:06,092 INFO
[org.apa.cam.mai.BaseMainSupport] (main) [MicroProfilePropertiesSource]
camel.main.routesIncludePattern=classpath:routes/*.jsh
2024-03-13T13:34:07.3506850Z 2024-03-13 13:34:07,295 ERROR
[org.apa.cam.qua.mai.CamelMainRuntime] (main) Failed to start application:
java.lang.RuntimeException: javax.script.ScriptException: Error evaluating
snippet:
2024-03-13T13:34:07.3509715Z var builder =
org.apache.camel.dsl.jsh.Jsh.getBinding("builder",
org.apache.camel.builder.endpoint.EndpointRouteBuilder.class);
2024-03-13T13:34:07.3512040Z at
org.apache.camel.dsl.jsh.JshRoutesBuilderLoader.eval(JshRoutesBuilderLoader.java:104)
2024-03-13T13:34:07.3515972Z at
org.apache.camel.builder.endpoint.EndpointRouteBuilder$2.configure(EndpointRouteBuilder.java:79)
2024-03-13T13:34:07.3517500Z at
org.apache.camel.builder.RouteBuilder.checkInitialized(RouteBuilder.java:780)
2024-03-13T13:34:07.3518832Z at
org.apache.camel.builder.RouteBuilder.configureRoutes(RouteBuilder.java:725)
2024-03-13T13:34:07.3520140Z at
org.apache.camel.builder.RouteBuilder.prepareModel(RouteBuilder.java:648)
2024-03-13T13:34:07.3521731Z at
org.apache.camel.builder.RouteBuilder.addRoutesToCamelContext(RouteBuilder.java:666)
2024-03-13T13:34:07.3523272Z at
org.apache.camel.impl.engine.AbstractCamelContext.addRoutes(AbstractCamelContext.java:983)
2024-03-13T13:34:07.3524808Z at
org.apache.camel.main.RoutesConfigurer.addDiscoveredRoutes(RoutesConfigurer.java:254)
2024-03-13T13:34:07.3535769Z at
org.apache.camel.main.RoutesConfigurer.configureRoutes(RoutesConfigurer.java:236)
2024-03-13T13:34:07.3537173Z at
org.apache.camel.quarkus.main.CamelMain.configureRoutes(CamelMain.java:67)
2024-03-13T13:34:07.3554314Z at
org.apache.camel.main.BaseMainSupport.postProcessCamelContext(BaseMainSupport.java:695)
2024-03-13T13:34:07.3555807Z at
org.apache.camel.quarkus.main.CamelMain.initCamelContext(CamelMain.java:113)
2024-03-13T13:34:07.3556986Z at
org.apache.camel.quarkus.main.CamelMain.doInit(CamelMain.java:83)
2024-03-13T13:34:07.3558102Z at
org.apache.camel.support.service.BaseService.init(BaseService.java:78)
2024-03-13T13:34:07.3560023Z at
org.apache.camel.quarkus.main.CamelMain.startEngine(CamelMain.java:134)
2024-03-13T13:34:07.3561313Z at
org.apache.camel.quarkus.main.CamelMainRuntime.start(CamelMainRuntime.java:49)
2024-03-13T13:34:07.3562791Z at
org.apache.camel.quarkus.core.CamelBootstrapRecorder.start(CamelBootstrapRecorder.java:45)
2024-03-13T13:34:07.3564343Z at
io.quarkus.deployment.steps.CamelBootstrapProcessor$boot173480958.deploy_0(Unknown
Source)
2024-03-13T13:34:07.3565930Z at
io.quarkus.deployment.steps.CamelBootstrapProcessor$boot173480958.deploy(Unknown
Source)
2024-03-13T13:34:07.3567169Z at
io.quarkus.runner.ApplicationImpl.doStart(Unknown Source)
2024-03-13T13:34:07.3568131Z at
io.quarkus.runtime.Application.start(Application.java:101)
2024-03-13T13:34:07.3569294Z at
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
2024-03-13T13:34:07.3570812Z at
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77)
2024-03-13T13:34:07.3572570Z at
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
2024-03-13T13:34:07.3574148Z at
java.base/java.lang.reflect.Method.invoke(Method.java:568)
[I] java-joor-dsl integration test fails on Windows [camel-quarkus]
jamesnetherton opened a new issue, #5872:
URL: https://github.com/apache/camel-quarkus/issues/5872
### Bug description
After upgrade to Quarkus 3.9.0.CR1 we see:
```
024-03-13T13:30:10.3372566Z [INFO] Running
org.apache.camel.quarkus.dsl.java.joor.JavaJoorDslTest
2024-03-13T13:30:17.5731031Z 2024-03-13 13:30:17,442 INFO
[org.apa.cam.qua.cor.dep.mai.CamelMainHotDeploymentProcessor] (build-55)
HotDeployment files:
2024-03-13T13:30:17.5762225Z 2024-03-13 13:30:17,492 INFO
[org.apa.cam.qua.cor.dep.mai.CamelMainHotDeploymentProcessor] (build-55) -
routes/*.java
2024-03-13T13:30:19.8887152Z 2024-03-13 13:30:19,871 INFO
[org.apa.cam.qua.cor.CamelBootstrapRecorder] (main) Bootstrap runtime:
org.apache.camel.quarkus.main.CamelMainRuntime
2024-03-13T13:30:19.9977162Z 2024-03-13 13:30:19,887 INFO
[org.apa.cam.mai.MainSupport] (main) Apache Camel (Main) 4.4.0 is starting
2024-03-13T13:30:20.6396391Z 2024-03-13 13:30:20,574 ERROR
[org.apa.cam.qua.mai.CamelMainRuntime] (main) Failed to start application:
org.joor.ReflectException: Compilation error:
2024-03-13T13:30:20.6398540Z /MyTemplate.java:17: error: package
org.apache.camel.builder does not exist
2024-03-13T13:30:20.6399810Z import org.apache.camel.builder.RouteBuilder;
2024-03-13T13:30:20.6400676Z^
2024-03-13T13:30:20.6401486Z /MyTemplate.java:19: error: cannot find symbol
2024-03-13T13:30:20.6402414Z public class MyTemplate extends RouteBuilder {
2024-03-13T13:30:20.6403224Z ^
2024-03-13T13:30:20.6403878Z symbol: class RouteBuilder
2024-03-13T13:30:20.6404892Z /MyRoutesWithTemplate.java:17: error: package
org.apache.camel.builder does not exist
2024-03-13T13:30:20.6406153Z import org.apache.camel.builder.RouteBuilder;
2024-03-13T13:30:20.6406972Z^
2024-03-13T13:30:20.6407814Z /MyRoutesWithTemplate.java:19: error: cannot
find symbol
2024-03-13T13:30:20.6408919Z public class MyRoutesWithTemplate extends
RouteBuilder {
2024-03-13T13:30:20.6410064Z ^
2024-03-13T13:30:20.6411032Z symbol: class RouteBuilder
2024-03-13T13:30:20.6411922Z /MyRoutesWithBeans.java:17: error: package
io.quarkus.runtime.annotations does not exist
2024-03-13T13:30:20.6413102Z import
io.quarkus.runtime.annotations.RegisterForReflection;
2024-03-13T13:30:20.6413822Z ^
2024-03-13T13:30:20.6414588Z /MyRoutesWithBeans.java:18: error: package
org.apache.camel does not exist
2024-03-13T13:30:20.6415452Z import org.apache.camel.BindToRegistry;
2024-03-13T13:30:20.6416184Z^
2024-03-13T13:30:20.6416918Z /MyRoutesWithBeans.java:19: error: package
org.apache.camel.builder does not exist
2024-03-13T13:30:20.6417866Z import org.apache.camel.builder.RouteBuilder;
2024-03-13T13:30:20.6418472Z^
2024-03-13T13:30:20.6419065Z /MyRoutesWithBeans.java:22: error: cannot find
symbol
2024-03-13T13:30:20.6419828Z public class MyRoutesWithBeans extends
RouteBuilder {
2024-03-13T13:30:20.6420486Z^
2024-03-13T13:30:20.6420986Z symbol: class RouteBuilder
2024-03-13T13:30:20.6421561Z /MyRoutesWithBeans.java:21: error: cannot find
symbol
2024-03-13T13:30:20.6422271Z @RegisterForReflection(ignoreNested = false)
2024-03-13T13:30:20.6422801Z ^
2024-03-13T13:30:20.6423854Z symbol: class RegisterForReflection
2024-03-13T13:30:20.6424589Z /MyRoutesWithBeans.java:31: error: cannot find
symbol
2024-03-13T13:30:20.6425299Z @BindToRegistry("myBean")
2024-03-13T13:30:20.6425781Z ^
2024-03-13T13:30:20.6426157Z symbol: class BindToRegistry
2024-03-13T13:30:20.6426717Z location: class MyRoutesWithBeans
2024-03-13T13:30:20.6427533Z /MyUser.java:18: error: package
io.quarkus.runtime.annotations does not exist
2024-03-13T13:30:20.6444827Z import
io.quarkus.runtime.annotations.RegisterForReflection;
2024-03-13T13:30:20.6445581Z ^
2024-03-13T13:30:20.6450639Z /MyUser.java:20: error: cannot find symbol
2024-03-13T13:30:20.6451269Z @RegisterForReflection
2024-03-13T13:30:20.6451900Z ^
2024-03-13T13:30:20.6452318Z symbol: class RegisterForReflection
2024-03-13T13:30:20.6454451Z /MyRoutesWithNestedClass.java:17: error:
package org.apache.camel does not exist
2024-03-13T13:30:20.6455365Z import org.apache.camel.Exchange;
2024-03-13T13:30:20.6455846Z^
2024-03-13T13:30:20.6456574Z /MyRoutesWithNestedClass.java:18: error:
package org.apache.camel does not exist
2024-03-13T13:30:20.6457402Z import org.apache.camel.Processor;
2024-03-13T13:30:20.6457871Z^
2024-03-13T13:30:20.6458651Z /MyRoutesWithNestedClass.java:19: error:
package org.apache.camel.builder does
(camel-k) branch main updated: chore: propagate capabilities to Kit
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new d2ec89c9e chore: propagate capabilities to Kit
d2ec89c9e is described below
commit d2ec89c9ed29e086f1d7ebac591113a7f3f5b206
Author: Pasquale Congiusti
AuthorDate: Wed Mar 13 15:32:22 2024 +0100
chore: propagate capabilities to Kit
Useful in order to know what are the capabilities instead of inspecting the
dependencies. It may also enable finer tuning on the kits matching.
---
docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 7 +++
helm/camel-k/crds/crd-integration-kit.yaml| 5 +
pkg/apis/camel/v1/integrationkit_types.go | 2 ++
pkg/apis/camel/v1/zz_generated.deepcopy.go| 5 +
.../camel/applyconfiguration/camel/v1/integrationkitspec.go | 11 +++
.../config/crd/bases/camel.apache.org_integrationkits.yaml| 5 +
pkg/trait/quarkus.go | 7 +++
7 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
index b81ddd851..f08fee353 100644
--- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
+++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc
@@ -2494,6 +2494,13 @@ Maven repositories that can be used by the kit
the sources to add at build time
+|`capabilities` +
+[]string
+|
+
+
+features offered by the IntegrationKit
+
|===
diff --git a/helm/camel-k/crds/crd-integration-kit.yaml
b/helm/camel-k/crds/crd-integration-kit.yaml
index 28880c09c..29bf85c96 100644
--- a/helm/camel-k/crds/crd-integration-kit.yaml
+++ b/helm/camel-k/crds/crd-integration-kit.yaml
@@ -88,6 +88,11 @@ spec:
spec:
description: the desired configuration
properties:
+ capabilities:
+description: features offered by the IntegrationKit
+items:
+ type: string
+type: array
configuration:
description: 'Deprecated: Use camel trait (camel.properties)
to manage
properties Use mount trait (mount.configs) to manage configs
Use
diff --git a/pkg/apis/camel/v1/integrationkit_types.go
b/pkg/apis/camel/v1/integrationkit_types.go
index 876323731..d8b0864c4 100644
--- a/pkg/apis/camel/v1/integrationkit_types.go
+++ b/pkg/apis/camel/v1/integrationkit_types.go
@@ -74,6 +74,8 @@ type IntegrationKitSpec struct {
Repositories []string `json:"repositories,omitempty"`
// the sources to add at build time
Sources []SourceSpec `json:"sources,omitempty"`
+ // features offered by the IntegrationKit
+ Capabilities []string `json:"capabilities,omitempty"`
}
// IntegrationKitTraits defines traits assigned to an `IntegrationKit`.
diff --git a/pkg/apis/camel/v1/zz_generated.deepcopy.go
b/pkg/apis/camel/v1/zz_generated.deepcopy.go
index 96f5e5fc6..6ca63f75f 100644
--- a/pkg/apis/camel/v1/zz_generated.deepcopy.go
+++ b/pkg/apis/camel/v1/zz_generated.deepcopy.go
@@ -1248,6 +1248,11 @@ func (in *IntegrationKitSpec) DeepCopyInto(out
*IntegrationKitSpec) {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
+ if in.Capabilities != nil {
+ in, out := ,
+ *out = make([]string, len(*in))
+ copy(*out, *in)
+ }
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver,
creating a new IntegrationKitSpec.
diff --git a/pkg/client/camel/applyconfiguration/camel/v1/integrationkitspec.go
b/pkg/client/camel/applyconfiguration/camel/v1/integrationkitspec.go
index 19bd2e613..9d85a6829 100644
--- a/pkg/client/camel/applyconfiguration/camel/v1/integrationkitspec.go
+++ b/pkg/client/camel/applyconfiguration/camel/v1/integrationkitspec.go
@@ -33,6 +33,7 @@ type IntegrationKitSpecApplyConfiguration struct {
Configuration []ConfigurationSpecApplyConfiguration
`json:"configuration,omitempty"`
Repositories []string
`json:"repositories,omitempty"`
Sources []SourceSpecApplyConfiguration
`json:"sources,omitempty"`
+ Capabilities []string
`json:"capabilities,omitempty"`
}
// IntegrationKitSpecApplyConfiguration constructs an declarative
configuration of the IntegrationKitSpec type for use with
@@ -110,3 +111,13 @@ func (b *IntegrationKitSpecApplyConfiguration)
WithSources(values ...*SourceSpec
}
return b
}
+
+// WithCapabilities adds the given value to the Capabilities field in the
declarative configuration
+// and returns the receiver, so that objects can be build by chaining "With"
function invocations.
+// If called
Re: [PR] chore: propagate capabilities to Kit [camel-k]
squakez merged PR #5247: URL: https://github.com/apache/camel-k/pull/5247 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] chore: propagate capabilities to Kit [camel-k]
squakez opened a new pull request, #5247: URL: https://github.com/apache/camel-k/pull/5247 The PR aims to tag each Kit with the capabilities for what it was created for. Useful in order to know what are the capabilities instead of inspecting the dependencies. It may also enable finer tuning on the kits matching eventually. **Release Note** ```release-note chore: propagate capabilities to Kit ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Speed up Windows, quarkus-main & camel-main builds [camel-quarkus]
aldettinger commented on PR #5871: URL: https://github.com/apache/camel-quarkus/pull/5871#issuecomment-1994546216 Looks cool, let's see how far we can get with T1C, T2C ... :) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch main updated: chore(ci): Upgrade setup-kubectl action
This is an automated email from the ASF dual-hosted git repository.
gfournier 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 5c8c144a7 chore(ci): Upgrade setup-kubectl action
5c8c144a7 is described below
commit 5c8c144a781bde769307c2efd648b8db723388bc
Author: Gaelle Fournier
AuthorDate: Tue Mar 12 09:48:29 2024 +0100
chore(ci): Upgrade setup-kubectl action
---
.github/actions/kamel-prepare-env/action.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/actions/kamel-prepare-env/action.yml
b/.github/actions/kamel-prepare-env/action.yml
index fd76c31cc..4fce0bca5 100644
--- a/.github/actions/kamel-prepare-env/action.yml
+++ b/.github/actions/kamel-prepare-env/action.yml
@@ -97,7 +97,7 @@ runs:
# Install a version of kubectl for generic access to cluster
#
- id: install-kubectl
- uses: azure/setup-kubectl@v3
+ uses: azure/setup-kubectl@v4
if: ${{ env.KAMEL_PREPARE_ENV != 'true' }}
with:
version: 'v1.27.4'
Re: [PR] chore(ci): Upgrade setup-kubectl action [camel-k]
gansheer merged PR #5243: URL: https://github.com/apache/camel-k/pull/5243 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Speed up Windows, quarkus-main & camel-main builds [camel-quarkus]
jamesnetherton opened a new pull request, #5871: URL: https://github.com/apache/camel-quarkus/pull/5871 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Running integrations fail when the used registry has a port other than default 80 [camel-k]
squakez commented on issue #5141: URL: https://github.com/apache/camel-k/issues/5141#issuecomment-1994477864 I think the port forward is meant to expose a Kubernetes service in your host machine and not the other way around. If you are using a registry as a Pod [1] (which is already done ootb by Minikube) you need to provide the IP to the operator. As you're running the operator in Minikube, there is no need to provide the `--registry` option during installation as it will be discovered by the tooling. [1] https://camel.apache.org/camel-k/2.2.x/installation/registry/own.html#configuring-registry-run-pod -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch camel-main updated: Generated files
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 7a2647252d Generated files 7a2647252d is described below commit 7a2647252d6fbafc7e845c7c03fcc792a75afdd8 Author: JiriOndrusek AuthorDate: Wed Mar 13 14:58:16 2024 +0100 Generated files --- poms/bom/src/main/generated/flattened-full-pom.xml| 2 +- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 3ac7c5ef9f..afc7a64244 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6369,7 +6369,7 @@ io.projectreactor.netty reactor-netty -1.1.15 +1.1.17 io.quarkiverse.freemarker diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index fd2d500beb..7dd73ba7a6 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6334,7 +6334,7 @@ io.projectreactor.netty reactor-netty -1.1.15 +1.1.17 io.quarkiverse.freemarker diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 54f0362484..47d11451a3 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6334,7 +6334,7 @@ io.projectreactor.netty reactor-netty -1.1.15 +1.1.17 io.quarkiverse.freemarker
[I] git native integration test fails with NoSuchMethodException [camel-quarkus]
jamesnetherton opened a new issue, #5870: URL: https://github.com/apache/camel-quarkus/issues/5870 ### Bug description Seen after upgrade to Quarkus 3.9.0.CR1. Probably needs fixing in `quarkus-jgit`. ``` Caused by: java.lang.IllegalArgumentException: Enumerated values of type org.eclipse.jgit.lib.CoreConfig$TrustLooseRefStat not available at org.eclipse.jgit.lib.Config.allValuesOf(Config.java:430) at org.eclipse.jgit.lib.Config.getEnum(Config.java:417) at org.eclipse.jgit.internal.storage.file.RefDirectory.(RefDirectory.java:222) at org.eclipse.jgit.internal.storage.file.FileRepository.(FileRepository.java:189) at org.eclipse.jgit.storage.file.FileRepositoryBuilder.build(FileRepositoryBuilder.java:55) at org.apache.camel.component.RepositoryFactory.getRepository(RepositoryFactory.java:100) at org.apache.camel.component.RepositoryFactory.of(RepositoryFactory.java:55) at org.apache.camel.component.git.producer.GitProducer.getLocalRepository(GitProducer.java:661) at org.apache.camel.component.git.producer.GitProducer.doStart(GitProducer.java:75) at org.apache.camel.support.service.BaseService.start(BaseService.java:113) at org.apache.camel.support.service.ServiceHelper.startService(ServiceHelper.java:126) at org.apache.camel.support.service.ServiceHelper.startService(ServiceHelper.java:113) at org.apache.camel.support.AsyncProcessorConverterHelper$ProcessorToAsyncProcessorBridge.start(AsyncProcessorConverterHelper.java:116) at org.apache.camel.support.service.ServiceHelper.startService(ServiceHelper.java:126) at org.apache.camel.impl.engine.InternalServiceManager.doAddService(InternalServiceManager.java:146) at org.apache.camel.impl.engine.AbstractCamelContext.addService(AbstractCamelContext.java:1317) at org.apache.camel.support.cache.ServicePool$SinglePool.acquire(ServicePool.java:252) at org.apache.camel.support.cache.ServicePool$SinglePool.acquire(ServicePool.java:230) at org.apache.camel.support.cache.ServicePool.acquire(ServicePool.java:122) at org.apache.camel.support.cache.ProducerServicePool.acquire(ProducerServicePool.java:28) at org.apache.camel.support.cache.DefaultProducerCache.acquireProducer(DefaultProducerCache.java:134) ... 38 more Caused by: java.lang.NoSuchMethodException: org.eclipse.jgit.lib.CoreConfig$TrustLooseRefStat.values() at java.base@21.0.2/java.lang.Class.checkMethod(DynamicHub.java:1075) at java.base@21.0.2/java.lang.Class.getMethod(DynamicHub.java:1060) at org.eclipse.jgit.lib.Config.allValuesOf(Config.java:425) ... 58 more ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch regen_bot updated (0036ea59726 -> 69930cbaac6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 0036ea59726 Camel-Hashicorp-Vault: Added Metadata annotations to show support for vault in catalog add 69930cbaac6 CAMEL-20504 - Google Pubsub CloudEvent Transformer (#13465) No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/transformers.properties | 1 + .../google-pubsub-application-cloudevents.json | 14 ++ .../camel-google/camel-google-pubsub/pom.xml | 9 .../org/apache/camel/transformer.properties| 7 +++ .../google-pubsub-application-cloudevents | 2 + .../google-pubsub-application-cloudevents.json | 14 ++ .../GooglePubsubCloudEventDataTypeTransformer.java | 56 ++ 7 files changed, 103 insertions(+) create mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/google-pubsub-application-cloudevents.json create mode 100644 components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties create mode 100644 components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/transformer/google-pubsub-application-cloudevents create mode 100644 components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/transformer/google-pubsub-application-cloudevents.json create mode 100644 components/camel-google/camel-google-pubsub/src/main/java/org/apache/camel/component/google/pubsub/transform/GooglePubsubCloudEventDataTypeTransformer.java
(camel-quarkus) branch camel-main updated: Micrometer more debug logging 02
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 6a5eb67c24 Micrometer more debug logging 02
6a5eb67c24 is described below
commit 6a5eb67c24f319a144db958ba31a5f6213a720f2
Author: JiriOndrusek
AuthorDate: Wed Mar 13 14:30:34 2024 +0100
Micrometer more debug logging 02
---
.../quarkus/component/micrometer/it/MicrometerResource.java | 9 +
1 file changed, 9 insertions(+)
diff --git
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
index 4e5cb3067a..4eafe512bf 100644
---
a/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
+++
b/integration-tests/micrometer/src/main/java/org/apache/camel/quarkus/component/micrometer/it/MicrometerResource.java
@@ -185,6 +185,15 @@ public class MicrometerResource {
if (service.getMeterRegistry() instanceof CompositeMeterRegistry) {
LOG.info("composite registry from " + ((CompositeMeterRegistry)
service.getMeterRegistry()).getRegistries());
}
+LOG.info("Searching for the `camel.routes.added` in single
registries.");
+((CompositeMeterRegistry)
service.getMeterRegistry()).getRegistries().forEach(mr -> {
+Optional o = mr.getMeters().stream().filter(m ->
m.getId().getName().equals("camel.routes.added")).findAny();
+LOG.info("`camel.routes.added` present in " + mr + ": " +
o.isPresent());
+if (o.isPresent()) {
+LOG.info(" with value " +
o.get().measure().iterator().next());
+}
+});
+
Optional om = service.getMeterRegistry().getMeters().stream()
.filter(m ->
m.getId().getName().contains("camel.routes.added")).findFirst();
LOG.info("meter `camel.routes.added` " + om.get());
(camel) branch main updated: CAMEL-20504 - Google Pubsub CloudEvent Transformer (#13465)
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 69930cbaac6 CAMEL-20504 - Google Pubsub CloudEvent Transformer (#13465)
69930cbaac6 is described below
commit 69930cbaac69a420cd4a869acf6af8790e747d69
Author: Andrea Cosentino
AuthorDate: Wed Mar 13 14:26:12 2024 +0100
CAMEL-20504 - Google Pubsub CloudEvent Transformer (#13465)
Signed-off-by: Andrea Cosentino
---
.../apache/camel/catalog/transformers.properties | 1 +
.../google-pubsub-application-cloudevents.json | 14 ++
.../camel-google/camel-google-pubsub/pom.xml | 9
.../org/apache/camel/transformer.properties| 7 +++
.../google-pubsub-application-cloudevents | 2 +
.../google-pubsub-application-cloudevents.json | 14 ++
.../GooglePubsubCloudEventDataTypeTransformer.java | 56 ++
7 files changed, 103 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties
index 16afe3fe2c9..c29b8c75b35 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties
@@ -19,6 +19,7 @@ azure-servicebus-application-cloudevents
azure-storage-blob-application-cloudevents
azure-storage-datalake-application-cloudevents
azure-storage-queue-application-cloudevents
+google-pubsub-application-cloudevents
google-sheets-application-x-struct
google-storage-application-cloudevents
http-application-cloudevents
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/google-pubsub-application-cloudevents.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/google-pubsub-application-cloudevents.json
new file mode 100644
index 000..2d34c1f1790
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/google-pubsub-application-cloudevents.json
@@ -0,0 +1,14 @@
+{
+ "transformer": {
+"kind": "transformer",
+"name": "google-pubsub:application-cloudevents",
+"title": "Google Pubsub (Application Cloudevents)",
+"description": "Adds CloudEvent headers to the Camel message with Google
Pubsub Pulling information",
+"deprecated": false,
+"javaType":
"org.apache.camel.component.google.pubsub.transform.GooglePubsubCloudEventDataTypeTransformer",
+"groupId": "org.apache.camel",
+"artifactId": "camel-google-pubsub",
+"version": "4.5.0-SNAPSHOT"
+ }
+}
+
diff --git a/components/camel-google/camel-google-pubsub/pom.xml
b/components/camel-google/camel-google-pubsub/pom.xml
index 9a50c1c56a7..5032389cd42 100644
--- a/components/camel-google/camel-google-pubsub/pom.xml
+++ b/components/camel-google/camel-google-pubsub/pom.xml
@@ -73,6 +73,15 @@
+
+
+
+org.apache.camel
+camel-cloudevents
+provided
+true
+
+
org.apache.camel
camel-test-junit5
diff --git
a/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties
b/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties
new file mode 100644
index 000..6d9d1931b2e
--- /dev/null
+++
b/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties
@@ -0,0 +1,7 @@
+# Generated by camel build tools - do NOT edit this file!
+transformers=google-pubsub:application-cloudevents
+groupId=org.apache.camel
+artifactId=camel-google-pubsub
+version=4.5.0-SNAPSHOT
+projectName=Camel :: Google :: PubSub
+projectDescription=Camel Component for Google Cloud Platform PubSub
diff --git
a/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/transformer/google-pubsub-application-cloudevents
b/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/transformer/google-pubsub-application-cloudevents
new file mode 100644
index 000..f2376c60d11
--- /dev/null
+++
b/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/transformer/google-pubsub-application-cloudevents
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.google.pubsub.transform.GooglePubsubCloudEventDataTypeTransformer
diff --git
Re: [PR] CAMEL-20504 - Google Pubsub CloudEvent Transformer [camel]
oscerd merged PR #13465: URL: https://github.com/apache/camel/pull/13465 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20504 - Google Pubsub CloudEvent Transformer [camel]
github-actions[bot] commented on PR #13465: URL: https://github.com/apache/camel/pull/13465#issuecomment-1994362019 :robot: The Apache Camel test robot will run the tests for you :+1: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20504 - Google Pubsub CloudEvent Transformer [camel]
github-actions[bot] commented on PR #13465: URL: https://github.com/apache/camel/pull/13465#issuecomment-1994361212 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20504 - Google Pubsub CloudEvent Transformer [camel]
oscerd commented on PR #13465: URL: https://github.com/apache/camel/pull/13465#issuecomment-1994361165 /component-test google -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] CAMEL-20504 - Google Pubsub CloudEvent Transformer [camel]
oscerd opened a new pull request, #13465: URL: https://github.com/apache/camel/pull/13465 # Description # Target - [x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [x] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) 01/01: CAMEL-20504 - Google Pubsub CloudEvent Transformer
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch CAMEL-20504
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0b0d41b5ffe7350760e251513740f8b1f253a455
Author: Andrea Cosentino
AuthorDate: Wed Mar 13 14:02:19 2024 +0100
CAMEL-20504 - Google Pubsub CloudEvent Transformer
Signed-off-by: Andrea Cosentino
---
.../apache/camel/catalog/transformers.properties | 1 +
.../google-pubsub-application-cloudevents.json | 14 ++
.../camel-google/camel-google-pubsub/pom.xml | 9
.../org/apache/camel/transformer.properties| 7 +++
.../google-pubsub-application-cloudevents | 2 +
.../google-pubsub-application-cloudevents.json | 14 ++
.../GooglePubsubCloudEventDataTypeTransformer.java | 56 ++
7 files changed, 103 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties
index 16afe3fe2c9..c29b8c75b35 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers.properties
@@ -19,6 +19,7 @@ azure-servicebus-application-cloudevents
azure-storage-blob-application-cloudevents
azure-storage-datalake-application-cloudevents
azure-storage-queue-application-cloudevents
+google-pubsub-application-cloudevents
google-sheets-application-x-struct
google-storage-application-cloudevents
http-application-cloudevents
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/google-pubsub-application-cloudevents.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/google-pubsub-application-cloudevents.json
new file mode 100644
index 000..2d34c1f1790
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/transformers/google-pubsub-application-cloudevents.json
@@ -0,0 +1,14 @@
+{
+ "transformer": {
+"kind": "transformer",
+"name": "google-pubsub:application-cloudevents",
+"title": "Google Pubsub (Application Cloudevents)",
+"description": "Adds CloudEvent headers to the Camel message with Google
Pubsub Pulling information",
+"deprecated": false,
+"javaType":
"org.apache.camel.component.google.pubsub.transform.GooglePubsubCloudEventDataTypeTransformer",
+"groupId": "org.apache.camel",
+"artifactId": "camel-google-pubsub",
+"version": "4.5.0-SNAPSHOT"
+ }
+}
+
diff --git a/components/camel-google/camel-google-pubsub/pom.xml
b/components/camel-google/camel-google-pubsub/pom.xml
index 9a50c1c56a7..5032389cd42 100644
--- a/components/camel-google/camel-google-pubsub/pom.xml
+++ b/components/camel-google/camel-google-pubsub/pom.xml
@@ -73,6 +73,15 @@
+
+
+
+org.apache.camel
+camel-cloudevents
+provided
+true
+
+
org.apache.camel
camel-test-junit5
diff --git
a/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties
b/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties
new file mode 100644
index 000..6d9d1931b2e
--- /dev/null
+++
b/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/transformer.properties
@@ -0,0 +1,7 @@
+# Generated by camel build tools - do NOT edit this file!
+transformers=google-pubsub:application-cloudevents
+groupId=org.apache.camel
+artifactId=camel-google-pubsub
+version=4.5.0-SNAPSHOT
+projectName=Camel :: Google :: PubSub
+projectDescription=Camel Component for Google Cloud Platform PubSub
diff --git
a/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/transformer/google-pubsub-application-cloudevents
b/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/transformer/google-pubsub-application-cloudevents
new file mode 100644
index 000..f2376c60d11
--- /dev/null
+++
b/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/transformer/google-pubsub-application-cloudevents
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.component.google.pubsub.transform.GooglePubsubCloudEventDataTypeTransformer
diff --git
a/components/camel-google/camel-google-pubsub/src/generated/resources/META-INF/services/org/apache/camel/transformer/google-pubsub-application-cloudevents.json
(camel) branch CAMEL-20504 created (now 0b0d41b5ffe)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20504 in repository https://gitbox.apache.org/repos/asf/camel.git at 0b0d41b5ffe CAMEL-20504 - Google Pubsub CloudEvent Transformer This branch includes the following new commits: new 0b0d41b5ffe CAMEL-20504 - Google Pubsub CloudEvent Transformer 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.
Re: [I] Pipe error handler not working with Camel 4.4.0 [camel-k]
davsclaus commented on issue #5242: URL: https://github.com/apache/camel-k/issues/5242#issuecomment-1994327168 Yes camel-yaml-dsl setup the pipe error handler on the route as a pure standard camel fashion. https://github.com/apache/camel/blob/78bd6d70f5af6997d3b4a21085b1bbbde4e2cf70/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java#L828 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Create Qdrant JVM only extension [camel-quarkus]
aldettinger closed issue #5860: Create Qdrant JVM only extension URL: https://github.com/apache/camel-quarkus/issues/5860 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Add Qdrant JVM only extension [camel-quarkus]
aldettinger merged PR #5861: URL: https://github.com/apache/camel-quarkus/pull/5861 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch camel-main updated: Add Qdrant JVM only extension #5860
This is an automated email from the ASF dual-hosted git repository.
aldettinger 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 d9e670c89d Add Qdrant JVM only extension #5860
d9e670c89d is described below
commit d9e670c89d4fb51ee29a1d91ac945f76a4ac0854
Author: aldettinger
AuthorDate: Mon Mar 11 17:19:18 2024 +0100
Add Qdrant JVM only extension #5860
---
docs/modules/ROOT/examples/components/qdrant.yml | 13 +++
docs/modules/ROOT/nav.adoc | 1 +
.../ROOT/pages/reference/extensions/qdrant.adoc| 41 +
extensions-jvm/pom.xml | 1 +
extensions-jvm/qdrant/deployment/pom.xml | 63 +
.../qdrant/deployment/QdrantProcessor.java | 46 ++
extensions-jvm/qdrant/pom.xml | 39
extensions-jvm/qdrant/runtime/pom.xml | 100 +
.../main/resources/META-INF/quarkus-extension.yaml | 33 +++
integration-tests-jvm/pom.xml | 1 +
integration-tests-jvm/qdrant/pom.xml | 84 +
.../component/qdrant/it/QdrantResource.java| 50 +++
.../quarkus/component/qdrant/it/QdrantTest.java| 34 +++
poms/bom/pom.xml | 39 +++-
poms/bom/src/main/generated/flattened-full-pom.xml | 39 +++-
.../src/main/generated/flattened-reduced-pom.xml | 47 +-
.../generated/flattened-reduced-verbose-pom.xml| 47 +-
17 files changed, 668 insertions(+), 10 deletions(-)
diff --git a/docs/modules/ROOT/examples/components/qdrant.yml
b/docs/modules/ROOT/examples/components/qdrant.yml
new file mode 100644
index 00..baf7abbffe
--- /dev/null
+++ b/docs/modules/ROOT/examples/components/qdrant.yml
@@ -0,0 +1,13 @@
+# Do not edit directly!
+# This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
+cqArtifactId: camel-quarkus-qdrant
+cqArtifactIdBase: qdrant
+cqNativeSupported: false
+cqStatus: Preview
+cqDeprecated: false
+cqJvmSince: 3.9.0
+cqNativeSince: n/a
+cqCamelPartName: qdrant
+cqCamelPartTitle: Qdrant
+cqCamelPartDescription: Perform operations on the Qdrant Vector Database.
+cqExtensionPageTitle: Qdrant
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index 36658c68d6..1fab5d81c5 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -239,6 +239,7 @@
*** xref:reference/extensions/jackson-protobuf.adoc[Protobuf Jackson]
*** xref:reference/extensions/pubnub.adoc[PubNub]
*** xref:reference/extensions/pulsar.adoc[Pulsar]
+*** xref:reference/extensions/qdrant.adoc[Qdrant]
*** xref:reference/extensions/quartz.adoc[Quartz]
*** xref:reference/extensions/quickfix.adoc[QuickFix]
*** xref:reference/extensions/qute.adoc[Qute]
diff --git a/docs/modules/ROOT/pages/reference/extensions/qdrant.adoc
b/docs/modules/ROOT/pages/reference/extensions/qdrant.adoc
new file mode 100644
index 00..79f50e40aa
--- /dev/null
+++ b/docs/modules/ROOT/pages/reference/extensions/qdrant.adoc
@@ -0,0 +1,41 @@
+// Do not edit directly!
+// This file was generated by
camel-quarkus-maven-plugin:update-extension-doc-page
+[id="extensions-qdrant"]
+= Qdrant
+:linkattrs:
+:cq-artifact-id: camel-quarkus-qdrant
+:cq-native-supported: false
+:cq-status: Preview
+:cq-status-deprecation: Preview
+:cq-description: Perform operations on the Qdrant Vector Database.
+:cq-deprecated: false
+:cq-jvm-since: 3.9.0
+:cq-native-since: n/a
+
+ifeval::[{doc-show-badges} == true]
+[.badges]
+[.badge-key]##JVM since##[.badge-supported]##3.9.0##
[.badge-key]##Native##[.badge-unsupported]##unsupported##
+endif::[]
+
+Perform operations on the Qdrant Vector Database.
+
+[id="extensions-qdrant-whats-inside"]
+== What's inside
+
+* xref:{cq-camel-components}::qdrant-component.adoc[Qdrant component], URI
syntax: `qdrant:collection`
+
+Please refer to the above link for usage and configuration details.
+
+[id="extensions-qdrant-maven-coordinates"]
+== Maven coordinates
+
+[source,xml]
+
+
+org.apache.camel.quarkus
+camel-quarkus-qdrant
+
+
+ifeval::[{doc-show-user-guide-link} == true]
+Check the xref:user-guide/index.adoc[User guide] for more information about
writing Camel Quarkus applications.
+endif::[]
diff --git a/extensions-jvm/pom.xml b/extensions-jvm/pom.xml
index f195f49fa1..8fcdb46adc 100644
--- a/extensions-jvm/pom.xml
+++ b/extensions-jvm/pom.xml
@@ -85,6 +85,7 @@
opensearch
printer
pulsar
+qdrant
quickfix
redis
robotframework
diff --git a/extensions-jvm/qdrant/deployment/pom.xml
b/extensions-jvm/qdrant/deployment/pom.xml
new file mode 100644
index 00..7a45573223
--- /dev/null
+++ b/extensions-jvm/qdrant/deployment/pom.xml
@@ -0,0 +1,63 @@
+
+
(camel) branch regen_bot updated (1a171ac0e6b -> 0036ea59726)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git from 1a171ac0e6b CAMEL-20560 - Camel-AWS-Bedrock: Support Anthropic models (#13462) add ca816a636d9 Camel-AWS-Secrets-Manager: Added Metadata annotations to show support for vault in catalog add c813bd0b256 Camel-Azure-Key-Vault: Added Metadata annotations to show support for vault in catalog add 98171f7fec5 Camel-Google-Secret-Manager: Added Metadata annotations to show support for vault in catalog add 0036ea59726 Camel-Hashicorp-Vault: Added Metadata annotations to show support for vault in catalog No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/components/aws-secrets-manager.json | 1 + .../org/apache/camel/catalog/components/azure-key-vault.json | 1 + .../org/apache/camel/catalog/components/google-secret-manager.json| 1 + .../org/apache/camel/catalog/components/hashicorp-vault.json | 1 + .../camel/component/aws/secretsmanager/aws-secrets-manager.json | 1 + .../camel/component/aws/secretsmanager/SecretsManagerEndpoint.java| 4 .../org/apache/camel/component/azure/key/vault/azure-key-vault.json | 1 + .../org/apache/camel/component/azure/key/vault/KeyVaultEndpoint.java | 4 .../camel/component/google/secret/manager/google-secret-manager.json | 1 + .../component/google/secret/manager/GoogleSecretManagerEndpoint.java | 4 .../org/apache/camel/component/hashicorp/vault/hashicorp-vault.json | 1 + .../camel/component/hashicorp/vault/HashicorpVaultEndpoint.java | 4 dsl/camel-componentdsl/src/generated/resources/metadata.json | 4 13 files changed, 28 insertions(+)
[PR] Upgrade Quarkus to 3.9.0.CR1 [camel-quarkus]
jamesnetherton opened a new pull request, #5869: URL: https://github.com/apache/camel-quarkus/pull/5869 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) 02/04: Camel-Azure-Key-Vault: Added Metadata annotations to show support for vault in catalog
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit c813bd0b2561183599463ef4e13f3ef674784177
Author: Andrea Cosentino
AuthorDate: Wed Mar 13 11:33:21 2024 +0100
Camel-Azure-Key-Vault: Added Metadata annotations to show support for vault
in catalog
Signed-off-by: Andrea Cosentino
---
.../org/apache/camel/catalog/components/azure-key-vault.json | 1 +
.../org/apache/camel/component/azure/key/vault/azure-key-vault.json | 1 +
.../org/apache/camel/component/azure/key/vault/KeyVaultEndpoint.java | 4
dsl/camel-componentdsl/src/generated/resources/metadata.json | 1 +
4 files changed, 7 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-key-vault.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-key-vault.json
index 0d59b1d884f..e057a190d4b 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-key-vault.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/azure-key-vault.json
@@ -9,6 +9,7 @@
"label": "cloud,cloud",
"javaType": "org.apache.camel.component.azure.key.vault.KeyVaultComponent",
"supportLevel": "Stable",
+"metadata": { "vault": "azure-key-vault" },
"groupId": "org.apache.camel",
"artifactId": "camel-azure-key-vault",
"version": "4.5.0-SNAPSHOT",
diff --git
a/components/camel-azure/camel-azure-key-vault/src/generated/resources/META-INF/org/apache/camel/component/azure/key/vault/azure-key-vault.json
b/components/camel-azure/camel-azure-key-vault/src/generated/resources/META-INF/org/apache/camel/component/azure/key/vault/azure-key-vault.json
index 0d59b1d884f..e057a190d4b 100644
---
a/components/camel-azure/camel-azure-key-vault/src/generated/resources/META-INF/org/apache/camel/component/azure/key/vault/azure-key-vault.json
+++
b/components/camel-azure/camel-azure-key-vault/src/generated/resources/META-INF/org/apache/camel/component/azure/key/vault/azure-key-vault.json
@@ -9,6 +9,7 @@
"label": "cloud,cloud",
"javaType": "org.apache.camel.component.azure.key.vault.KeyVaultComponent",
"supportLevel": "Stable",
+"metadata": { "vault": "azure-key-vault" },
"groupId": "org.apache.camel",
"artifactId": "camel-azure-key-vault",
"version": "4.5.0-SNAPSHOT",
diff --git
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpoint.java
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpoint.java
index e1c6da18ede..c0d44f426ab 100644
---
a/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpoint.java
+++
b/components/camel-azure/camel-azure-key-vault/src/main/java/org/apache/camel/component/azure/key/vault/KeyVaultEndpoint.java
@@ -26,6 +26,7 @@ import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.DefaultEndpoint;
@@ -38,6 +39,9 @@ import org.apache.camel.support.DefaultEndpoint;
Category.CLOUD, Category.CLOUD },
producerOnly = true,
headersClass = KeyVaultConstants.class)
+@Metadata(annotations = {
+"vault=azure-key-vault",
+})
public class KeyVaultEndpoint extends DefaultEndpoint {
private SecretClient secretClient;
diff --git a/dsl/camel-componentdsl/src/generated/resources/metadata.json
b/dsl/camel-componentdsl/src/generated/resources/metadata.json
index 2f0df35c689..7168c73ea95 100644
--- a/dsl/camel-componentdsl/src/generated/resources/metadata.json
+++ b/dsl/camel-componentdsl/src/generated/resources/metadata.json
@@ -955,6 +955,7 @@
"label": "cloud,cloud",
"javaType": "org.apache.camel.component.azure.key.vault.KeyVaultComponent",
"supportLevel": "Stable",
+"metadata": { "vault": "azure-key-vault" },
"groupId": "org.apache.camel",
"artifactId": "camel-azure-key-vault",
"version": "4.5.0-SNAPSHOT",
(camel) 03/04: Camel-Google-Secret-Manager: Added Metadata annotations to show support for vault in catalog
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 98171f7fec50002534405aecdf9f73487a9f994f
Author: Andrea Cosentino
AuthorDate: Wed Mar 13 11:54:55 2024 +0100
Camel-Google-Secret-Manager: Added Metadata annotations to show support for
vault in catalog
Signed-off-by: Andrea Cosentino
---
.../org/apache/camel/catalog/components/google-secret-manager.json| 1 +
.../camel/component/google/secret/manager/google-secret-manager.json | 1 +
.../component/google/secret/manager/GoogleSecretManagerEndpoint.java | 4
dsl/camel-componentdsl/src/generated/resources/metadata.json | 1 +
4 files changed, 7 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-secret-manager.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-secret-manager.json
index c6fae908335..05eeb908c61 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-secret-manager.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/google-secret-manager.json
@@ -9,6 +9,7 @@
"label": "cloud",
"javaType":
"org.apache.camel.component.google.secret.manager.GoogleSecretManagerComponent",
"supportLevel": "Stable",
+"metadata": { "vault": "google-secret-manager" },
"groupId": "org.apache.camel",
"artifactId": "camel-google-secret-manager",
"version": "4.5.0-SNAPSHOT",
diff --git
a/components/camel-google/camel-google-secret-manager/src/generated/resources/META-INF/org/apache/camel/component/google/secret/manager/google-secret-manager.json
b/components/camel-google/camel-google-secret-manager/src/generated/resources/META-INF/org/apache/camel/component/google/secret/manager/google-secret-manager.json
index c6fae908335..05eeb908c61 100644
---
a/components/camel-google/camel-google-secret-manager/src/generated/resources/META-INF/org/apache/camel/component/google/secret/manager/google-secret-manager.json
+++
b/components/camel-google/camel-google-secret-manager/src/generated/resources/META-INF/org/apache/camel/component/google/secret/manager/google-secret-manager.json
@@ -9,6 +9,7 @@
"label": "cloud",
"javaType":
"org.apache.camel.component.google.secret.manager.GoogleSecretManagerComponent",
"supportLevel": "Stable",
+"metadata": { "vault": "google-secret-manager" },
"groupId": "org.apache.camel",
"artifactId": "camel-google-secret-manager",
"version": "4.5.0-SNAPSHOT",
diff --git
a/components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerEndpoint.java
b/components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerEndpoint.java
index f037a4d3ea3..d9b5f5e25af 100644
---
a/components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerEndpoint.java
+++
b/components/camel-google/camel-google-secret-manager/src/main/java/org/apache/camel/component/google/secret/manager/GoogleSecretManagerEndpoint.java
@@ -21,6 +21,7 @@ import org.apache.camel.Category;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.support.DefaultEndpoint;
@@ -34,6 +35,9 @@ import org.apache.camel.support.DefaultEndpoint;
syntax = "google-secret-manager:project", category = {
Category.CLOUD },
producerOnly = true, headersClass =
GoogleSecretManagerConstants.class)
+@Metadata(annotations = {
+"vault=google-secret-manager",
+})
public class GoogleSecretManagerEndpoint extends DefaultEndpoint {
@UriParam
diff --git a/dsl/camel-componentdsl/src/generated/resources/metadata.json
b/dsl/camel-componentdsl/src/generated/resources/metadata.json
index 7168c73ea95..49036fc2faf 100644
--- a/dsl/camel-componentdsl/src/generated/resources/metadata.json
+++ b/dsl/camel-componentdsl/src/generated/resources/metadata.json
@@ -2792,6 +2792,7 @@
"label": "cloud",
"javaType":
"org.apache.camel.component.google.secret.manager.GoogleSecretManagerComponent",
"supportLevel": "Stable",
+"metadata": { "vault": "google-secret-manager" },
"groupId": "org.apache.camel",
"artifactId": "camel-google-secret-manager",
"version": "4.5.0-SNAPSHOT",
