Re: [PR] fix(#5292): Simplify run cmd for archs other than amd64 [camel-k]
tdiesler commented on PR #5403: URL: https://github.com/apache/camel-k/pull/5403#issuecomment-2074063570 The idea is, that (if not explicitly configured otherwise) we build the integration for the arch we run on. Building the integration for multiarch is a different story (and breaking change), which we deferred until the next major version. A configuration variable which is set at operator install time would likely not add relevant information to what we get from the Go runtime already, or would it? `if runtime.GOARCH == "arm64"` is just a variation of a `switch` that I head earlier. When more archs become relevant we can expand the mapping. Currently it is ... ``` switch runtime.GOARCH { arm64: linux/arm64 default: linux/amd64 } ``` -- 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] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
oscerd closed pull request #1134: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) URL: https://github.com/apache/camel-spring-boot/pull/1134 -- 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-2073893227 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 8809978812-1462-ba078005-a37b-4c8f-ac48-41c7ed22a99b * Camel Quarkus Commit: 12dc485b4832e7f835e002391e1d070254a94788 * Quarkus Main Commit: 9be20b7862b5794df20d1f7976d24b4a7b23c3db * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8809978812 -- 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 release-2.2.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.2.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.2.x by this push: new 0868ef99b chore: changelog automatic update 0868ef99b is described below commit 0868ef99b4617e80b8c70bff64766f3492bdcb74 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Apr 24 01:08:08 2024 + chore: changelog automatic update --- CHANGELOG.md | 5 + 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d29ffd0f..3f4a37d9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Error when setting knative-service trait annotations [\#5401](https://github.com/apache/camel-k/issues/5401) - Contributing page is obsolete [\#5386](https://github.com/apache/camel-k/issues/5386) - IntegrationKit Trait condition missing [\#5381](https://github.com/apache/camel-k/issues/5381) - Wrongly formatted license [\#5360](https://github.com/apache/camel-k/issues/5360) @@ -14,9 +15,13 @@ - IntegrationProfile empty description [\#5341](https://github.com/apache/camel-k/issues/5341) - OLM procedure, clear errors and warnings [\#5333](https://github.com/apache/camel-k/issues/5333) - Flaky TestOperatorBasic [\#5326](https://github.com/apache/camel-k/issues/5326) +- fatal error: concurrent map read and map write [\#5315](https://github.com/apache/camel-k/issues/5315) - Deprecate Spectrum publishing strategy [\#5314](https://github.com/apache/camel-k/issues/5314) +- Sourceless Integration status show default provider/version [\#5309](https://github.com/apache/camel-k/issues/5309) - TestHelmOperatorUpgrade error [\#5304](https://github.com/apache/camel-k/issues/5304) +- Platform choice for aarch64 is incorrect [\#5298](https://github.com/apache/camel-k/issues/5298) - Build configuration on IntegrationPlatform ignored [\#5289](https://github.com/apache/camel-k/issues/5289) +- \[2.2.x\] Basic integration fails on ARM64 [\#5280](https://github.com/apache/camel-k/issues/5280) - Pod failure when using fixed native image [\#5207](https://github.com/apache/camel-k/issues/5207) - unambigious reference to configmaps and secrets [\#4841](https://github.com/apache/camel-k/issues/4841) - Startup times take way longer than advertised numbers [\#4192](https://github.com/apache/camel-k/issues/4192)
(camel-k) branch dependabot/go_modules/knative.dev/eventing-0.41.0 created (now 3c316639e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/knative.dev/eventing-0.41.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 3c316639e chore(deps): bump knative.dev/eventing from 0.40.3 to 0.41.0 No new revisions were added by this update.
[PR] chore(deps): bump knative.dev/eventing from 0.40.3 to 0.41.0 [camel-k]
dependabot[bot] opened a new pull request, #5406: URL: https://github.com/apache/camel-k/pull/5406 Bumps [knative.dev/eventing](https://github.com/knative/eventing) from 0.40.3 to 0.41.0. Commits https://github.com/knative/eventing/commit/e23ebab11c1de74d527e58aaf5b7c25a95663b9d;>e23ebab Reconcile trigger on OIDC service account changes only, if SA references a tr... https://github.com/knative/eventing/commit/ea1429662ffe62840b279f9491288e0518bdb248;>ea14296 fix: remove duplicate configMaps (https://redirect.github.com/knative/eventing/issues/7847;>#7847) https://github.com/knative/eventing/commit/4ba426cd4305e014421402a2046f34b7bb9bf5e9;>4ba426c [main] Upgrade to latest dependencies (https://redirect.github.com/knative/eventing/issues/7850;>#7850) https://github.com/knative/eventing/commit/4139fdf8909c1447306eed9a8ebc732f908b981a;>4139fdf [main] Update community files (https://redirect.github.com/knative/eventing/issues/7845;>#7845) https://github.com/knative/eventing/commit/6585a2bab3cb92df704129fea99e54ee03ebc9d5;>6585a2b [main] Upgrade to latest dependencies (https://redirect.github.com/knative/eventing/issues/7843;>#7843) https://github.com/knative/eventing/commit/f9d8dea7953b6654200dcffe351afc2680107463;>f9d8dea [main] Upgrade to latest dependencies (https://redirect.github.com/knative/eventing/issues/7842;>#7842) https://github.com/knative/eventing/commit/d96c6db350347e009bf60ac31df0d585edd48ab3;>d96c6db feat: add initial pathfinding algorithm (https://redirect.github.com/knative/eventing/issues/7782;>#7782) https://github.com/knative/eventing/commit/1ed11b74e50924e57587848152395e2ebaecfd8f;>1ed11b7 [e2e] fix ManyTriggers possible starvation of Setup features (https://redirect.github.com/knative/eventing/issues/7831;>#7831) https://github.com/knative/eventing/commit/cb538fc90c39c58ad326a8581e2c101bac7de8f6;>cb538fc [main] Upgrade to latest dependencies (https://redirect.github.com/knative/eventing/issues/7835;>#7835) https://github.com/knative/eventing/commit/0264d60e0015a5dcae8f9b786dc70e7e8c3643aa;>0264d60 Remove sinkbindings OIDC token secret when not needed and fix status setting ... Additional commits viewable in https://github.com/knative/eventing/compare/v0.40.3...v0.41.0;>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=knative.dev/eventing=go_modules=0.40.3=0.41.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) -- 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(deps): bump knative.dev/serving from 0.40.1 to 0.41.0 [camel-k]
dependabot[bot] opened a new pull request, #5405: URL: https://github.com/apache/camel-k/pull/5405 Bumps [knative.dev/serving](https://github.com/knative/serving) from 0.40.1 to 0.41.0. Commits https://github.com/knative/serving/commit/afc8a599a85d45c50d309f961e5f56457720c781;>afc8a59 Update net-gateway-api nightly (https://redirect.github.com/knative/serving/issues/15159;>#15159) https://github.com/knative/serving/commit/f328f967ee3cb4c6ebf7450dedfdf907b16a374b;>f328f96 Update net-gateway-api nightly (https://redirect.github.com/knative/serving/issues/15158;>#15158) https://github.com/knative/serving/commit/0a999c42a131629b6b0b7ddebc81f76c155a8de3;>0a999c4 Update net-certmanager nightly (https://redirect.github.com/knative/serving/issues/15157;>#15157) https://github.com/knative/serving/commit/7b6fc7bbe9d5d47fe39fe9fcbc6226383d4d865a;>7b6fc7b re-enable contour gateway tests (https://redirect.github.com/knative/serving/issues/15150;>#15150) https://github.com/knative/serving/commit/f65df074aaa189b0dbe83da66bdf875a740b5ccf;>f65df07 feat: bubble up kcert status message when it's failed (https://redirect.github.com/knative/serving/issues/14962;>#14962) https://github.com/knative/serving/commit/e4d813980d335b000a224ceaffa14b1561526742;>e4d8139 cleanup service after tests completes (https://redirect.github.com/knative/serving/issues/15147;>#15147) https://github.com/knative/serving/commit/076cd07fe7aff116e35afdbef912bfe94e362b1e;>076cd07 upgrade to latest dependencies (https://redirect.github.com/knative/serving/issues/15155;>#15155) https://github.com/knative/serving/commit/5128114abb57a21439837e13674d22b6940e2764;>5128114 Update net-contour nightly (https://redirect.github.com/knative/serving/issues/15152;>#15152) https://github.com/knative/serving/commit/5943c7af5e3b4d75228d949b8ceffc0496b228ab;>5943c7a Update net-istio nightly (https://redirect.github.com/knative/serving/issues/15151;>#15151) https://github.com/knative/serving/commit/e8d86106b2487bc7da35d1c1a832294bd805da53;>e8d8610 Update net-kourier nightly (https://redirect.github.com/knative/serving/issues/15153;>#15153) Additional commits viewable in https://github.com/knative/serving/compare/v0.40.1...v0.41.0;>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=knative.dev/serving=go_modules=0.40.1=0.41.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) -- 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 dependabot/go_modules/knative.dev/serving-0.41.0 created (now dba34b995)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/knative.dev/serving-0.41.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git at dba34b995 chore(deps): bump knative.dev/serving from 0.40.1 to 0.41.0 No new revisions were added by this update.
Re: [I] [CI] - Camel Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-2073719748 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 8808900374-1358-0aa8ab72-d7c6-40de-afe7-cbdd91e05c72 * Camel Quarkus Commit: 91400cafe73513369a227fbb2dfb358f890da463 * Camel Main Commit: 9be20b7862b5794df20d1f7976d24b4a7b23c3db * Link to build: https://github.com/apache/camel-quarkus/actions/runs/8808900374 -- 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 release-2.3.x updated: chore: nightly automatic updates
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.3.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.3.x by this push: new f9469c9da chore: nightly automatic updates f9469c9da is described below commit f9469c9daa3038c54642d84f3b4c3f6d39a05d6d Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Apr 24 00:27:12 2024 + chore: nightly automatic updates --- CHANGELOG.md | 5 + 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d29ffd0f..3f4a37d9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Error when setting knative-service trait annotations [\#5401](https://github.com/apache/camel-k/issues/5401) - Contributing page is obsolete [\#5386](https://github.com/apache/camel-k/issues/5386) - IntegrationKit Trait condition missing [\#5381](https://github.com/apache/camel-k/issues/5381) - Wrongly formatted license [\#5360](https://github.com/apache/camel-k/issues/5360) @@ -14,9 +15,13 @@ - IntegrationProfile empty description [\#5341](https://github.com/apache/camel-k/issues/5341) - OLM procedure, clear errors and warnings [\#5333](https://github.com/apache/camel-k/issues/5333) - Flaky TestOperatorBasic [\#5326](https://github.com/apache/camel-k/issues/5326) +- fatal error: concurrent map read and map write [\#5315](https://github.com/apache/camel-k/issues/5315) - Deprecate Spectrum publishing strategy [\#5314](https://github.com/apache/camel-k/issues/5314) +- Sourceless Integration status show default provider/version [\#5309](https://github.com/apache/camel-k/issues/5309) - TestHelmOperatorUpgrade error [\#5304](https://github.com/apache/camel-k/issues/5304) +- Platform choice for aarch64 is incorrect [\#5298](https://github.com/apache/camel-k/issues/5298) - Build configuration on IntegrationPlatform ignored [\#5289](https://github.com/apache/camel-k/issues/5289) +- \[2.2.x\] Basic integration fails on ARM64 [\#5280](https://github.com/apache/camel-k/issues/5280) - Pod failure when using fixed native image [\#5207](https://github.com/apache/camel-k/issues/5207) - unambigious reference to configmaps and secrets [\#4841](https://github.com/apache/camel-k/issues/4841) - Startup times take way longer than advertised numbers [\#4192](https://github.com/apache/camel-k/issues/4192)
[PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
github-actions[bot] opened a new pull request, #1134: URL: https://github.com/apache/camel-spring-boot/pull/1134 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 494b0040c chore: nightly automatic updates 494b0040c is described below commit 494b0040c154594981cb51f4f7b87023431c0162 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Apr 23 23:46:03 2024 + chore: nightly automatic updates --- CHANGELOG.md | 7 ++ coverage.out | 350 ++- 2 files changed, 183 insertions(+), 174 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e14aaf08..4cd5eee13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Error when setting knative-service trait annotations [\#5401](https://github.com/apache/camel-k/issues/5401) - Contributing page is obsolete [\#5386](https://github.com/apache/camel-k/issues/5386) - IntegrationKit Trait condition missing [\#5381](https://github.com/apache/camel-k/issues/5381) - Wrongly formatted license [\#5360](https://github.com/apache/camel-k/issues/5360) @@ -14,9 +15,13 @@ - IntegrationProfile empty description [\#5341](https://github.com/apache/camel-k/issues/5341) - OLM procedure, clear errors and warnings [\#5333](https://github.com/apache/camel-k/issues/5333) - Flaky TestOperatorBasic [\#5326](https://github.com/apache/camel-k/issues/5326) +- fatal error: concurrent map read and map write [\#5315](https://github.com/apache/camel-k/issues/5315) - Deprecate Spectrum publishing strategy [\#5314](https://github.com/apache/camel-k/issues/5314) +- Sourceless Integration status show default provider/version [\#5309](https://github.com/apache/camel-k/issues/5309) - TestHelmOperatorUpgrade error [\#5304](https://github.com/apache/camel-k/issues/5304) +- Platform choice for aarch64 is incorrect [\#5298](https://github.com/apache/camel-k/issues/5298) - Build configuration on IntegrationPlatform ignored [\#5289](https://github.com/apache/camel-k/issues/5289) +- \[2.2.x\] Basic integration fails on ARM64 [\#5280](https://github.com/apache/camel-k/issues/5280) - Pod failure when using fixed native image [\#5207](https://github.com/apache/camel-k/issues/5207) - unambigious reference to configmaps and secrets [\#4841](https://github.com/apache/camel-k/issues/4841) - Startup times take way longer than advertised numbers [\#4192](https://github.com/apache/camel-k/issues/4192) @@ -36,6 +41,7 @@ **Merged pull requests:** +- fix\(trait\): define synthetic Kit [\#5399](https://github.com/apache/camel-k/pull/5399) ([squakez](https://github.com/squakez)) - chore\(deps\): bump org.apache:apache from 31 to 32 in /java/crds [\#5397](https://github.com/apache/camel-k/pull/5397) ([dependabot[bot]](https://github.com/apps/dependabot)) - chore\(deps\): bump fabric8-version from 6.12.0 to 6.12.1 in /java/crds [\#5396](https://github.com/apache/camel-k/pull/5396) ([dependabot[bot]](https://github.com/apps/dependabot)) - doc\(\#5386\): Contributing page updated [\#5393](https://github.com/apache/camel-k/pull/5393) ([vkrejcirik](https://github.com/vkrejcirik)) @@ -46,6 +52,7 @@ - fix\(trait\): inherit platform configuration [\#5383](https://github.com/apache/camel-k/pull/5383) ([squakez](https://github.com/squakez)) - fix\(trait\): condition kit type [\#5382](https://github.com/apache/camel-k/pull/5382) ([squakez](https://github.com/squakez)) - chore: re-enable file permissions test on darwin [\#5380](https://github.com/apache/camel-k/pull/5380) ([lzap](https://github.com/lzap)) +- fix\(trait\): don't report runtime version... [\#5378](https://github.com/apache/camel-k/pull/5378) ([squakez](https://github.com/squakez)) - fix\(ci\): remove Helm upgrade test [\#5377](https://github.com/apache/camel-k/pull/5377) ([squakez](https://github.com/squakez)) - \(fix\#5315\): concurrent map read and map write [\#5375](https://github.com/apache/camel-k/pull/5375) ([tdiesler](https://github.com/tdiesler)) - chore\(ci\): Upgrade kind to 0.22.0 and kindest/node to 1.28.7 [\#5373](https://github.com/apache/camel-k/pull/5373) ([gansheer](https://github.com/gansheer)) diff --git a/coverage.out b/coverage.out index 01cc188c1..f584527c9 100644 --- a/coverage.out +++ b/coverage.out @@ -1,25 +1,25 @@ github.com/apache/camel-k/v2/addons/keda/keda.go:113: NewKedaTrait 100.0% -github.com/apache/camel-k/v2/addons/keda/keda.go:119: Configure 62.5% -github.com/apache/camel-k/v2/addons/keda/keda.go:136: Apply 75.0%
(camel-karavan) branch main updated: Doc fo docker fix
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 78f2353e Doc fo docker fix 78f2353e is described below commit 78f2353e541d425df7444a3001e8eecd85eb5a57 Author: Marat Gubaidullin AuthorDate: Tue Apr 23 18:47:53 2024 -0400 Doc fo docker fix --- docs/install/karavan-docker/docker-compose-gitea.yaml | 1 - docs/install/karavan-docker/docker-compose.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/docs/install/karavan-docker/docker-compose-gitea.yaml b/docs/install/karavan-docker/docker-compose-gitea.yaml index d53868f8..ae335915 100644 --- a/docs/install/karavan-docker/docker-compose-gitea.yaml +++ b/docs/install/karavan-docker/docker-compose-gitea.yaml @@ -1,4 +1,3 @@ -version: '3.8' name: karavan services: diff --git a/docs/install/karavan-docker/docker-compose.yaml b/docs/install/karavan-docker/docker-compose.yaml index 92533c97..32640223 100644 --- a/docs/install/karavan-docker/docker-compose.yaml +++ b/docs/install/karavan-docker/docker-compose.yaml @@ -1,4 +1,3 @@ -version: '3.8' name: karavan services:
(camel-karavan) branch main updated: Doc fo docker fix
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 b4bde143 Doc fo docker fix b4bde143 is described below commit b4bde14334882d185119f6748f75ef3eae9dd453 Author: Marat Gubaidullin AuthorDate: Tue Apr 23 18:44:38 2024 -0400 Doc fo docker fix --- docs/install/karavan-docker/docker-compose-gitea.yaml | 1 + docs/install/karavan-docker/docker-compose.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/docs/install/karavan-docker/docker-compose-gitea.yaml b/docs/install/karavan-docker/docker-compose-gitea.yaml index 01fbfa77..d53868f8 100644 --- a/docs/install/karavan-docker/docker-compose-gitea.yaml +++ b/docs/install/karavan-docker/docker-compose-gitea.yaml @@ -1,4 +1,5 @@ version: '3.8' +name: karavan services: diff --git a/docs/install/karavan-docker/docker-compose.yaml b/docs/install/karavan-docker/docker-compose.yaml index 05d5068b..92533c97 100644 --- a/docs/install/karavan-docker/docker-compose.yaml +++ b/docs/install/karavan-docker/docker-compose.yaml @@ -1,4 +1,5 @@ version: '3.8' +name: karavan services:
[PR] CAMEL-20093 : Replaced 3 test cases with a single parameterized one. [camel]
sudipmahata09 opened a new pull request, #13904: URL: https://github.com/apache/camel/pull/13904 # 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 - [CAMEL-20093] 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
[PR] CAMEL-20714 Added public no-arg constructor for SourceCache [camel]
dk2k opened a new pull request, #13903: URL: https://github.com/apache/camel/pull/13903 CAMEL-20714 Added public no-arg constructor for SourceCache It throws an exception since I can't set a proper value to private final int length; -- 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-20714 Added public no-arg constructor for SourceCache [camel]
github-actions[bot] commented on PR #13903: URL: https://github.com/apache/camel/pull/13903#issuecomment-2073179104 :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] Upgrade Quarkus to 3.10.0 [camel-quarkus]
jamesnetherton opened a new pull request, #6033: URL: https://github.com/apache/camel-quarkus/pull/6033 (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: [PR] [3.8.x] Jt400: possible missing resource in the native [camel-quarkus]
jamesnetherton merged PR #6031: URL: https://github.com/apache/camel-quarkus/pull/6031 -- 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 3.8.x updated: Jt400: possible missing resource in the native
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch 3.8.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/3.8.x by this push: new 325911d5e2 Jt400: possible missing resource in the native 325911d5e2 is described below commit 325911d5e2b546347f1243578f8144937b3ce34b Author: JiriOndrusek AuthorDate: Tue Apr 23 13:56:25 2024 +0200 Jt400: possible missing resource in the native --- .../component/jt400/deployment/Jt400Processor.java | 14 ++ .../component/jt400/mocked/it/Jt400MockResource.java| 13 + .../quarkus/component/jt400/mocked/Jt400MockTest.java | 15 +++ .../camel/quarkus/component/jt400/it/Jt400Resource.java | 17 + .../camel/quarkus/component/jt400/it/Jt400Test.java | 15 +++ 5 files changed, 70 insertions(+), 4 deletions(-) diff --git a/extensions/jt400/deployment/src/main/java/org/apache/camel/quarkus/component/jt400/deployment/Jt400Processor.java b/extensions/jt400/deployment/src/main/java/org/apache/camel/quarkus/component/jt400/deployment/Jt400Processor.java index 133fbb3a76..a666373483 100644 --- a/extensions/jt400/deployment/src/main/java/org/apache/camel/quarkus/component/jt400/deployment/Jt400Processor.java +++ b/extensions/jt400/deployment/src/main/java/org/apache/camel/quarkus/component/jt400/deployment/Jt400Processor.java @@ -18,6 +18,7 @@ package org.apache.camel.quarkus.component.jt400.deployment; import java.util.ArrayList; import java.util.List; +import java.util.ListResourceBundle; import java.util.regex.Pattern; import com.ibm.as400.access.AS400; @@ -29,6 +30,7 @@ import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.IndexDependencyBuildItem; import io.quarkus.deployment.builditem.NativeImageEnableAllCharsetsBuildItem; +import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem; @@ -41,6 +43,7 @@ class Jt400Processor { private static final Logger LOG = Logger.getLogger(Jt400Processor.class); private static final String FEATURE = "camel-jt400"; private static final DotName CONV_TABLE_NAME = DotName.createSimple(ConvTable.class.getName()); +private static final DotName LIST_RESOURCE_BUNDLE_NAME = DotName.createSimple(ListResourceBundle.class.getName()); @BuildStep FeatureBuildItem feature() { @@ -86,6 +89,17 @@ class Jt400Processor { } +@BuildStep +void resourceBundles(BuildProducer imageResourceBundles, +CombinedIndexBuildItem combinedIndex) { +IndexView index = combinedIndex.getIndex(); + +index.getAllKnownSubclasses(LIST_RESOURCE_BUNDLE_NAME).stream() +.filter(cl -> cl.name().toString().startsWith("com.ibm.as400")) +.map(c -> new NativeImageResourceBundleBuildItem(c.name().toString())) +.forEach(imageResourceBundles::produce); +} + @BuildStep IndexDependencyBuildItem registerDependencyForIndex() { return new IndexDependencyBuildItem("net.sf.jt400", "jt400", "java11"); diff --git a/integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/Jt400MockResource.java b/integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/Jt400MockResource.java index fa3247e2db..0d47926d2b 100644 --- a/integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/Jt400MockResource.java +++ b/integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/Jt400MockResource.java @@ -41,6 +41,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.ConsumerTemplate; import org.apache.camel.Exchange; import org.apache.camel.ProducerTemplate; +import org.apache.camel.component.jt400.Jt400Component; import org.apache.camel.component.jt400.Jt400Endpoint; import org.jboss.logging.Logger; @@ -157,4 +158,16 @@ public class Jt400MockResource { return Response.ok().build(); } +@Path("/component/stopWrong") +@GET +@Produces(MediaType.TEXT_PLAIN) +public Response stopComponent() throws Exception { +Jt400Component comp = context.getComponent("jt400", Jt400Component.class); +comp.close(); +//this second call to close connection won't wprk, because the connection pool is already closing +//the call would need to read from a resource bundle therefore it covers existence of resource bundle in the native +
Re: [PR] Fix AsciiDoc attribute substitution in MapStruct and Jasypt documentation [camel-quarkus]
jamesnetherton merged PR #6032: URL: https://github.com/apache/camel-quarkus/pull/6032 -- 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 main updated: Fix AsciiDoc attribute substitution in MapStruct and Jasypt documentation
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 9be20b7862 Fix AsciiDoc attribute substitution in MapStruct and Jasypt documentation 9be20b7862 is described below commit 9be20b7862b5794df20d1f7976d24b4a7b23c3db Author: James Netherton AuthorDate: Tue Apr 23 15:28:22 2024 +0100 Fix AsciiDoc attribute substitution in MapStruct and Jasypt documentation --- docs/modules/ROOT/pages/reference/extensions/jasypt.adoc| 2 +- docs/modules/ROOT/pages/reference/extensions/mapstruct.adoc | 4 ++-- extensions/jasypt/runtime/src/main/doc/usage.adoc | 2 +- extensions/mapstruct/runtime/src/main/doc/usage.adoc| 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/jasypt.adoc b/docs/modules/ROOT/pages/reference/extensions/jasypt.adoc index 4d4b25d461..745fa33d68 100644 --- a/docs/modules/ROOT/pages/reference/extensions/jasypt.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/jasypt.adoc @@ -57,7 +57,7 @@ By default, you do not need to write custom code to configure the Camel `JasyptP Any Camel configuration property added to `application.properties` can be secured with Jasypt. To encrypt a value, there is a utility that can be run with https://www.jbang.dev/[JBang]. -[source] +[source,shell,subs="attributes"] jbang org.apache.camel:camel-jasypt:{camel-version} -c encrypt -p secret-password -i "Some secret content" diff --git a/docs/modules/ROOT/pages/reference/extensions/mapstruct.adoc b/docs/modules/ROOT/pages/reference/extensions/mapstruct.adoc index 4d2268cd80..aaa9c9a2b8 100644 --- a/docs/modules/ROOT/pages/reference/extensions/mapstruct.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/mapstruct.adoc @@ -54,7 +54,7 @@ To use MapStruct, you must configure your build to use an annotation processor. [id="extensions-mapstruct-usage-maven"] Maven -[source,xml] +[source,xml,subs="attributes"] @@ -76,7 +76,7 @@ To use MapStruct, you must configure your build to use an annotation processor. [id="extensions-mapstruct-usage-gradle"] Gradle -[source,gradle] +[source,gradle,subs="attributes"] dependencies { annotationProcessor 'org.mapstruct:mapstruct-processor:{mapstruct-version}' diff --git a/extensions/jasypt/runtime/src/main/doc/usage.adoc b/extensions/jasypt/runtime/src/main/doc/usage.adoc index f8a55b4b36..f56050e4da 100644 --- a/extensions/jasypt/runtime/src/main/doc/usage.adoc +++ b/extensions/jasypt/runtime/src/main/doc/usage.adoc @@ -9,7 +9,7 @@ By default, you do not need to write custom code to configure the Camel `JasyptP Any Camel configuration property added to `application.properties` can be secured with Jasypt. To encrypt a value, there is a utility that can be run with https://www.jbang.dev/[JBang]. -[source] +[source,shell,subs="attributes"] jbang org.apache.camel:camel-jasypt:{camel-version} -c encrypt -p secret-password -i "Some secret content" diff --git a/extensions/mapstruct/runtime/src/main/doc/usage.adoc b/extensions/mapstruct/runtime/src/main/doc/usage.adoc index dad335f4c9..60e073a64c 100644 --- a/extensions/mapstruct/runtime/src/main/doc/usage.adoc +++ b/extensions/mapstruct/runtime/src/main/doc/usage.adoc @@ -4,7 +4,7 @@ To use MapStruct, you must configure your build to use an annotation processor. Maven -[source,xml] +[source,xml,subs="attributes"] @@ -25,7 +25,7 @@ To use MapStruct, you must configure your build to use an annotation processor. Gradle -[source,gradle] +[source,gradle,subs="attributes"] dependencies { annotationProcessor 'org.mapstruct:mapstruct-processor:{mapstruct-version}'
Re: [PR] CAMEL-20713 Added type check into equals() [camel]
github-actions[bot] commented on PR #13902: URL: https://github.com/apache/camel/pull/13902#issuecomment-2073131191 :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: [I] Jt400: possible missing resource in the native [camel-quarkus]
jamesnetherton closed issue #6029: Jt400: possible missing resource in the native URL: https://github.com/apache/camel-quarkus/issues/6029 -- 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 main updated: Jt400: possible missing resource in the native
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 9d3bce3d4c Jt400: possible missing resource in the native 9d3bce3d4c is described below commit 9d3bce3d4cd3af1d9e462fe03b0d973aeff59db0 Author: JiriOndrusek AuthorDate: Tue Apr 23 13:56:25 2024 +0200 Jt400: possible missing resource in the native --- .../component/jt400/deployment/Jt400Processor.java | 14 ++ .../component/jt400/mocked/it/Jt400MockResource.java| 13 + .../quarkus/component/jt400/mocked/Jt400MockTest.java | 15 +++ .../camel/quarkus/component/jt400/it/Jt400Resource.java | 17 + .../camel/quarkus/component/jt400/it/Jt400Test.java | 15 +++ 5 files changed, 70 insertions(+), 4 deletions(-) diff --git a/extensions/jt400/deployment/src/main/java/org/apache/camel/quarkus/component/jt400/deployment/Jt400Processor.java b/extensions/jt400/deployment/src/main/java/org/apache/camel/quarkus/component/jt400/deployment/Jt400Processor.java index 133fbb3a76..a666373483 100644 --- a/extensions/jt400/deployment/src/main/java/org/apache/camel/quarkus/component/jt400/deployment/Jt400Processor.java +++ b/extensions/jt400/deployment/src/main/java/org/apache/camel/quarkus/component/jt400/deployment/Jt400Processor.java @@ -18,6 +18,7 @@ package org.apache.camel.quarkus.component.jt400.deployment; import java.util.ArrayList; import java.util.List; +import java.util.ListResourceBundle; import java.util.regex.Pattern; import com.ibm.as400.access.AS400; @@ -29,6 +30,7 @@ import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.IndexDependencyBuildItem; import io.quarkus.deployment.builditem.NativeImageEnableAllCharsetsBuildItem; +import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBundleBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeReinitializedClassBuildItem; @@ -41,6 +43,7 @@ class Jt400Processor { private static final Logger LOG = Logger.getLogger(Jt400Processor.class); private static final String FEATURE = "camel-jt400"; private static final DotName CONV_TABLE_NAME = DotName.createSimple(ConvTable.class.getName()); +private static final DotName LIST_RESOURCE_BUNDLE_NAME = DotName.createSimple(ListResourceBundle.class.getName()); @BuildStep FeatureBuildItem feature() { @@ -86,6 +89,17 @@ class Jt400Processor { } +@BuildStep +void resourceBundles(BuildProducer imageResourceBundles, +CombinedIndexBuildItem combinedIndex) { +IndexView index = combinedIndex.getIndex(); + +index.getAllKnownSubclasses(LIST_RESOURCE_BUNDLE_NAME).stream() +.filter(cl -> cl.name().toString().startsWith("com.ibm.as400")) +.map(c -> new NativeImageResourceBundleBuildItem(c.name().toString())) +.forEach(imageResourceBundles::produce); +} + @BuildStep IndexDependencyBuildItem registerDependencyForIndex() { return new IndexDependencyBuildItem("net.sf.jt400", "jt400", "java11"); diff --git a/integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/Jt400MockResource.java b/integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/Jt400MockResource.java index fa3247e2db..0d47926d2b 100644 --- a/integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/Jt400MockResource.java +++ b/integration-tests/jt400-mocked/src/main/java/org/apache/camel/quarkus/component/jt400/mocked/it/Jt400MockResource.java @@ -41,6 +41,7 @@ import org.apache.camel.CamelContext; import org.apache.camel.ConsumerTemplate; import org.apache.camel.Exchange; import org.apache.camel.ProducerTemplate; +import org.apache.camel.component.jt400.Jt400Component; import org.apache.camel.component.jt400.Jt400Endpoint; import org.jboss.logging.Logger; @@ -157,4 +158,16 @@ public class Jt400MockResource { return Response.ok().build(); } +@Path("/component/stopWrong") +@GET +@Produces(MediaType.TEXT_PLAIN) +public Response stopComponent() throws Exception { +Jt400Component comp = context.getComponent("jt400", Jt400Component.class); +comp.close(); +//this second call to close connection won't wprk, because the connection pool is already closing +//the call would need to read from a resource bundle therefore it covers existence of resource bundle in the native +
[PR] CAMEL-20713 Added type check into equals() [camel]
dk2k opened a new pull request, #13902: URL: https://github.com/apache/camel/pull/13902 CAMEL-20713 Added type check into equals() of class TagData -- 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] Jt400: possible missing resource in the native [camel-quarkus]
jamesnetherton merged PR #6030: URL: https://github.com/apache/camel-quarkus/pull/6030 -- 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/02: Activate format profile as part of CI checks
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 f9ad836ac859d229204d1767b2e2fe9348ba5449 Author: James Netherton AuthorDate: Tue Apr 23 08:58:00 2024 +0100 Activate format profile as part of CI checks --- .github/workflows/camel-master-cron.yaml | 5 - .github/workflows/ci-build.yaml| 5 - .github/workflows/quarkus-master-cron.yaml | 5 - 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/camel-master-cron.yaml b/.github/workflows/camel-master-cron.yaml index 484eb7ed62..5c367c7373 100644 --- a/.github/workflows/camel-master-cron.yaml +++ b/.github/workflows/camel-master-cron.yaml @@ -71,9 +71,12 @@ jobs: && cd camel \ && echo "Current Camel commit:" $(git rev-parse HEAD) \ && ./mvnw ${CQ_MAVEN_ARGS} clean install -Dquickly -T1C + - name: Update extension metadata +run: | + ./mvnw -N cq:update-quarkus-metadata ${CQ_MAVEN_ARGS} - name: mvn clean install -DskipTests run: | - eval ./mvnw ${CQ_MAVEN_ARGS} clean install -DskipTests -Dquarkus.build.skip + eval ./mvnw ${CQ_MAVEN_ARGS} clean install -DskipTests -Dquarkus.build.skip -Pformat - name: Sync Maven properties run: | ./mvnw cq:sync-versions ${CQ_MAVEN_ARGS} -N diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index bc9afcfd84..827bc9ff17 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -157,9 +157,12 @@ jobs: with: ref: ${{ env.CHECKOUT_REF }} fetch-depth: 0 + - name: Update extension metadata +run: | + ./mvnw -N cq:update-quarkus-metadata ${CQ_MAVEN_ARGS} - name: mvn clean install -DskipTests run: | - eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip + eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip -Pformat - name: Sync Maven properties run: | ./mvnw cq:sync-versions ${CQ_MAVEN_ARGS} -N diff --git a/.github/workflows/quarkus-master-cron.yaml b/.github/workflows/quarkus-master-cron.yaml index 11001176e2..56ccb5e31d 100644 --- a/.github/workflows/quarkus-master-cron.yaml +++ b/.github/workflows/quarkus-master-cron.yaml @@ -72,9 +72,12 @@ jobs: && echo "Current Quarkus commit:" $(git rev-parse HEAD) \ && sed -i '/integration-tests<\/module>/d' pom.xml \ && ./mvnw ${CQ_MAVEN_ARGS} clean install -Dquickly -T1C + - name: Update extension metadata +run: | + ./mvnw -N cq:update-quarkus-metadata ${CQ_MAVEN_ARGS} - name: mvn clean install -DskipTests run: | - eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip + eval ./mvnw ${CQ_MAVEN_ARGS} ${BRANCH_OPTIONS} clean install -DskipTests -Dquarkus.build.skip -Pformat - name: Sync Maven properties run: | ./mvnw cq:sync-versions ${CQ_MAVEN_ARGS} -N
(camel-quarkus) branch main updated: Make Jasypt SmallRye Config integration operate only on runtime properties
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new c53bbd085f Make Jasypt SmallRye Config integration operate only on runtime properties c53bbd085f is described below commit c53bbd085f94f7405cf9312e74b81ef4589eab11 Author: James Netherton AuthorDate: Mon Apr 22 11:30:07 2024 +0100 Make Jasypt SmallRye Config integration operate only on runtime properties Fixes #5946 --- .../jasypt/deployment/JasyptProcessor.java | 32 -- .../quarkus/component/jasypt/JasyptDevUITest.java | 2 -- .../CamelJasyptConfigSourceInterceptorFactory.java | 9 +- .../component/jasypt/CamelJasyptRecorder.java | 17 +--- .../jasypt/CamelJasyptRuntimeConfigBuilder.java| 28 +++ .../CamelJasyptSecretKeysHandlerFactory.java | 14 ++ smallrye.config.ConfigSourceInterceptorFactory | 1 - .../io.smallrye.config.SecretKeysHandlerFactory| 1 - integration-tests/jasypt/pom.xml | 9 -- .../jasypt/it/JasyptSecureExtensionConfigTest.java | 9 -- .../it/JasyptSecureExtensionConfigTestProfile.java | 8 -- 11 files changed, 61 insertions(+), 69 deletions(-) diff --git a/extensions/jasypt/deployment/src/main/java/org/apache/camel/quarkus/component/jasypt/deployment/JasyptProcessor.java b/extensions/jasypt/deployment/src/main/java/org/apache/camel/quarkus/component/jasypt/deployment/JasyptProcessor.java index ee9595c1d6..bd87b43d00 100644 --- a/extensions/jasypt/deployment/src/main/java/org/apache/camel/quarkus/component/jasypt/deployment/JasyptProcessor.java +++ b/extensions/jasypt/deployment/src/main/java/org/apache/camel/quarkus/component/jasypt/deployment/JasyptProcessor.java @@ -16,16 +16,19 @@ */ package org.apache.camel.quarkus.component.jasypt.deployment; +import java.util.function.BooleanSupplier; + import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.ExecutionTime; import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.RunTimeConfigBuilderBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import org.apache.camel.quarkus.component.jasypt.CamelJasyptBuildTimeConfig; -import org.apache.camel.quarkus.component.jasypt.CamelJasyptConfig; import org.apache.camel.quarkus.component.jasypt.CamelJasyptRecorder; +import org.apache.camel.quarkus.component.jasypt.CamelJasyptRuntimeConfigBuilder; import org.apache.camel.quarkus.component.jasypt.JasyptConfigurationCustomizer; import org.apache.camel.quarkus.core.deployment.main.spi.CamelMainBuildItem; import org.apache.camel.quarkus.core.deployment.spi.RuntimeCamelContextCustomizerBuildItem; @@ -53,21 +56,32 @@ class JasyptProcessor { } @Record(ExecutionTime.RUNTIME_INIT) -@BuildStep +@BuildStep(onlyIf = CamelJasyptEnabled.class) void disableCamelMainAutoConfigFromSysEnv( CamelMainBuildItem camelMain, -CamelJasyptConfig config, CamelJasyptRecorder recorder) { // Avoid camel-main overriding system / environment config values that were already resolved by SmallRye config. // Else there's the potential for encrypted property values to be overridden with their raw ENC(..) form -recorder.disableCamelMainAutoConfigFromSysEnv(camelMain.getInstance(), config); +recorder.disableCamelMainAutoConfigFromSysEnv(camelMain.getInstance()); } @Record(ExecutionTime.RUNTIME_INIT) -@BuildStep -RuntimeCamelContextCustomizerBuildItem propertiesComponentRuntimeCamelContextCustomizer( -CamelJasyptBuildTimeConfig config, -CamelJasyptRecorder recorder) { -return new RuntimeCamelContextCustomizerBuildItem(recorder.createPropertiesComponentCamelContextCustomizer(config)); +@BuildStep(onlyIf = CamelJasyptEnabled.class) +RuntimeCamelContextCustomizerBuildItem propertiesComponentRuntimeCamelContextCustomizer(CamelJasyptRecorder recorder) { +return new RuntimeCamelContextCustomizerBuildItem(recorder.createPropertiesComponentCamelContextCustomizer()); +} + +@BuildStep(onlyIf = CamelJasyptEnabled.class) +RunTimeConfigBuilderBuildItem jasyptRuntimeConfigBuilder() { +return new RunTimeConfigBuilderBuildItem(CamelJasyptRuntimeConfigBuilder.class.getName()); +} + +static final class CamelJasyptEnabled implements BooleanSupplier { +CamelJasyptBuildTimeConfig config; + +@Override +public boolean getAsBoolean() { +return config.enabled; +} } } diff
(camel-quarkus) 02/02: Clean up leftovers from MicroProfile Fault Tolerance disablement
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 d4f319e23673b7b3bd0979e610e0bccdce4a7a5c Author: James Netherton AuthorDate: Tue Apr 23 09:28:33 2024 +0100 Clean up leftovers from MicroProfile Fault Tolerance disablement --- integration-tests/foundation-grouped/pom.xml | 13 - pom.xml | 2 ++ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/integration-tests/foundation-grouped/pom.xml b/integration-tests/foundation-grouped/pom.xml index 1120c376a7..67359b9a0b 100644 --- a/integration-tests/foundation-grouped/pom.xml +++ b/integration-tests/foundation-grouped/pom.xml @@ -456,19 +456,6 @@ - -org.apache.camel.quarkus - camel-quarkus-microprofile-fault-tolerance-deployment -${project.version} -pom -test - - -* -* - - - org.apache.camel.quarkus camel-quarkus-mock-deployment diff --git a/pom.xml b/pom.xml index b86ee396d0..eada499e67 100644 --- a/pom.xml +++ b/pom.xml @@ -974,6 +974,7 @@ ${basedir}/integration-tests/compression-grouped/pom.xml + ${basedir}/integration-test-groups/mongodb
(camel-quarkus) branch main updated (c53bbd085f -> d4f319e236)
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 c53bbd085f Make Jasypt SmallRye Config integration operate only on runtime properties new f9ad836ac8 Activate format profile as part of CI checks new d4f319e236 Clean up leftovers from MicroProfile Fault Tolerance disablement The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/camel-master-cron.yaml | 5 - .github/workflows/ci-build.yaml | 5 - .github/workflows/quarkus-master-cron.yaml | 5 - integration-tests/foundation-grouped/pom.xml | 13 - pom.xml | 2 ++ 5 files changed, 14 insertions(+), 16 deletions(-)
Re: [PR] Activate format profile as part of CI checks [camel-quarkus]
jamesnetherton merged PR #6027: URL: https://github.com/apache/camel-quarkus/pull/6027 -- 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] JasyptDevUITest fails due to the jasypt password not being configured [camel-quarkus]
jamesnetherton closed issue #5946: JasyptDevUITest fails due to the jasypt password not being configured URL: https://github.com/apache/camel-quarkus/issues/5946 -- 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] Make Jasypt SmallRye Config integration operate only on runtime properties [camel-quarkus]
jamesnetherton merged PR #6017: URL: https://github.com/apache/camel-quarkus/pull/6017 -- 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] Olingo4 API Name error : No matching method for /DEFAULT [camel-karavan]
cdia8890 opened a new issue, #1244: URL: https://github.com/apache/camel-karavan/issues/1244 ### Describe the bug When using Olingo4 component with Karavan, the following error is displayed. The dropdown of the API Name only has a `DEFAULT` option. ### Steps to reproduce the behavior ![image](https://github.com/apache/camel-karavan/assets/98742037/c3656644-10b4-41b6-be87-1478049c9c6c) ![image](https://github.com/apache/camel-karavan/assets/98742037/ddbb7404-b3aa-4fd0-a291-4a64913d2ca7) ### Variant Web Application ### Container Management (if applicable) Docker ### Operating System (if applicable) Windows ### Version 4.5.0 ### Relevant log output ```shell 2024-04-23 19:24:51.565 INFO 26740 --- [ main] org.apache.camel.main.MainSupport : Apache Camel (JBang) 4.5.0 is starting 2024-04-23 19:24:51.864 INFO 26740 --- [ main] org.apache.camel.main.MainSupport : Using Java 17.0.10 with PID 26740. 2024-04-23 19:24:52.032 INFO 26740 --- [ main] g.apache.camel.main.BaseMainSupport : Properties location: file:application.properties 2024-04-23 19:24:52.103 INFO 26740 --- [ main] apache.camel.main.ProfileConfigurer : The application is starting with profile: dev 2024-04-23 19:24:52.240 INFO 26740 --- [ main] g.apache.camel.main.BaseMainSupport : Auto-configuration summary 2024-04-23 19:24:52.241 INFO 26740 --- [ main] g.apache.camel.main.BaseMainSupport : [application.properties] camel.health.enabled=true 2024-04-23 19:24:52.241 INFO 26740 --- [ main] g.apache.camel.main.BaseMainSupport : [application.properties] camel.health.exposureLevel=full 2024-04-23 19:24:53.580 INFO 26740 --- [ main] mel.cli.connector.LocalCliConnector : Management from Camel JBang enabled org.apache.camel.FailedToCreateRouteException: Failed to create route route-e4da at: >>> To[olingo4:DEFAULT/read?serviceUri=https://services.odata.org/TripPinRESTierService] <<< in route: Route(route-e4da)[From[timer:kafka-timer] -> [To[olingo4:DEF... because of Failed to resolve endpoint: olingo4://DEFAULT/read?serviceUri=https://services.odata.org/TripPinRESTierService due to: No matching method for /DEFAULT, with arguments [responseHandler, resourcePath, edm] at org.apache.camel.reifier.RouteReifier.doCreateRoute(RouteReifier.java:228) at org.apache.camel.reifier.RouteReifier.createRoute(RouteReifier.java:79) at org.apache.camel.impl.DefaultModelReifierFactory.createRoute(DefaultModelReifierFactory.java:49) at org.apache.camel.impl.DefaultCamelContext.startRouteDefinitions(DefaultCamelContext.java:728) at org.apache.camel.impl.DefaultCamelContext.startRouteDefinitions(DefaultCamelContext.java:594) at org.apache.camel.impl.engine.AbstractCamelContext.doInit(AbstractCamelContext.java:2391) at org.apache.camel.support.service.BaseService.init(BaseService.java:78) at org.apache.camel.impl.engine.AbstractCamelContext.init(AbstractCamelContext.java:2027) at org.apache.camel.support.service.BaseService.start(BaseService.java:105) at org.apache.camel.impl.engine.AbstractCamelContext.start(AbstractCamelContext.java:2046) at org.apache.camel.impl.DefaultCamelContext.start(DefaultCamelContext.java:212) at org.apache.camel.main.KameletMain.doStart(KameletMain.java:363) at org.apache.camel.support.service.BaseService.start(BaseService.java:113) at org.apache.camel.dsl.jbang.core.commands.Run.runKameletMain(Run.java:1125) at org.apache.camel.dsl.jbang.core.commands.Run.run(Run.java:811) at org.apache.camel.dsl.jbang.core.commands.Run.doCall(Run.java:301) at org.apache.camel.dsl.jbang.core.commands.CamelCommand.call(CamelCommand.java:71) at org.apache.camel.dsl.jbang.core.commands.CamelCommand.call(CamelCommand.java:37) at picocli.CommandLine.executeUserObject(CommandLine.java:2041) at picocli.CommandLine.access$1500(CommandLine.java:148) at picocli.CommandLine$RunLast.executeUserObjectOfLastSubcommandWithSameParent(CommandLine.java:2461) at picocli.CommandLine$RunLast.handle(CommandLine.java:2453) at picocli.CommandLine$RunLast.handle(CommandLine.java:2415) at picocli.CommandLine$AbstractParseResultHandler.execute(CommandLine.java:2273) at picocli.CommandLine$RunLast.execute(CommandLine.java:2417) at picocli.CommandLine.execute(CommandLine.java:2170) at org.apache.camel.dsl.jbang.core.commands.CamelJBangMain.run(CamelJBangMain.java:164) at org.apache.camel.dsl.jbang.core.commands.CamelJBangMain.run(CamelJBangMain.java:60) at main.CamelJBang.main(CamelJBang.java:36)
Re: [PR] CAMEL-20704 duplicate case blocks [camel]
dk2k closed pull request #13884: CAMEL-20704 duplicate case blocks URL: https://github.com/apache/camel/pull/13884 -- 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-20710 Implemented Objects.equals() for comparison of strings [camel]
github-actions[bot] commented on PR #13901: URL: https://github.com/apache/camel/pull/13901#issuecomment-2073087453 :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-20708 added volatile keyword for double locking in JiraEndpoint [camel]
github-actions[bot] commented on PR #13900: URL: https://github.com/apache/camel/pull/13900#issuecomment-2073054764 :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] CAMEL-20708 added volatile keyword for double locking in JiraEndpoint [camel]
dk2k opened a new pull request, #13900: URL: https://github.com/apache/camel/pull/13900 CAMEL-20708 added volatile keyword for double locking in JiraEndpoint -- 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-20707 Implemented isPresent() check for 2 optionals [camel]
dk2k opened a new pull request, #13899: URL: https://github.com/apache/camel/pull/13899 CAMEL-20707 Implemented isPresent() check for 2 optionals instead of null check -- 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-20707 Implemented isPresent() check for 2 optionals [camel]
github-actions[bot] commented on PR #13899: URL: https://github.com/apache/camel/pull/13899#issuecomment-2073043181 :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: [I] Cannot load Knative configuration from file or env variable [camel-k]
christophd commented on issue #5402: URL: https://github.com/apache/camel-k/issues/5402#issuecomment-2072960603 okay, many thanks for the clarification. Addressable resolver makes sense and I recall that we have that in place somewhere else in Camel K, too. For the K_SINK injection - just to be sure. Does that mean that the K_SINK is injected by Knative eventing? Serving does not deal with K_SINK at all? Could be that we create the SinkBinding only when Knative serving is found on the cluster and that needs to be fixed in Camel K. -- 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] Overlapping UI on the Blog Page [camel-website]
aashnajena opened a new issue, #1176: URL: https://github.com/apache/camel-website/issues/1176 The topics list on the left side seems to overlap with the footer. The height of the container having that list needs to be fixed. https://github.com/apache/camel-website/assets/32356795/1cf82a49-4790-4528-8a1d-e812ae18da80;> -- 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: [I] Cannot load Knative configuration from file or env variable [camel-k]
matzew commented on issue #5402: URL: https://github.com/apache/camel-k/issues/5402#issuecomment-2072797028 We have a resolver for addressables: https://github.com/knative/pkg/blob/main/resolver/addressable_resolver.go And the addressable is basically a named type w/ a `apis.URL` (and optional things like certs): https://github.com/knative/pkg/blob/main/apis/duck/v1/addressable_types.go#L40-L45 You can use it like here, where we want the `addressable` / URI from the subscriber reference of the Trigger: ```go addressable, err := r.Resolver.AddressableFromDestinationV1(ctx, trigger.Spec.Subscriber, trigger) ... ``` That way you can resolve the URL. However, I guess you do not directly use our types (e.g. Destination or even KRefs), but we have wrappers for that. see `URIFromObjectReference` in the resolver.go file -- 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-20383: convert CI jobs to a Matrix job. [camel]
orpiske opened a new pull request, #13898: URL: https://github.com/apache/camel/pull/13898 (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
[PR] CAMEL-20383: convert CI jobs to a Matrix job. [camel]
orpiske opened a new pull request, #13897: URL: https://github.com/apache/camel/pull/13897 (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] How can I get more documentations on using and configuring karavan? [camel-karavan]
cdia8890 commented on issue #743: URL: https://github.com/apache/camel-karavan/issues/743#issuecomment-2072751574 @mgubaidullin is it possible to add a small explanation on how to configure and use Beans using Karavan UI? This will be a great help. Thanks. -- 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 handshakeHeaders uri param in vertx-websocket component [camel]
alexisgra commented on PR #13866: URL: https://github.com/apache/camel/pull/13866#issuecomment-2072728866 No, I don't have any real world example. We can make the choice to not support comma in handshake headers. I will add it in the doc. However, I have real world example with `:`, `=` with the APIs I'm trying to integrate using `camel-vertx-websocket`. Typically on an `ApiTimestamp` and an `ApiSign`. Do I update with this format: `headerName,headerValue,headerName2,headerValue2`? Thanks. -- 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] Simplify run cmd for archs other than amd64 [camel-k]
tdiesler commented on PR #5403: URL: https://github.com/apache/camel-k/pull/5403#issuecomment-2072551237 Seems to ail unrelated in TestServiceTrait -- 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] Jt400: possible missing resource in the native [camel-quarkus]
JiriOndrusek commented on PR #6030: URL: https://github.com/apache/camel-quarkus/pull/6030#issuecomment-2072536628 I added the new test intojt400-mocked (as duplication) Therefore it should be fulfilled that at leas one of `jt400` and `jt400-mocked` is executed. -- 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] Builder trait maven-profiles expect the profile in the operator namespace [camel-k]
squakez commented on issue #5372: URL: https://github.com/apache/camel-k/issues/5372#issuecomment-2072508673 Okey, then, if IIUC this problem is not affecting the general build, but only a build where we expect a profile provided by the user. As you correctly said, the profile is meant to be a configuration of the IntegrationKit, hence, it's natural place is the IntegrationKit namespace. I think this particular situation should be only documented as available providing the configmap in the namespace where the operator is going to create the IntegrationKit (if it would change in the future) if the user really needs it. It is reported correctly in conditions, so it is quite clear the reason why this is failing: ``` message: 'integration kit global/kit-cojsajgpro1c738mvbh0 is in state "Error". Failure: could not load profile : configmap:my-profile/profile.xml: ConfigMap "my-profile" not found. ' ``` -- 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] Cannot load Knative configuration from file or env variable [camel-k]
matzew commented on issue #5402: URL: https://github.com/apache/camel-k/issues/5402#issuecomment-2072482517 There was no serving installed. I just added the "serivce" CRD, but not more. A broker is an addressable type, see: https://knative.dev/docs/concepts/duck-typing/#addressable and there are golang apis to resolve the url from those Really no serving is needed -- 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] Fix AsciiDoc attribute substitution in MapStruct and Jasypt documentation [camel-quarkus]
jamesnetherton opened a new pull request, #6032: URL: https://github.com/apache/camel-quarkus/pull/6032 (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] Cannot load Knative configuration from file or env variable [camel-k]
christophd commented on issue #5402: URL: https://github.com/apache/camel-k/issues/5402#issuecomment-2072439471 I guess one of the hacks was to also install Knative serving. I do not fully understand how the Camel K operator should resolve the Knative broker URL if there is no serving available (with K_SINK SinkBinding injection). -- 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 handshakeHeaders uri param in vertx-websocket component [camel]
davsclaus commented on PR #13866: URL: https://github.com/apache/camel/pull/13866#issuecomment-2072423239 Do you have any real-world examples of use header values with comma for that handshake situation? The test in the code use Bearer and ApiSign123 -- 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] Error when setting knative-service trait annotations [camel-k]
lsergio commented on issue #5401: URL: https://github.com/apache/camel-k/issues/5401#issuecomment-2072420995 Thanks! Using generic annotations under knative-service.annotations worked as expected -- 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-20546] Move schemas in META-INF/camel [camel]
gnodet commented on PR #13895: URL: https://github.com/apache/camel/pull/13895#issuecomment-2072415193 > I wonder if this PR breaks `docs` as it seems something is wrong there. > > It may be good to do a full rebuild locally to ensure something is not breaking too big Yes, something is broken. The CI build barfs with lines at end of file, but... Do not merge until this is 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
Re: [PR] CAMEL-20704 duplicate case blocks [camel]
davsclaus commented on PR #13884: URL: https://github.com/apache/camel/pull/13884#issuecomment-2072408640 This is a generated source file so you should not edit it manually // Generated by camel-yaml-dsl-maven-plugin - do NOT edit this file! -- 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-20546] Move schemas in META-INF/camel [camel]
davsclaus commented on PR #13895: URL: https://github.com/apache/camel/pull/13895#issuecomment-2072406963 I wonder if this PR breaks `docs` as it seems something is wrong there. It may be good to do a full rebuild locally to ensure something is not breaking too big -- 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] Error when setting knative-service trait annotations [camel-k]
squakez closed issue #5401: Error when setting knative-service trait annotations URL: https://github.com/apache/camel-k/issues/5401 -- 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] Error when setting knative-service trait annotations [camel-k]
squakez commented on issue #5401: URL: https://github.com/apache/camel-k/issues/5401#issuecomment-2072397908 All those parameters are "Revision" annotations that would ends up in the specific Knative templated object. You need to use the trait configuration `knative-service.autoscaling-class` etc in order to configure them. The `knative-service.annotations` is meant to configure the "Service" annotations instead. Let us know if you need any further info. -- 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] Jt400: possible missing resource in the native [camel-quarkus]
JiriOndrusek commented on PR #6030: URL: https://github.com/apache/camel-quarkus/pull/6030#issuecomment-2072394237 > > move the test into `jt400-mocked` > > Sounds ok to me. Or if we need to have it duplicated in both mocked and non-mocked, that's fine too. Duplication (even if should be avoided) sounds like the right solution . -- 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] Jt400: possible missing resource in the native [camel-quarkus]
jamesnetherton commented on PR #6030: URL: https://github.com/apache/camel-quarkus/pull/6030#issuecomment-2072391830 > move the test into `jt400-mocked` Sounds ok to me. Or if we need to have it duplicated in both mocked and non-mocked, that's fine too. -- 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] Jt400: possible missing resource in the native [camel-quarkus]
JiriOndrusek commented on PR #6030: URL: https://github.com/apache/camel-quarkus/pull/6030#issuecomment-2072358729 @jamesnetherton As I think about the test coverage, it makes sense to me to move the test into `jt400-mocked`, because it does not require a real service and it would be executed by CI. (of course U=I have to try , whether it is possible). WDYT? -- 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] fix(#5362): Cannot run `make test-smoke` on arm64 out of the box [camel-k]
squakez commented on code in PR #5370: URL: https://github.com/apache/camel-k/pull/5370#discussion_r1576274477 ## e2e/common/misc/cron_test.go: ## @@ -45,13 +45,6 @@ func TestRunCronExample(t *testing.T) { g.Eventually(SelectedPlatformPhase(t, ctx, ns, operatorID), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady)) - t.Run("cron", func(t *testing.T) { Review Comment: Why removing this test? ## e2e/common/misc/pipe_test.go: ## @@ -38,6 +40,12 @@ import ( func TestPipe(t *testing.T) { t.Parallel() + // [TODO] Enable arm64 smoke tests to run out of the box + // https://github.com/apache/camel-k/issues/5362 + if runtime.GOARCH == "arm64" && os.Getenv("CAMEL_K_TEST_BASE_IMAGE") == "" { + t.Skipf("TestPipe not supported on platform: %s/%s", runtime.GOOS, runtime.GOARCH) Review Comment: Why is this test not supported? I don't think it should fail whichever the platform running it is. -- 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] fix(#5362): Cannot run `make test-smoke` on arm64 out of the box [camel-k]
squakez commented on code in PR #5370: URL: https://github.com/apache/camel-k/pull/5370#discussion_r1576275942 ## e2e/support/test_support.go: ## @@ -350,6 +352,11 @@ func KamelRunWithID(t *testing.T, ctx context.Context, operatorID string, namesp } func KamelRunWithContext(t *testing.T, ctx context.Context, operatorID string, namespace string, args ...string) *cobra.Command { + if runtime.GOARCH == "arm64" && !slices.Contains(args, "builder.platforms") { + builderPlatform := "linux/arm64" + fmt.Printf("Add trait to run command: -t builder.platforms=%s\n", builderPlatform) + args = append(args, "-t", "builder.platforms="+builderPlatform) Review Comment: I don't think this is safe. We cannot include such an implicit configuration in all tests. Ideally, if you want to proceed in this direction, you should find a way to include the configuration in the IntegrationPlatform or IntegrationProfile as suggested in https://github.com/apache/camel-k/pull/5403#pullrequestreview-2017276065 -- 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] [Backport 2.3.x] Various trait works [camel-k]
squakez opened a new pull request, #5404: URL: https://github.com/apache/camel-k/pull/5404 **Release Note** ```release-note NONE ``` -- 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] Simplify run cmd for archs other than amd64 [camel-k]
tdiesler commented on issue #5292: URL: https://github.com/apache/camel-k/issues/5292#issuecomment-2072234802 PR: https://github.com/apache/camel-k/pull/5403 -- 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] Simplify run cmd for archs other than amd64 [camel-k]
tdiesler opened a new pull request, #5403: URL: https://github.com/apache/camel-k/pull/5403 This adds `-Djib.from.platforms=linux/arm64` when there is no explicit `-t builder.platforms` trait. Unlike previous attempts, this should not interfere with upgrade functionality On arm64, try this ... ``` make images kamel install kamel run --dev ./e2e/advanced/files/Java.java ``` -- 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] Jt400: possible missing resource in the native [camel-quarkus]
JiriOndrusek commented on PR #6030: URL: https://github.com/apache/camel-quarkus/pull/6030#issuecomment-2072221482 > @zhfeng I have to check again, whether the added test can not affect existing one when executed in different order I run the tests ordered with new method at the first place and at last place and there was no issue. -- 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] Jt400: possible missing resource in the native [camel-quarkus]
JiriOndrusek commented on PR #6030: URL: https://github.com/apache/camel-quarkus/pull/6030#issuecomment-2072195982 @zhfeng I have to check again, whether the added test can not affect existing one when executed in different order -- 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] Jt400: possible missing resource in the native [camel-quarkus]
JiriOndrusek commented on PR #6030: URL: https://github.com/apache/camel-quarkus/pull/6030#issuecomment-2072188662 @zhfeng test is added -- 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] [2.2.x] Basic integration fails on ARM64 [camel-k]
tdiesler commented on issue #5280: URL: https://github.com/apache/camel-k/issues/5280#issuecomment-2072183339 Won't Fix -- 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] [2.2.x] Basic integration fails on ARM64 [camel-k]
tdiesler closed issue #5280: [2.2.x] Basic integration fails on ARM64 URL: https://github.com/apache/camel-k/issues/5280 -- 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] Platform choice for aarch64 is incorrect [camel-k]
tdiesler commented on issue #5298: URL: https://github.com/apache/camel-k/issues/5298#issuecomment-2072178289 PR https://github.com/apache/camel-k/pull/5299 Done -- 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] fatal error: concurrent map read and map write [camel-k]
tdiesler closed issue #5315: fatal error: concurrent map read and map write URL: https://github.com/apache/camel-k/issues/5315 -- 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] fatal error: concurrent map read and map write [camel-k]
tdiesler commented on issue #5315: URL: https://github.com/apache/camel-k/issues/5315#issuecomment-2072166369 Done -- 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 (bfd2fd31d82 -> c2b21559da2)
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 bfd2fd31d82 Calling super.doStart() after initializing the consumer to avoid poll() (#13867) add c2b21559da2 CAMEL-20513 - Camel-AWS-Bedrock: Support Amazon Titan Multimodal Embeddings G1 Model (#13896) No new revisions were added by this update. Summary of changes: .../component/aws2/bedrock/BedrockModels.java | 1 + .../runtime/integration/BedrockProducerIT.java | 23 ++ 2 files changed, 24 insertions(+)
Re: [PR] Jt400: possible missing resource in the native [camel-quarkus]
JiriOndrusek commented on PR #6030: URL: https://github.com/apache/camel-quarkus/pull/6030#issuecomment-2072149042 > @JiriOndrusek is it possible to add an unit test? I'm thinking about that, I can try. Although the test would cover a scenario which does not make sense -- 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] Jt400: possible missing resource in the native [camel-quarkus]
JiriOndrusek commented on code in PR #6030: URL: https://github.com/apache/camel-quarkus/pull/6030#discussion_r1576150617 ## extensions/jt400/deployment/src/main/java/org/apache/camel/quarkus/component/jt400/deployment/Jt400Processor.java: ## @@ -86,6 +89,16 @@ void reflectiveClasses(BuildProducer reflectiveClasses } +@BuildStep +void resourceBundles(BuildProducer imageResourceBundles, +CombinedIndexBuildItem combinedIndex) { +IndexView index = combinedIndex.getIndex(); + +index.getAllKnownSubclasses(LIST_RESOURCE_BUNDLE_NAME).stream() 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) branch main updated: CAMEL-20513 - Camel-AWS-Bedrock: Support Amazon Titan Multimodal Embeddings G1 Model (#13896)
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 c2b21559da2 CAMEL-20513 - Camel-AWS-Bedrock: Support Amazon Titan Multimodal Embeddings G1 Model (#13896) c2b21559da2 is described below commit c2b21559da229c457ba673747a41be689d1c6f75 Author: Andrea Cosentino AuthorDate: Tue Apr 23 14:09:31 2024 +0200 CAMEL-20513 - Camel-AWS-Bedrock: Support Amazon Titan Multimodal Embeddings G1 Model (#13896) Signed-off-by: Andrea Cosentino --- .../component/aws2/bedrock/BedrockModels.java | 1 + .../runtime/integration/BedrockProducerIT.java | 23 ++ 2 files changed, 24 insertions(+) diff --git a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java index 8ca768b90e7..7b02f216a2e 100644 --- a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java +++ b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java @@ -22,6 +22,7 @@ public enum BedrockModels { TITAN_TEXT_LITE_V1("amazon.titan-text-lite-v1"), TITAN_IMAGE_GENERATOR_V1("amazon.titan-image-generator-v1"), TITAN_EMBEDDINGS_G1("amazon.titan-embed-text-v1"), +TITAN_MULTIMODAL_EMBEDDINGS_G1("amazon.titan-embed-image-v1"), JURASSIC2_ULTRA("ai21.j2-ultra-v1"), JURASSIC2_MID("ai21.j2-mid-v1"), ANTROPHIC_CLAUDE_INSTANT_V1("anthropic.claude-instant-v1"), diff --git a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java index 56a7f725ea2..9c5ced46233 100644 --- a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java +++ b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java @@ -443,6 +443,24 @@ class BedrockProducerIT extends CamelTestSupport { MockEndpoint.assertIsSatisfied(context); } +@Test +public void testInvokeTitanMultimodalEmbeddingsModel() throws InterruptedException { + +result.expectedMessageCount(1); +final Exchange result = template.send("direct:send_titan_multimodal_embeddings", exchange -> { +ObjectMapper mapper = new ObjectMapper(); +ObjectNode rootNode = mapper.createObjectNode(); +rootNode.putIfAbsent("inputText", +new TextNode("A Sci-fi camel running in the desert")); + + exchange.getMessage().setBody(mapper.writer().writeValueAsString(rootNode)); + exchange.getMessage().setHeader(BedrockConstants.MODEL_CONTENT_TYPE, "application/json"); + exchange.getMessage().setHeader(BedrockConstants.MODEL_ACCEPT_CONTENT_TYPE, "*/*"); +}); + +MockEndpoint.assertIsSatisfied(context); +} + @Override protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { @@ -471,6 +489,11 @@ class BedrockProducerIT extends CamelTestSupport { + BedrockModels.TITAN_EMBEDDINGS_G1.model) .to(result); +from("direct:send_titan_multimodal_embeddings") + .to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=invokeEmbeddingsModel=" ++ BedrockModels.TITAN_MULTIMODAL_EMBEDDINGS_G1.model) +.to(result); + from("direct:send_jurassic2_model") .to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=invokeTextModel=" + BedrockModels.JURASSIC2_ULTRA.model)
Re: [PR] CAMEL-20513 - Camel-AWS-Bedrock: Support Amazon Titan Multimodal Embe… [camel]
oscerd merged PR #13896: URL: https://github.com/apache/camel/pull/13896 -- 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 CAMEL-20513 deleted (was c61b3500d39)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20513 in repository https://gitbox.apache.org/repos/asf/camel.git was c61b3500d39 CAMEL-20513 - Camel-AWS-Bedrock: Support Amazon Titan Multimodal Embeddings G1 Model 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] Jt400: possible missing resource in the native [camel-quarkus]
zhfeng commented on PR #6030: URL: https://github.com/apache/camel-quarkus/pull/6030#issuecomment-2072134394 @JiriOndrusek is it possible to add an unit test? -- 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] Jt400: possible missing resource in the native [camel-quarkus]
jamesnetherton commented on code in PR #6030: URL: https://github.com/apache/camel-quarkus/pull/6030#discussion_r1576136812 ## extensions/jt400/deployment/src/main/java/org/apache/camel/quarkus/component/jt400/deployment/Jt400Processor.java: ## @@ -86,6 +89,16 @@ void reflectiveClasses(BuildProducer reflectiveClasses } +@BuildStep +void resourceBundles(BuildProducer imageResourceBundles, +CombinedIndexBuildItem combinedIndex) { +IndexView index = combinedIndex.getIndex(); + +index.getAllKnownSubclasses(LIST_RESOURCE_BUNDLE_NAME).stream() Review Comment: Probably best to filter on a package prefix of `com.ibm.as400`. Otherwise we register everything on the classpath extending `ListResourceBundle`. Which is probably not what we want. -- 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] [3.8.x] Jt400: possible missing resource in the native [camel-quarkus]
JiriOndrusek opened a new pull request, #6031: URL: https://github.com/apache/camel-quarkus/pull/6031 cherry-picked: 38e388cb75f95d77c9adcbad5662b0184b350c3e upstream PR: https://github.com/apache/camel-quarkus/pull/6030 -- 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] Jt400: possible missing resource in the native [camel-quarkus]
JiriOndrusek opened a new pull request, #6030: URL: https://github.com/apache/camel-quarkus/pull/6030 fixes https://github.com/apache/camel-quarkus/issues/6029 -- 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] fix(trait): don't report runtime version... [camel-k]
squakez merged PR #5378: URL: https://github.com/apache/camel-k/pull/5378 -- 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 (a5c2ce757 -> 57149cfdb)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from a5c2ce757 fix(trait): synthetic Kit new bea48df57 fix(trait): don't report runtime version... new 57149cfdb chore(trait): disable traits requiring catalog when missing The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: addons/keda/keda.go| 4 +++- addons/master/master.go| 3 +++ addons/resume/resume.go| 3 +++ addons/telemetry/telemetry.go | 4 +++- addons/tracing/tracing.go | 42 +- pkg/trait/builder.go | 4 +++- pkg/trait/camel.go | 31 pkg/trait/camel_test.go| 33 ++ pkg/trait/container.go | 1 - pkg/trait/cron.go | 8 ++-- pkg/trait/dependencies.go | 4 +++- pkg/trait/dependencies_test.go | 8 ++-- pkg/trait/error_handler.go | 4 +++- pkg/trait/error_handler_test.go| 14 + pkg/trait/health.go| 3 +++ pkg/trait/jvm.go | 7 +-- pkg/trait/kamelets.go | 3 +++ pkg/trait/knative.go | 3 +++ pkg/trait/knative_service.go | 4 ++-- pkg/trait/logging.go | 4 +++- pkg/trait/openapi.go | 4 +++- pkg/trait/quarkus.go | 3 +++ pkg/trait/service.go | 6 -- pkg/trait/service_binding.go | 3 +++ pkg/trait/trait_condition_types.go | 17 ++- 25 files changed, 161 insertions(+), 59 deletions(-)
(camel-k) 02/02: chore(trait): disable traits requiring catalog when missing
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 commit 57149cfdbf9db836363e411350857f97e47984af Author: Pasquale Congiusti AuthorDate: Thu Apr 18 15:37:40 2024 +0200 chore(trait): disable traits requiring catalog when missing We must explicitly define which are the traits that can be executed and which can't because missing catalog. The catalog has sense only for the "managed" Integrations. --- addons/keda/keda.go| 4 +++- addons/master/master.go| 3 +++ addons/resume/resume.go| 3 +++ addons/telemetry/telemetry.go | 4 +++- addons/tracing/tracing.go | 42 +- pkg/trait/builder.go | 4 +++- pkg/trait/camel.go | 26 +-- pkg/trait/camel_test.go| 34 -- pkg/trait/container.go | 1 - pkg/trait/cron.go | 7 --- pkg/trait/dependencies.go | 4 +++- pkg/trait/dependencies_test.go | 8 ++-- pkg/trait/error_handler.go | 4 +++- pkg/trait/error_handler_test.go| 14 + pkg/trait/health.go| 3 +++ pkg/trait/jvm.go | 6 +++--- pkg/trait/kamelets.go | 3 +++ pkg/trait/knative.go | 3 +++ pkg/trait/knative_service.go | 4 ++-- pkg/trait/logging.go | 2 +- pkg/trait/openapi.go | 4 +++- pkg/trait/quarkus.go | 3 +++ pkg/trait/service.go | 6 -- pkg/trait/service_binding.go | 3 +++ pkg/trait/trait_condition_types.go | 17 ++- 25 files changed, 138 insertions(+), 74 deletions(-) diff --git a/addons/keda/keda.go b/addons/keda/keda.go index ce4b56ab9..184dbdb90 100644 --- a/addons/keda/keda.go +++ b/addons/keda/keda.go @@ -120,10 +120,12 @@ func (t *kedaTrait) Configure(e *trait.Environment) (bool, *trait.TraitCondition if e.Integration == nil || !pointer.BoolDeref(t.Enabled, false) { return false, nil, nil } + if e.CamelCatalog == nil { + return false, trait.NewIntegrationConditionPlatformDisabledCatalogMissing(), nil + } if !e.IntegrationInPhase(camelv1.IntegrationPhaseInitialization) && !e.IntegrationInRunningPhases() { return false, nil, nil } - if t.Auto == nil || *t.Auto { if err := t.populateTriggersFromKamelets(e); err != nil { return false, nil, err diff --git a/addons/master/master.go b/addons/master/master.go index 692bfb2c4..deec026f1 100644 --- a/addons/master/master.go +++ b/addons/master/master.go @@ -92,6 +92,9 @@ func (t *masterTrait) Configure(e *trait.Environment) (bool, *trait.TraitConditi if !pointer.BoolDeref(t.Enabled, true) { return false, trait.NewIntegrationConditionUserDisabled(masterComponent), nil } + if e.CamelCatalog == nil { + return false, trait.NewIntegrationConditionPlatformDisabledCatalogMissing(), nil + } if !e.IntegrationInPhase(v1.IntegrationPhaseInitialization, v1.IntegrationPhaseBuildingKit) && !e.IntegrationInRunningPhases() { return false, nil, nil } diff --git a/addons/resume/resume.go b/addons/resume/resume.go index 221ae0364..2f44d1701 100644 --- a/addons/resume/resume.go +++ b/addons/resume/resume.go @@ -79,6 +79,9 @@ func (r *resumeTrait) Configure(environment *trait.Environment) (bool, *trait.Tr if !pointer.BoolDeref(r.Enabled, false) { return false, nil, nil } + if environment.CamelCatalog == nil { + return false, trait.NewIntegrationConditionPlatformDisabledCatalogMissing(), nil + } if !environment.IntegrationInPhase(v1.IntegrationPhaseInitialization) && !environment.IntegrationInRunningPhases() { return false, nil, nil } diff --git a/addons/telemetry/telemetry.go b/addons/telemetry/telemetry.go index ec7f7c858..d6363a868 100644 --- a/addons/telemetry/telemetry.go +++ b/addons/telemetry/telemetry.go @@ -93,7 +93,9 @@ func (t *telemetryTrait) Configure(e *trait.Environment) (bool, *trait.TraitCond if e.Integration == nil || !pointer.BoolDeref(t.Enabled, false) { return false, nil, nil } - + if e.CamelCatalog == nil { + return false, trait.NewIntegrationConditionPlatformDisabledCatalogMissing(), nil + } var condition *trait.TraitCondition if pointer.BoolDeref(t.Auto, true) { if t.Endpoint == "" { diff --git a/addons/tracing/tracing.go b/addons/tracing/tracing.go index 0cf3852e0..52cb6684c 100644 --- a/addons/tracing/tracing.go +++ b/addons/tracing/tracing.go @@ -90,6 +90,9 @@ func (t *tracingTrait) Configure(e
(camel-k) 01/02: fix(trait): don't report runtime version...
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 commit bea48df579362ac2125ea96d8fc17b21a4c000de Author: Pasquale Congiusti AuthorDate: Wed Apr 17 16:20:37 2024 +0200 fix(trait): don't report runtime version... ... for external kit or syntetic Integrations. As a side effect, we had to introduce a further check to avoid leveraging a Camel catalog which was taken as default. Closes #5309 --- pkg/trait/camel.go | 15 --- pkg/trait/camel_test.go | 29 + pkg/trait/cron.go | 3 +++ pkg/trait/jvm.go| 3 +++ pkg/trait/logging.go| 4 +++- 5 files changed, 46 insertions(+), 8 deletions(-) diff --git a/pkg/trait/camel.go b/pkg/trait/camel.go index d774cfca2..9f573c503 100644 --- a/pkg/trait/camel.go +++ b/pkg/trait/camel.go @@ -63,6 +63,13 @@ func (t *camelTrait) Matches(trait Trait) bool { } func (t *camelTrait) Configure(e *Environment) (bool, *TraitCondition, error) { + if e.IntegrationKit != nil && e.IntegrationKit.IsExternal() { + return false, newIntegrationConditionPlatformDisabledWithMessage("Camel", "integration kit was not created via Camel K operator"), nil + } + if e.Integration != nil && e.Integration.IsSynthetic() { + return false, newIntegrationConditionPlatformDisabledWithMessage("Camel", "syntetic integration"), nil + } + if t.RuntimeVersion == "" { if runtimeVersion, err := determineRuntimeVersion(e); err != nil { return false, nil, err @@ -71,21 +78,15 @@ func (t *camelTrait) Configure(e *Environment) (bool, *TraitCondition, error) { } } - // Don't run this trait for a synthetic Integration - return e.Integration == nil || !e.Integration.IsSynthetic(), nil, nil + return true, nil, nil } func (t *camelTrait) Apply(e *Environment) error { - if t.RuntimeVersion == "" { - return errors.New("unable to determine runtime version") - } - if e.CamelCatalog == nil { if err := t.loadOrCreateCatalog(e, t.RuntimeVersion); err != nil { return err } } - e.RuntimeVersion = e.CamelCatalog.Runtime.Version if e.Integration != nil { diff --git a/pkg/trait/camel_test.go b/pkg/trait/camel_test.go index 5d5a13a4f..2ca58645e 100644 --- a/pkg/trait/camel_test.go +++ b/pkg/trait/camel_test.go @@ -246,3 +246,32 @@ func TestCamelCatalogSemver(t *testing.T) { // 2.x will translate with 2.16.0 as it is already existing assert.Equal(t, environment.CamelCatalog.CamelCatalogSpec.Runtime.Version, environment.RuntimeVersion) } + +func TestCamelTraitExternalKit(t *testing.T) { + trait, environment := createNominalCamelTest(true) + environment.Integration.Status = v1.IntegrationStatus{} + environment.IntegrationKit.Labels[v1.IntegrationKitTypeLabel] = v1.IntegrationKitTypeExternal + + configured, condition, err := trait.Configure(environment) + require.NoError(t, err) + assert.Equal(t, "explicitly disabled by the platform: integration kit was not created via Camel K operator", condition.message) + assert.False(t, configured) + + assert.Equal(t, v1.RuntimeProvider(""), environment.Integration.Status.RuntimeProvider) + assert.Equal(t, "", environment.Integration.Status.RuntimeVersion) +} + +func TestCamelTraitSyntheticIntegration(t *testing.T) { + trait, environment := createNominalCamelTest(true) + environment.Integration.Status = v1.IntegrationStatus{} + environment.Integration.Annotations = make(map[string]string) + environment.Integration.Annotations[v1.IntegrationSyntheticLabel] = "true" + + configured, condition, err := trait.Configure(environment) + require.NoError(t, err) + assert.Equal(t, "explicitly disabled by the platform: syntetic integration", condition.message) + assert.False(t, configured) + + assert.Equal(t, v1.RuntimeProvider(""), environment.Integration.Status.RuntimeProvider) + assert.Equal(t, "", environment.Integration.Status.RuntimeVersion) +} diff --git a/pkg/trait/cron.go b/pkg/trait/cron.go index adf04f0c3..3e81c8ea2 100644 --- a/pkg/trait/cron.go +++ b/pkg/trait/cron.go @@ -83,6 +83,9 @@ func (t *cronTrait) Configure(e *Environment) (bool, *TraitCondition, error) { if !e.IntegrationInPhase(v1.IntegrationPhaseInitialization) && !e.IntegrationInRunningPhases() { return false, nil, nil } + if e.CamelCatalog == nil { + return false, newIntegrationConditionPlatformDisabledWithMessage("Cron", "no camel catalog available for this Integration"), nil + } if _, ok :=
Re: [I] Sourceless Integration status show default provider/version [camel-k]
squakez closed issue #5309: Sourceless Integration status show default provider/version URL: https://github.com/apache/camel-k/issues/5309 -- 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] Error when setting knative-service trait annotations [camel-k]
lsergio commented on issue #5401: URL: https://github.com/apache/camel-k/issues/5401#issuecomment-2072018811 @squakez We're using Knative Serving 1.12.3 ``` kubectl get namespace knative-serving -o 'go-template={{index .metadata.labels "app.kubernetes.io/version"}}' 1.12.3 ``` Per https://camel.apache.org/camel-k/2.2.x/index.html, Camel K 2.2 is compatible with Knative API 0.27.7, but I could not find any documentation on Knative website that mapped the API Version to the Knative version. So we used the latest available version when 2.2 was released. Maybe I have just found out that the API version is not the expected one. -- 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] JT400: refactor test to avoid CPF2451 correctly [camel-quarkus]
JiriOndrusek opened a new issue, #6028: URL: https://github.com/apache/camel-quarkus/issues/6028 ### Bug description Current implementation of jt400 test coverage with a real server clears data not optimally, because of `CPF2451 Message queue REPLYMSGQ is allocated to another job`. The reason of the error is the timeout of connection pool used by jt400 component (which is by default 30 seconds). It should be possible to set timeout to 0 and refactor clearing of the resource to happen after the execution of the tests (not before). This should make fix proposed by https://github.com/apache/camel-quarkus/issues/6018 better. -- 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-20513 - Camel-AWS-Bedrock: Support Amazon Titan Multimodal Embe… [camel]
oscerd commented on PR #13896: URL: https://github.com/apache/camel/pull/13896#issuecomment-2071928264 /component-test aws -- 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-20513 - Camel-AWS-Bedrock: Support Amazon Titan Multimodal Embe… [camel]
oscerd opened a new pull request, #13896: URL: https://github.com/apache/camel/pull/13896 …ddings G1 Model # 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) branch CAMEL-20513 created (now c61b3500d39)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-20513 in repository https://gitbox.apache.org/repos/asf/camel.git at c61b3500d39 CAMEL-20513 - Camel-AWS-Bedrock: Support Amazon Titan Multimodal Embeddings G1 Model This branch includes the following new commits: new c61b3500d39 CAMEL-20513 - Camel-AWS-Bedrock: Support Amazon Titan Multimodal Embeddings G1 Model 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: [PR] CAMEL-20513 - Camel-AWS-Bedrock: Support Amazon Titan Multimodal Embe… [camel]
github-actions[bot] commented on PR #13896: URL: https://github.com/apache/camel/pull/13896#issuecomment-2071929155 :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-20513 - Camel-AWS-Bedrock: Support Amazon Titan Multimodal Embe… [camel]
github-actions[bot] commented on PR #13896: URL: https://github.com/apache/camel/pull/13896#issuecomment-2071927003 :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
(camel) 01/01: CAMEL-20513 - Camel-AWS-Bedrock: Support Amazon Titan Multimodal Embeddings G1 Model
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch CAMEL-20513 in repository https://gitbox.apache.org/repos/asf/camel.git commit c61b3500d396143098e78eda45fc35fcfa5b25af Author: Andrea Cosentino AuthorDate: Tue Apr 23 12:10:49 2024 +0200 CAMEL-20513 - Camel-AWS-Bedrock: Support Amazon Titan Multimodal Embeddings G1 Model Signed-off-by: Andrea Cosentino --- .../component/aws2/bedrock/BedrockModels.java | 1 + .../runtime/integration/BedrockProducerIT.java | 23 ++ 2 files changed, 24 insertions(+) diff --git a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java index 8ca768b90e7..7b02f216a2e 100644 --- a/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java +++ b/components/camel-aws/camel-aws-bedrock/src/main/java/org/apache/camel/component/aws2/bedrock/BedrockModels.java @@ -22,6 +22,7 @@ public enum BedrockModels { TITAN_TEXT_LITE_V1("amazon.titan-text-lite-v1"), TITAN_IMAGE_GENERATOR_V1("amazon.titan-image-generator-v1"), TITAN_EMBEDDINGS_G1("amazon.titan-embed-text-v1"), +TITAN_MULTIMODAL_EMBEDDINGS_G1("amazon.titan-embed-image-v1"), JURASSIC2_ULTRA("ai21.j2-ultra-v1"), JURASSIC2_MID("ai21.j2-mid-v1"), ANTROPHIC_CLAUDE_INSTANT_V1("anthropic.claude-instant-v1"), diff --git a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java index 56a7f725ea2..9c5ced46233 100644 --- a/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java +++ b/components/camel-aws/camel-aws-bedrock/src/test/java/org/apache/camel/component/aws2/bedrock/runtime/integration/BedrockProducerIT.java @@ -443,6 +443,24 @@ class BedrockProducerIT extends CamelTestSupport { MockEndpoint.assertIsSatisfied(context); } +@Test +public void testInvokeTitanMultimodalEmbeddingsModel() throws InterruptedException { + +result.expectedMessageCount(1); +final Exchange result = template.send("direct:send_titan_multimodal_embeddings", exchange -> { +ObjectMapper mapper = new ObjectMapper(); +ObjectNode rootNode = mapper.createObjectNode(); +rootNode.putIfAbsent("inputText", +new TextNode("A Sci-fi camel running in the desert")); + + exchange.getMessage().setBody(mapper.writer().writeValueAsString(rootNode)); + exchange.getMessage().setHeader(BedrockConstants.MODEL_CONTENT_TYPE, "application/json"); + exchange.getMessage().setHeader(BedrockConstants.MODEL_ACCEPT_CONTENT_TYPE, "*/*"); +}); + +MockEndpoint.assertIsSatisfied(context); +} + @Override protected RouteBuilder createRouteBuilder() { return new RouteBuilder() { @@ -471,6 +489,11 @@ class BedrockProducerIT extends CamelTestSupport { + BedrockModels.TITAN_EMBEDDINGS_G1.model) .to(result); +from("direct:send_titan_multimodal_embeddings") + .to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=invokeEmbeddingsModel=" ++ BedrockModels.TITAN_MULTIMODAL_EMBEDDINGS_G1.model) +.to(result); + from("direct:send_jurassic2_model") .to("aws-bedrock:label?accessKey=RAW({{aws.manual.access.key}})=RAW({{aws.manual.secret.key}}=us-east-1=invokeTextModel=" + BedrockModels.JURASSIC2_ULTRA.model)