[camel-quarkus] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 7eecb9a2e9 Updated CHANGELOG.md 7eecb9a2e9 is described below commit 7eecb9a2e96e659db7b2c01e77ed2cdebffb27e7 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Aug 12 03:15:46 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 11 +++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6dd002e5ea..d399b00b26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,20 @@ [Full Changelog](https://github.com/apache/camel-quarkus/compare/3.0.0-RC2...HEAD) +**Implemented enhancements:** + +- Add `org.mapstruct:mapstruct-processor` to the BOM [\#5163](https://github.com/apache/camel-quarkus/issues/5163) + **Fixed bugs:** +- Compilation fails for gRPC applications in dev mode [\#5167](https://github.com/apache/camel-quarkus/issues/5167) - camel-quarkus-mail: Exception classes not registered for reflection [\#5142](https://github.com/apache/camel-quarkus/issues/5142) - ical native build failure [\#5099](https://github.com/apache/camel-quarkus/issues/5099) **Closed issues:** +- Add tests for camel-quarkus-elasticsearch [\#5162](https://github.com/apache/camel-quarkus/issues/5162) +- Extend test coverage of gRPC extension [\#5155](https://github.com/apache/camel-quarkus/issues/5155) - Manage icu4j version [\#5149](https://github.com/apache/camel-quarkus/issues/5149) - Introduce group testing for different jdbc db types [\#4772](https://github.com/apache/camel-quarkus/issues/4772) - aws2-cw: remove workaround with autowired once CAMEL-18878 is fixed [\#4400](https://github.com/apache/camel-quarkus/issues/4400) @@ -19,7 +26,11 @@ **Merged pull requests:** +- Unban com.google.code.findbugs:jsr305 for gRPC extension [\#5175](https://github.com/apache/camel-quarkus/pull/5175) ([jamesnetherton](https://github.com/jamesnetherton)) +- Add org.mapstruct:mapstruct-processor to the BOM [\#5172](https://github.com/apache/camel-quarkus/pull/5172) ([jamesnetherton](https://github.com/jamesnetherton)) - Bump quarkiverse-pooled-jms.version from 2.0.1 to 2.0.2 [\#5171](https://github.com/apache/camel-quarkus/pull/5171) ([dependabot[bot]](https://github.com/apps/dependabot)) +- \[5162\] Add elasticsearch tests [\#5170](https://github.com/apache/camel-quarkus/pull/5170) ([llowinge](https://github.com/llowinge)) +- Extend test coverage of gRPC extension [\#5168](https://github.com/apache/camel-quarkus/pull/5168) ([jamesnetherton](https://github.com/jamesnetherton)) - Reclaim disk space before running integration tests [\#5159](https://github.com/apache/camel-quarkus/pull/5159) ([jamesnetherton](https://github.com/jamesnetherton)) - Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom from 2.4.2 to 2.4.3 [\#5158](https://github.com/apache/camel-quarkus/pull/5158) ([dependabot[bot]](https://github.com/apps/dependabot)) - Set encoding to UTF-8 when writing microprofile-config.properties [\#5157](https://github.com/apache/camel-quarkus/pull/5157) ([jamesnetherton](https://github.com/jamesnetherton))
[camel-kamelets] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git The following commit(s) were added to refs/heads/main by this push: new b29b1cbd Updated CHANGELOG.md b29b1cbd is described below commit b29b1cbd5740f5516cb9da238efb99d26e8dec2d Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Aug 12 03:08:37 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b09549f..3c185b2c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ **Merged pull requests:** +- Generated sources regen [\#1567](https://github.com/apache/camel-kamelets/pull/1567) ([github-actions[bot]](https://github.com/apps/github-actions)) - CAMEL-19561 - align Artemis version with Camel 4.0.0 [\#1563](https://github.com/apache/camel-kamelets/pull/1563) ([apupier](https://github.com/apupier)) - Fix indentation in pom.xml \(tab used instead of spaces\) [\#1555](https://github.com/apache/camel-kamelets/pull/1555) ([apupier](https://github.com/apupier)) - Upgrade Camel K CRD from 1.12 to 2.0.0 [\#1551](https://github.com/apache/camel-kamelets/pull/1551) ([apupier](https://github.com/apupier))
[camel-k] 01/02: 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.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 78c04e0535808788904c4c3f9d2b42ebd5b77534 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Aug 12 00:42:55 2023 + chore: changelog automatic update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b972e518..b4a9dbc60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Tekton ServiceAccount missing camelcatalog access [\#4666](https://github.com/apache/camel-k/issues/4666) - 404 in release page [\#4654](https://github.com/apache/camel-k/issues/4654) - Error running integration on Camel-K v2 [\#4632](https://github.com/apache/camel-k/issues/4632) - camel-k installed with helm does not create cluster role for pipes and kameletbindings [\#4629](https://github.com/apache/camel-k/issues/4629)
[camel-k] branch release-2.0.x updated (b8f18f775 -> 397097b94)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from b8f18f775 chore: nightly SBOM update new 78c04e053 chore: changelog automatic update new 397097b94 chore: nightly SBOM update 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: CHANGELOG.md | 1 + camel-k-sbom/camel-k-sbom.json | 54 +- 2 files changed, 28 insertions(+), 27 deletions(-)
[camel-k] 02/02: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 397097b94c5a1427fd60f8625160aac8afaff6f4 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Aug 12 00:48:10 2023 + chore: nightly SBOM update --- camel-k-sbom/camel-k-sbom.json | 54 +- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json index 1acc71614..caba3e422 100644 --- a/camel-k-sbom/camel-k-sbom.json +++ b/camel-k-sbom/camel-k-sbom.json @@ -2,10 +2,10 @@ "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json;, "bomFormat": "CycloneDX", "specVersion": "1.4", - "serialNumber": "urn:uuid:1504120f-0606-4522-b77d-149bcaabeb6f", + "serialNumber": "urn:uuid:d1ec5e0c-34ca-4315-9abf-787d52c710cd", "version": 1, "metadata": { -"timestamp": "2023-08-11T00:50:27Z", +"timestamp": "2023-08-12T00:48:10Z", "tools": [ { "vendor": "CycloneDX", @@ -46,11 +46,11 @@ } ], "component": { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230811004431-f1bdf5c6538a?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230812004255-78c04e053580?type=module", "type": "application", "name": "github.com/apache/camel-k/v2", - "version": "v0.0.0-20230811004431-f1bdf5c6538a", - "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230811004431-f1bdf5c6538a?type=module\u0026goos=linux\u0026goarch=amd64", + "version": "v0.0.0-20230812004255-78c04e053580", + "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230812004255-78c04e053580?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k;, @@ -423,18 +423,18 @@ } }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230811004431-f1bdf5c6538a?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230812004255-78c04e053580?type=module", "type": "library", "name": "github.com/apache/camel-k/v2/pkg/apis/camel", - "version": "v0.0.0-20230811004431-f1bdf5c6538a", + "version": "v0.0.0-20230812004255-78c04e053580", "scope": "required", "hashes": [ { "alg": "SHA-256", - "content": "e300fb735d4279e1bc74c677ea47cd8aa8fa5675cffa693ad08bc0a18952744b" + "content": "678cd2da6b80d851f776d2ae7d2ee401972e18bb9e6d9c661c6a75e5c49e8f12" } ], - "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230811004431-f1bdf5c6538a?type=module\u0026goos=linux\u0026goarch=amd64", + "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230812004255-78c04e053580?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k/v2/pkg/apis/camel;, @@ -443,18 +443,18 @@ ] }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230811004431-f1bdf5c6538a?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230812004255-78c04e053580?type=module", "type": "library", "name": "github.com/apache/camel-k/v2/pkg/client/camel", - "version": "v0.0.0-20230811004431-f1bdf5c6538a", + "version": "v0.0.0-20230812004255-78c04e053580", "scope": "required", "hashes": [ { "alg": "SHA-256", - "content": "8095a8d645002f6b22543957949029e4b6c688871eec9322ce02f7c60bdba2cd" + "content": "343a9a42e99017ed458a6f2e18ca28fe42b8603f101bb2ef31306adf4fc3b07f" } ], - "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230811004431-f1bdf5c6538a?type=module\u0026goos=linux\u0026goarch=amd64", + "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230812004255-78c04e053580?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k/v2/pkg/client/camel;, @@ -463,18 +463,18 @@ ] }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230811004431-f1bdf5c6538a?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230812004255-78c04e053580?type=module", "type": "library", "name": "github.com/apache/camel-k/v2/pkg/kamelet/repository", - "version": "v0.0.0-20230811004431-f1bdf5c6538a", + "version": "v0.0.0-20230812004255-78c04e053580", "scope": "required", "hashes": [
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1675574146 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 5838123854-1102-5a12b18c-9259-4551-870c-5849763434df * Camel Quarkus Commit: 9de74ffd41d7281e32628f4a289a5b7b00bf4d2d * Camel Main Commit: 5847d118cb847aeab6f8754357b93b558083ff4f * Link to build: https://github.com/apache/camel-quarkus/actions/runs/5838123854 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton opened a new issue, #2927: [CI] - Camel Main Branch Build Failure
jamesnetherton opened a new issue, #2927: URL: https://github.com/apache/camel-quarkus/issues/2927 This is a placeholder issue used by the [nightly sync workflow](https://github.com/apache/camel-quarkus/actions/workflows/camel-master-cron.yaml) for the [`camel-main`](https://github.com/apache/camel-quarkus/tree/camel-main) branch. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 02/02: Periodic Sync of Camel K Main Branch for SBOM Generation
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-1.12.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit cffe9bc2d0aef431b19c89840d3f0313395d462d Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Aug 12 00:35:55 2023 + Periodic Sync of Camel K Main Branch for SBOM Generation --- camel-k-sbom/camel-k-sbom.json | 54 +- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json index 9526d0ffe..d06d80085 100644 --- a/camel-k-sbom/camel-k-sbom.json +++ b/camel-k-sbom/camel-k-sbom.json @@ -2,10 +2,10 @@ "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json;, "bomFormat": "CycloneDX", "specVersion": "1.4", - "serialNumber": "urn:uuid:6babdf77-e48e-4e4e-ab31-4cc719090670", + "serialNumber": "urn:uuid:2cf98fb0-9122-4998-828c-d9e383001655", "version": 1, "metadata": { -"timestamp": "2023-08-11T00:34:26Z", +"timestamp": "2023-08-12T00:35:55Z", "tools": [ { "vendor": "CycloneDX", @@ -46,11 +46,11 @@ } ], "component": { - "bom-ref": "pkg:golang/github.com/apache/camel-k@v0.0.0-20230811002848-10a0282066c6?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k@v0.0.0-20230812002958-2021d323de0f?type=module", "type": "application", "name": "github.com/apache/camel-k", - "version": "v0.0.0-20230811002848-10a0282066c6", - "purl": "pkg:golang/github.com/apache/camel-k@v0.0.0-20230811002848-10a0282066c6?type=module\u0026goos=linux\u0026goarch=amd64", + "version": "v0.0.0-20230812002958-2021d323de0f", + "purl": "pkg:golang/github.com/apache/camel-k@v0.0.0-20230812002958-2021d323de0f?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k;, @@ -510,18 +510,18 @@ } }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230811002848-10a0282066c6?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230812002958-2021d323de0f?type=module", "type": "library", "name": "github.com/apache/camel-k/pkg/apis/camel", - "version": "v0.0.0-20230811002848-10a0282066c6", + "version": "v0.0.0-20230812002958-2021d323de0f", "scope": "required", "hashes": [ { "alg": "SHA-256", - "content": "81b95350aa25d3eab8cbd49373469f44eb149d011e7a717bc985b8b0c26e9a3a" + "content": "ad2d597152f5629328eafb34c7dd735cae3e43037837d4c14cb51e49d5c67fda" } ], - "purl": "pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230811002848-10a0282066c6?type=module\u0026goos=linux\u0026goarch=amd64", + "purl": "pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230812002958-2021d323de0f?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k/pkg/apis/camel;, @@ -530,18 +530,18 @@ ] }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230811002848-10a0282066c6?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230812002958-2021d323de0f?type=module", "type": "library", "name": "github.com/apache/camel-k/pkg/client/camel", - "version": "v0.0.0-20230811002848-10a0282066c6", + "version": "v0.0.0-20230812002958-2021d323de0f", "scope": "required", "hashes": [ { "alg": "SHA-256", - "content": "34f66c5730214baff00703286cd8e0a5879622155eaee527db3fd20f1faed98f" + "content": "f7042d7840734500581ba1699515b896a73f06ea7b3a85f36a3b46180079bf84" } ], - "purl": "pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230811002848-10a0282066c6?type=module\u0026goos=linux\u0026goarch=amd64", + "purl": "pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230812002958-2021d323de0f?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k/pkg/client/camel;, @@ -550,18 +550,18 @@ ] }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20230811002848-10a0282066c6?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20230812002958-2021d323de0f?type=module", "type": "library", "name": "github.com/apache/camel-k/pkg/kamelet/repository", - "version": "v0.0.0-20230811002848-10a0282066c6", + "version": "v0.0.0-20230812002958-2021d323de0f", "scope": "required", "hashes": [ { "alg":
[camel-k] branch release-1.12.x updated (05b39b2eb -> cffe9bc2d)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release-1.12.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from 05b39b2eb Periodic Sync of Camel K Main Branch for SBOM Generation new 2021d323d chore: changelog automatic update new cffe9bc2d Periodic Sync of Camel K Main Branch for SBOM Generation 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: CHANGELOG.md | 1 + camel-k-sbom/camel-k-sbom.json | 54 +- 2 files changed, 28 insertions(+), 27 deletions(-)
[camel-k] 01/02: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-1.12.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 2021d323de0f85586e4d419c081ed18cad2ecb5e Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Aug 12 00:29:58 2023 + chore: changelog automatic update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b972e518..b4a9dbc60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Tekton ServiceAccount missing camelcatalog access [\#4666](https://github.com/apache/camel-k/issues/4666) - 404 in release page [\#4654](https://github.com/apache/camel-k/issues/4654) - Error running integration on Camel-K v2 [\#4632](https://github.com/apache/camel-k/issues/4632) - camel-k installed with helm does not create cluster role for pipes and kameletbindings [\#4629](https://github.com/apache/camel-k/issues/4629)
[camel-k] 01/03: chore: changelog automatic update
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 commit f6dfe30d505cdb4e64d3a0df84acac3021cd732f Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Aug 11 23:43:44 2023 + chore: changelog automatic update --- CHANGELOG.md | 6 ++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94a6e1d64..48912795f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Tekton ServiceAccount missing camelcatalog access [\#4666](https://github.com/apache/camel-k/issues/4666) - 404 in release page [\#4654](https://github.com/apache/camel-k/issues/4654) - Error running integration on Camel-K v2 [\#4632](https://github.com/apache/camel-k/issues/4632) - camel-k installed with helm does not create cluster role for pipes and kameletbindings [\#4629](https://github.com/apache/camel-k/issues/4629) @@ -34,7 +35,12 @@ **Merged pull requests:** +- fix\(cicd\): Add list camelcatalog permission in tekton SA [\#4667](https://github.com/apache/camel-k/pull/4667) ([gansheer](https://github.com/gansheer)) +- feat: added annotations support for route trait [\#4664](https://github.com/apache/camel-k/pull/4664) ([realMartinez](https://github.com/realMartinez)) +- feat\(trait\): prepare to remove runtime dependencies [\#4663](https://github.com/apache/camel-k/pull/4663) ([squakez](https://github.com/squakez)) - chore\(ci\): Updates of otlp collector and some github actions [\#4660](https://github.com/apache/camel-k/pull/4660) ([gansheer](https://github.com/gansheer)) +- chore\(e2e\): Test on kamelets configurations using configmaps [\#4659](https://github.com/apache/camel-k/pull/4659) ([gansheer](https://github.com/gansheer)) +- Enhance CamelCatalog can't be found error msg [\#4658](https://github.com/apache/camel-k/pull/4658) ([bouskaJ](https://github.com/bouskaJ)) - fix\(ci\): sleep 30 minutes [\#4657](https://github.com/apache/camel-k/pull/4657) ([squakez](https://github.com/squakez)) - feat\(install\): Camel K offline mode [\#4656](https://github.com/apache/camel-k/pull/4656) ([squakez](https://github.com/squakez)) - chore\(deps\): bump github.com/container-tools/spectrum from 0.6.33 to 0.6.34 [\#4653](https://github.com/apache/camel-k/pull/4653) ([dependabot[bot]](https://github.com/apps/dependabot))
[camel-k] 02/03: chore: autogenerated project resource update
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 commit 905320b794f0aec87d2c81a438c7326a4a4d5fa0 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Aug 11 23:46:54 2023 + chore: autogenerated project resource update --- config/crd/bases/camel.apache.org_builds.yaml | 3 +- .../crd/bases/camel.apache.org_camelcatalogs.yaml | 3 +- .../camel.apache.org_integrationplatforms.yaml | 16 .../crd/bases/camel.apache.org_integrations.yaml | 8 .../bases/camel.apache.org_kameletbindings.yaml| 8 config/crd/bases/camel.apache.org_pipes.yaml | 8 docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 11 ++ docs/modules/traits/pages/route.adoc | 7 helm/camel-k/crds/crd-build.yaml | 3 +- helm/camel-k/crds/crd-camel-catalog.yaml | 3 +- helm/camel-k/crds/crd-integration-platform.yaml| 16 helm/camel-k/crds/crd-integration.yaml | 8 helm/camel-k/crds/crd-kamelet-binding.yaml | 8 helm/camel-k/crds/crd-pipe.yaml| 8 pkg/apis/camel/v1/trait/zz_generated.deepcopy.go | 7 pkg/resources/resources.go | 45 +++--- resources/traits.yaml | 5 +++ 17 files changed, 132 insertions(+), 35 deletions(-) diff --git a/config/crd/bases/camel.apache.org_builds.yaml b/config/crd/bases/camel.apache.org_builds.yaml index 1c136fc3a..dea33d717 100644 --- a/config/crd/bases/camel.apache.org_builds.yaml +++ b/config/crd/bases/camel.apache.org_builds.yaml @@ -546,7 +546,8 @@ spec: capabilities: additionalProperties: description: Capability is a particular feature which - requires a well known set of dependencies + requires a well known set of dependencies which + are specified in the runtime catalog properties: dependencies: items: diff --git a/config/crd/bases/camel.apache.org_camelcatalogs.yaml b/config/crd/bases/camel.apache.org_camelcatalogs.yaml index d389d9a23..24d4ad574 100644 --- a/config/crd/bases/camel.apache.org_camelcatalogs.yaml +++ b/config/crd/bases/camel.apache.org_camelcatalogs.yaml @@ -336,7 +336,8 @@ spec: capabilities: additionalProperties: description: Capability is a particular feature which requires -a well known set of dependencies +a well known set of dependencies which are specified in the +runtime catalog properties: dependencies: items: diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml index c96606c87..ba79f08de 100644 --- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -1606,6 +1606,14 @@ spec: route: description: The configuration of Route trait properties: + annotations: +additionalProperties: + type: string +description: 'The annotations added to route. This can be + used to set route specific annotations For annotations options + see https://docs.openshift.com/container-platform/3.11/architecture/networking/routes.html#route-specific-annotations + CLI usage example: -t "route.annotations.''haproxy.router.openshift.io/balance''=true"' +type: object configuration: description: 'Legacy trait configuration parameters. Deprecated: for backward compatibility.' @@ -3354,6 +3362,14 @@ spec: route: description: The configuration of Route trait properties: + annotations: +additionalProperties: + type: string +description: 'The annotations added to route. This can be + used to set route specific annotations For annotations options + see https://docs.openshift.com/container-platform/3.11/architecture/networking/routes.html#route-specific-annotations + CLI usage
[camel-k] 03/03: chore: nightly SBOM update
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 commit 73dd9d690d69f13b853fac6338e77358bcd08285 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Aug 11 23:47:20 2023 + chore: nightly SBOM update --- camel-k-sbom/camel-k-sbom.json | 54 +- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json index db6a57cae..4ba96f0f3 100644 --- a/camel-k-sbom/camel-k-sbom.json +++ b/camel-k-sbom/camel-k-sbom.json @@ -2,10 +2,10 @@ "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json;, "bomFormat": "CycloneDX", "specVersion": "1.4", - "serialNumber": "urn:uuid:f9b36bb7-4c07-4721-9071-f18bd0ab0cdb", + "serialNumber": "urn:uuid:9d979ba8-a81b-4dbb-b4b1-1b150ce0ca7c", "version": 1, "metadata": { -"timestamp": "2023-08-10T23:48:43Z", +"timestamp": "2023-08-11T23:47:20Z", "tools": [ { "vendor": "CycloneDX", @@ -46,11 +46,11 @@ } ], "component": { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230810234503-c0664e2423d2?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230811234654-905320b794f0?type=module", "type": "application", "name": "github.com/apache/camel-k/v2", - "version": "v0.0.0-20230810234503-c0664e2423d2", - "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230810234503-c0664e2423d2?type=module\u0026goos=linux\u0026goarch=amd64", + "version": "v0.0.0-20230811234654-905320b794f0", + "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230811234654-905320b794f0?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k;, @@ -423,18 +423,18 @@ } }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230810234503-c0664e2423d2?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230811234654-905320b794f0?type=module", "type": "library", "name": "github.com/apache/camel-k/v2/pkg/apis/camel", - "version": "v0.0.0-20230810234503-c0664e2423d2", + "version": "v0.0.0-20230811234654-905320b794f0", "scope": "required", "hashes": [ { "alg": "SHA-256", - "content": "9a8b3aad39c0cdd583559e4fd04eac904965961ee7895fa4d3ba4b611bca77a4" + "content": "996053372c2a904b5cbd8272938bc5011e4adc5e83d6926408b4cd5fafc7d0f4" } ], - "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230810234503-c0664e2423d2?type=module\u0026goos=linux\u0026goarch=amd64", + "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230811234654-905320b794f0?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k/v2/pkg/apis/camel;, @@ -443,18 +443,18 @@ ] }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230810234503-c0664e2423d2?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230811234654-905320b794f0?type=module", "type": "library", "name": "github.com/apache/camel-k/v2/pkg/client/camel", - "version": "v0.0.0-20230810234503-c0664e2423d2", + "version": "v0.0.0-20230811234654-905320b794f0", "scope": "required", "hashes": [ { "alg": "SHA-256", - "content": "71e3167f12205701ee735374f9194db23d9f38a597cd8c15b4526c126348d826" + "content": "557591fecf9bb6d124efba3303160371bedb7b6f5c096813c3d03982234127f3" } ], - "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230810234503-c0664e2423d2?type=module\u0026goos=linux\u0026goarch=amd64", + "purl": "pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230811234654-905320b794f0?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k/v2/pkg/client/camel;, @@ -463,18 +463,18 @@ ] }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230810234503-c0664e2423d2?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230811234654-905320b794f0?type=module", "type": "library", "name": "github.com/apache/camel-k/v2/pkg/kamelet/repository", - "version": "v0.0.0-20230810234503-c0664e2423d2", + "version": "v0.0.0-20230811234654-905320b794f0", "scope": "required", "hashes": [ {
[camel-k] branch main updated (b214f24c5 -> 73dd9d690)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from b214f24c5 chore(e2e): Test on kamelets configurations using configmaps new f6dfe30d5 chore: changelog automatic update new 905320b79 chore: autogenerated project resource update new 73dd9d690 chore: nightly SBOM update The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG.md | 6 +++ camel-k-sbom/camel-k-sbom.json | 54 +++--- config/crd/bases/camel.apache.org_builds.yaml | 3 +- .../crd/bases/camel.apache.org_camelcatalogs.yaml | 3 +- .../camel.apache.org_integrationplatforms.yaml | 16 +++ .../crd/bases/camel.apache.org_integrations.yaml | 8 .../bases/camel.apache.org_kameletbindings.yaml| 8 config/crd/bases/camel.apache.org_pipes.yaml | 8 docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 11 + docs/modules/traits/pages/route.adoc | 7 +++ helm/camel-k/crds/crd-build.yaml | 3 +- helm/camel-k/crds/crd-camel-catalog.yaml | 3 +- helm/camel-k/crds/crd-integration-platform.yaml| 16 +++ helm/camel-k/crds/crd-integration.yaml | 8 helm/camel-k/crds/crd-kamelet-binding.yaml | 8 helm/camel-k/crds/crd-pipe.yaml| 8 pkg/apis/camel/v1/trait/zz_generated.deepcopy.go | 7 +++ pkg/resources/resources.go | 45 ++ resources/traits.yaml | 5 ++ 19 files changed, 165 insertions(+), 62 deletions(-)
[GitHub] [camel] github-actions[bot] commented on pull request #11092: WIP: [CAMEL-19698] [CAMEL-19699] camel-yaml-dsl: schema: Restrict language…
github-actions[bot] commented on PR #11092: URL: https://github.com/apache/camel/pull/11092#issuecomment-1675377705 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] igarashitm opened a new pull request, #11092: WIP: [CAMEL-19698] [CAMEL-19699] camel-yaml-dsl: schema: Restrict language…
igarashitm opened a new pull request, #11092: URL: https://github.com/apache/camel/pull/11092 …s/dataformats to be mutually exclusive * checkpoint: Added `oneOf` property on @YamlProperty annotation. This is to hold an oneOf grouping name to show those are mutually exclusive on deserializer annotation. The schema generator should then use these to generate oneOf restriction. Expected change on YAML DSL schema (expression as an example): https://github.com/igarashitm/misc/blob/main/camel/json-schema-yaml-validator/src/test/resources/schema/whenAndExpression.json Validation Tests: https://github.com/igarashitm/misc/blob/main/camel/json-schema-yaml-validator/src/test/groovy/com/github/igarashitm/camel/ExpressionTest.groovy # TODO - [ ] Update GenerateYamlSchemaMojo to use `oneOf` and generate revised schema - [ ] Tests # 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). https://issues.apache.org/jira/browse/CAMEL-19698 https://issues.apache.org/jira/browse/CAMEL-19699 # 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 Cc: @lburgazzoli -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11091: camel-mail - Attempt to fix flaky test
github-actions[bot] commented on PR #11091: URL: https://github.com/apache/camel/pull/11091#issuecomment-1675161861 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus opened a new pull request, #11091: camel-mail - Attempt to fix flaky test
davsclaus opened a new pull request, #11091: URL: https://github.com/apache/camel/pull/11091 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: camel-mail - Attempt to fix flaky test
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch mf in repository https://gitbox.apache.org/repos/asf/camel.git commit c3df464278e4bf0f9895cf3a4c16c47aeef9f9bb Author: Claus Ibsen AuthorDate: Fri Aug 11 19:50:02 2023 +0200 camel-mail - Attempt to fix flaky test --- .../test/java/org/apache/camel/component/mail/MailConvertersTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java index c25fe9e7cc6..96383fe7b95 100644 --- a/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java +++ b/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailConvertersTest.java @@ -36,12 +36,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; public class MailConvertersTest extends CamelTestSupport { -private static final MailboxUser james = Mailbox.getOrCreateUser("james", "secret"); + +private MailboxUser james; @Override @BeforeEach public void setUp() throws Exception { Mailbox.clearAll(); +james = Mailbox.getOrCreateUser("james", "secret"); super.setUp(); }
[camel] branch mf created (now c3df464278e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch mf in repository https://gitbox.apache.org/repos/asf/camel.git at c3df464278e camel-mail - Attempt to fix flaky test This branch includes the following new commits: new c3df464278e camel-mail - Attempt to fix flaky test The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] branch regen_bot_3x updated (57a6c1ced5c -> f7edf7cd2d6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3x in repository https://gitbox.apache.org/repos/asf/camel.git omit 57a6c1ced5c Regen for commit e98ab58a7c11481bb685fb95ed31bb789f53fad7 add f7edf7cd2d6 Regen for commit e98ab58a7c11481bb685fb95ed31bb789f53fad7 (#11089) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (57a6c1ced5c) \ N -- N -- N refs/heads/regen_bot_3x (f7edf7cd2d6) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[camel] branch regen_bot updated (692c21169ad -> bdfe78d392b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit 692c21169ad Regen for commit 8ff5dee8e9bf944f1bbefbfb88f297b98e2f9976 add 341df911b78 Fix flaky test add bdfe78d392b Fix flaky test This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (692c21169ad) \ N -- N -- N refs/heads/regen_bot (bdfe78d392b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/schemas/camel-spring.xsd | 10627 --- .../language/csimple/joor/OriginalSimpleTest.java | 3 +- .../camel/component/kafka/KafkaConfiguration.java |11 + .../file/FileConsumerFileNameFilterTest.java | 4 +- .../org/apache/camel/main/BaseMainSupport.java | 3 + .../java/org/apache/camel/util/SensitiveUtils.java | 2 +- .../org/apache/camel/xml/in/ModelParserTest.java |10 +- 7 files changed, 4398 insertions(+), 6262 deletions(-)
[camel] branch main updated: Fix flaky test
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new bdfe78d392b Fix flaky test bdfe78d392b is described below commit bdfe78d392bafcba33144c7aa2ee4e3b039ca143 Author: Claus Ibsen AuthorDate: Fri Aug 11 19:21:40 2023 +0200 Fix flaky test --- .../apache/camel/component/file/FileConsumerFileNameFilterTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileNameFilterTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileNameFilterTest.java index 710761c408a..b77f5252bfa 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileNameFilterTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFileNameFilterTest.java @@ -16,8 +16,6 @@ */ package org.apache.camel.component.file; -import java.time.Duration; - import org.apache.camel.ContextTestSupport; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; @@ -41,7 +39,7 @@ public class FileConsumerFileNameFilterTest extends ContextTestSupport { final MockEndpoint mockEndpoint = getMockEndpoint("mock:txt"); mockEndpoint.expectedBodiesReceivedInAnyOrder("Hello World", "Bye World"); -mockEndpoint.assertIsSatisfied(Duration.ofSeconds(2).toMillis()); +mockEndpoint.assertIsSatisfied(); } @Override
[GitHub] [camel] davsclaus closed pull request #11090: Generated sources regen
davsclaus closed pull request #11090: Generated sources regen URL: https://github.com/apache/camel/pull/11090 -- 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: Fix flaky test
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 341df911b78 Fix flaky test 341df911b78 is described below commit 341df911b7898693495ca954e2ac23a6616393c1 Author: Claus Ibsen AuthorDate: Fri Aug 11 19:14:39 2023 +0200 Fix flaky test --- .../org/apache/camel/language/csimple/joor/OriginalSimpleTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java index 44b5cbbccdf..abbca568940 100644 --- a/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java +++ b/components/camel-csimple-joor/src/test/java/org/apache/camel/language/csimple/joor/OriginalSimpleTest.java @@ -676,7 +676,8 @@ public class OriginalSimpleTest extends LanguageTestSupport { @Test public void testDatePredicates() { assertPredicate("${date:now} < ${date:now+60s}"); -assertPredicate("${date:now-2s+2s} == ${date:now}"); +assertPredicate("${date:now-5s} < ${date:now}"); +assertPredicate("${date:now+5s} > ${date:now}"); } @Test
[camel-karavan] branch main updated: Fix #852
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 542daa38 Fix #852 542daa38 is described below commit 542daa388ea3c4161fcc2cbaaff3d3dfde0d4651 Author: Marat Gubaidullin AuthorDate: Fri Aug 11 13:04:03 2023 -0400 Fix #852 --- karavan-vscode/package-lock.json | 189 +++--- karavan-vscode/package.json | 8 +- karavan-vscode/src/webviewContent.ts | 2 +- karavan-vscode/webview/App.tsx | 2 +- karavan-vscode/webview/index.css | 220 ++- 5 files changed, 188 insertions(+), 233 deletions(-) diff --git a/karavan-vscode/package-lock.json b/karavan-vscode/package-lock.json index d2feef88..dd37d9da 100644 --- a/karavan-vscode/package-lock.json +++ b/karavan-vscode/package-lock.json @@ -1,18 +1,18 @@ { "name": "karavan", - "version": "3.21.1-SNAPSHOT", + "version": "4.0.0-RC2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "karavan", - "version": "3.21.1-SNAPSHOT", + "version": "4.0.0-RC2", "license": "Apache-2.0", "dependencies": { -"@monaco-editor/react": "4.5.0", -"@patternfly/patternfly": "4.224.2", -"@patternfly/react-core": "4.276.8", -"@patternfly/react-table": "4.113.0", +"@monaco-editor/react": "4.5.1", +"@patternfly/patternfly": "^5.0.2", +"@patternfly/react-core": "^5.0.0", +"@patternfly/react-table": "^5.0.0", "@types/js-yaml": "4.0.5", "@types/uuid": "9.0.1", "html-to-image": "1.11.11", @@ -2108,9 +2108,9 @@ } }, "node_modules/@monaco-editor/react": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.5.0.tgz;, - "integrity": "sha512-VJMkp5Fe1+w8pLEq8tZPHZKu8zDXQIA1FtiDTSNccg1D3wg1YIZaH2es2Qpvop1k62g3c/YySRb3bnGXu2XwYQ==", + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.5.1.tgz;, + "integrity": "sha512-NNDFdP+2HojtNhCkRfE6/D6ro6pBNihaOzMbGK84lNWzRu+CfBjwzGt4jmnqimLuqp5yE5viHS2vi+QOAnD5FQ==", "dependencies": { "@monaco-editor/loader": "^1.3.3" }, @@ -2165,63 +2165,62 @@ } }, "node_modules/@patternfly/patternfly": { - "version": "4.224.2", - "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.224.2.tgz;, - "integrity": "sha512-HGNV26uyHSIECuhjPg/WGn0mXbAotcs6ODfhAOkfYjIgGylddgiwElxUe1rpEHV5mQJJ2rMn4OdeJIIpzRX61g==" + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-5.0.2.tgz;, + "integrity": "sha512-PB8+MLdYVgF1hIOxGmnVsZG+YHUX3RePe5W1oMS4gS00EmSgw1cobr1Qbpy/BqqS8/R9DRN4hZ2FKDT0d5tkFQ==" }, "node_modules/@patternfly/react-core": { - "version": "4.276.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.276.8.tgz;, - "integrity": "sha512-dn322rEzBeiVztZEuCZMUUittNb8l1hk30h9ZN31FLZLLVtXGlThFNV9ieqOJYA9zrYxYZrHMkTnOxSWVacMZg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-5.0.0.tgz;, + "integrity": "sha512-kewRVFhLw0Dvt8250pqrO47sVRx8E93sMGZbHQomJnZdachYeQ9STnQTP2gvOBq/GPnMei0LZLv0T99g8mPE4w==", "dependencies": { -"@patternfly/react-icons": "^4.93.6", -"@patternfly/react-styles": "^4.92.6", -"@patternfly/react-tokens": "^4.94.6", -"focus-trap": "6.9.2", -"react-dropzone": "9.0.0", -"tippy.js": "5.1.2", -"tslib": "^2.0.0" +"@patternfly/react-icons": "^5.0.0", +"@patternfly/react-styles": "^5.0.0", +"@patternfly/react-tokens": "^5.0.0", +"focus-trap": "7.4.3", +"react-dropzone": "^14.2.3", +"tslib": "^2.5.0" }, "peerDependencies": { -"react": "^16.8 || ^17 || ^18", -"react-dom": "^16.8 || ^17 || ^18" +"react": "^17 || ^18", +"react-dom": "^17 || ^18" } }, "node_modules/@patternfly/react-icons": { - "version": "4.93.6", - "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-4.93.6.tgz;, - "integrity": "sha512-ZrXegc/81oiuTIeWvoHb3nG/eZODbB4rYmekBEsrbiysyO7m/sUFoi/RLvgFINrRoh6YCJqL5fj06Jg6d7jX1g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@patternfly/react-icons/-/react-icons-5.0.0.tgz;, + "integrity": "sha512-GG5Y/UYl0h346MyDU9U650Csaq4Mxk8S6U8XC7ERk/xIrRr2RF67O2uY7zKBDMTNLYdBvPzgc2s3OMV1+d2/mg==", "peerDependencies": { -"react": "^16.8 || ^17 || ^18", -"react-dom": "^16.8 || ^17 || ^18" +"react": "^17 || ^18", +"react-dom": "^17 || ^18" } },
[camel] branch camel-3.x updated: Regen for commit e98ab58a7c11481bb685fb95ed31bb789f53fad7 (#11089)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.x by this push: new f7edf7cd2d6 Regen for commit e98ab58a7c11481bb685fb95ed31bb789f53fad7 (#11089) f7edf7cd2d6 is described below commit f7edf7cd2d6d0a1172090f405b18324b4c723fc6 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Aug 11 18:54:05 2023 +0200 Regen for commit e98ab58a7c11481bb685fb95ed31bb789f53fad7 (#11089) Signed-off-by: GitHub Co-authored-by: davsclaus --- core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java index 6c57f8d3aa7..5b577bee865 100644 --- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java +++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java @@ -188,7 +188,7 @@ public final class SensitiveUtils { + "|\\Qverificationcode\\E" + "|\\Qwebhookverifytoken\\E" + "|\\Qzookeeperpassword\\E" -// SENSITIVE-PATTERN: END +// SENSITIVE-PATTERN: END ; private SensitiveUtils() {
[GitHub] [camel] oscerd merged pull request #11089: Generated sources regen (Camel 3)
oscerd merged PR #11089: URL: https://github.com/apache/camel/pull/11089 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karavan] branch main updated: Fix #857
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 0534301b Fix #857 0534301b is described below commit 0534301bbd7a9da21ea41df1c47a0964b573ddc8 Author: Marat Gubaidullin AuthorDate: Fri Aug 11 12:34:28 2023 -0400 Fix #857 --- karavan-designer/package.json | 4 +- karavan-space/package-lock.json| 167 - karavan-space/package.json | 6 +- karavan-space/src/App.tsx | 8 +- .../src/designer/beans/BeanProperties.tsx | 37 +++-- .../src/designer/rest/RestMethodSelector.tsx | 2 +- .../src/designer/route/DslConnections.tsx | 4 +- karavan-space/src/designer/route/DslElement.tsx| 8 +- karavan-space/src/designer/route/DslProperties.tsx | 17 ++- karavan-space/src/designer/route/DslSelector.tsx | 13 +- karavan-space/src/designer/route/RouteDesigner.tsx | 2 +- .../route/property/ComponentParameterField.tsx | 49 +++--- .../designer/route/property/DataFormatField.tsx| 19 ++- .../designer/route/property/DslPropertyField.tsx | 112 +++--- .../designer/route/property/ExpressionField.tsx| 26 ++-- .../route/property/InfrastructureSelector.tsx | 22 +-- .../route/property/KameletPropertyField.tsx| 10 +- .../src/designer/route/property/ModalEditor.tsx| 6 +- .../src/designer/templates/TemplatesDesigner.tsx | 7 +- karavan-space/src/designer/utils/CamelUi.tsx | 1 - .../src/designer/utils/KaravanComponents.tsx | 4 +- karavan-space/src/index.css| 26 ++-- .../src/knowledgebase/KnowledgebasePage.tsx| 4 +- .../knowledgebase/components/ComponentModal.tsx| 15 +- karavan-space/src/knowledgebase/eip/EipCard.tsx| 6 +- karavan-space/src/knowledgebase/eip/EipModal.tsx | 15 +- .../src/knowledgebase/kamelets/KameletCard.tsx | 2 +- .../src/knowledgebase/kamelets/KameletModal.tsx| 15 +- karavan-space/src/space/GithubModal.tsx| 14 +- karavan-space/src/space/SpaceBus.ts| 6 +- karavan-space/src/space/SpacePage.tsx | 10 +- karavan-space/src/space/UploadModal.tsx| 17 ++- 32 files changed, 321 insertions(+), 333 deletions(-) diff --git a/karavan-designer/package.json b/karavan-designer/package.json index 1a04f9bd..548304dd 100644 --- a/karavan-designer/package.json +++ b/karavan-designer/package.json @@ -26,7 +26,7 @@ ] }, "dependencies": { -"@monaco-editor/react": "4.5.0", +"@monaco-editor/react": "4.5.1", "@patternfly/patternfly": "^5.0.2", "@patternfly/react-core": "^5.0.0", "@patternfly/react-table": "^5.0.0", @@ -53,7 +53,7 @@ "@typescript-eslint/eslint-plugin": "^5.59.2", "@typescript-eslint/parser": "^5.59.2", "eslint": "^8.39.0", -"monaco-editor": "0.38.0", +"monaco-editor": "0.41.0", "react-scripts": "5.0.1", "typescript": "^4.9.5" }, diff --git a/karavan-space/package-lock.json b/karavan-space/package-lock.json index c8f2a906..e6696d93 100644 --- a/karavan-space/package-lock.json +++ b/karavan-space/package-lock.json @@ -10,9 +10,9 @@ "license": "Apache-2.0", "dependencies": { "@monaco-editor/react": "4.5.0", -"@patternfly/patternfly": "4.224.2", -"@patternfly/react-core": "4.276.8", -"@patternfly/react-table": "4.113.0", +"@patternfly/patternfly": "^5.0.2", +"@patternfly/react-core": "^5.0.0", +"@patternfly/react-table": "^5.0.0", "@types/js-yaml": "4.0.5", "@types/node": "18.15.3", "@types/uuid": "9.0.1", @@ -3379,63 +3379,62 @@ "integrity": "sha512-AanzbulOHljrku1NGfafxdpTCfw2ENaWzH01N2vqQM+cUFbk868Cgh0xylz0JIM9BoKbfI++bdD6EYX0Q/UTEw==" }, "node_modules/@patternfly/patternfly": { - "version": "4.224.2", - "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.224.2.tgz;, - "integrity": "sha512-HGNV26uyHSIECuhjPg/WGn0mXbAotcs6ODfhAOkfYjIgGylddgiwElxUe1rpEHV5mQJJ2rMn4OdeJIIpzRX61g==" + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-5.0.2.tgz;, + "integrity": "sha512-PB8+MLdYVgF1hIOxGmnVsZG+YHUX3RePe5W1oMS4gS00EmSgw1cobr1Qbpy/BqqS8/R9DRN4hZ2FKDT0d5tkFQ==" }, "node_modules/@patternfly/react-core": { - "version": "4.276.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.276.8.tgz;, - "integrity": "sha512-dn322rEzBeiVztZEuCZMUUittNb8l1hk30h9ZN31FLZLLVtXGlThFNV9ieqOJYA9zrYxYZrHMkTnOxSWVacMZg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-5.0.0.tgz;, +
[camel-karavan] branch main updated: Fix #859
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 19feb997 Fix #859 19feb997 is described below commit 19feb99710156baac03117e5b9e01cdae03a8920 Author: Marat Gubaidullin AuthorDate: Fri Aug 11 12:32:46 2023 -0400 Fix #859 --- karavan-designer/src/designer/karavan.css | 1 + karavan-space/src/designer/karavan.css | 274 +++-- .../designer/route/property/KubernetesSelector.tsx | 243 -- .../src/main/webui/src/designer/karavan.css| 1 + 4 files changed, 150 insertions(+), 369 deletions(-) diff --git a/karavan-designer/src/designer/karavan.css b/karavan-designer/src/designer/karavan.css index 59a44eda..d0cfcc36 100644 --- a/karavan-designer/src/designer/karavan.css +++ b/karavan-designer/src/designer/karavan.css @@ -1379,6 +1379,7 @@ flex-shrink: unset; flex-grow: 1; background-color: var(--pf-v5-global--BackgroundColor--light-300); +margin-bottom: 100px; } .karavan .designer-page { diff --git a/karavan-space/src/designer/karavan.css b/karavan-space/src/designer/karavan.css index 5bfd3fef..d0cfcc36 100644 --- a/karavan-space/src/designer/karavan.css +++ b/karavan-space/src/designer/karavan.css @@ -35,7 +35,7 @@ } .karavan .header-button { -margin-left: var(--pf-c-page__header-tools--MarginRight); +margin-left: var(--pf-v5-c-page__header-tools--MarginRight); } .karavan .page-header { @@ -43,7 +43,7 @@ justify-content: space-between; } -.karavan .page-header .top-toolbar .pf-c-page__header-tools { +.karavan .page-header .top-toolbar .pf-v5-c-page__header-tools { margin-right: 0; } @@ -51,7 +51,7 @@ width: 100%; } -.karavan .page-header .pf-c-page__header-brand { +.karavan .page-header .pf-v5-c-page__header-brand { padding-right: 16px; } @@ -63,29 +63,29 @@ width: 100%; } -.modal-footer .deploy-buttons .pf-c-form__actions { +.modal-footer .deploy-buttons .pf-v5-c-form__actions { justify-content: flex-end; margin-top: 16px; } -.modal-footer .deploy-buttons .pf-c-button { +.modal-footer .deploy-buttons .pf-v5-c-button { margin-left: 16px; } -.action-buttons .pf-c-form__actions { +.action-buttons .pf-v5-c-form__actions { justify-content: flex-end; margin-top: 16px; } -.action-buttons .pf-c-button { +.action-buttons .pf-v5-c-button { margin-left: 16px; } -.pf-c-modal-box__footer .hidden { +.pf-v5-c-modal-box__footer .hidden { display: none; } -.upload-buttons .pf-c-form__actions { +.upload-buttons .pf-v5-c-form__actions { margin-top: 20px; justify-content: flex-end; } @@ -96,7 +96,7 @@ height: 160px; } -.integration-page .integration-card .pf-c-card__header { +.integration-page .integration-card .pf-v5-c-card__header { padding-right: 6px; } @@ -125,16 +125,26 @@ height: 160px; } -.kamelets-page .kamelet-card .pf-c-card__header .custom { + +.kamelets-page .kamelet-card .pf-v5-c-card__header { +padding-top: var(--pf-v5-global--spacer--sm); +} + +.kamelets-page .kamelet-card .pf-v5-c-card__header .custom { margin-left: auto; } -.kamelets-page .kamelet-card .pf-c-card__title { +.kamelets-page .kamelet-card .pf-v5-c-card__header .pf-v5-c-card__header-main { +display: flex; +flex-direction: row; +} + +.kamelets-page .kamelet-card .pf-v5-c-card__title { font-size: 15px; font-weight: 400; } -.kamelets-page .kamelet-card .pf-c-card__body { +.kamelets-page .kamelet-card .pf-v5-c-card__body { overflow: hidden; position: relative; line-height: 1.6em; @@ -142,7 +152,7 @@ .kamelets-page .kamelet-card .icon { height: 24px; -width: 24px; +max-width: 24px; margin-top: auto; margin-bottom: auto; margin-right: 5px; @@ -184,13 +194,13 @@ } /*kamelet modal*/ -.kamelet-modal-card .pf-c-card__header { +.kamelet-modal-card .pf-v5-c-card__header { padding-right: 6px; display: flex; justify-content: space-between; } -.kamelet-modal-card .pf-c-card__title { +.kamelet-modal-card .pf-v5-c-card__title { font-weight: 600; } @@ -243,7 +253,7 @@ } .karavan .main-tabs .top-menu-item .count { -background: var(--pf-global--active-color--100); +background: var(--pf-v5-global--active-color--100); color: white; height: fit-content; margin-top: auto; @@ -251,12 +261,12 @@ min-width: 0px; } -.karavan .main-tabs .pf-c-tabs__link .pf-c-tabs__item-icon { +.karavan .main-tabs .pf-v5-c-tabs__link .pf-v5-c-tabs__item-icon { height: 24px; margin-right: 0; } -.karavan .main-tabs .pf-c-tabs__item-text { +.karavan .main-tabs .pf-v5-c-tabs__item-text { font-size: 14px; font-weight: bold; margin-top: auto; @@ -279,12 +289,12 @@ margin-bottom: 70px; }
[GitHub] [camel-karavan] mgubaidullin closed issue #859: Karavan Space - Knowledge space - Cannot scroll full way to bottom
mgubaidullin closed issue #859: Karavan Space - Knowledge space - Cannot scroll full way to bottom URL: https://github.com/apache/camel-karavan/issues/859 -- 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 (ea13b5adc27 -> 692c21169ad)
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 ea13b5adc27 [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087) add 692c21169ad Regen for commit 8ff5dee8e9bf944f1bbefbfb88f297b98e2f9976 No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/schemas/camel-spring.xsd | 10421 +++ .../camel/component/kafka/KafkaConfiguration.java |11 - .../org/apache/camel/main/BaseMainSupport.java | 3 - .../java/org/apache/camel/util/SensitiveUtils.java | 2 +- .../org/apache/camel/xml/in/ModelParserTest.java |10 +- 5 files changed, 6155 insertions(+), 4292 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #11090: Generated sources regen
github-actions[bot] opened a new pull request, #11090: URL: https://github.com/apache/camel/pull/11090 Regen bot :robot: found some uncommitted changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated (01f624fd8d -> 5847d118cb)
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 01f624fd8d Extend test coverage of gRPC extension add 5847d118cb Unban com.google.code.findbugs:jsr305 for gRPC extension No new revisions were added by this update. Summary of changes: extensions/grpc/deployment/pom.xml | 6 --- extensions/grpc/pom.xml| 48 ++ extensions/grpc/runtime/pom.xml| 6 --- integration-tests/grpc/pom.xml | 43 +++ ...-banned-dependencies.xsl => allow-findbugs.xsl} | 7 ++-- 5 files changed, 94 insertions(+), 16 deletions(-) copy tooling/enforcer-rules/{quarkus-banned-dependencies.xsl => allow-findbugs.xsl} (78%)
[GitHub] [camel-quarkus] jamesnetherton closed issue #5167: Compilation fails for gRPC applications in dev mode
jamesnetherton closed issue #5167: Compilation fails for gRPC applications in dev mode URL: https://github.com/apache/camel-quarkus/issues/5167 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton merged pull request #5175: Unban com.google.code.findbugs:jsr305 for gRPC extension
jamesnetherton merged PR #5175: URL: https://github.com/apache/camel-quarkus/pull/5175 -- 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 (0bb5315b15 -> 01f624fd8d)
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 0bb5315b15 Add org.mapstruct:mapstruct-processor to the BOM add 5c60c3bbf6 Exclude redundant javassist dependency from camel-grpc add df2bc76eb9 Run docs module build in case Dependabot updates a version property referenced in antora.yml add 01f624fd8d Extend test coverage of gRPC extension No new revisions were added by this update. Summary of changes: .github/workflows/ci-build.yaml| 1 + docs/antora.yml| 2 + .../ROOT/pages/reference/extensions/grpc.adoc | 93 ++- .../component/grpc/deployment/GrpcProcessor.java | 2 + extensions/grpc/runtime/pom.xml| 6 - .../grpc/runtime/src/main/doc/limitations.adoc | 18 -- extensions/grpc/runtime/src/main/doc/usage.adoc| 88 ++ ...Processor.java => CustomClientInterceptor.java} | 31 ++- .../component/grpc/it/CustomServerInterceptor.java | 45 .../quarkus/component/grpc/it/GrpcResource.java| 34 ++- .../camel/quarkus/component/grpc/it/GrpcRoute.java | 141 -- .../quarkus/component/grpc/it/PingPongImpl.java| 38 ++- .../grpc/src/main/resources/application.properties | 2 +- .../grpc/src/main/resources/keys/app.json | 13 + .../component/grpc/it/GrpcServerTestResource.java | 29 +- .../camel/quarkus/component/grpc/it/GrpcTest.java | 294 +++-- poms/bom/pom.xml | 4 + poms/bom/src/main/generated/flattened-full-pom.xml | 4 + .../src/main/generated/flattened-reduced-pom.xml | 4 + .../generated/flattened-reduced-verbose-pom.xml| 4 + 20 files changed, 724 insertions(+), 129 deletions(-) create mode 100644 extensions/grpc/runtime/src/main/doc/usage.adoc copy integration-tests/grpc/src/main/java/org/apache/camel/quarkus/component/grpc/it/{MessageOriginProcessor.java => CustomClientInterceptor.java} (51%) create mode 100644 integration-tests/grpc/src/main/java/org/apache/camel/quarkus/component/grpc/it/CustomServerInterceptor.java create mode 100644 integration-tests/grpc/src/main/resources/keys/app.json
[GitHub] [camel-quarkus] jamesnetherton closed issue #5155: Extend test coverage of gRPC extension
jamesnetherton closed issue #5155: Extend test coverage of gRPC extension URL: https://github.com/apache/camel-quarkus/issues/5155 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton merged pull request #5168: Extend test coverage of gRPC extension
jamesnetherton merged PR #5168: URL: https://github.com/apache/camel-quarkus/pull/5168 -- 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_3x updated (b5f7e3493ac -> 57a6c1ced5c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3x in repository https://gitbox.apache.org/repos/asf/camel.git from b5f7e3493ac docs: remove duplication in DHIS2 component docs (#11074) add e98ab58a7c1 [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087) add 57a6c1ced5c Regen for commit e98ab58a7c11481bb685fb95ed31bb789f53fad7 No new revisions were added by this update. Summary of changes: .../resources/org/apache/camel/catalog/main/sensitive-keys.json | 1 + core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java | 2 ++ .../src/test/java/org/apache/camel/util/SensitiveUtilsTest.java | 1 + .../java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java| 2 +- 4 files changed, 5 insertions(+), 1 deletion(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #11089: Generated sources regen (Camel 3)
github-actions[bot] opened a new pull request, #11089: URL: https://github.com/apache/camel/pull/11089 Regen bot :robot: found some uncommitted changes after running build on :camel: `camel-3` branch. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] davsclaus opened a new issue, #859: Karavan Space - Knowledge space - Cannot scroll full way to bottom
davsclaus opened a new issue, #859: URL: https://github.com/apache/camel-karavan/issues/859 When browsing EIPs, components, etc then when you go to the very bottom, then the last row is cut and you cannot scroll further down. https://github.com/apache/camel-karavan/assets/477100/19b3aa91-3e0e-4fb7-b410-8b63b0c87b44;> -- 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
[GitHub] [camel-karavan] davsclaus opened a new issue, #858: Karavan Space - Add option to override saved file
davsclaus opened a new issue, #858: URL: https://github.com/apache/camel-karavan/issues/858 Would it be possible to have an [x] replace existing file in the karavan space (web designer) so when you save the file it does not save as - example 1 - example 2 - ... When you have a file already. I would like to turn this [x] so I can run jbang in --dev mode and have karavan as a quick prototype UI designer. https://github.com/apache/camel-karavan/assets/477100/4cf799f9-a8ad-44ec-b1cf-bc68eab4d761;> -- 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
[GitHub] [camel-quarkus] ppalaga commented on a diff in pull request #5166: Fix compareVersion in sanity-checks.groovy #5165
ppalaga commented on code in PR #5166: URL: https://github.com/apache/camel-quarkus/pull/5166#discussion_r1291508991 ## tooling/scripts/sanity-checks.groovy: ## @@ -68,10 +68,11 @@ int compareVersion(String a, String b) { List verB = b.tokenize('.') def commonIndices = Math.min(verA.size(), verB.size()) +def versionRegex = ~/\-.*/ for (int i = 0; i < commonIndices; ++i) { def numA = verA[i].toInteger() - def numB = verB[i].toInteger() + def numB = (verB[i] - versionRegex).toInteger() Review Comment: Yeah, I think that would be safer for any future reuse of `compareVersion()` -- 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 (6210686c361 -> ea13b5adc27)
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 6210686c361 camel-test - Make jms test faster (#11086) add 9ea25e4be57 camel-spring - Run test a bit faster with JMX disabled (#11088) add ea13b5adc27 [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087) No new revisions were added by this update. Summary of changes: .../resources/org/apache/camel/catalog/main/sensitive-keys.json | 1 + .../camel/spring/processor/idempotent/FileConsumerIdempotentTest.java | 3 ++- .../src/test/resources/META-INF/spring/camel-context.xml | 1 + .../org/apache/camel/component/bean/AutowireConstructorRouteTest.xml | 1 + .../apache/camel/component/bean/AutowireConstructorRouteTwoTest.xml | 1 + .../apache/camel/component/bean/BeanWithRecipientListTest-context.xml | 1 + .../apache/camel/component/bean/SpringRouteMethodCallStaticTest.xml | 1 + .../resources/org/apache/camel/component/bean/beanBindingTest.xml | 1 + .../test/resources/org/apache/camel/component/bean/camelContext.xml | 1 + .../src/test/resources/org/apache/camel/component/cron/cron.xml | 1 + .../org/apache/camel/component/dataset/SpringDataSetTest-context.xml | 1 + .../test/resources/org/apache/camel/component/event/camelContext.xml | 1 + .../resources/org/apache/camel/component/event/mistypedPackage.xml| 2 ++ .../apache/camel/component/log/SpringCustomLogMaskTest-context.xml| 1 + .../org/apache/camel/component/log/SpringLogMarkerTest-context.xml| 1 + .../org/apache/camel/component/log/SpringLogTest-context.xml | 1 + .../apache/camel/component/log/custom-exchange-formatter-context.xml | 1 + .../properties/CamelSpringPropertyPlaceholderConfigurer2Test.xml | 1 + .../properties/CamelSpringPropertyPlaceholderConfigurer3Test.xml | 1 + .../properties/CamelSpringPropertyPlaceholderConfigurerNestedTest.xml | 1 + .../properties/CamelSpringPropertyPlaceholderConfigurerTest.xml | 1 + .../properties/SpringAttributeNewLineRouteContextRefTest.xml | 1 + .../apache/camel/component/properties/SpringAttributeNewLineTest.xml | 1 + .../camel/component/properties/SpringBuilderRefBeanInjectTest.xml | 1 + .../camel/component/properties/SpringBuilderRefPropertiesTest.xml | 1 + .../camel/component/properties/SpringBuilderRefPropertyInjectTest.xml | 1 + .../properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.xml | 1 + .../properties/SpringErrorHandlerPropertiesPlaceholderTest.xml| 1 + .../camel/component/properties/SpringOptionalPropertiesDslTest.xml| 2 ++ .../component/properties/SpringOptionalPropertiesDslTokenizeTest.xml | 2 ++ .../apache/camel/component/properties/SpringPackagePropertiesTest.xml | 2 +- .../camel/component/properties/SpringPackageScanPropertiesTest.xml| 2 +- .../component/properties/SpringPropertiesAfterTransactedDSL2Test.xml | 1 + .../component/properties/SpringPropertiesAfterTransactedDSLTest.xml | 1 + .../camel/component/properties/SpringPropertiesComponent3Test.xml | 2 ++ .../SpringPropertiesComponentEIPChoiceConvertBodyToTest.xml | 1 + .../properties/SpringPropertiesComponentEIPConvertBodyToTest.xml | 2 ++ .../component/properties/SpringPropertiesComponentFunctionTest.xml| 2 ++ .../properties/SpringPropertiesComponentInterceptFromTest.xml | 1 + .../component/properties/SpringPropertiesComponentOnExceptionTest.xml | 1 + .../camel/component/properties/SpringPropertiesComponentRefTest.xml | 1 + .../camel/component/properties/SpringPropertiesRouteFromTest.xml | 1 + .../apache/camel/component/properties/SpringPropertiesRouteIdTest.xml | 1 + .../properties/SpringPropertyPlaceholderOnExceptionRefTest.xml| 1 + .../test/resources/org/apache/camel/component/rest/RestRefTest.xml| 1 + .../apache/camel/component/rest/SpringFromRestConfigurationTest.xml | 1 + .../org/apache/camel/component/rest/SpringFromRestDuplicateTest.xml | 1 + .../apache/camel/component/rest/SpringFromRestGetInterceptTest.xml| 1 + .../apache/camel/component/rest/SpringFromRestGetOnExceptionTest.xml | 1 + .../camel/component/rest/SpringFromRestGetRouteOnExceptionTest.xml| 1 + .../org/apache/camel/component/rest/SpringFromRestGetTest.xml | 2 ++ .../camel/component/rest/SpringFromRestIdAndDescriptionTest.xml | 2 ++ .../org/apache/camel/component/rest/SpringFromRestUriPrefixTest.xml | 1 + .../resources/org/apache/camel/component/validator/camelContext.xml | 1 + .../org/apache/camel/component/xslt/SpringXsltRouteFileTest.xml | 1 + .../resources/org/apache/camel/component/xslt/SpringXsltRouteTest.xml | 1 + .../org/apache/camel/language/SpringConstantResultTypeTest.xml| 1 + .../org/apache/camel/language/SpringSimpleEmptyStringTest.xml | 1 +
[camel] branch camel-3.20.x updated: [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.20.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.20.x by this push: new 8ff5dee8e9b [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087) 8ff5dee8e9b is described below commit 8ff5dee8e9bf944f1bbefbfb88f297b98e2f9976 Author: Maarten Donderwinkel AuthorDate: Fri Aug 11 17:10:15 2023 +0200 [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087) * Add 'secret' as sensitive key for logging purposes. Will mask environment variables upon usage * Add 'secret' as sensitive key for logging purposes. Will mask environment variables upon usage add 'secret' to Helper file, added SensitiveUtils and sensitive-keys.json files from changes by mvn clean install -DskipTests - Co-authored-by: Maarten Donderwinkel --- .../resources/org/apache/camel/catalog/main/sensitive-keys.json | 1 + .../src/main/java/org/apache/camel/util/SensitiveUtils.java | 4 +++- .../src/test/java/org/apache/camel/util/SensitiveUtilsTest.java | 1 + .../java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json index ccdc434cf56..87ce978a25c 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json @@ -54,6 +54,7 @@ "sascredential", "sasljaasconfig", "sassignature", + "secret", "secretkey", "securerandom", "sharedaccesskey", diff --git a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java index 8414c16966d..f54e681abc9 100644 --- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java +++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java @@ -83,6 +83,7 @@ public final class SensitiveUtils { "sascredential", "sasljaasconfig", "sassignature", +"secret", "secretkey", "securerandom", "sharedaccesskey", @@ -164,6 +165,7 @@ public final class SensitiveUtils { + "|\\Qsascredential\\E" + "|\\Qsasljaasconfig\\E" + "|\\Qsassignature\\E" ++ "|\\Qsecret\\E" + "|\\Qsecretkey\\E" + "|\\Qsecurerandom\\E" + "|\\Qsharedaccesskey\\E" @@ -184,7 +186,7 @@ public final class SensitiveUtils { + "|\\Qverificationcode\\E" + "|\\Qwebhookverifytoken\\E" + "|\\Qzookeeperpassword\\E" -// SENSITIVE-PATTERN: END +// SENSITIVE-PATTERN: END ; private SensitiveUtils() { diff --git a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java index 47ca1d80aa5..8588c4b9024 100644 --- a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java +++ b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java @@ -35,6 +35,7 @@ class SensitiveUtilsTest { assertTrue(SensitiveUtils.containsSensitive("sasljaasconfig")); assertTrue(SensitiveUtils.containsSensitive("sasl-jaas-config")); assertTrue(SensitiveUtils.containsSensitive("saslJaasConfig")); +assertTrue(SensitiveUtils.containsSensitive("secret")); assertTrue(SensitiveUtils.containsSensitive("secretkey")); assertTrue(SensitiveUtils.containsSensitive("secret-key")); assertTrue(SensitiveUtils.containsSensitive("secretKey")); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java index e3c98b49cc3..a650f30a1cc 100644 ---
[camel] branch camel-3.21.x updated: [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.21.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.21.x by this push: new 4cebad7ebfd [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087) 4cebad7ebfd is described below commit 4cebad7ebfd912429ea6e00ef3338a488870b7be Author: Maarten Donderwinkel AuthorDate: Fri Aug 11 17:10:15 2023 +0200 [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087) * Add 'secret' as sensitive key for logging purposes. Will mask environment variables upon usage * Add 'secret' as sensitive key for logging purposes. Will mask environment variables upon usage add 'secret' to Helper file, added SensitiveUtils and sensitive-keys.json files from changes by mvn clean install -DskipTests - Co-authored-by: Maarten Donderwinkel --- .../resources/org/apache/camel/catalog/main/sensitive-keys.json | 1 + .../src/main/java/org/apache/camel/util/SensitiveUtils.java | 4 +++- .../src/test/java/org/apache/camel/util/SensitiveUtilsTest.java | 1 + .../java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json index da2b096023e..c52a7669a8e 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json @@ -55,6 +55,7 @@ "sascredential", "sasljaasconfig", "sassignature", + "secret", "secretkey", "securerandom", "sharedaccesskey", diff --git a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java index b6806bf3ca0..6c57f8d3aa7 100644 --- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java +++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java @@ -84,6 +84,7 @@ public final class SensitiveUtils { "sascredential", "sasljaasconfig", "sassignature", +"secret", "secretkey", "securerandom", "sharedaccesskey", @@ -166,6 +167,7 @@ public final class SensitiveUtils { + "|\\Qsascredential\\E" + "|\\Qsasljaasconfig\\E" + "|\\Qsassignature\\E" ++ "|\\Qsecret\\E" + "|\\Qsecretkey\\E" + "|\\Qsecurerandom\\E" + "|\\Qsharedaccesskey\\E" @@ -186,7 +188,7 @@ public final class SensitiveUtils { + "|\\Qverificationcode\\E" + "|\\Qwebhookverifytoken\\E" + "|\\Qzookeeperpassword\\E" -// SENSITIVE-PATTERN: END +// SENSITIVE-PATTERN: END ; private SensitiveUtils() { diff --git a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java index 47ca1d80aa5..8588c4b9024 100644 --- a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java +++ b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java @@ -35,6 +35,7 @@ class SensitiveUtilsTest { assertTrue(SensitiveUtils.containsSensitive("sasljaasconfig")); assertTrue(SensitiveUtils.containsSensitive("sasl-jaas-config")); assertTrue(SensitiveUtils.containsSensitive("saslJaasConfig")); +assertTrue(SensitiveUtils.containsSensitive("secret")); assertTrue(SensitiveUtils.containsSensitive("secretkey")); assertTrue(SensitiveUtils.containsSensitive("secret-key")); assertTrue(SensitiveUtils.containsSensitive("secretKey")); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java index e3c98b49cc3..a650f30a1cc 100644 ---
[camel] branch camel-3.x updated: [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.x by this push: new e98ab58a7c1 [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087) e98ab58a7c1 is described below commit e98ab58a7c11481bb685fb95ed31bb789f53fad7 Author: Maarten Donderwinkel AuthorDate: Fri Aug 11 17:10:15 2023 +0200 [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087) * Add 'secret' as sensitive key for logging purposes. Will mask environment variables upon usage * Add 'secret' as sensitive key for logging purposes. Will mask environment variables upon usage add 'secret' to Helper file, added SensitiveUtils and sensitive-keys.json files from changes by mvn clean install -DskipTests - Co-authored-by: Maarten Donderwinkel --- .../resources/org/apache/camel/catalog/main/sensitive-keys.json | 1 + .../src/main/java/org/apache/camel/util/SensitiveUtils.java | 4 +++- .../src/test/java/org/apache/camel/util/SensitiveUtilsTest.java | 1 + .../java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json index da2b096023e..c52a7669a8e 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json @@ -55,6 +55,7 @@ "sascredential", "sasljaasconfig", "sassignature", + "secret", "secretkey", "securerandom", "sharedaccesskey", diff --git a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java index b6806bf3ca0..6c57f8d3aa7 100644 --- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java +++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java @@ -84,6 +84,7 @@ public final class SensitiveUtils { "sascredential", "sasljaasconfig", "sassignature", +"secret", "secretkey", "securerandom", "sharedaccesskey", @@ -166,6 +167,7 @@ public final class SensitiveUtils { + "|\\Qsascredential\\E" + "|\\Qsasljaasconfig\\E" + "|\\Qsassignature\\E" ++ "|\\Qsecret\\E" + "|\\Qsecretkey\\E" + "|\\Qsecurerandom\\E" + "|\\Qsharedaccesskey\\E" @@ -186,7 +188,7 @@ public final class SensitiveUtils { + "|\\Qverificationcode\\E" + "|\\Qwebhookverifytoken\\E" + "|\\Qzookeeperpassword\\E" -// SENSITIVE-PATTERN: END +// SENSITIVE-PATTERN: END ; private SensitiveUtils() { diff --git a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java index 47ca1d80aa5..8588c4b9024 100644 --- a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java +++ b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java @@ -35,6 +35,7 @@ class SensitiveUtilsTest { assertTrue(SensitiveUtils.containsSensitive("sasljaasconfig")); assertTrue(SensitiveUtils.containsSensitive("sasl-jaas-config")); assertTrue(SensitiveUtils.containsSensitive("saslJaasConfig")); +assertTrue(SensitiveUtils.containsSensitive("secret")); assertTrue(SensitiveUtils.containsSensitive("secretkey")); assertTrue(SensitiveUtils.containsSensitive("secret-key")); assertTrue(SensitiveUtils.containsSensitive("secretKey")); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java index e3c98b49cc3..a650f30a1cc 100644 ---
[camel] branch camel-4.0.x updated: [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-4.0.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-4.0.x by this push: new e1ee9241846 [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087) e1ee9241846 is described below commit e1ee9241846e8c309d72819f2ad221dbc30a Author: Maarten Donderwinkel AuthorDate: Fri Aug 11 17:10:15 2023 +0200 [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087) * Add 'secret' as sensitive key for logging purposes. Will mask environment variables upon usage * Add 'secret' as sensitive key for logging purposes. Will mask environment variables upon usage add 'secret' to Helper file, added SensitiveUtils and sensitive-keys.json files from changes by mvn clean install -DskipTests - Co-authored-by: Maarten Donderwinkel --- .../resources/org/apache/camel/catalog/main/sensitive-keys.json | 1 + .../src/main/java/org/apache/camel/util/SensitiveUtils.java | 4 +++- .../src/test/java/org/apache/camel/util/SensitiveUtilsTest.java | 1 + .../java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json index d29c3718b60..8ca7ecace56 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json @@ -52,6 +52,7 @@ "sascredential", "sasljaasconfig", "sassignature", + "secret", "secretkey", "securerandom", "sharedaccesskey", diff --git a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java index 265ffb1fc92..0288b00652c 100644 --- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java +++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java @@ -81,6 +81,7 @@ public final class SensitiveUtils { "sascredential", "sasljaasconfig", "sassignature", +"secret", "secretkey", "securerandom", "sharedaccesskey", @@ -159,6 +160,7 @@ public final class SensitiveUtils { + "|\\Qsascredential\\E" + "|\\Qsasljaasconfig\\E" + "|\\Qsassignature\\E" ++ "|\\Qsecret\\E" + "|\\Qsecretkey\\E" + "|\\Qsecurerandom\\E" + "|\\Qsharedaccesskey\\E" @@ -178,7 +180,7 @@ public final class SensitiveUtils { + "|\\Qverificationcode\\E" + "|\\Qwebhookverifytoken\\E" + "|\\Qzookeeperpassword\\E" -// SENSITIVE-PATTERN: END +// SENSITIVE-PATTERN: END ; private SensitiveUtils() { diff --git a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java index 47ca1d80aa5..8588c4b9024 100644 --- a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java +++ b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java @@ -35,6 +35,7 @@ class SensitiveUtilsTest { assertTrue(SensitiveUtils.containsSensitive("sasljaasconfig")); assertTrue(SensitiveUtils.containsSensitive("sasl-jaas-config")); assertTrue(SensitiveUtils.containsSensitive("saslJaasConfig")); +assertTrue(SensitiveUtils.containsSensitive("secret")); assertTrue(SensitiveUtils.containsSensitive("secretkey")); assertTrue(SensitiveUtils.containsSensitive("secret-key")); assertTrue(SensitiveUtils.containsSensitive("secretKey")); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java index e3c98b49cc3..a650f30a1cc 100644 ---
[camel] branch main updated: [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new ea13b5adc27 [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087) ea13b5adc27 is described below commit ea13b5adc2739b6e769bf7bc9d307756bb6b8527 Author: Maarten Donderwinkel AuthorDate: Fri Aug 11 17:10:15 2023 +0200 [CAMEL-19736] Add 'secret' as sensitive key for logging purposes. (#11087) * Add 'secret' as sensitive key for logging purposes. Will mask environment variables upon usage * Add 'secret' as sensitive key for logging purposes. Will mask environment variables upon usage add 'secret' to Helper file, added SensitiveUtils and sensitive-keys.json files from changes by mvn clean install -DskipTests - Co-authored-by: Maarten Donderwinkel --- .../resources/org/apache/camel/catalog/main/sensitive-keys.json | 1 + .../src/main/java/org/apache/camel/util/SensitiveUtils.java | 4 +++- .../src/test/java/org/apache/camel/util/SensitiveUtilsTest.java | 1 + .../java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json index d29c3718b60..8ca7ecace56 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/sensitive-keys.json @@ -52,6 +52,7 @@ "sascredential", "sasljaasconfig", "sassignature", + "secret", "secretkey", "securerandom", "sharedaccesskey", diff --git a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java index 265ffb1fc92..0288b00652c 100644 --- a/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java +++ b/core/camel-util/src/main/java/org/apache/camel/util/SensitiveUtils.java @@ -81,6 +81,7 @@ public final class SensitiveUtils { "sascredential", "sasljaasconfig", "sassignature", +"secret", "secretkey", "securerandom", "sharedaccesskey", @@ -159,6 +160,7 @@ public final class SensitiveUtils { + "|\\Qsascredential\\E" + "|\\Qsasljaasconfig\\E" + "|\\Qsassignature\\E" ++ "|\\Qsecret\\E" + "|\\Qsecretkey\\E" + "|\\Qsecurerandom\\E" + "|\\Qsharedaccesskey\\E" @@ -178,7 +180,7 @@ public final class SensitiveUtils { + "|\\Qverificationcode\\E" + "|\\Qwebhookverifytoken\\E" + "|\\Qzookeeperpassword\\E" -// SENSITIVE-PATTERN: END +// SENSITIVE-PATTERN: END ; private SensitiveUtils() { diff --git a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java index 47ca1d80aa5..8588c4b9024 100644 --- a/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java +++ b/core/camel-util/src/test/java/org/apache/camel/util/SensitiveUtilsTest.java @@ -35,6 +35,7 @@ class SensitiveUtilsTest { assertTrue(SensitiveUtils.containsSensitive("sasljaasconfig")); assertTrue(SensitiveUtils.containsSensitive("sasl-jaas-config")); assertTrue(SensitiveUtils.containsSensitive("saslJaasConfig")); +assertTrue(SensitiveUtils.containsSensitive("secret")); assertTrue(SensitiveUtils.containsSensitive("secretkey")); assertTrue(SensitiveUtils.containsSensitive("secret-key")); assertTrue(SensitiveUtils.containsSensitive("secretKey")); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java index e3c98b49cc3..a650f30a1cc 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java +++
[GitHub] [camel] davsclaus merged pull request #11088: camel-spring - Run test a bit faster with JMX disabled
davsclaus merged PR #11088: URL: https://github.com/apache/camel/pull/11088 -- 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 (6210686c361 -> 9ea25e4be57)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 6210686c361 camel-test - Make jms test faster (#11086) add 9ea25e4be57 camel-spring - Run test a bit faster with JMX disabled (#11088) No new revisions were added by this update. Summary of changes: .../camel/spring/processor/idempotent/FileConsumerIdempotentTest.java | 3 ++- .../src/test/resources/META-INF/spring/camel-context.xml | 1 + .../org/apache/camel/component/bean/AutowireConstructorRouteTest.xml | 1 + .../apache/camel/component/bean/AutowireConstructorRouteTwoTest.xml| 1 + .../apache/camel/component/bean/BeanWithRecipientListTest-context.xml | 1 + .../apache/camel/component/bean/SpringRouteMethodCallStaticTest.xml| 1 + .../test/resources/org/apache/camel/component/bean/beanBindingTest.xml | 1 + .../test/resources/org/apache/camel/component/bean/camelContext.xml| 1 + .../src/test/resources/org/apache/camel/component/cron/cron.xml| 1 + .../org/apache/camel/component/dataset/SpringDataSetTest-context.xml | 1 + .../test/resources/org/apache/camel/component/event/camelContext.xml | 1 + .../resources/org/apache/camel/component/event/mistypedPackage.xml | 2 ++ .../org/apache/camel/component/log/SpringCustomLogMaskTest-context.xml | 1 + .../org/apache/camel/component/log/SpringLogMarkerTest-context.xml | 1 + .../resources/org/apache/camel/component/log/SpringLogTest-context.xml | 1 + .../apache/camel/component/log/custom-exchange-formatter-context.xml | 1 + .../properties/CamelSpringPropertyPlaceholderConfigurer2Test.xml | 1 + .../properties/CamelSpringPropertyPlaceholderConfigurer3Test.xml | 1 + .../properties/CamelSpringPropertyPlaceholderConfigurerNestedTest.xml | 1 + .../properties/CamelSpringPropertyPlaceholderConfigurerTest.xml| 1 + .../component/properties/SpringAttributeNewLineRouteContextRefTest.xml | 1 + .../apache/camel/component/properties/SpringAttributeNewLineTest.xml | 1 + .../camel/component/properties/SpringBuilderRefBeanInjectTest.xml | 1 + .../camel/component/properties/SpringBuilderRefPropertiesTest.xml | 1 + .../camel/component/properties/SpringBuilderRefPropertyInjectTest.xml | 1 + .../properties/SpringErrorHandlerInlinedPropertiesPlaceholderTest.xml | 1 + .../properties/SpringErrorHandlerPropertiesPlaceholderTest.xml | 1 + .../camel/component/properties/SpringOptionalPropertiesDslTest.xml | 2 ++ .../component/properties/SpringOptionalPropertiesDslTokenizeTest.xml | 2 ++ .../apache/camel/component/properties/SpringPackagePropertiesTest.xml | 2 +- .../camel/component/properties/SpringPackageScanPropertiesTest.xml | 2 +- .../component/properties/SpringPropertiesAfterTransactedDSL2Test.xml | 1 + .../component/properties/SpringPropertiesAfterTransactedDSLTest.xml| 1 + .../camel/component/properties/SpringPropertiesComponent3Test.xml | 2 ++ .../properties/SpringPropertiesComponentEIPChoiceConvertBodyToTest.xml | 1 + .../properties/SpringPropertiesComponentEIPConvertBodyToTest.xml | 2 ++ .../component/properties/SpringPropertiesComponentFunctionTest.xml | 2 ++ .../properties/SpringPropertiesComponentInterceptFromTest.xml | 1 + .../component/properties/SpringPropertiesComponentOnExceptionTest.xml | 1 + .../camel/component/properties/SpringPropertiesComponentRefTest.xml| 1 + .../camel/component/properties/SpringPropertiesRouteFromTest.xml | 1 + .../apache/camel/component/properties/SpringPropertiesRouteIdTest.xml | 1 + .../properties/SpringPropertyPlaceholderOnExceptionRefTest.xml | 1 + .../src/test/resources/org/apache/camel/component/rest/RestRefTest.xml | 1 + .../apache/camel/component/rest/SpringFromRestConfigurationTest.xml| 1 + .../org/apache/camel/component/rest/SpringFromRestDuplicateTest.xml| 1 + .../org/apache/camel/component/rest/SpringFromRestGetInterceptTest.xml | 1 + .../apache/camel/component/rest/SpringFromRestGetOnExceptionTest.xml | 1 + .../camel/component/rest/SpringFromRestGetRouteOnExceptionTest.xml | 1 + .../org/apache/camel/component/rest/SpringFromRestGetTest.xml | 2 ++ .../apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.xml | 2 ++ .../org/apache/camel/component/rest/SpringFromRestUriPrefixTest.xml| 1 + .../resources/org/apache/camel/component/validator/camelContext.xml| 1 + .../org/apache/camel/component/xslt/SpringXsltRouteFileTest.xml| 1 + .../resources/org/apache/camel/component/xslt/SpringXsltRouteTest.xml | 1 + .../org/apache/camel/language/SpringConstantResultTypeTest.xml | 1 + .../org/apache/camel/language/SpringSimpleEmptyStringTest.xml | 1 + .../resources/org/apache/camel/language/SpringSimpleExpressionTest.xml | 1 + .../org/apache/camel/language/SpringSimpleMultiLineExpressionTest.xml |
[camel] branch spring-fast deleted (was 6de14b113d6)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch spring-fast in repository https://gitbox.apache.org/repos/asf/camel.git was 6de14b113d6 Fix flaky test The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[GitHub] [camel] davsclaus commented on pull request #11076: [Camel-18635] Added ability to generate route coverage reports in HTML and XLSX format
davsclaus commented on PR #11076: URL: https://github.com/apache/camel/pull/11076#issuecomment-1674933450 Its a large PR - I wonder if you have considered a PR with the Excel first, and then for HTML later where we need to find a way to have a HTML page that is easy for others to maintain and don't require online access to 3rd party CSS -- 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 spring-fast updated (c0c41330a94 -> 6de14b113d6)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch spring-fast in repository https://gitbox.apache.org/repos/asf/camel.git from c0c41330a94 camel-spring - Run test a bit faster with JMX disabled add 6de14b113d6 Fix flaky test No new revisions were added by this update. Summary of changes: .../camel/spring/processor/idempotent/FileConsumerIdempotentTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[camel] branch regen_bot updated (5ba5be16400 -> 6210686c361)
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 5ba5be16400 camel-itest - Make sql test a bit faster (#11085) add 6210686c361 camel-test - Make jms test faster (#11086) No new revisions were added by this update. Summary of changes: .../apache/camel/itest/jms/JmsConsumerShutdownTest.java | 15 --- .../org/apache/camel/itest/jms/JmsJettyAsyncTest.java | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-)
[camel] branch regen_bot updated (e47a7a1d766 -> 5ba5be16400)
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 e47a7a1d766 camel-core - Run test faster (#11083) add 045bd3adb7a camel-sjms - Run test fast that was waiting for a latch with a wrong count (#11082) add 8844de4d587 Some more components can test in parallel (#11084) add efd3ae2679f Run a bit faster add 5ba5be16400 camel-itest - Make sql test a bit faster (#11085) No new revisions were added by this update. Summary of changes: components/camel-freemarker/pom.xml | 1 + components/camel-mvel/pom.xml | 1 + components/camel-ognl/pom.xml | 1 + components/camel-resilience4j/pom.xml | 3 +-- .../camel/component/sjms/tx/TransactedConsumerSupport.java | 13 - components/camel-stringtemplate/pom.xml | 1 + components/camel-velocity/pom.xml | 4 .../itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java | 6 +++--- 8 files changed, 20 insertions(+), 10 deletions(-)
[camel-karavan] branch main updated: Tracking upgrade patternfly (#853)
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 2c1082a9 Tracking upgrade patternfly (#853) 2c1082a9 is described below commit 2c1082a974e0e3217ca92b60ecd9994e77d9d476 Author: Stefan Huber AuthorDate: Fri Aug 11 16:30:35 2023 +0200 Tracking upgrade patternfly (#853) * upgrade packages, use codemods fix * fix all compile errors, added TODOs in the code for clarification * left vertical menu styling fixed with v5 prefixes * fix bean property editing * Fix errors for #833 * Fix styles for #833 * Fix TODOs for #833 * remove unused import - Co-authored-by: Stefan Huber Co-authored-by: Marat Gubaidullin --- karavan-designer/package-lock.json | 174 + karavan-designer/package.json | 6 +- karavan-designer/src/App.tsx | 3 +- karavan-designer/src/DesignerPage.tsx | 6 +- .../src/designer/beans/BeanProperties.tsx | 37 +-- karavan-designer/src/designer/karavan.css | 273 +++-- .../src/designer/rest/RestMethodSelector.tsx | 2 +- karavan-designer/src/designer/route/DslElement.tsx | 8 +- .../src/designer/route/DslProperties.tsx | 4 +- .../src/designer/route/DslSelector.tsx | 10 +- .../src/designer/route/RouteDesigner.tsx | 2 +- .../route/property/ComponentParameterField.tsx | 49 ++-- .../designer/route/property/DataFormatField.tsx| 19 +- .../designer/route/property/DslPropertyField.tsx | 112 + .../designer/route/property/ExpressionField.tsx| 26 +- .../route/property/InfrastructureSelector.tsx | 22 +- .../route/property/KameletPropertyField.tsx| 10 +- .../src/designer/route/property/ModalEditor.tsx| 6 +- .../src/designer/templates/TemplatesDesigner.tsx | 7 +- .../src/designer/utils/KaravanComponents.tsx | 4 +- karavan-designer/src/index.css | 24 +- .../src/knowledgebase/KnowledgebasePage.tsx| 4 +- .../knowledgebase/components/ComponentModal.tsx| 15 +- karavan-designer/src/knowledgebase/eip/EipCard.tsx | 6 +- .../src/knowledgebase/eip/EipModal.tsx | 15 +- .../src/knowledgebase/kamelets/KameletCard.tsx | 2 +- .../src/knowledgebase/kamelets/KameletModal.tsx| 15 +- 27 files changed, 432 insertions(+), 429 deletions(-) diff --git a/karavan-designer/package-lock.json b/karavan-designer/package-lock.json index 565ad220..a9956967 100644 --- a/karavan-designer/package-lock.json +++ b/karavan-designer/package-lock.json @@ -1,18 +1,18 @@ { "name": "karavan-designer", - "version": "3.21.1-SNAPSHOT", + "version": "4.0.0-RC2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "karavan-designer", - "version": "3.21.1-SNAPSHOT", + "version": "4.0.0-RC2", "license": "Apache-2.0", "dependencies": { "@monaco-editor/react": "4.5.0", -"@patternfly/patternfly": "4.224.2", -"@patternfly/react-core": "4.276.8", -"@patternfly/react-table": "4.113.0", +"@patternfly/patternfly": "^5.0.2", +"@patternfly/react-core": "^5.0.0", +"@patternfly/react-table": "^5.0.0", "@types/js-yaml": "4.0.5", "@types/node": "18.16.3", "@types/uuid": "9.0.1", @@ -42,7 +42,7 @@ } }, "../karavan-core": { - "version": "3.21.1-SNAPSHOT", + "version": "4.0.0-RC2", "license": "Apache-2.0", "dependencies": { "@types/js-yaml": "^4.0.5", @@ -3255,63 +3255,62 @@ } }, "node_modules/@patternfly/patternfly": { - "version": "4.224.2", - "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-4.224.2.tgz;, - "integrity": "sha512-HGNV26uyHSIECuhjPg/WGn0mXbAotcs6ODfhAOkfYjIgGylddgiwElxUe1rpEHV5mQJJ2rMn4OdeJIIpzRX61g==" + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@patternfly/patternfly/-/patternfly-5.0.2.tgz;, + "integrity": "sha512-PB8+MLdYVgF1hIOxGmnVsZG+YHUX3RePe5W1oMS4gS00EmSgw1cobr1Qbpy/BqqS8/R9DRN4hZ2FKDT0d5tkFQ==" }, "node_modules/@patternfly/react-core": { - "version": "4.276.8", - "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-4.276.8.tgz;, - "integrity": "sha512-dn322rEzBeiVztZEuCZMUUittNb8l1hk30h9ZN31FLZLLVtXGlThFNV9ieqOJYA9zrYxYZrHMkTnOxSWVacMZg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@patternfly/react-core/-/react-core-5.0.0.tgz;, + "integrity": "sha512-kewRVFhLw0Dvt8250pqrO47sVRx8E93sMGZbHQomJnZdachYeQ9STnQTP2gvOBq/GPnMei0LZLv0T99g8mPE4w==",
[GitHub] [camel-karavan] mgubaidullin merged pull request #853: Tracking upgrade patternfly
mgubaidullin merged PR #853: URL: https://github.com/apache/camel-karavan/pull/853 -- 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 (5ba5be16400 -> 6210686c361)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 5ba5be16400 camel-itest - Make sql test a bit faster (#11085) add 6210686c361 camel-test - Make jms test faster (#11086) No new revisions were added by this update. Summary of changes: .../apache/camel/itest/jms/JmsConsumerShutdownTest.java | 15 --- .../org/apache/camel/itest/jms/JmsJettyAsyncTest.java | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-)
[camel] branch main updated: camel-itest - Make sql test a bit faster (#11085)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 5ba5be16400 camel-itest - Make sql test a bit faster (#11085) 5ba5be16400 is described below commit 5ba5be164008abed3956adc65cac86f36c832c9a Author: Claus Ibsen AuthorDate: Fri Aug 11 16:26:37 2023 +0200 camel-itest - Make sql test a bit faster (#11085) --- .../camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java index cde02d59868..5b039929cdd 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java @@ -124,7 +124,7 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest extends CamelSpringTestSup // check that there is no message in the database and JMS queue assertEquals(0, jdbcTemplate.queryForObject("select count(*) from CAMEL_MESSAGEPROCESSED", int.class)); -assertNull(consumer.receiveBody("activemq2:queue:outbox", 3000)); +assertNull(consumer.receiveBody("activemq2:queue:outbox", 100)); } @Test @@ -152,7 +152,7 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest extends CamelSpringTestSup // check that there is no message in the database and JMS queue assertEquals(0, jdbcTemplate.queryForObject("select count(*) from CAMEL_MESSAGEPROCESSED", int.class)); -assertNull(consumer.receiveBody("activemq2:queue:outbox", 3000)); +assertNull(consumer.receiveBody("activemq2:queue:outbox", 100)); } @Test @@ -218,7 +218,7 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest extends CamelSpringTestSup protected void checkInitialState() { // check there are no messages in the database and JMS queue assertEquals(0, jdbcTemplate.queryForObject("select count(*) from CAMEL_MESSAGEPROCESSED", int.class)); -assertNull(consumer.receiveBody("activemq2:queue:outbox", 2000)); +assertNull(consumer.receiveBody("activemq2:queue:outbox", 100)); } @Override
[camel] branch itest-jms deleted (was ecc8eea789f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch itest-jms in repository https://gitbox.apache.org/repos/asf/camel.git was ecc8eea789f camel-test - Make jms test faster The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch itest-sql deleted (was 75980463673)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch itest-sql in repository https://gitbox.apache.org/repos/asf/camel.git was 75980463673 camel-itest - Make sql test a bit faster The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[GitHub] [camel] davsclaus commented on pull request #11087: [CAMEL-19736] Add 'secret' as sensitive key for logging purposes.
davsclaus commented on PR #11087: URL: https://github.com/apache/camel/pull/11087#issuecomment-1674883391 yes add it to extra keys, and keep the test as we want to ensure its in the generated source code -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11088: camel-spring - Run test a bit faster with JMX disabled
github-actions[bot] commented on PR #11088: URL: https://github.com/apache/camel/pull/11088#issuecomment-1674881894 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- 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 spring-fast created (now c0c41330a94)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch spring-fast in repository https://gitbox.apache.org/repos/asf/camel.git at c0c41330a94 camel-spring - Run test a bit faster with JMX disabled This branch includes the following new commits: new c0c41330a94 camel-spring - Run test a bit faster with JMX disabled The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[GitHub] [camel] davsclaus opened a new pull request, #11088: camel-spring - Run test a bit faster with JMX disabled
davsclaus opened a new pull request, #11088: URL: https://github.com/apache/camel/pull/11088 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] maarten-donderwinkel commented on pull request #11087: [CAMEL-19736] Add 'secret' as sensitive key for logging purposes.
maarten-donderwinkel commented on PR #11087: URL: https://github.com/apache/camel/pull/11087#issuecomment-1674876403 > the file is generated > > ``` > // Generated by camel build tools - do NOT edit this list! > // SENSITIVE-KEYS: START > ``` > > Search for `SENSITIVE-KEYS: START` and find the source generator that does this, and add the secret into it there Will do, should the line also be removed from the test? And as I'm not a 100% sure you mean adding this to the EXTRA KEYS in UpdateSensitizeHelper right? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] branch regen_bot updated (24ece345 -> 5d82d6f8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git omit 24ece345 Regen for commit 52e4fdb0e7aaa9e7b0ef0d6525321fdb8f385aa9 add 345fef3c Updated CHANGELOG.md add 5d82d6f8 Regen for commit 52e4fdb0e7aaa9e7b0ef0d6525321fdb8f385aa9 (#1567) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (24ece345) \ N -- N -- N refs/heads/regen_bot (5d82d6f8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: CHANGELOG.md | 1 + 1 file changed, 1 insertion(+)
[GitHub] [camel] github-actions[bot] commented on pull request #11087: [CAMEL-19736] Add 'secret' as sensitive key for logging purposes.
github-actions[bot] commented on PR #11087: URL: https://github.com/apache/camel/pull/11087#issuecomment-1674846914 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] maarten-donderwinkel opened a new pull request, #11087: [CAMEL-19736] Add 'secret' as sensitive key for logging purposes.
maarten-donderwinkel opened a new pull request, #11087: URL: https://github.com/apache/camel/pull/11087 # Description Add 'secret' as sensitive data for masking purposes in logs. Often we us 'secret' as (last) part of an environmentVariable especially if that matches the naming convention of an external party to keep easier overview of application & variables. However these values aren't masked in the logging (as username/password are). Add 'secret' as potentially sensitive data. # 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 [CAMEL-19736](https://issues.apache.org/jira/browse/CAMEL-19736) # 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-kamelets] branch main updated: Regen for commit 52e4fdb0e7aaa9e7b0ef0d6525321fdb8f385aa9 (#1567)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git The following commit(s) were added to refs/heads/main by this push: new 5d82d6f8 Regen for commit 52e4fdb0e7aaa9e7b0ef0d6525321fdb8f385aa9 (#1567) 5d82d6f8 is described below commit 5d82d6f8e821f239efc3be6cf5249884d6a7a23e Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Aug 11 16:01:51 2023 +0200 Regen for commit 52e4fdb0e7aaa9e7b0ef0d6525321fdb8f385aa9 (#1567) Signed-off-by: GitHub Co-authored-by: orpiske --- kamelets/jms-apache-artemis-sink.kamelet.yaml | 2 +- kamelets/jms-apache-artemis-source.kamelet.yaml | 2 +- .../src/main/resources/kamelets/jms-apache-artemis-sink.kamelet.yaml| 2 +- .../src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kamelets/jms-apache-artemis-sink.kamelet.yaml b/kamelets/jms-apache-artemis-sink.kamelet.yaml index ce9d69dc..b4141596 100644 --- a/kamelets/jms-apache-artemis-sink.kamelet.yaml +++ b/kamelets/jms-apache-artemis-sink.kamelet.yaml @@ -55,7 +55,7 @@ spec: dependencies: - "camel:jms" - "camel:kamelet" - - "mvn:org.apache.activemq:artemis-jms-client-all:2.28.0" + - "mvn:org.apache.activemq:artemis-jms-client-all:2.30.0" template: beans: - name: connectionFactoryBean diff --git a/kamelets/jms-apache-artemis-source.kamelet.yaml b/kamelets/jms-apache-artemis-source.kamelet.yaml index 5e538ca2..f4c6e53d 100644 --- a/kamelets/jms-apache-artemis-source.kamelet.yaml +++ b/kamelets/jms-apache-artemis-source.kamelet.yaml @@ -54,7 +54,7 @@ spec: dependencies: - "camel:jms" - "camel:kamelet" - - "mvn:org.apache.activemq:artemis-jms-client-all:2.28.0" + - "mvn:org.apache.activemq:artemis-jms-client-all:2.30.0" template: beans: - name: connectionFactoryBean diff --git a/library/camel-kamelets/src/main/resources/kamelets/jms-apache-artemis-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/jms-apache-artemis-sink.kamelet.yaml index ce9d69dc..b4141596 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/jms-apache-artemis-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/jms-apache-artemis-sink.kamelet.yaml @@ -55,7 +55,7 @@ spec: dependencies: - "camel:jms" - "camel:kamelet" - - "mvn:org.apache.activemq:artemis-jms-client-all:2.28.0" + - "mvn:org.apache.activemq:artemis-jms-client-all:2.30.0" template: beans: - name: connectionFactoryBean diff --git a/library/camel-kamelets/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml index 5e538ca2..f4c6e53d 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/jms-apache-artemis-source.kamelet.yaml @@ -54,7 +54,7 @@ spec: dependencies: - "camel:jms" - "camel:kamelet" - - "mvn:org.apache.activemq:artemis-jms-client-all:2.28.0" + - "mvn:org.apache.activemq:artemis-jms-client-all:2.30.0" template: beans: - name: connectionFactoryBean
[GitHub] [camel-kamelets] oscerd merged pull request #1567: Generated sources regen
oscerd merged PR #1567: URL: https://github.com/apache/camel-kamelets/pull/1567 -- 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: Run a bit faster
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new efd3ae2679f Run a bit faster efd3ae2679f is described below commit efd3ae2679f80669edfbc3234ee14f255418306a Author: Claus Ibsen AuthorDate: Fri Aug 11 15:48:20 2023 +0200 Run a bit faster --- components/camel-resilience4j/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/camel-resilience4j/pom.xml b/components/camel-resilience4j/pom.xml index f487e2ee584..b2829b2fe78 100644 --- a/components/camel-resilience4j/pom.xml +++ b/components/camel-resilience4j/pom.xml @@ -35,8 +35,7 @@ 3.0.0 eip,microservice - -4 +true
[camel] branch par deleted (was d0419c09ba1)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch par in repository https://gitbox.apache.org/repos/asf/camel.git was d0419c09ba1 Some more components can test in parallel The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch regen_bot updated (b2bd16f255d -> e47a7a1d766)
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 b2bd16f255d CAMEL-19735: use singleton services to speed up camel-rocketmq tests (#11081) add e47a7a1d766 camel-core - Run test faster (#11083) No new revisions were added by this update. Summary of changes: .../file/cluster/FileLockClusteredRoutePolicyFactoryTest.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-)
[camel] branch main updated (045bd3adb7a -> 8844de4d587)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 045bd3adb7a camel-sjms - Run test fast that was waiting for a latch with a wrong count (#11082) add 8844de4d587 Some more components can test in parallel (#11084) No new revisions were added by this update. Summary of changes: components/camel-freemarker/pom.xml | 1 + components/camel-mvel/pom.xml | 1 + components/camel-ognl/pom.xml | 1 + components/camel-stringtemplate/pom.xml | 1 + components/camel-velocity/pom.xml | 4 5 files changed, 8 insertions(+)
[GitHub] [camel] davsclaus merged pull request #11084: Some more components can test in parallel
davsclaus merged PR #11084: URL: https://github.com/apache/camel/pull/11084 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus opened a new pull request, #11086: camel-test - Make jms test faster
davsclaus opened a new pull request, #11086: URL: https://github.com/apache/camel/pull/11086 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: camel-test - Make jms test faster
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch itest-jms in repository https://gitbox.apache.org/repos/asf/camel.git commit ecc8eea789ffd930779aa7bfada8193a021f6d07 Author: Claus Ibsen AuthorDate: Fri Aug 11 15:43:34 2023 +0200 camel-test - Make jms test faster --- .../apache/camel/itest/jms/JmsConsumerShutdownTest.java | 15 --- .../org/apache/camel/itest/jms/JmsJettyAsyncTest.java | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsConsumerShutdownTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsConsumerShutdownTest.java index 18258486f42..d7fd0125ddf 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsConsumerShutdownTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsConsumerShutdownTest.java @@ -16,6 +16,7 @@ */ package org.apache.camel.itest.jms; +import org.apache.camel.CamelContext; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.Processor; @@ -27,6 +28,7 @@ import org.apache.camel.itest.utils.extensions.JmsServiceExtension; import org.apache.camel.test.spring.junit5.CamelSpringTest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; @@ -36,6 +38,9 @@ public class JmsConsumerShutdownTest { @RegisterExtension public static JmsServiceExtension jmsServiceExtension = JmsServiceExtension.createExtension(); +@Autowired +CamelContext camelContext; + @Produce("jms:start") protected ProducerTemplate activemq; @@ -51,8 +56,10 @@ public class JmsConsumerShutdownTest { @Test @DirtiesContext void testJmsConsumerShutdownWithMessageInFlight() throws InterruptedException { +camelContext.getShutdownStrategy().setTimeout(3); + end.expectedMessageCount(0); -end.setResultWaitTime(2000); +end.setResultWaitTime(1000); // direct:dir route always fails exception.whenAnyExchangeReceived(new Processor() { @@ -71,8 +78,10 @@ public class JmsConsumerShutdownTest { @Test @DirtiesContext void testSedaConsumerShutdownWithMessageInFlight() throws InterruptedException { +camelContext.getShutdownStrategy().setTimeout(3); + end.expectedMessageCount(0); -end.setResultWaitTime(2000); +end.setResultWaitTime(1000); // direct:dir route always fails exception.whenAnyExchangeReceived(new Processor() { @@ -100,7 +109,7 @@ public class JmsConsumerShutdownTest { from("direct:dir") .onException(Exception.class) -.redeliveryDelay(1000) +.redeliveryDelay(500) .maximumRedeliveries(-1) // forever .end() .to("mock:exception"); diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java index 01e170fd71d..15d958c8f3a 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJettyAsyncTest.java @@ -62,7 +62,7 @@ public class JmsJettyAsyncTest extends CamelTestSupport { .to("log:result?groupSize=10", "mock:result"); from("jetty:http://0.0.0.0:; + port + "/myapp") -.delay(100) +.delay(10) .transform(body().prepend("Bye ")); } };
[camel] branch itest-jms created (now ecc8eea789f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch itest-jms in repository https://gitbox.apache.org/repos/asf/camel.git at ecc8eea789f camel-test - Make jms test faster This branch includes the following new commits: new ecc8eea789f camel-test - Make jms test faster The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[GitHub] [camel-k] github-actions[bot] commented on pull request #4665: feat(ctrl): confimap and secret hot reload
github-actions[bot] commented on PR #4665: URL: https://github.com/apache/camel-k/pull/4665#issuecomment-1674809404 :camel: **Thank you for contributing!** Code Coverage Report :warning: - Coverage changed: 39.2% --> 39.0% (Coverage difference: **-.2%**) -- 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-sjms - Run test fast that was waiting for a latch with a wrong count (#11082)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 045bd3adb7a camel-sjms - Run test fast that was waiting for a latch with a wrong count (#11082) 045bd3adb7a is described below commit 045bd3adb7af218d4f2519d0b21dfa7fd78cd77c Author: Claus Ibsen AuthorDate: Fri Aug 11 15:31:15 2023 +0200 camel-sjms - Run test fast that was waiting for a latch with a wrong count (#11082) --- .../camel/component/sjms/tx/TransactedConsumerSupport.java | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java index 09c1980f39e..8c2c312df71 100644 --- a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java +++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConsumerSupport.java @@ -51,7 +51,7 @@ public abstract class TransactedConsumerSupport extends CamelTestSupport { // unit all the messages have been processed. It is also // set to time out on the await. Our values are multiplied // by the number of routes we have. -CountDownLatch latch = new CountDownLatch((totalRedeliverdFalse * routeCount) + (totalRedeliveredTrue * routeCount)); +CountDownLatch latch = new CountDownLatch((totalRedeliverdFalse * routeCount)); for (int i = 1; i <= routeCount; i++) { // We add a route here so we can pass our latch into it. @@ -68,13 +68,16 @@ public abstract class TransactedConsumerSupport extends CamelTestSupport { // Send only 10 messages for (int i = 1; i <= messageCount; i++) { String message = "Hello World " + i; -template.sendBody("direct:start", message); +template.sendBody("direct:start?block=false", message); log.trace("Sending message: {}", message); } -// Await on our countdown for 30 seconds at most then move on -latch.await(30, TimeUnit.SECONDS); -MockEndpoint.assertIsSatisfied(context, 30, TimeUnit.SECONDS); +// Await on our countdown for 20 seconds at most then move on +log.info("Waiting for latch to count down from: {}", latch.getCount()); +boolean zero = latch.await(20, TimeUnit.SECONDS); +log.info("Latch wait done: {} with count: {}", zero, latch.getCount()); + +MockEndpoint.assertIsSatisfied(context); } @Override
[camel] branch sjms-fast deleted (was 9b8b4a9566f)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch sjms-fast in repository https://gitbox.apache.org/repos/asf/camel.git was 9b8b4a9566f camel-sjms - Run test fast that was waiting for a latch with a wrong count The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch fc deleted (was 6955de1130b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch fc in repository https://gitbox.apache.org/repos/asf/camel.git was 6955de1130b camel-core - Run test faster The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[GitHub] [camel] davsclaus merged pull request #11082: camel-sjms - Run test fast that was waiting for a latch with a wrong …
davsclaus merged PR #11082: URL: https://github.com/apache/camel/pull/11082 -- 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-core - Run test faster (#11083)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new e47a7a1d766 camel-core - Run test faster (#11083) e47a7a1d766 is described below commit e47a7a1d766ea9312f89ef86f655ee5a9916b21f Author: Claus Ibsen AuthorDate: Fri Aug 11 15:31:02 2023 +0200 camel-core - Run test faster (#11083) --- .../file/cluster/FileLockClusteredRoutePolicyFactoryTest.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java b/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java index af11a86d882..4779b50cc2d 100644 --- a/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java +++ b/core/camel-core/src/test/java/org/apache/camel/component/file/cluster/FileLockClusteredRoutePolicyFactoryTest.java @@ -52,7 +52,7 @@ public final class FileLockClusteredRoutePolicyFactoryTest { SCHEDULER.submit(() -> run(id)); } -LATCH.await(1, TimeUnit.MINUTES); +LATCH.await(20, TimeUnit.SECONDS); SCHEDULER.shutdownNow(); assertEquals(CLIENTS.size(), RESULTS.size()); @@ -71,8 +71,8 @@ public final class FileLockClusteredRoutePolicyFactoryTest { FileLockClusterService service = new FileLockClusterService(); service.setId("node-" + id); service.setRoot(TestSupport.testDirectory(FileLockClusteredRoutePolicyTest.class, true).toString()); -service.setAcquireLockDelay(1, TimeUnit.SECONDS); -service.setAcquireLockInterval(1, TimeUnit.SECONDS); +service.setAcquireLockDelay(100, TimeUnit.MILLISECONDS); +service.setAcquireLockInterval(100, TimeUnit.MILLISECONDS); DefaultCamelContext context = new DefaultCamelContext(); context.disableJMX(); @@ -82,7 +82,7 @@ public final class FileLockClusteredRoutePolicyFactoryTest { context.addRoutes(new RouteBuilder() { @Override public void configure() throws Exception { - from("timer:file-lock?delay=1000=1000").routeId("route-" + id).log("From ${routeId}") + from("timer:file-lock?delay=10=100").routeId("route-" + id).log("From ${routeId}") .process(e -> contextLatch.countDown()); } }); @@ -92,7 +92,7 @@ public final class FileLockClusteredRoutePolicyFactoryTest { Thread.sleep(ThreadLocalRandom.current().nextInt(500)); context.start(); -contextLatch.await(); +contextLatch.await(10, TimeUnit.SECONDS); LOGGER.debug("Shutting down node {}", id); RESULTS.add(id);
[GitHub] [camel] davsclaus merged pull request #11083: camel-core - Run test faster
davsclaus merged PR #11083: URL: https://github.com/apache/camel/pull/11083 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #11083: camel-core - Run test faster
davsclaus commented on PR #11083: URL: https://github.com/apache/camel/pull/11083#issuecomment-1674799768 test failure is not this 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
[GitHub] [camel] davsclaus opened a new pull request, #11085: camel-itest - Make sql test a bit faster
davsclaus opened a new pull request, #11085: URL: https://github.com/apache/camel/pull/11085 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: camel-itest - Make sql test a bit faster
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch itest-sql in repository https://gitbox.apache.org/repos/asf/camel.git commit 7598046367354d70f1648c73e3534467fc4ee538 Author: Claus Ibsen AuthorDate: Fri Aug 11 15:30:01 2023 +0200 camel-itest - Make sql test a bit faster --- .../camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java index cde02d59868..5b039929cdd 100644 --- a/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java +++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/sql/FromJmsToJdbcIdempotentConsumerToJmsTest.java @@ -124,7 +124,7 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest extends CamelSpringTestSup // check that there is no message in the database and JMS queue assertEquals(0, jdbcTemplate.queryForObject("select count(*) from CAMEL_MESSAGEPROCESSED", int.class)); -assertNull(consumer.receiveBody("activemq2:queue:outbox", 3000)); +assertNull(consumer.receiveBody("activemq2:queue:outbox", 100)); } @Test @@ -152,7 +152,7 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest extends CamelSpringTestSup // check that there is no message in the database and JMS queue assertEquals(0, jdbcTemplate.queryForObject("select count(*) from CAMEL_MESSAGEPROCESSED", int.class)); -assertNull(consumer.receiveBody("activemq2:queue:outbox", 3000)); +assertNull(consumer.receiveBody("activemq2:queue:outbox", 100)); } @Test @@ -218,7 +218,7 @@ public class FromJmsToJdbcIdempotentConsumerToJmsTest extends CamelSpringTestSup protected void checkInitialState() { // check there are no messages in the database and JMS queue assertEquals(0, jdbcTemplate.queryForObject("select count(*) from CAMEL_MESSAGEPROCESSED", int.class)); -assertNull(consumer.receiveBody("activemq2:queue:outbox", 2000)); +assertNull(consumer.receiveBody("activemq2:queue:outbox", 100)); } @Override
[camel] branch itest-sql created (now 75980463673)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch itest-sql in repository https://gitbox.apache.org/repos/asf/camel.git at 75980463673 camel-itest - Make sql test a bit faster This branch includes the following new commits: new 75980463673 camel-itest - Make sql test a bit faster The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[GitHub] [camel] github-actions[bot] commented on pull request #11084: Some more components can test in parallel
github-actions[bot] commented on PR #11084: URL: https://github.com/apache/camel/pull/11084#issuecomment-1674791922 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus opened a new pull request, #11084: Some more components can test in parallel
davsclaus opened a new pull request, #11084: URL: https://github.com/apache/camel/pull/11084 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: Some more components can test in parallel
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch par in repository https://gitbox.apache.org/repos/asf/camel.git commit d0419c09ba175ea6b08710466e112e4975c5f649 Author: Claus Ibsen AuthorDate: Fri Aug 11 15:24:14 2023 +0200 Some more components can test in parallel --- components/camel-freemarker/pom.xml | 1 + components/camel-mvel/pom.xml | 1 + components/camel-ognl/pom.xml | 1 + components/camel-stringtemplate/pom.xml | 1 + components/camel-velocity/pom.xml | 4 5 files changed, 8 insertions(+) diff --git a/components/camel-freemarker/pom.xml b/components/camel-freemarker/pom.xml index 09b7e2d2eee..5811ac9a242 100644 --- a/components/camel-freemarker/pom.xml +++ b/components/camel-freemarker/pom.xml @@ -32,6 +32,7 @@ Camel Freemarker support +true diff --git a/components/camel-mvel/pom.xml b/components/camel-mvel/pom.xml index 2026142af07..29aed141faf 100644 --- a/components/camel-mvel/pom.xml +++ b/components/camel-mvel/pom.xml @@ -32,6 +32,7 @@ Camel MVEL support +true diff --git a/components/camel-ognl/pom.xml b/components/camel-ognl/pom.xml index 3d3d36a07a2..8fc0e5d93b2 100644 --- a/components/camel-ognl/pom.xml +++ b/components/camel-ognl/pom.xml @@ -32,6 +32,7 @@ Camel OGNL support +true diff --git a/components/camel-stringtemplate/pom.xml b/components/camel-stringtemplate/pom.xml index 0e8f76a7269..f83a01cdb13 100644 --- a/components/camel-stringtemplate/pom.xml +++ b/components/camel-stringtemplate/pom.xml @@ -33,6 +33,7 @@ Camel StringTemplate support +true diff --git a/components/camel-velocity/pom.xml b/components/camel-velocity/pom.xml index b5c518d584d..b32b8193953 100644 --- a/components/camel-velocity/pom.xml +++ b/components/camel-velocity/pom.xml @@ -32,6 +32,10 @@ Camel :: Velocity Camel Velocity support + +true + +
[camel] branch par created (now d0419c09ba1)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch par in repository https://gitbox.apache.org/repos/asf/camel.git at d0419c09ba1 Some more components can test in parallel This branch includes the following new commits: new d0419c09ba1 Some more components can test in parallel The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[GitHub] [camel-quarkus] aldettinger commented on a diff in pull request #5168: Extend test coverage of gRPC extension
aldettinger commented on code in PR #5168: URL: https://github.com/apache/camel-quarkus/pull/5168#discussion_r1291319010 ## docs/modules/ROOT/pages/reference/extensions/grpc.adoc: ## @@ -72,3 +118,34 @@ To avoid compilation issues, the `grpc-java` project recommendation is to add a Alternatively, you can use Maven or Gradle plugins to iterate over the generated code (found at `target/generated-sources` for Maven) and replace all instances of `@javax.annotation.Generated` with `@jakarta.annotation.Generated`. +[id="extensions-grpc-usage-accessing-classpath-resources-in-native-mode"] +=== Accessing classpath resources in native mode + +The gRPC component has various options where resources are resolved from the classpath: + +* `keyCertChainResource` +* `keyResource` +* `serviceAccountResource` +* `trustCertCollectionResource` + +When using these options in native mode, you must ensure that any such resources are included in the native image. + +This can be accomplished by adding the configuration property `quarkus.native.resources.includes` to `application.properties`. Review Comment: There are always tradeof in such questions. The justification looks fair, let's keep it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton commented on a diff in pull request #5168: Extend test coverage of gRPC extension
jamesnetherton commented on code in PR #5168: URL: https://github.com/apache/camel-quarkus/pull/5168#discussion_r1291315993 ## docs/modules/ROOT/pages/reference/extensions/grpc.adoc: ## @@ -72,3 +118,34 @@ To avoid compilation issues, the `grpc-java` project recommendation is to add a Alternatively, you can use Maven or Gradle plugins to iterate over the generated code (found at `target/generated-sources` for Maven) and replace all instances of `@javax.annotation.Generated` with `@jakarta.annotation.Generated`. +[id="extensions-grpc-usage-accessing-classpath-resources-in-native-mode"] +=== Accessing classpath resources in native mode + +The gRPC component has various options where resources are resolved from the classpath: + +* `keyCertChainResource` +* `keyResource` +* `serviceAccountResource` +* `trustCertCollectionResource` + +When using these options in native mode, you must ensure that any such resources are included in the native image. + +This can be accomplished by adding the configuration property `quarkus.native.resources.includes` to `application.properties`. Review Comment: I figured it was better to have some instructions inline, because it's nicer to be able to directly copy a code snippet, rather than click away to another page and loose the context of the thing you're interested in (gRPC). If you think not having it is better, then I can change it. Although, there are other extensions where the docs are like this, so please open an issue so we clean up the rest of the codebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] aldettinger commented on a diff in pull request #5168: Extend test coverage of gRPC extension
aldettinger commented on code in PR #5168: URL: https://github.com/apache/camel-quarkus/pull/5168#discussion_r1291307492 ## docs/modules/ROOT/pages/reference/extensions/grpc.adoc: ## @@ -72,3 +118,34 @@ To avoid compilation issues, the `grpc-java` project recommendation is to add a Alternatively, you can use Maven or Gradle plugins to iterate over the generated code (found at `target/generated-sources` for Maven) and replace all instances of `@javax.annotation.Generated` with `@jakarta.annotation.Generated`. +[id="extensions-grpc-usage-accessing-classpath-resources-in-native-mode"] +=== Accessing classpath resources in native mode + +The gRPC component has various options where resources are resolved from the classpath: + +* `keyCertChainResource` +* `keyResource` +* `serviceAccountResource` +* `trustCertCollectionResource` + +When using these options in native mode, you must ensure that any such resources are included in the native image. + +This can be accomplished by adding the configuration property `quarkus.native.resources.includes` to `application.properties`. Review Comment: Could we remove lines 133-140 to ease long term maintenance ? Everything is already described in embedding-`resource-in-native-executable[native mode guide]` at line 141. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11083: camel-core - Run test faster
github-actions[bot] commented on PR #11083: URL: https://github.com/apache/camel/pull/11083#issuecomment-1674738315 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- 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