[camel-kamelets] branch regen_bot updated (8438076f -> 758bef74)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git from 8438076f Regen SBOM from commit e47128b97a22b5c5bb83ab6067d7cbe49aed724f add 758bef74 Regen SBOM from commit 8438076f1e9bf9f80c3d6b475fee771b90866d9b No new revisions were added by this update. Summary of changes: camel-kamelets-sbom/camel-kamelets-sbom.json | 4 ++-- camel-kamelets-sbom/camel-kamelets-sbom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
[camel-kamelets] branch main updated: Regen SBOM from commit 8438076f1e9bf9f80c3d6b475fee771b90866d9b
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 758bef74 Regen SBOM from commit 8438076f1e9bf9f80c3d6b475fee771b90866d9b 758bef74 is described below commit 758bef748efa894eb781048d0feaccb5ccdf17ea Author: oscerd AuthorDate: Sun May 7 11:32:21 2023 + Regen SBOM from commit 8438076f1e9bf9f80c3d6b475fee771b90866d9b Signed-off-by: GitHub --- camel-kamelets-sbom/camel-kamelets-sbom.json | 4 ++-- camel-kamelets-sbom/camel-kamelets-sbom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/camel-kamelets-sbom/camel-kamelets-sbom.json b/camel-kamelets-sbom/camel-kamelets-sbom.json index ae6cfab7..67d65691 100644 --- a/camel-kamelets-sbom/camel-kamelets-sbom.json +++ b/camel-kamelets-sbom/camel-kamelets-sbom.json @@ -1,10 +1,10 @@ { "bomFormat" : "CycloneDX", "specVersion" : "1.4", - "serialNumber" : "urn:uuid:1a21d7b8-b436-4c76-93b9-c8d03339a0e8", + "serialNumber" : "urn:uuid:c542e1e0-0378-4420-8642-7b202bccb711", "version" : 1, "metadata" : { -"timestamp" : "2023-04-30T11:31:52Z", +"timestamp" : "2023-05-07T11:32:06Z", "tools" : [ { "vendor" : "OWASP Foundation", diff --git a/camel-kamelets-sbom/camel-kamelets-sbom.xml b/camel-kamelets-sbom/camel-kamelets-sbom.xml index 22207e2c..91b3bbd7 100644 --- a/camel-kamelets-sbom/camel-kamelets-sbom.xml +++ b/camel-kamelets-sbom/camel-kamelets-sbom.xml @@ -1,7 +1,7 @@ -http://cyclonedx.org/schema/bom/1.4;> +http://cyclonedx.org/schema/bom/1.4;> -2023-04-30T11:31:52Z +2023-05-07T11:32:06Z OWASP Foundation
[GitHub] [camel-kamelets] oscerd merged pull request #1462: Generated sources regen for SBOM
oscerd merged PR #1462: URL: https://github.com/apache/camel-kamelets/pull/1462 -- 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-spring-boot] oscerd closed pull request #831: [Github Actions] Periodic Sync Camel Spring Boot (Camel 3)
oscerd closed pull request #831: [Github Actions] Periodic Sync Camel Spring Boot (Camel 3) URL: https://github.com/apache/camel-spring-boot/pull/831 -- 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: 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 ed13ab0c6b Updated CHANGELOG.md ed13ab0c6b is described below commit ed13ab0c6bc5f9edfc7c1d0cc7cebe636dffcd38 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon May 8 03:16:46 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d85cbde16..396a3a2330 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ **Merged pull requests:** +- Generated sources regen for SBOM [\#4878](https://github.com/apache/camel-quarkus/pull/4878) ([github-actions[bot]](https://github.com/apps/github-actions)) - Bump quarkiverse-jackson-jq.version from 2.0.0.Alpha to 2.0.1 [\#4877](https://github.com/apache/camel-quarkus/pull/4877) ([dependabot[bot]](https://github.com/apps/dependabot)) - Restore camel-kubernetes related native testing [\#4874](https://github.com/apache/camel-quarkus/pull/4874) ([jamesnetherton](https://github.com/jamesnetherton)) - Snmp: tiny timeout change in test to help stability [\#4872](https://github.com/apache/camel-quarkus/pull/4872) ([JiriOndrusek](https://github.com/JiriOndrusek))
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1537665593 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 4910714183-1110-7ba92ff1-4812-4e4e-9dcb-fbe60c8e308d * Camel Quarkus Commit: 38310db47b5a0910af74d3634c429a361b5b459d * Quarkus Main Commit: eefc9178275211252cd7c76beec75879a98b8c19 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/4910714183 -- 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-k] dependabot[bot] opened a new pull request, #4332: chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring from 0.60.0 to 0.65.1
dependabot[bot] opened a new pull request, #4332: URL: https://github.com/apache/camel-k/pull/4332 Bumps [github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring](https://github.com/prometheus-operator/prometheus-operator) from 0.60.0 to 0.65.1. Release notes Sourced from https://github.com/prometheus-operator/prometheus-operator/releases;>github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring's releases. 0.65.1 / 2022-05-05 [BUGFIX] Fix panic when ScrapeConfig CRD is not installed. https://redirect.github.com/prometheus-operator/prometheus-operator/issues/5550;>#5550 0.65.0 / 2022-05-04 The main change introduced by this release is the new v1alpha1 ScrapeConfig CRD. This implements the https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/proposals/202212-scrape-config.md;>proposal documented in https://redirect.github.com/prometheus-operator/prometheus-operator/pull/5279;>prometheus-operator/prometheus-operator#5279 and provides a Kubernetes native API to create and manage additional scrape configurations. To try it, follow the following steps: Install the new CRD in the cluster (see example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml). Update the Prometheus operator's RBAC permissions to manage ScrapeConfig resources (see example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml). NOTE: if these conditions aren't met, the operator will start but it won't be able to reconcile the ScrapeConfig resources. [FEATURE] Add the status subresource for the ThanosRuler CRD. https://redirect.github.com/prometheus-operator/prometheus-operator/issues/5520;>#5520 [FEATURE] Add spec.web.timeout and spec.web.getConcurrency to the Alertmanager CRD. https://redirect.github.com/prometheus-operator/prometheus-operator/issues/5478;>#5478 [FEATURE] Add spec.groups[].limit to the Prometheus CRD. https://redirect.github.com/prometheus-operator/prometheus-operator/issues/4999;>#4999 [FEATURE] Add ScrapeConfig CRD. https://redirect.github.com/prometheus-operator/prometheus-operator/issues/5335;>#5335 [ENHANCEMENT] Set a default for seccompProfile on the operator and webhook Deployments to RuntimeDefault. https://redirect.github.com/prometheus-operator/prometheus-operator/issues/5477;>#5477 [ENHANCEMENT] Add optional liveness and readiness probes to prometheus-config-reloader. This can be enabled via the --enable-config-reloader-probes CLI flag. https://redirect.github.com/prometheus-operator/prometheus-operator/issues/5449;>#5449 [BUGFIX] Don't start the PrometheusAgent controller if the CRD isn't present or the operator lacks permissions. https://redirect.github.com/prometheus-operator/prometheus-operator/issues/5476;>#5476 [BUGFIX] Declare spec.rules optional in PrometheusRule CRD. https://redirect.github.com/prometheus-operator/prometheus-operator/issues/5481;>#5481 [BUGFIX] Fix incorrect metric counter value for failed sync status. https://redirect.github.com/prometheus-operator/prometheus-operator/issues/5533;>#5533 0.64.1 / 2023-04-24 [BUGFIX] Fix panic when scraping /metrics with PrometheusAgent resources declared. https://redirect.github.com/prometheus-operator/prometheus-operator/issues/5511;>#5511 0.64.0 / 2023-03-29 This release provides first-class support for running Prometheus in agent mode with the new PrometheusAgent CRD. As the v1alpha1 version tells it, we don't recommend using it in production but we're eager to hear all possible feedback. To try it, follow the following steps: Install the new CRD in the cluster (see example/prometheus-operator-crd/monitoring.coreos.com_prometheusagents.yaml). Update the Prometheus operator's RBAC permissions to manage PrometheusAgents resources (see example/rbac/prometheus-operator/prometheus-operator-cluster-role.yaml). NOTE: if these conditions aren't met, the operator will start but it won't be able to reconcile the PrometheusAgent resources. For the first time, the container images associated to this release are signed using https://www.sigstore.dev/;>sigstore. [CHANGE] Remove the /apis endpoints from the operator's web server. https://redirect.github.com/prometheus-operator/prometheus-operator/issues/5396;>#5396 [CHANGE] Set default default value of spec.portName to web. https://redirect.github.com/prometheus-operator/prometheus-operator/issues/5350;>#5350 [FEATURE] Add v1alpha1 PrometheusAgent CRD to run Prometheus in agent mode. https://redirect.github.com/prometheus-operator/prometheus-operator/issues/5385;>#5385 [FEATURE] Add --reload-timeout argument to the config-reloader binary which controls how long the program will wait for the reload operation to complete (default: 30s). https://redirect.github.com/prometheus-operator/prometheus-operator/issues/5349;>#5349
[camel-k] branch dependabot/go_modules/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring-0.65.1 created (now 0c816a6d0)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring-0.65.1 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 0c816a6d0 chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring No new revisions were added by this update.
[camel-k] branch dependabot/go_modules/github.com/prometheus/common-0.43.0 created (now d525dd6d8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/prometheus/common-0.43.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git at d525dd6d8 chore(deps): bump github.com/prometheus/common from 0.42.0 to 0.43.0 No new revisions were added by this update.
[GitHub] [camel-k] dependabot[bot] opened a new pull request, #4331: chore(deps): bump github.com/prometheus/common from 0.42.0 to 0.43.0
dependabot[bot] opened a new pull request, #4331: URL: https://github.com/apache/camel-k/pull/4331 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.42.0 to 0.43.0. Release notes Sourced from https://github.com/prometheus/common/releases;>github.com/prometheus/common's releases. 0.43.0 / 2023-05-04 NOTE: The protobuf library has been changed from the deprecated github.com/golang/protobuf to the new officially supported google.golang.org/protobuf. If you have direct use of the proto, you may need to make changes for deprecated functions. What's Changed Synchronize common files from prometheus/prometheus by https://github.com/prombot;>@prombot in https://redirect.github.com/prometheus/common/pull/463;>prometheus/common#463 Negotiate OM v1.0.0 by https://github.com/gouthamve;>@gouthamve in https://redirect.github.com/prometheus/common/pull/475;>prometheus/common#475 Bump golang.org/x/oauth2 from 0.5.0 to 0.7.0 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/prometheus/common/pull/478;>prometheus/common#478 Bump github.com/prometheus/client_golang from 1.14.0 to 1.15.1 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/prometheus/common/pull/481;>prometheus/common#481 Update Go modules by https://github.com/SuperQ;>@SuperQ in https://redirect.github.com/prometheus/common/pull/479;>prometheus/common#479 Bump github.com/alecthomas/kingpin/v2 from 2.3.1 to 2.3.2 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/prometheus/common/pull/469;>prometheus/common#469 Full Changelog: https://github.com/prometheus/common/compare/v0.42.0...v0.43.0;>https://github.com/prometheus/common/compare/v0.42.0...v0.43.0 Commits https://github.com/prometheus/common/commit/e27922a100211b71acc8e65327b61d5fe22e2a77;>e27922a Merge pull request https://redirect.github.com/prometheus/common/issues/469;>#469 from prometheus/dependabot/go_modules/github.com/alec... https://github.com/prometheus/common/commit/9a176e101d53f64ec3a507dac59261841a36e0c0;>9a176e1 Bump github.com/alecthomas/kingpin/v2 from 2.3.1 to 2.3.2 https://github.com/prometheus/common/commit/a2ac26086c2e10167dd3a177dacea63c83eb06fb;>a2ac260 Merge pull request https://redirect.github.com/prometheus/common/issues/479;>#479 from prometheus/superq/updates https://github.com/prometheus/common/commit/5e8c998641443778da5358605063b33fcc1a2301;>5e8c998 expfmt: Avoid copying mutex in proto message https://github.com/prometheus/common/commit/27a8fa5058d6a145c45fa4f75bec23ccc9fff448;>27a8fa5 Update Go modules https://github.com/prometheus/common/commit/92f8c2716e744729fe044871238cae6c9bbb3694;>92f8c27 Merge pull request https://redirect.github.com/prometheus/common/issues/481;>#481 from prometheus/dependabot/go_modules/github.com/prom... https://github.com/prometheus/common/commit/2328fd686db148b446305d4ee2ef1d8036236b30;>2328fd6 Bump github.com/prometheus/client_golang from 1.14.0 to 1.15.1 https://github.com/prometheus/common/commit/cffd08e4f5c482a40bad2f01a3324f5a4ffdbf50;>cffd08e Merge pull request https://redirect.github.com/prometheus/common/issues/478;>#478 from prometheus/dependabot/go_modules/golang.org/x/oa... https://github.com/prometheus/common/commit/b933a95a4ee610b29d19ac53e275e4e442c7ddc3;>b933a95 Merge pull request https://redirect.github.com/prometheus/common/issues/475;>#475 from gouthamve/negotiate-om-1.0 https://github.com/prometheus/common/commit/567ed12a7508817d9a9c1d0e17d142507c309a4a;>567ed12 Bump golang.org/x/oauth2 from 0.5.0 to 0.7.0 Additional commits viewable in https://github.com/prometheus/common/compare/v0.42.0...v0.43.0;>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/prometheus/common=go_modules=0.42.0=0.43.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request, #831: [Github Actions] Periodic Sync Camel Spring Boot (Camel 3)
github-actions[bot] opened a new pull request, #831: URL: https://github.com/apache/camel-spring-boot/pull/831 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-camel-3.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[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-1537589121 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 4910022281-1006-e5687169-d67c-40f6-a868-1f7054480024 * Camel Quarkus Commit: bbd336939a8d1467ac5a8f71b4e1140d9eb92ef6 * Camel Main Commit: eefc9178275211252cd7c76beec75879a98b8c19 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/4910022281 -- 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-k] github-actions[bot] commented on issue #4017: Bump Mandrel from 22.2.0 to 22.3.1
github-actions[bot] commented on issue #4017: URL: https://github.com/apache/camel-k/issues/4017#issuecomment-1537580157 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- 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-k] github-actions[bot] commented on issue #4031: Add an option to define config priority
github-actions[bot] commented on issue #4031: URL: https://github.com/apache/camel-k/issues/4031#issuecomment-1537580124 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- 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-spring-boot] oscerd merged pull request #830: [Github Actions] Periodic Sync Camel Spring Boot SBOM (Camel 4)
oscerd merged PR #830: URL: https://github.com/apache/camel-spring-boot/pull/830 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch camel-main updated (4bc33ba797 -> bbd336939a)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 4bc33ba797 regenerate poms discard 86e19e43a8 Remove camel-quarkus-solr permanently because it was removed from Camel in CAMEL-19290 discard 7f9d880ff6 regenerate poms discard 21eb082acb Small change related to Remove experimental LightweightCamelContext CAMEL-19292 discard 989fb3c5e3 regenerate poms discard 836842d3ce Fix of Rest testt: Remove experimental LightweightCamelContext CAMEL-19292 discard dbcf1fd3f5 Fixed debezium-mongodb (CAMEL-19287) + regen poms discard 11e135fdd9 Regenerate poms discard 0874820fa6 Regenerate poms discard f57d39078e Fix of Opentelemetry test discard f3976a2b64 Fixed jackson-jq-extra (CAMEL-19276) discard 53d705a37f Fix of upgrade jackson-jq discard 57adcf6b69 Regen poms discard d0ef31d0bc Fixed Tika compilation issue discard cf56209ef8 Regen poms discard e18f0152ea Regen poms discard 220b13f11e Regen poms discard 17875e2cf7 Regen poms discard e56bdbb785 camel-java-joor-dsl - Ease the way to get all the compiled classes discard 3a4b59b323 Regen poms discard e4618312b1 Ref #4745: Add context plugins for the dry mode as expected discard 7e6d80ce6f Fixed #4735 and auto-generated changes discard 7e69a1df53 Fixed compilation error linked to getModelToXMLDumper() discard 12cc7ad84b Fixed KameletProcessor.java compilation error discard c032363f38 Disabled several foundation tests + fixin runtinme because of CAMEL-15105 discard 9d6cac85c1 Fixed compilation failures because of CAMEL-15105 discard 0981f7296e Fixed getter/setter on ExtendedCamelContext - CAMEL-15105 discard 3c06e1c658 [camel-main] fixed salesforce (CAMEL-18551), cxf-soap-client (updates in image) discard 7a0d06aadc Revert "Temporarily disable dataformat integration tests due to #4662" discard 4159be8164 Generated flattened pom + add more information into cxf-soap-client assert discard de8f9fd639 Fuxed Cxf-soap-client:missing licence in wsdl discard 75b88d40d9 Fixed micrometer and opentelemtry test because of CAMEL-19124, CAMEL-19193 discard 59446fac6a Fix in cxf-soap-client discard e21cda8093 Fix in http component (caused by upgrade of httpclient) discard 44c43eb6d0 Ref #1746: Groovy language native support discard 2ee5fcf9ee Add support of expressions referring an external resource discard a67e23349e Upgrade Camel to 4.0.0-M3 discard 1e50a5c43d Ref #4624: Upgrade to Groovy 4.x discard 8f1b6b437c Ref #4384: Groovy DSL - Add support of Groovy extensions add 24b279ea33 Updated CHANGELOG.md add ccc90939c7 Snmp: tiny timeout change in test to help stability add 4912ac03f0 Upgrade Camel to 4.0.0-M3 add 5286e7f09c Ref #4384: Groovy DSL - Add support of Groovy extensions add 0832f41ba9 Ref #4624: Upgrade to Groovy 4.x add 7f04b173e0 Add support of expressions referring an external resource add 3e3735e9dc Ref #1746: Groovy language native support add aa15026584 Bump quarkiverse-jackson-jq.version from 2.0.0.Alpha to 2.0.1 (#4877) add 8121356015 Restore camel-kubernetes related native testing (#4874) add 73e85406b5 Updated CHANGELOG.md add eefc917827 Regen SBOM from commit 73e85406b5542dd5a0010f3efecacb1db0d25cef new bbd336939a Upgrade Camel to 4.0.0-M4 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 (4bc33ba797) \ N -- N -- N refs/heads/camel-main (bbd336939a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG.md |10 + camel-quarkus-sbom/camel-quarkus-sbom.json | 19828 +-- camel-quarkus-sbom/camel-quarkus-sbom.xml | 15016 +++--- catalog/pom.xml|13 - extensions/jq/runtime/pom.xml | 8 +- extensions/tika/runtime/pom.xml| 2 +- .../src/main/resources/wsdl/CalculatorService.wsdl | 332 +- .../camel/quarkus/component/snmp/it/SnmpTest.java | 5 +- integration-tests/kubernetes/pom.xml | 2 - integration-tests/master-openshift/pom.xml
[camel-quarkus] 01/01: Upgrade Camel to 4.0.0-M4
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit bbd336939a8d1467ac5a8f71b4e1140d9eb92ef6 Author: James Netherton AuthorDate: Sun May 7 18:30:54 2023 +0100 Upgrade Camel to 4.0.0-M4 --- docs/antora.yml | 2 +- pom.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 56449ea052..20557326e6 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -28,7 +28,7 @@ asciidoc: requires: "'util=camel-website-util,quarkus=xref:js/quarkus.js'" # Project versions -camel-version: 4.0.0-M3 # replace ${camel.version} +camel-version: 4.0.0-SNAPSHOT # replace ${camel.version} camel-docs-version: "" quarkus-version: 3.0.1.Final # replace ${quarkus.version} graalvm-version: 22.3.0 # replace ${graalvm.version} diff --git a/pom.xml b/pom.xml index 10927276bf..ac411abf83 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies -4.0.0-M3 +4.0.0-SNAPSHOT org.apache.camel.quarkus @@ -40,7 +40,7 @@ 4.0 -${camel.major.minor}.0-M3 +${camel.major.minor}.0-SNAPSHOT ${camel.major.minor}.x ${camel.docs.components.version}@components camel-${camel.major.minor}.x
[camel] branch regen_bot updated (ca6731047d8 -> ad00f00764e)
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 ca6731047d8 CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention add ad00f00764e Regen SBOM from commit ca6731047d83c80c709c5e4fd84e2b6f61392cce No new revisions were added by this update. Summary of changes: camel-sbom/camel-sbom.json | 163 +++-- camel-sbom/camel-sbom.xml | 111 +++--- 2 files changed, 80 insertions(+), 194 deletions(-)
[camel] branch main updated: Regen SBOM from commit ca6731047d83c80c709c5e4fd84e2b6f61392cce
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new ad00f00764e Regen SBOM from commit ca6731047d83c80c709c5e4fd84e2b6f61392cce ad00f00764e is described below commit ad00f00764e9323228f7612a8f8e7c5d75894d73 Author: oscerd AuthorDate: Sun May 7 15:55:47 2023 + Regen SBOM from commit ca6731047d83c80c709c5e4fd84e2b6f61392cce Signed-off-by: GitHub --- camel-sbom/camel-sbom.json | 163 +++-- camel-sbom/camel-sbom.xml | 111 +++--- 2 files changed, 80 insertions(+), 194 deletions(-) diff --git a/camel-sbom/camel-sbom.json b/camel-sbom/camel-sbom.json index b49e8eb97d4..626122fc6ab 100644 --- a/camel-sbom/camel-sbom.json +++ b/camel-sbom/camel-sbom.json @@ -1,10 +1,10 @@ { "bomFormat" : "CycloneDX", "specVersion" : "1.4", - "serialNumber" : "urn:uuid:9d3fa7af-79a9-4c36-a5b4-85f58dc87660", + "serialNumber" : "urn:uuid:ad15948b-4f90-4339-a3d0-6e7df152ecc8", "version" : 1, "metadata" : { -"timestamp" : "2023-04-30T15:01:02Z", +"timestamp" : "2023-05-07T15:01:37Z", "tools" : [ { "vendor" : "OWASP Foundation", @@ -4653,41 +4653,41 @@ { "group" : "io.smallrye", "name" : "jandex", - "version" : "3.0.3", + "version" : "3.1.1", "description" : "SmallRye Build Parent POM", "scope" : "optional", "hashes" : [ { "alg" : "MD5", - "content" : "5eea5950eba074081eb28cce4bc73a77" + "content" : "8ff908a8bacbd19ed08335e322ac7255" }, { "alg" : "SHA-1", - "content" : "4a80909fffa46672f7a0f334ac5e10ff5df9343f" + "content" : "8ba25c8455eba1420c95531a42fe717a6eed0e37" }, { "alg" : "SHA-256", - "content" : "876ebc8665a9b6661b60f8436f1a74ab09746a48105121ca636fd36733f281f0" + "content" : "14fdef243c6c534100d4209cf4ff0e459b512011c6acf7ac374c033e7936549f" }, { "alg" : "SHA-512", - "content" : "748062f75fdea689e7b529e14143357f87f3242d903c42c25d605cdbc145cbeaf9fd4b5f1ddc3f79bdf1a998f297b1afa94733e6a2ee17f6e31db4d9cd91121a" + "content" : "6f714920c984085d11ca17f43b59bc5e3251030cfcdfd7d8c33b6fef796406e39be79e768621193dd45543f466a427981efab3186cdd96bbb10effaf7890274e" }, { "alg" : "SHA-384", - "content" : "81888175de91009e5f47a9fdcaab92fb725f1388c3e7ca6f5f287711c899310367bc16700644e9133bad84a40529e4d0" + "content" : "f66c2d3506dda69d0aebb84b541429db54d1b001fbdd0e85854ad81f82fd44a04cd966f08c76c127e1aeb1c264f0e3ac" }, { "alg" : "SHA3-384", - "content" : "92d13f44ad942bb5881451564f6147321f233acd801ee36dd2dd2090062d06765c8ba0b412362af4e138c26791108125" + "content" : "d1c9f28e1c5a2f1f3da37ff4551ee9e9bcb2243dcc3d4cb0c4437dd8d08f9d818ce8ec852dd1737e4b7930db0d696ad5" }, { "alg" : "SHA3-256", - "content" : "eb92d87c5a65ce17b89f9339eaeb5222455cfa09bd6a0ac52dc2d7b873f784da" + "content" : "3233aba05e6d8bab97563ca0cc0f8133984687735526d7f822807c8735473bbc" }, { "alg" : "SHA3-512", - "content" : "5d0ddd5b860529f64f19b1791177c5c9239e81cd87e132a00a299d5805e328d763cb847bbc22a4b9e98b37927fa04a7066eec5fee6d4b633ca94c824b950536a" + "content" : "4fc9984292d539f8850a2fb13569c5a96168c2f086533062895ef6b31bbd72d5428691f61ddfbdb06264c0352871fe97806e263140b0c47766dfa89808306ec6" } ], "licenses" : [ @@ -4697,11 +4697,11 @@ } } ], - "purl" : "pkg:maven/io.smallrye/jandex@3.0.3?type=jar", + "purl" : "pkg:maven/io.smallrye/jandex@3.1.1?type=jar", "externalReferences" : [ { "type" : "website", - "url" : "https://smallrye.io/jandex-parent/jandex; + "url" : "https://smallrye.io; }, { "type" : "distribution", @@ -4717,7 +4717,7 @@ } ], "type" : "library", - "bom-ref" : "pkg:maven/io.smallrye/jandex@3.0.3?type=jar" + "bom-ref" : "pkg:maven/io.smallrye/jandex@3.1.1?type=jar" }, { "publisher" : "OW2", @@ -8101,81 +8101,6 @@ "type" : "library", "bom-ref" : "pkg:maven/org.apache.camel/camel-core@4.0.0-SNAPSHOT?type=jar" }, -{ - "publisher" : "The Apache Software Foundation", - "group" : "org.apache.camel", - "name" : "camel-directvm", - "version" : "4.0.0-SNAPSHOT", - "description" : "Camel Direct VM component", - "scope" : "optional", - "hashes" : [ -{ - "alg" : "MD5", - "content" : "89c99c01f3455b15ba0c561287c4c8d6" -}, -{ - "alg" : "SHA-1", -
[GitHub] [camel] oscerd merged pull request #10021: Generated sources regen for SBOM
oscerd merged PR #10021: URL: https://github.com/apache/camel/pull/10021 -- 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] 02/03: Revert "Revert "Restore smallrye-reactive-messaging-camel extension""
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit dbcfcc2044ef51501d3150ff5ccbae8f9b67104c Author: James Netherton AuthorDate: Mon Apr 24 08:02:56 2023 +0100 Revert "Revert "Restore smallrye-reactive-messaging-camel extension"" This reverts commit 7906778cc8cb618e2db325fdee125db4cbf28779. --- docs/modules/ROOT/nav.adoc | 1 + .../extensions/smallrye-reactive-messaging.adoc| 62 ++ extensions/pom.xml | 2 +- integration-tests/pom.xml | 2 +- .../messaging/it/FilesMessageConsumer.java | 1 - .../reactive/messaging/it/PublisherRoute.java | 1 - .../it/SmallRyeReactiveMessagingResource.java | 1 - .../reactive/messaging/it/SubscriberRoute.java | 3 +- poms/bom/pom.xml | 24 +++-- poms/bom/src/main/generated/flattened-full-pom.xml | 15 ++ .../src/main/generated/flattened-reduced-pom.xml | 15 ++ .../generated/flattened-reduced-verbose-pom.xml| 15 ++ tooling/scripts/test-categories.yaml | 1 + 13 files changed, 132 insertions(+), 11 deletions(-) diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index 3b95543c8e..acfb922dfc 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -267,6 +267,7 @@ *** xref:reference/extensions/sjms2.adoc[Simple JMS2] *** xref:reference/extensions/huaweicloud-smn.adoc[SimpleNotification] *** xref:reference/extensions/slack.adoc[Slack] +*** xref:reference/extensions/smallrye-reactive-messaging.adoc[SmallRye Reactive Messaging] *** xref:reference/extensions/snakeyaml.adoc[SnakeYAML] *** xref:reference/extensions/splunk.adoc[Splunk] *** xref:reference/extensions/splunk-hec.adoc[Splunk HEC] diff --git a/docs/modules/ROOT/pages/reference/extensions/smallrye-reactive-messaging.adoc b/docs/modules/ROOT/pages/reference/extensions/smallrye-reactive-messaging.adoc new file mode 100644 index 00..5f23cc78f2 --- /dev/null +++ b/docs/modules/ROOT/pages/reference/extensions/smallrye-reactive-messaging.adoc @@ -0,0 +1,62 @@ +// Do not edit directly! +// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page +[id="extensions-smallrye-reactive-messaging"] += SmallRye Reactive Messaging +:page-aliases: extensions/smallrye-reactive-messaging.adoc +:linkattrs: +:cq-artifact-id: camel-quarkus-smallrye-reactive-messaging +:cq-native-supported: true +:cq-status: Stable +:cq-status-deprecation: Stable +:cq-description: Camel integration with SmallRye Reactive Messaging +:cq-deprecated: false +:cq-jvm-since: 1.0.0 +:cq-native-since: 1.0.0 + +ifeval::[{doc-show-badges} == true] +[.badges] +[.badge-key]##JVM since##[.badge-supported]##1.0.0## [.badge-key]##Native since##[.badge-supported]##1.0.0## +endif::[] + +Camel integration with SmallRye Reactive Messaging + +[id="extensions-smallrye-reactive-messaging-maven-coordinates"] +== Maven coordinates + +https://{link-quarkus-code-generator}/?extension-search=camel-quarkus-smallrye-reactive-messaging[Create a new project with this extension on {link-quarkus-code-generator}, window="_blank"] + +Or add the coordinates to your existing project: + +[source,xml] + + +org.apache.camel.quarkus +camel-quarkus-smallrye-reactive-messaging + + +ifeval::[{doc-show-user-guide-link} == true] +Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. +endif::[] + +[id="extensions-smallrye-reactive-messaging-usage"] +== Usage +This extension leverages https://www.smallrye.io/smallrye-reactive-messaging/[SmallRye Reactive Messaging]. +Examples for how to use the Camel connector are outlined within the https://www.smallrye.io/smallrye-reactive-messaging/[documentation]. + +[NOTE] + +Where the SmallRye Reactive Messaging documentation makes references to Camel component maven dependencies, you should ensure that the corresponding camel-quarkus extension is used. +E.g `camel-file` should be `camel-quarkus-file`. + +When using this extension, there is no need to explictly add `io.smallrye.reactive:smallrye-reactive-messaging-camel` or `io.quarkus:quarkus-quarkus-smallrye-reactive-messaging` to your project. + + + +[id="extensions-smallrye-reactive-messaging-additional-camel-quarkus-configuration"] +== Additional Camel Quarkus configuration + +This extension leverages the Camel xref:reference/extensions/reactive-streams.adoc[Reactive Streams] extension. Various aspects of the reactive streams component can be configured +via the configuration options outlined within the xref:reference/extensions/reactive-streams.adoc[documentation]. + +This extension also leverages the Quarkus SmallRye Reactive Messaging extension. Its configuration options are
[camel-quarkus] 03/03: Add workaround for RemoteCacheManager bean discovery #4841
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 38310db47b5a0910af74d3634c429a361b5b459d Author: James Netherton AuthorDate: Thu Apr 27 11:03:48 2023 +0100 Add workaround for RemoteCacheManager bean discovery #4841 --- .../pages/reference/extensions/infinispan.adoc | 23 + .../camel/quarkus/core/RuntimeBeanRepository.java | 8 + .../runtime/src/main/doc/configuration.adoc| 23 + .../infinispan/CamelInfinispanRecorder.java| 39 ++ .../infinispan/InfinispanQuarkusClientRoutes.java | 7 5 files changed, 100 insertions(+) diff --git a/docs/modules/ROOT/pages/reference/extensions/infinispan.adoc b/docs/modules/ROOT/pages/reference/extensions/infinispan.adoc index 20cfea3021..15eeabc4a4 100644 --- a/docs/modules/ROOT/pages/reference/extensions/infinispan.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/infinispan.adoc @@ -54,6 +54,29 @@ endif::[] You can either configure the Infinispan client via the relevant Camel Infinispan component & endpoint options, or you may use the https://quarkus.io/guides/infinispan-client#configuration-reference[Quarkus Infinispan extension configuration properties]. +Note that if you choose to use Quarkus Infinispan configuration properties, you *must* add an injection point for the `RemoteCacheManager` in order for it to be discoverable by the Camel Infinispan component. For example: + +[source,java] + +public class Routes extends RouteBuilder { +// Injects the default unnamed RemoteCacheManager +@Inject +RemoteCacheManager cacheManager; + +// If configured, injects an optional named RemoteCacheManager +@Inject +@InfinispanClientName("myNamedClient") +RemoteCacheManager namedCacheManager; + +@Override +public void configure() { +// Route configuration here... +} +} + + + + [id="extensions-infinispan-configuration-camel-infinispan-infinispanremoteaggregationrepository-in-native-mode"] === Camel Infinispan `InfinispanRemoteAggregationRepository` in native mode diff --git a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java index cd01044e1b..cfb34569f3 100644 --- a/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java +++ b/extensions-core/core/runtime/src/main/java/org/apache/camel/quarkus/core/RuntimeBeanRepository.java @@ -28,6 +28,7 @@ import io.quarkus.arc.Arc; import io.quarkus.arc.ArcContainer; import io.smallrye.common.annotation.Identifier; import jakarta.enterprise.inject.AmbiguousResolutionException; +import jakarta.enterprise.inject.literal.NamedLiteral; import jakarta.enterprise.inject.spi.Bean; import jakarta.enterprise.inject.spi.BeanManager; import org.apache.camel.spi.BeanRepository; @@ -73,10 +74,17 @@ public final class RuntimeBeanRepository implements BeanRepository { private static Optional getReferenceByName(BeanManager manager, String name, Class type) { Set> beans = manager.getBeans(name); + +if (beans.isEmpty()) { +// Fallback to searching explicitly with NamedLiteral +beans = manager.getBeans(type, NamedLiteral.of(name)); +} + if (beans.isEmpty()) { // Fallback to SmallRye @Identifier beans = manager.getBeans(type, Identifier.Literal.of(name)); } + return Optional.ofNullable(manager.resolve(beans)).map(bean -> getReference(manager, type, bean)); } diff --git a/extensions/infinispan/runtime/src/main/doc/configuration.adoc b/extensions/infinispan/runtime/src/main/doc/configuration.adoc index f4bd4fac58..cdc779e832 100644 --- a/extensions/infinispan/runtime/src/main/doc/configuration.adoc +++ b/extensions/infinispan/runtime/src/main/doc/configuration.adoc @@ -3,6 +3,29 @@ You can either configure the Infinispan client via the relevant Camel Infinispan component & endpoint options, or you may use the https://quarkus.io/guides/infinispan-client#configuration-reference[Quarkus Infinispan extension configuration properties]. +Note that if you choose to use Quarkus Infinispan configuration properties, you *must* add an injection point for the `RemoteCacheManager` in order for it to be discoverable by the Camel Infinispan component. For example: + +[source,java] + +public class Routes extends RouteBuilder { +// Injects the default unnamed RemoteCacheManager +@Inject +RemoteCacheManager cacheManager; + +// If configured, injects an optional named RemoteCacheManager +@Inject +@InfinispanClientName("myNamedClient") +RemoteCacheManager namedCacheManager; + +@Override +public void configure()
[camel-quarkus] 01/03: Upgrade Quarkus to 3.1.0.CR1
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 36426bcd9aaf2ff2846cf2e6c5dfc92438965b87 Author: James Netherton AuthorDate: Mon Apr 17 08:25:26 2023 +0100 Upgrade Quarkus to 3.1.0.CR1 --- docs/antora.yml | 4 ++-- pom.xml | 10 +- poms/bom/src/main/generated/flattened-full-pom.xml| 8 poms/bom/src/main/generated/flattened-reduced-pom.xml | 8 poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 8 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 56449ea052..afc02f5223 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -30,11 +30,11 @@ asciidoc: # Project versions camel-version: 4.0.0-M3 # replace ${camel.version} camel-docs-version: "" -quarkus-version: 3.0.1.Final # replace ${quarkus.version} +quarkus-version: 999-SNAPSHOT # replace ${quarkus.version} graalvm-version: 22.3.0 # replace ${graalvm.version} graalvm-docs-version: 22.3 min-maven-version: 3.8.2 # replace ${min-maven-version} -target-maven-version: 3.8.8 # replace ${target-maven-version} +target-maven-version: 3.9.1 # replace ${target-maven-version} # Attributes used in xrefs to other Antora components cq-camel-components: components diff --git a/pom.xml b/pom.xml index 10927276bf..94c8a23900 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 2.0.0 2.0.1 2.0.0 -3.0.1.Final +999-SNAPSHOT 3.0.0 2.1.0 @@ -80,7 +80,7 @@ 1.8.1 1.0.0-beta.3 3.7.1 -1.72 +1.73 0.1.2 3.1.5 ${commons-beanutils-version} @@ -102,7 +102,7 @@ 1.121.0 1.121.0 22.3.0 -1.54.0 +1.54.1 ${hapi-version} ${hapi-base-version} ${hapi-fhir-version} @@ -144,7 +144,7 @@ 3.4.27 ${reactor-netty-version} 2.5.0 - 4.4.0 + 4.5.0 ${spring-version} 2.0 0.43.1 @@ -223,7 +223,7 @@ 3.8.2 -3.8.8 +3.9.1 [${min-maven-version},) diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 9e17604dbb..77a7e96f92 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6328,22 +6328,22 @@ org.bouncycastle bcmail-jdk18on -1.72 +1.73 org.bouncycastle bcpg-jdk18on -1.72 +1.73 org.bouncycastle bcprov-ext-jdk18on -1.72 +1.73 org.bouncycastle bcutil-jdk18on -1.72 +1.73 org.brotli diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index d3a938b8ca..cf2ce7a641 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6308,22 +6308,22 @@ org.bouncycastle bcmail-jdk18on -1.72 +1.73 org.bouncycastle bcpg-jdk18on -1.72 +1.73 org.bouncycastle bcprov-ext-jdk18on -1.72 +1.73 org.bouncycastle bcutil-jdk18on -1.72 +1.73 org.brotli diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index e7709d7ded..fcae3e30a4 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6308,22 +6308,22 @@ org.bouncycastle bcmail-jdk18on -1.72 +1.73 org.bouncycastle bcpg-jdk18on -1.72 +1.73 org.bouncycastle bcprov-ext-jdk18on -1.72 +1.73 org.bouncycastle bcutil-jdk18on -1.72 +1.73 org.brotli
[camel-quarkus] branch quarkus-main updated (b1937f9c3e -> 38310db47b)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard b1937f9c3e Add workaround for RemoteCacheManager bean discovery #4841 discard 67b7e59e05 Revert "Revert "Restore smallrye-reactive-messaging-camel extension"" discard 3c7f8d3cd2 Upgrade Quarkus to 3.1.0.CR1 add 68e13e6a07 Updated CHANGELOG.md add cf09ed618b Snnmp: reworked tests to avoid flaky failures add 24b279ea33 Updated CHANGELOG.md add ccc90939c7 Snmp: tiny timeout change in test to help stability add 4912ac03f0 Upgrade Camel to 4.0.0-M3 add 5286e7f09c Ref #4384: Groovy DSL - Add support of Groovy extensions add 0832f41ba9 Ref #4624: Upgrade to Groovy 4.x add 7f04b173e0 Add support of expressions referring an external resource add 3e3735e9dc Ref #1746: Groovy language native support add aa15026584 Bump quarkiverse-jackson-jq.version from 2.0.0.Alpha to 2.0.1 (#4877) add 8121356015 Restore camel-kubernetes related native testing (#4874) add 73e85406b5 Updated CHANGELOG.md add eefc917827 Regen SBOM from commit 73e85406b5542dd5a0010f3efecacb1db0d25cef new 36426bcd9a Upgrade Quarkus to 3.1.0.CR1 new dbcfcc2044 Revert "Revert "Restore smallrye-reactive-messaging-camel extension"" new 38310db47b Add workaround for RemoteCacheManager bean discovery #4841 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 (b1937f9c3e) \ N -- N -- N refs/heads/quarkus-main (38310db47b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 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 |12 + camel-quarkus-sbom/camel-quarkus-sbom.json | 19828 +-- camel-quarkus-sbom/camel-quarkus-sbom.xml | 15016 +++--- catalog/pom.xml|26 - docs/antora.yml| 2 +- docs/modules/ROOT/examples/components/http.yml | 2 +- docs/modules/ROOT/examples/components/solr.yml |13 - docs/modules/ROOT/examples/components/vm.yml |13 - docs/modules/ROOT/examples/languages/groovy.yml| 6 +- docs/modules/ROOT/nav.adoc | 2 - .../pages/reference/extensions/groovy-dsl.adoc | 6 - .../ROOT/pages/reference/extensions/groovy.adoc|22 +- .../ROOT/pages/reference/extensions/http.adoc | 4 +- .../ROOT/pages/reference/extensions/solr.adoc |54 - .../ROOT/pages/reference/extensions/vm.adoc|46 - .../CamelPackageScanClassResolverTest.java | 6 +- .../camel/quarkus/core/CamelContextRecorder.java | 9 +- .../apache/camel/quarkus/core/CamelRecorder.java | 3 +- .../apache/camel/quarkus/core/ConsumeRecorder.java | 3 +- .../camel/quarkus/core/FastCamelContext.java |12 +- .../org/apache/camel/quarkus/main/CamelMain.java | 3 +- .../groovy/deployment/GroovyProcessor.java |47 - extensions-jvm/pom.xml | 1 - .../httpclient/deployment/HttpClientProcessor.java |22 +- extensions-support/httpclient/runtime/pom.xml | 7 + .../language/deployment/ExpressionBuildItem.java |26 +- .../deployment/LanguageSupportProcessor.java |10 +- .../language/deployment/ScriptBuildItem.java | 8 +- .../language/deployment/dm/DryModeLanguage.java|17 +- .../deployment/dm/DryModeLanguageResolver.java | 4 +- .../language/deployment/dm/DryModeMain.java| 6 +- .../deployment/dm/DryModeScriptingLanguage.java| 7 +- .../language/deployment/dm/ExpressionHolder.java |12 +- .../language/deployment/dm/ScriptHolder.java | 8 +- .../dsl/groovy/deployment/GroovyDslProcessor.java |65 +- .../runtime/src/main/doc/limitations.adoc | 1 - .../groovy/runtime/graal/GroovySubstitutions.java | 130 +- .../groovy/deployment/pom.xml | 8 + .../GroovyExpressionSourceBuildItem.java} |31 +- .../groovy/deployment/GroovyProcessor.java | 176 + {extensions-jvm =>
[camel] branch regen_bot_sbom updated (d5cbca1843b -> f7b134e8b95)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_sbom in repository https://gitbox.apache.org/repos/asf/camel.git omit d5cbca1843b Regen SBOM from commit 93a1ba2ae62e4a5fb46a5e43f364b40cfb60a93d add 244b828a371 Regen SBOM from commit 93a1ba2ae62e4a5fb46a5e43f364b40cfb60a93d add d0888629fcb CAMEL-19058: rework the Message to avoid hitting the type-check scalability issue add 43a6a299189 (chores) camel-sjms: disabled flaky tests on GH Actions add f53a9203a0e (chores) camel-jms: disabled flaky tests on GH Actions add bbd1140ebd5 CAMEL-19304: camel-jpa implement paging (#9970) add 6564b678d27 Regen for commit bbd1140ebd5b3e135c1f66c0658ca4a75c650b9a add d7f80e11b42 CAMEL-19301: Upgrade to hawtio 2.17.2 add c5a7a8c3240 CAMEL-17946 Introducing HTTPS support for AS2 component for the main and 4.x branch add d7e2eb5eee8 Changed version for commons-io to 2.11.0 add 3ff6e2f5496 Substituted calls of System.out.println() to slf4j logging add 30b3b1a1e7f Fixed checkstyle issue add 75fa4ab130f Fixed checkstyle and source check issue add 2abbd5cd94a committing PFX file again, looks like my IDEA "optimized" it during the initial commit add c057e26f6ca Refactored test class for Mendelson AS2 resource: moved settings into property file, disabled the test by default add a65eac0f757 Regen add 4a0b22560bd Regen for commit d7f80e11b42f0a4afb69eb3dfc5f50dd42cb808c (#9977) add ab66c331511 CAMEL-19306: camel-jbang - added beans definition as known yaml file (#9974) add 0874cd7b43b CAMEL-19302: camel init - Should not include hardcoded routeId add 58b83ef3ec3 CAMEL-17946 candidate hotfix for AS2 POM. Sorry (#9981) add 1520bbaacee (chores) ci: added a note about PRs from first-timers requiring manual approval add b573466c4b6 CAMEL-19058: wrap some internal properties in an EnumMap add 42007838891 camel-ldap: Updated documentation (#9988) add 33965611a7d (chores) deps: upgrade Jandex to the latest version add eee3b671e62 Added DSL tabs for EIPs docs (#9992) add f5d78189f2c Regen for commit eee3b671e62764f457b1972278659a7bd33a7af1 add 5d868bdfd37 CAMEL-19309: camel-jbang - camel run --source-dir add 625f833739f Regen for commit 43c81eaf390d2e67fb22ce0258368cfd354be816 (#9994) add d1170342e36 Update rest-component.adoc (#9996) add 1262efb754e Remove dependencies on camel-directvm add a1188ec8521 [maven-release-plugin] prepare release camel-4.0.0-M3 add f668472b9f7 [maven-release-plugin] prepare for next development iteration add 024e14284b1 Merge branch 'release/4.0.0-M3' add 2b8ba9da93f CAMEL-19320: camel-jbang - Reload on demand add 5b836fe80ea Fix CS add 4bfaa057725 Regen for commit 95ddb6e47148a8fa3d76866fc4b9aff2a73eb23f (#9997) add 61a6a650891 Regen add 76aff3ea039 Regen add a654ae8932e Regen for commit 61a6a65089114cfba59c22c86ef95ebcd0ef79ec (#9998) add daab82ac0b1 CAMEL-19325: Add default identity support (#10003) add b40a1ad5022 CAMEL-17495 Added support of media type "application/xml" for AS2 component (#) add 945923fd798 Regen for commit b40a1ad5022c71e238123bedd937d70c7292c76e (#10004) add 12c9d8a0edd Regen for commit 945923fd798ea51f29b7303fb71c7375f3e52c81 add d9a8b4942aa CAMEL-19322: camel-jbang - Source Dir to support application.properties add e01a06e3d25 Regen for commit 2e5dbb9c0dee8004c2c23c3e7c57627abab41849 add 9eaab087ec1 CAMEL-19299: camel-console - Add bean registry console add f5c6c84447e CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention add a447f6d4f7c Regen for commit 9eaab087ec124ab4466a9b64e468e55e76b1a88e add 7511bed1de5 Regen for commit 435f4324008c9a13eb0c637ff797ef6b7608e5c6 add bd55bc90e96 CAMEL-19320: camel-jbang - Reload on demand add 07a9849c431 Regen for commit 7511bed1de51ec85a96d4d014d556fb9d1add2ea add 1095606f20e Regen for commit 44b87db848a22492da8efb75b6dec826a58ffa35 add 40d80f5c737 Regen for commit 1095606f20e28dbe265ca1c42053f407e547e1c0 add ca6731047d8 CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention add f7b134e8b95 Regen SBOM from commit ca6731047d83c80c709c5e4fd84e2b6f61392cce 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 (d5cbca1843b) \ N -- N -- N refs/heads/regen_bot_sbom (f7b134e8b95) 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
[GitHub] [camel] github-actions[bot] opened a new pull request, #10021: Generated sources regen for SBOM
github-actions[bot] opened a new pull request, #10021: URL: https://github.com/apache/camel/pull/10021 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` branch for generating SBOMs. Please do not delete `regen_bot_sbom` 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] branch regen_bot updated (40d80f5c737 -> ca6731047d8)
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 40d80f5c737 Regen for commit 1095606f20e28dbe265ca1c42053f407e547e1c0 add ca6731047d8 CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/impl/engine/DefaultInflightRepository.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch regen_bot updated (f449c01ebab -> 40d80f5c737)
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 f449c01ebab Regen for commit 1095606f20e28dbe265ca1c42053f407e547e1c0 add 40d80f5c737 Regen for commit 1095606f20e28dbe265ca1c42053f407e547e1c0 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 (f449c01ebab) \ N -- N -- N refs/heads/regen_bot (40d80f5c737) 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 main updated: CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention
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 ca6731047d8 CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention ca6731047d8 is described below commit ca6731047d83c80c709c5e4fd84e2b6f61392cce Author: Claus Ibsen AuthorDate: Sun May 7 16:16:27 2023 +0200 CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention --- .../java/org/apache/camel/impl/engine/DefaultInflightRepository.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java index 30650e6a079..25988d4d48a 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java @@ -77,7 +77,7 @@ public class DefaultInflightRepository extends ServiceSupport implements Infligh public void remove(Exchange exchange, String routeId) { LongAdder existing = routeCount.get(routeId); if (existing != null) { -existing.increment(); +existing.decrement(); } }
[GitHub] [camel] oscerd merged pull request #10020: Generated sources regen
oscerd merged PR #10020: URL: https://github.com/apache/camel/pull/10020 -- 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 (be4ecfcc3bb -> f449c01ebab)
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 be4ecfcc3bb Regen for commit 44b87db848a22492da8efb75b6dec826a58ffa35 add 1095606f20e Regen for commit 44b87db848a22492da8efb75b6dec826a58ffa35 add f449c01ebab Regen for commit 1095606f20e28dbe265ca1c42053f407e547e1c0 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 (be4ecfcc3bb) \ N -- N -- N refs/heads/regen_bot (f449c01ebab) 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 | 7912 +++- 1 file changed, 2561 insertions(+), 5351 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #10020: Generated sources regen
github-actions[bot] opened a new pull request, #10020: URL: https://github.com/apache/camel/pull/10020 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` 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
[camel] branch regen_bot updated (07a9849c431 -> be4ecfcc3bb)
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 07a9849c431 Regen for commit 7511bed1de51ec85a96d4d014d556fb9d1add2ea add be4ecfcc3bb Regen for commit 44b87db848a22492da8efb75b6dec826a58ffa35 No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/schemas/camel-spring.xsd | 7936 +--- 1 file changed, 5363 insertions(+), 2573 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #10019: Generated sources regen
github-actions[bot] opened a new pull request, #10019: URL: https://github.com/apache/camel/pull/10019 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
[GitHub] [camel] oscerd merged pull request #10019: Generated sources regen
oscerd merged PR #10019: URL: https://github.com/apache/camel/pull/10019 -- 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 (4fec1d8c856 -> 07a9849c431)
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 4fec1d8c856 Regen for commit bd55bc90e96a40af5183bd7b2af9a35eb6fafc54 add 07a9849c431 Regen for commit 7511bed1de51ec85a96d4d014d556fb9d1add2ea 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 (4fec1d8c856) \ N -- N -- N refs/heads/regen_bot (07a9849c431) 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_3x updated (07a7f5449e8 -> 73a8e1e423f)
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 07a7f5449e8 CAMEL-19299: camel-console - Add bean registry console add 73a8e1e423f CAMEL-19320: camel-jbang - Reload on demand No new revisions were added by this update. Summary of changes: .../org/apache/camel/spi/PropertiesComponent.java | 5 +++ ...erMatcher.java => PropertiesSourceFactory.java} | 28 - .../DefaultPropertiesSourceFactory.java} | 36 +++--- .../component/properties/PropertiesComponent.java | 7 + .../camel/support/RouteWatcherReloadStrategy.java | 29 + 5 files changed, 72 insertions(+), 33 deletions(-) copy core/camel-api/src/main/java/org/apache/camel/spi/{NotifyBuilderMatcher.java => PropertiesSourceFactory.java} (59%) copy core/{camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlip2Test.java => camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesSourceFactory.java} (52%)
[camel] branch main created (now 07a9849c431)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git at 07a9849c431 Regen for commit 7511bed1de51ec85a96d4d014d556fb9d1add2ea This branch includes the following new commits: new 07a9849c431 Regen for commit 7511bed1de51ec85a96d4d014d556fb9d1add2ea 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] oscerd merged pull request #10018: Generated sources regen
oscerd merged PR #10018: URL: https://github.com/apache/camel/pull/10018 -- 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 (608359bcb21 -> 4fec1d8c856)
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 608359bcb21 Regen for commit 7511bed1de51ec85a96d4d014d556fb9d1add2ea add bd55bc90e96 CAMEL-19320: camel-jbang - Reload on demand add 4fec1d8c856 Regen for commit bd55bc90e96a40af5183bd7b2af9a35eb6fafc54 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 (608359bcb21) \ N -- N -- N refs/heads/regen_bot (4fec1d8c856) 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: .../org/apache/camel/spi/PropertiesComponent.java | 5 +++ ...erMatcher.java => PropertiesSourceFactory.java} | 28 - .../DefaultPropertiesSourceFactory.java} | 36 +++--- .../component/properties/PropertiesComponent.java | 7 + .../camel/support/RouteWatcherReloadStrategy.java | 29 + 5 files changed, 72 insertions(+), 33 deletions(-) copy core/camel-api/src/main/java/org/apache/camel/spi/{NotifyBuilderMatcher.java => PropertiesSourceFactory.java} (59%) copy core/{camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoutingSlip2Test.java => camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesSourceFactory.java} (52%)
[GitHub] [camel] github-actions[bot] opened a new pull request, #10018: Generated sources regen
github-actions[bot] opened a new pull request, #10018: URL: https://github.com/apache/camel/pull/10018 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` 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] orpiske commented on a diff in pull request #10010: CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention
orpiske commented on code in PR #10010: URL: https://github.com/apache/camel/pull/10010#discussion_r1186844510 ## core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java: ## @@ -67,28 +67,28 @@ public void remove(Exchange exchange) { @Override public void add(Exchange exchange, String routeId) { -AtomicInteger existing = routeCount.get(routeId); +LongAdder existing = routeCount.get(routeId); if (existing != null) { -existing.incrementAndGet(); +existing.increment(); } } @Override public void remove(Exchange exchange, String routeId) { -AtomicInteger existing = routeCount.get(routeId); +LongAdder existing = routeCount.get(routeId); if (existing != null) { -existing.decrementAndGet(); +existing.increment(); Review Comment: @davsclaus i think the bug could be here. It should decrement, but it is incrementing. -- 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] orpiske commented on pull request #10010: CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention
orpiske commented on PR #10010: URL: https://github.com/apache/camel/pull/10010#issuecomment-1537428969 > Yes this works fine on 3.20.x branch How about with M3? -- 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-k] mrkhedri commented on issue #4304: camel k operator error when running simple example
mrkhedri commented on issue #4304: URL: https://github.com/apache/camel-k/issues/4304#issuecomment-1537428235 I changed my registry address to the external registry and that's worked. For my local registry issue, I think it's better to move the registry container to the kind cluster. So all pods can see together (with default kubernetes network policy). -- 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 #10010: CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention
davsclaus commented on PR #10010: URL: https://github.com/apache/camel/pull/10010#issuecomment-1537423862 Yes this works fine on 3.20.x 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 For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.20.x updated: CAMEL-19320: camel-jbang - Reload on demand
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 44b87db848a CAMEL-19320: camel-jbang - Reload on demand 44b87db848a is described below commit 44b87db848a22492da8efb75b6dec826a58ffa35 Author: Claus Ibsen AuthorDate: Sun May 7 13:54:37 2023 +0200 CAMEL-19320: camel-jbang - Reload on demand --- .../org/apache/camel/spi/PropertiesComponent.java | 5 +++ .../apache/camel/spi/PropertiesSourceFactory.java | 44 ++ .../properties/DefaultPropertiesSourceFactory.java | 44 ++ .../component/properties/PropertiesComponent.java | 7 .../camel/support/RouteWatcherReloadStrategy.java | 30 +++ 5 files changed, 130 insertions(+) diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java index a49fbc81bd6..eddcdcaab24 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java @@ -163,6 +163,11 @@ public interface PropertiesComponent extends StaticService { */ void addLocation(String location); +/** + * Gets the {@link PropertiesSourceFactory}. + */ +PropertiesSourceFactory getPropertiesSourceFactory(); + /** * Adds a custom {@link PropertiesSource} to use as source for loading and/or looking up property values. */ diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesSourceFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesSourceFactory.java new file mode 100644 index 000..bde47dd204b --- /dev/null +++ b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesSourceFactory.java @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.spi; + +/** + * Factory for creating out of the box {@link PropertiesSource}. + */ +public interface PropertiesSourceFactory { + +/** + * New file based {@link PropertiesSource} + * + * @param location location of the file + */ +PropertiesSource newFilePropertiesSource(String location); + +/** + * New classpath based {@link PropertiesSource} + * + * @param location location of the file in the classpath + */ +PropertiesSource newClasspathPropertiesSource(String location); + +/** + * New ref based {@link PropertiesSource} + * + * @param ref id for the {@link java.util.Properties} bean. + */ +PropertiesSource newRefPropertiesSource(String ref); +} diff --git a/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesSourceFactory.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesSourceFactory.java new file mode 100644 index 000..a1d43dcebd4 --- /dev/null +++ b/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesSourceFactory.java @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.properties; + +import org.apache.camel.spi.PropertiesSource; +import org.apache.camel.spi.PropertiesSourceFactory; + +public class
[GitHub] [camel] oscerd merged pull request #10017: Generated sources regen
oscerd merged PR #10017: URL: https://github.com/apache/camel/pull/10017 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.x updated: CAMEL-19320: camel-jbang - Reload on demand
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 73a8e1e423f CAMEL-19320: camel-jbang - Reload on demand 73a8e1e423f is described below commit 73a8e1e423f8f0e51e7d635d214bf1d2ca14b41c Author: Claus Ibsen AuthorDate: Sun May 7 13:54:37 2023 +0200 CAMEL-19320: camel-jbang - Reload on demand --- .../org/apache/camel/spi/PropertiesComponent.java | 5 +++ .../apache/camel/spi/PropertiesSourceFactory.java | 44 ++ .../properties/DefaultPropertiesSourceFactory.java | 44 ++ .../component/properties/PropertiesComponent.java | 7 .../camel/support/RouteWatcherReloadStrategy.java | 29 ++ 5 files changed, 129 insertions(+) diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java index 2f3d3030400..0a201077fd1 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java @@ -163,6 +163,11 @@ public interface PropertiesComponent extends StaticService { */ void addLocation(String location); +/** + * Gets the {@link PropertiesSourceFactory}. + */ +PropertiesSourceFactory getPropertiesSourceFactory(); + /** * Adds a custom {@link PropertiesSource} to use as source for loading and/or looking up property values. */ diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesSourceFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesSourceFactory.java new file mode 100644 index 000..bde47dd204b --- /dev/null +++ b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesSourceFactory.java @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.spi; + +/** + * Factory for creating out of the box {@link PropertiesSource}. + */ +public interface PropertiesSourceFactory { + +/** + * New file based {@link PropertiesSource} + * + * @param location location of the file + */ +PropertiesSource newFilePropertiesSource(String location); + +/** + * New classpath based {@link PropertiesSource} + * + * @param location location of the file in the classpath + */ +PropertiesSource newClasspathPropertiesSource(String location); + +/** + * New ref based {@link PropertiesSource} + * + * @param ref id for the {@link java.util.Properties} bean. + */ +PropertiesSource newRefPropertiesSource(String ref); +} diff --git a/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesSourceFactory.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesSourceFactory.java new file mode 100644 index 000..a1d43dcebd4 --- /dev/null +++ b/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesSourceFactory.java @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.properties; + +import org.apache.camel.spi.PropertiesSource; +import org.apache.camel.spi.PropertiesSourceFactory; + +public class
[camel] branch main updated: CAMEL-19320: camel-jbang - Reload on demand
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 bd55bc90e96 CAMEL-19320: camel-jbang - Reload on demand bd55bc90e96 is described below commit bd55bc90e96a40af5183bd7b2af9a35eb6fafc54 Author: Claus Ibsen AuthorDate: Sun May 7 13:54:37 2023 +0200 CAMEL-19320: camel-jbang - Reload on demand --- .../org/apache/camel/spi/PropertiesComponent.java | 5 +++ .../apache/camel/spi/PropertiesSourceFactory.java | 44 ++ .../properties/DefaultPropertiesSourceFactory.java | 44 ++ .../component/properties/PropertiesComponent.java | 7 .../camel/support/RouteWatcherReloadStrategy.java | 29 ++ 5 files changed, 129 insertions(+) diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java index 2f3d3030400..0a201077fd1 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesComponent.java @@ -163,6 +163,11 @@ public interface PropertiesComponent extends StaticService { */ void addLocation(String location); +/** + * Gets the {@link PropertiesSourceFactory}. + */ +PropertiesSourceFactory getPropertiesSourceFactory(); + /** * Adds a custom {@link PropertiesSource} to use as source for loading and/or looking up property values. */ diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesSourceFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesSourceFactory.java new file mode 100644 index 000..bde47dd204b --- /dev/null +++ b/core/camel-api/src/main/java/org/apache/camel/spi/PropertiesSourceFactory.java @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.spi; + +/** + * Factory for creating out of the box {@link PropertiesSource}. + */ +public interface PropertiesSourceFactory { + +/** + * New file based {@link PropertiesSource} + * + * @param location location of the file + */ +PropertiesSource newFilePropertiesSource(String location); + +/** + * New classpath based {@link PropertiesSource} + * + * @param location location of the file in the classpath + */ +PropertiesSource newClasspathPropertiesSource(String location); + +/** + * New ref based {@link PropertiesSource} + * + * @param ref id for the {@link java.util.Properties} bean. + */ +PropertiesSource newRefPropertiesSource(String ref); +} diff --git a/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesSourceFactory.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesSourceFactory.java new file mode 100644 index 000..a1d43dcebd4 --- /dev/null +++ b/core/camel-base/src/main/java/org/apache/camel/component/properties/DefaultPropertiesSourceFactory.java @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.component.properties; + +import org.apache.camel.spi.PropertiesSource; +import org.apache.camel.spi.PropertiesSourceFactory; + +public class
[GitHub] [camel] davsclaus commented on pull request #10010: CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention
davsclaus commented on PR #10010: URL: https://github.com/apache/camel/pull/10010#issuecomment-1537421305 I think this may break stuff, I can now see jbang have incorrect inflight exchanges out in 5 seconds. Inflights per route: [route2 = 26] 2023-05-07 13:53:14.719 INFO 39678 --- [ - ShutdownTask] impl.engine.DefaultShutdownStrategy : Waiting as there are still 26 inflight and pending exchanges to complete, timeout in 4 seconds. Inflights per route: [route2 = 26] 2023-05-07 13:53:15.721 INFO 39678 --- [ - ShutdownTask] impl.engine.DefaultShutdownStrategy : Waiting as there are still 26 inflight and pending exchanges to complete, timeout in 3 seconds. Inflights per route: [route2 = 26] 2023-05-07 13:53:16.727 INFO 39678 --- [ - ShutdownTask] impl.engine.DefaultShutdownStrategy : Waiting as there are still 26 inflight and pending exchanges to complete, timeout in 2 seconds. Inflights per route: [route2 = 26] 2023-05-07 13:53:17.731 INFO 39678 --- [ - ShutdownTask] impl.engine.DefaultShutdownStrategy : Waiting as there are still 26 inflight and pending exchanges to complete, timeout in 1 seconds. Inflights per route: [route2 = 26] -- 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 (a447f6d4f7c -> 608359bcb21)
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 a447f6d4f7c Regen for commit 9eaab087ec124ab4466a9b64e468e55e76b1a88e add 7511bed1de5 Regen for commit 435f4324008c9a13eb0c637ff797ef6b7608e5c6 add 608359bcb21 Regen for commit 7511bed1de51ec85a96d4d014d556fb9d1add2ea No new revisions were added by this update. Summary of changes:
[GitHub] [camel] github-actions[bot] opened a new pull request, #10017: Generated sources regen
github-actions[bot] opened a new pull request, #10017: URL: https://github.com/apache/camel/pull/10017 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` 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
[camel] branch regen_bot updated (dcd93e80f88 -> a447f6d4f7c)
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 dcd93e80f88 Regen for commit 435f4324008c9a13eb0c637ff797ef6b7608e5c6 This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/regen_bot (a447f6d4f7c) \ O -- O -- O (dcd93e80f88) 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 | 7912 +++- 1 file changed, 2561 insertions(+), 5351 deletions(-)
[GitHub] [camel] grgrzybek commented on pull request #10000: Xml in jbang
grgrzybek commented on PR #1: URL: https://github.com/apache/camel/pull/1#issuecomment-1537418064 Sure, as I said - naming is work in progress. Package scanning is a must and we could simply: * register beans with default ctor * register beans with `@Named` and `@Inject` constructors Yaml dsl code is a bit weird for me (at this stage of grasping Camel changes), but definitely there must be one mechanism underneath. `` and `` are kind of aliases, but for now the first one looks more natural (as there are no `` element to justify `` :D). Another thought - if Spring's top-level `` would be supported, it should be able to use `` inside and it's more a work related to CAMEL-19041. Anyway - the hardest part for me is done (which was to actually write some initial code). I start slowly, but then it's easier for me ;) -- 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_sbom updated (85517e65 -> 4b98588b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_sbom in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git omit 85517e65 Regen SBOM from commit e47128b97a22b5c5bb83ab6067d7cbe49aed724f add 8438076f Regen SBOM from commit e47128b97a22b5c5bb83ab6067d7cbe49aed724f add 4b98588b Regen SBOM from commit 8438076f1e9bf9f80c3d6b475fee771b90866d9b 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 (85517e65) \ N -- N -- N refs/heads/regen_bot_sbom (4b98588b) 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-kamelets-sbom/camel-kamelets-sbom.json | 4 ++-- camel-kamelets-sbom/camel-kamelets-sbom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
[GitHub] [camel-kamelets] github-actions[bot] opened a new pull request, #1462: Generated sources regen for SBOM
github-actions[bot] opened a new pull request, #1462: URL: https://github.com/apache/camel-kamelets/pull/1462 Regen bot :robot: found some uncommitted changes after running build on :camel-kamelets: `main` branch for generating SBOMs. Please do not delete `regen_bot_sbom` 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] oscerd merged pull request #10016: Generated sources regen
oscerd merged PR #10016: URL: https://github.com/apache/camel/pull/10016 -- 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 (bf8c95eb3ba -> dcd93e80f88)
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 bf8c95eb3ba Regen for commit f5c6c84447e797969307b74758a43e6b7c7fdd2d add a447f6d4f7c Regen for commit 9eaab087ec124ab4466a9b64e468e55e76b1a88e add dcd93e80f88 Regen for commit 435f4324008c9a13eb0c637ff797ef6b7608e5c6 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 (bf8c95eb3ba) \ N -- N -- N refs/heads/regen_bot (dcd93e80f88) 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 | 7936 +--- 1 file changed, 5363 insertions(+), 2573 deletions(-)
[camel] branch regen_bot updated (1192c16bacd -> bf8c95eb3ba)
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 1192c16bacd Regen for commit 9eaab087ec124ab4466a9b64e468e55e76b1a88e add f5c6c84447e CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention add bf8c95eb3ba Regen for commit f5c6c84447e797969307b74758a43e6b7c7fdd2d 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 (1192c16bacd) \ N -- N -- N refs/heads/regen_bot (bf8c95eb3ba) 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: .../impl/engine/DefaultInflightRepository.java | 26 +++--- 1 file changed, 13 insertions(+), 13 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #10016: Generated sources regen
github-actions[bot] opened a new pull request, #10016: URL: https://github.com/apache/camel/pull/10016 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` 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
[camel] branch regen_bot_3x updated (e9cd93b5635 -> 07a7f5449e8)
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 e9cd93b5635 Regen for commit 189e44eb0f1ee6f89dfe510e8b4b0601c0e9a612 (#10012) add 07a7f5449e8 CAMEL-19299: camel-console - Add bean registry console No new revisions were added by this update. Summary of changes: .../services/org/apache/camel/dev-console}/bean| 2 +- ...opertiesDevConsole.java => BeanDevConsole.java} | 43 ++ 2 files changed, 20 insertions(+), 25 deletions(-) copy {components/camel-bean/src/generated/resources/META-INF/services/org/apache/camel/language => core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console}/bean (53%) copy core/camel-console/src/main/java/org/apache/camel/impl/console/{PropertiesDevConsole.java => BeanDevConsole.java} (53%)
[GitHub] [camel-quarkus] oscerd merged pull request #4878: Generated sources regen for SBOM
oscerd merged PR #4878: URL: https://github.com/apache/camel-quarkus/pull/4878 -- 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 regen_bot_sbom updated (13d9866b9c -> 59dbd0bede)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_sbom in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git omit 13d9866b9c Regen SBOM from commit 71214c59048e90b4f0df51665303ada8ceaba3e7 add 1434c6a0e4 Regen SBOM from commit 71214c59048e90b4f0df51665303ada8ceaba3e7 add 12b15469c5 Fixup 9db92b2 Upgrade to Maven Wrapper 3.2.0 and Maven 3.9.1 add 7c8af33103 Remove Wagon related configuration as Maven 3.9.0+ does not use Wagon for http by default add f66584aabe Limit aether.connector.http.connectionMaxTtl to 120 seconds to avoid Connection timeouts on Github actions #4842 add a89132ab6f Patch mvnw with maven-resolver-1.9.8 artifacts so that it honors aether.connector.http.connectionMaxTtl to avoid Connect timeouts on GH actions add 9f45cdae11 Updated CHANGELOG.md add 5ef701cef8 simple("${exchange.getMessage().getBody()}") causes a MethodNotFoundException in native mode #4860 add 9f7ea2100a Updated CHANGELOG.md add 38f4e54e08 Update documentation references for javax packages to jakarta add b9e3722940 [MapStruct] Add tests add 68e13e6a07 Updated CHANGELOG.md add cf09ed618b Snnmp: reworked tests to avoid flaky failures add 24b279ea33 Updated CHANGELOG.md add ccc90939c7 Snmp: tiny timeout change in test to help stability add 4912ac03f0 Upgrade Camel to 4.0.0-M3 add 5286e7f09c Ref #4384: Groovy DSL - Add support of Groovy extensions add 0832f41ba9 Ref #4624: Upgrade to Groovy 4.x add 7f04b173e0 Add support of expressions referring an external resource add 3e3735e9dc Ref #1746: Groovy language native support add aa15026584 Bump quarkiverse-jackson-jq.version from 2.0.0.Alpha to 2.0.1 (#4877) add 8121356015 Restore camel-kubernetes related native testing (#4874) add 73e85406b5 Updated CHANGELOG.md add 59dbd0bede Regen SBOM from commit 73e85406b5542dd5a0010f3efecacb1db0d25cef 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 (13d9866b9c) \ N -- N -- N refs/heads/regen_bot_sbom (59dbd0bede) 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: .github/workflows/camel-master-cron.yaml |37 +- .github/workflows/ci-build.yaml|45 +- .github/workflows/generate-sbom-main.yml | 6 +- .github/workflows/pr-validate.yml | 9 +- .github/workflows/quarkus-master-cron.yaml |37 +- .mvn/wrapper/maven-wrapper.properties | 2 +- CHANGELOG.md |16 + camel-quarkus-sbom/camel-quarkus-sbom.json | 19828 +-- camel-quarkus-sbom/camel-quarkus-sbom.xml | 15016 +++--- catalog/pom.xml|26 - docs/antora.yml| 2 +- docs/modules/ROOT/examples/components/http.yml | 2 +- docs/modules/ROOT/examples/components/solr.yml |13 - docs/modules/ROOT/examples/components/vm.yml |13 - docs/modules/ROOT/examples/languages/groovy.yml| 6 +- docs/modules/ROOT/nav.adoc | 2 - .../ROOT/pages/reference/extensions/aws2-ddb.adoc | 2 +- .../ROOT/pages/reference/extensions/aws2-s3.adoc | 2 +- .../ROOT/pages/reference/extensions/aws2-ses.adoc | 2 +- .../ROOT/pages/reference/extensions/aws2-sns.adoc | 2 +- .../ROOT/pages/reference/extensions/aws2-sqs.adoc | 2 +- .../pages/reference/extensions/freemarker.adoc | 6 +- .../pages/reference/extensions/groovy-dsl.adoc | 6 - .../ROOT/pages/reference/extensions/groovy.adoc|22 +- .../ROOT/pages/reference/extensions/http.adoc | 4 +- .../ROOT/pages/reference/extensions/mock.adoc | 4 +- .../ROOT/pages/reference/extensions/solr.adoc |54 - .../ROOT/pages/reference/extensions/vm.adoc|46 - docs/modules/ROOT/pages/user-guide/cdi.adoc|20 +- .../ROOT/pages/user-guide/command-mode.adoc| 2 +- .../ROOT/pages/user-guide/configuration.adoc | 8 +- docs/modules/ROOT/pages/user-guide/testing.adoc| 2 +- .../core/deployment/CamelNativeImageProcessor.java | 5 + .../CamelPackageScanClassResolverTest.java | 6 +- .../camel/quarkus/core/CamelContextRecorder.java |
[GitHub] [camel-quarkus] github-actions[bot] opened a new pull request, #4878: Generated sources regen for SBOM
github-actions[bot] opened a new pull request, #4878: URL: https://github.com/apache/camel-quarkus/pull/4878 Regen bot :robot: found some uncommitted changes after running build on :camel-quarkus: `main` branch for generating SBOMs. Please do not delete `regen_bot_sbom` 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] oscerd merged pull request #10015: Generated sources regen
oscerd merged PR #10015: URL: https://github.com/apache/camel/pull/10015 -- 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 (68831f6bf26 -> 1192c16bacd)
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 68831f6bf26 Regen for commit e01a06e3d2571ffa2a1c1670c89a3437fe4e0e15 add 9eaab087ec1 CAMEL-19299: camel-console - Add bean registry console add 1192c16bacd Regen for commit 9eaab087ec124ab4466a9b64e468e55e76b1a88e 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 (68831f6bf26) \ N -- N -- N refs/heads/regen_bot (1192c16bacd) 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: .../services/org/apache/camel/dev-console}/bean| 2 +- ...opertiesDevConsole.java => BeanDevConsole.java} | 43 ++ 2 files changed, 20 insertions(+), 25 deletions(-) copy {components/camel-bean/src/generated/resources/META-INF/services/org/apache/camel/language => core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console}/bean (53%) copy core/camel-console/src/main/java/org/apache/camel/impl/console/{PropertiesDevConsole.java => BeanDevConsole.java} (53%)
[camel] branch regen_bot updated (144bfaef41d -> 68831f6bf26)
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 144bfaef41d Regen for commit 2e5dbb9c0dee8004c2c23c3e7c57627abab41849 add e01a06e3d25 Regen for commit 2e5dbb9c0dee8004c2c23c3e7c57627abab41849 add 68831f6bf26 Regen for commit e01a06e3d2571ffa2a1c1670c89a3437fe4e0e15 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 (144bfaef41d) \ N -- N -- N refs/heads/regen_bot (68831f6bf26) 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 | 7912 +++- 1 file changed, 2561 insertions(+), 5351 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #10015: Generated sources regen
github-actions[bot] opened a new pull request, #10015: URL: https://github.com/apache/camel/pull/10015 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` 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
[camel] branch main updated: CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new f5c6c84447e CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention f5c6c84447e is described below commit f5c6c84447e797969307b74758a43e6b7c7fdd2d Author: Otavio Rodolfo Piske AuthorDate: Sat May 6 16:13:08 2023 +0200 CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention --- .../impl/engine/DefaultInflightRepository.java | 26 +++--- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java index 212e59309cf..30650e6a079 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultInflightRepository.java @@ -22,7 +22,7 @@ import java.util.Comparator; import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.LongAdder; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -42,14 +42,14 @@ public class DefaultInflightRepository extends ServiceSupport implements Infligh private static final Logger LOG = LoggerFactory.getLogger(DefaultInflightRepository.class); -private final AtomicInteger size = new AtomicInteger(); +private final LongAdder size = new LongAdder(); private final ConcurrentMap inflight = new ConcurrentHashMap<>(); -private final ConcurrentMap routeCount = new ConcurrentHashMap<>(); +private final ConcurrentMap routeCount = new ConcurrentHashMap<>(); private boolean inflightExchangeEnabled; @Override public void add(Exchange exchange) { -size.incrementAndGet(); +size.increment(); if (inflightExchangeEnabled) { inflight.put(exchange.getExchangeId(), exchange); @@ -58,7 +58,7 @@ public class DefaultInflightRepository extends ServiceSupport implements Infligh @Override public void remove(Exchange exchange) { -size.decrementAndGet(); +size.decrement(); if (inflightExchangeEnabled) { inflight.remove(exchange.getExchangeId()); @@ -67,28 +67,28 @@ public class DefaultInflightRepository extends ServiceSupport implements Infligh @Override public void add(Exchange exchange, String routeId) { -AtomicInteger existing = routeCount.get(routeId); +LongAdder existing = routeCount.get(routeId); if (existing != null) { -existing.incrementAndGet(); +existing.increment(); } } @Override public void remove(Exchange exchange, String routeId) { -AtomicInteger existing = routeCount.get(routeId); +LongAdder existing = routeCount.get(routeId); if (existing != null) { -existing.decrementAndGet(); +existing.increment(); } } @Override public int size() { -return size.get(); +return size.intValue(); } @Override public void addRoute(String routeId) { -routeCount.putIfAbsent(routeId, new AtomicInteger()); +routeCount.putIfAbsent(routeId, new LongAdder()); } @Override @@ -98,8 +98,8 @@ public class DefaultInflightRepository extends ServiceSupport implements Infligh @Override public int size(String routeId) { -AtomicInteger existing = routeCount.get(routeId); -return existing != null ? existing.get() : 0; +LongAdder existing = routeCount.get(routeId); +return existing != null ? existing.intValue() : 0; } @Override
[GitHub] [camel] orpiske merged pull request #10010: CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention
orpiske merged PR #10010: URL: https://github.com/apache/camel/pull/10010 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.20.x updated: CAMEL-19299: camel-console - Add bean registry console
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 435f4324008 CAMEL-19299: camel-console - Add bean registry console 435f4324008 is described below commit 435f4324008c9a13eb0c637ff797ef6b7608e5c6 Author: Claus Ibsen AuthorDate: Sun May 7 11:59:57 2023 +0200 CAMEL-19299: camel-console - Add bean registry console --- .../services/org/apache/camel/dev-console/bean | 2 + .../apache/camel/impl/console/BeanDevConsole.java | 62 ++ 2 files changed, 64 insertions(+) diff --git a/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/bean b/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/bean new file mode 100644 index 000..0108ad92105 --- /dev/null +++ b/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/bean @@ -0,0 +1,2 @@ +# Generated by camel build tools - do NOT edit this file! +class=org.apache.camel.impl.console.BeanDevConsole diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java new file mode 100644 index 000..f94dd336421 --- /dev/null +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java @@ -0,0 +1,62 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.impl.console; + +import java.util.Map; +import java.util.stream.Stream; + +import org.apache.camel.spi.annotations.DevConsole; +import org.apache.camel.support.console.AbstractDevConsole; +import org.apache.camel.util.json.JsonObject; + +@DevConsole("bean") +public class BeanDevConsole extends AbstractDevConsole { + +public BeanDevConsole() { +super("camel", "bean", "Bean", "Displays Java beans from the registry"); +} + +@Override +protected String doCallText(Map options) { +StringBuilder sb = new StringBuilder(); + +Map beans = getCamelContext().getRegistry().findByTypeWithName(Object.class); +Stream keys = beans.keySet().stream().sorted(String::compareToIgnoreCase); +keys.forEach(k -> { +String v = beans.getOrDefault(k, "").getClass().getName(); +sb.append(String.format("%s (class: %s)%n", k, v)); +}); + +return sb.toString(); +} + +@Override +protected JsonObject doCallJson(Map options) { +JsonObject root = new JsonObject(); + +JsonObject jo = new JsonObject(); +root.put("beans", jo); +Map beans = getCamelContext().getRegistry().findByTypeWithName(Object.class); +Stream keys = beans.keySet().stream().sorted(String::compareToIgnoreCase); +keys.forEach(k -> { +String v = beans.getOrDefault(k, "null").getClass().getName(); +beans.put(k, v); +}); + +return root; +} +}
[camel] branch camel-3.x updated: CAMEL-19299: camel-console - Add bean registry console
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 07a7f5449e8 CAMEL-19299: camel-console - Add bean registry console 07a7f5449e8 is described below commit 07a7f5449e8a77784c7ace8aafc3d25be7dfebad Author: Claus Ibsen AuthorDate: Sun May 7 11:59:57 2023 +0200 CAMEL-19299: camel-console - Add bean registry console --- .../services/org/apache/camel/dev-console/bean | 2 + .../apache/camel/impl/console/BeanDevConsole.java | 62 ++ 2 files changed, 64 insertions(+) diff --git a/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/bean b/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/bean new file mode 100644 index 000..0108ad92105 --- /dev/null +++ b/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/bean @@ -0,0 +1,2 @@ +# Generated by camel build tools - do NOT edit this file! +class=org.apache.camel.impl.console.BeanDevConsole diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java new file mode 100644 index 000..f94dd336421 --- /dev/null +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java @@ -0,0 +1,62 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.impl.console; + +import java.util.Map; +import java.util.stream.Stream; + +import org.apache.camel.spi.annotations.DevConsole; +import org.apache.camel.support.console.AbstractDevConsole; +import org.apache.camel.util.json.JsonObject; + +@DevConsole("bean") +public class BeanDevConsole extends AbstractDevConsole { + +public BeanDevConsole() { +super("camel", "bean", "Bean", "Displays Java beans from the registry"); +} + +@Override +protected String doCallText(Map options) { +StringBuilder sb = new StringBuilder(); + +Map beans = getCamelContext().getRegistry().findByTypeWithName(Object.class); +Stream keys = beans.keySet().stream().sorted(String::compareToIgnoreCase); +keys.forEach(k -> { +String v = beans.getOrDefault(k, "").getClass().getName(); +sb.append(String.format("%s (class: %s)%n", k, v)); +}); + +return sb.toString(); +} + +@Override +protected JsonObject doCallJson(Map options) { +JsonObject root = new JsonObject(); + +JsonObject jo = new JsonObject(); +root.put("beans", jo); +Map beans = getCamelContext().getRegistry().findByTypeWithName(Object.class); +Stream keys = beans.keySet().stream().sorted(String::compareToIgnoreCase); +keys.forEach(k -> { +String v = beans.getOrDefault(k, "null").getClass().getName(); +beans.put(k, v); +}); + +return root; +} +}
[camel] branch main updated: CAMEL-19299: camel-console - Add bean registry console
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 9eaab087ec1 CAMEL-19299: camel-console - Add bean registry console 9eaab087ec1 is described below commit 9eaab087ec124ab4466a9b64e468e55e76b1a88e Author: Claus Ibsen AuthorDate: Sun May 7 11:59:57 2023 +0200 CAMEL-19299: camel-console - Add bean registry console --- .../services/org/apache/camel/dev-console/bean | 2 + .../apache/camel/impl/console/BeanDevConsole.java | 62 ++ 2 files changed, 64 insertions(+) diff --git a/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/bean b/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/bean new file mode 100644 index 000..0108ad92105 --- /dev/null +++ b/core/camel-console/src/generated/resources/META-INF/services/org/apache/camel/dev-console/bean @@ -0,0 +1,2 @@ +# Generated by camel build tools - do NOT edit this file! +class=org.apache.camel.impl.console.BeanDevConsole diff --git a/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java b/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java new file mode 100644 index 000..f94dd336421 --- /dev/null +++ b/core/camel-console/src/main/java/org/apache/camel/impl/console/BeanDevConsole.java @@ -0,0 +1,62 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.impl.console; + +import java.util.Map; +import java.util.stream.Stream; + +import org.apache.camel.spi.annotations.DevConsole; +import org.apache.camel.support.console.AbstractDevConsole; +import org.apache.camel.util.json.JsonObject; + +@DevConsole("bean") +public class BeanDevConsole extends AbstractDevConsole { + +public BeanDevConsole() { +super("camel", "bean", "Bean", "Displays Java beans from the registry"); +} + +@Override +protected String doCallText(Map options) { +StringBuilder sb = new StringBuilder(); + +Map beans = getCamelContext().getRegistry().findByTypeWithName(Object.class); +Stream keys = beans.keySet().stream().sorted(String::compareToIgnoreCase); +keys.forEach(k -> { +String v = beans.getOrDefault(k, "").getClass().getName(); +sb.append(String.format("%s (class: %s)%n", k, v)); +}); + +return sb.toString(); +} + +@Override +protected JsonObject doCallJson(Map options) { +JsonObject root = new JsonObject(); + +JsonObject jo = new JsonObject(); +root.put("beans", jo); +Map beans = getCamelContext().getRegistry().findByTypeWithName(Object.class); +Stream keys = beans.keySet().stream().sorted(String::compareToIgnoreCase); +keys.forEach(k -> { +String v = beans.getOrDefault(k, "null").getClass().getName(); +beans.put(k, v); +}); + +return root; +} +}
[camel] branch regen_bot_3x updated (14440b6fbe7 -> e9cd93b5635)
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 discard 14440b6fbe7 Regen for commit 44754fc56c49010de6d2510ecda58c0d838256e1 add e9cd93b5635 Regen for commit 189e44eb0f1ee6f89dfe510e8b4b0601c0e9a612 (#10012) 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 (14440b6fbe7) \ N -- N -- N refs/heads/regen_bot_3x (e9cd93b5635) 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:
[GitHub] [camel] github-actions[bot] closed pull request #10013: Generated sources regen (Camel 3)
github-actions[bot] closed pull request #10013: Generated sources regen (Camel 3) URL: https://github.com/apache/camel/pull/10013 -- 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] oscerd merged pull request #10014: Generated sources regen
oscerd merged PR #10014: URL: https://github.com/apache/camel/pull/10014 -- 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 (d9a8b4942aa -> 144bfaef41d)
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 d9a8b4942aa CAMEL-19322: camel-jbang - Source Dir to support application.properties add 144bfaef41d Regen for commit 2e5dbb9c0dee8004c2c23c3e7c57627abab41849 No new revisions were added by this update. Summary of changes: .../apache/camel/catalog/schemas/camel-spring.xsd | 7936 +--- 1 file changed, 5363 insertions(+), 2573 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #10014: Generated sources regen
github-actions[bot] opened a new pull request, #10014: URL: https://github.com/apache/camel/pull/10014 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
[GitHub] [camel] github-actions[bot] opened a new pull request, #10013: Generated sources regen (Camel 3)
github-actions[bot] opened a new pull request, #10013: URL: https://github.com/apache/camel/pull/10013 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
[camel] branch regen_bot_3x updated (9eec6ffb097 -> 14440b6fbe7)
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 9eec6ffb097 Regen for commit 189e44eb0f1ee6f89dfe510e8b4b0601c0e9a612 add 44754fc56c4 CAMEL-19322: camel-jbang - Source Dir to support application.properties add 14440b6fbe7 Regen for commit 44754fc56c49010de6d2510ecda58c0d838256e1 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 (9eec6ffb097) \ N -- N -- N refs/heads/regen_bot_3x (14440b6fbe7) 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-dependencies/pom.xml | 2 +- .../apache/camel/support/RouteWatcherReloadStrategy.java | 4 ++-- .../java/org/apache/camel/dsl/jbang/core/commands/Run.java | 14 +- parent/pom.xml | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-)
[camel] branch regen_bot updated (12c9d8a0edd -> d9a8b4942aa)
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 12c9d8a0edd Regen for commit 945923fd798ea51f29b7303fb71c7375f3e52c81 add d9a8b4942aa CAMEL-19322: camel-jbang - Source Dir to support application.properties No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- .../apache/camel/support/RouteWatcherReloadStrategy.java | 4 ++-- .../java/org/apache/camel/dsl/jbang/core/commands/Run.java | 14 +- parent/pom.xml | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-)
[camel-spring-boot] branch camel-spring-boot-3.x updated: [create-pull-request] automated change
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-spring-boot-3.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/camel-spring-boot-3.x by this push: new bbeec442a74 [create-pull-request] automated change bbeec442a74 is described below commit bbeec442a746de4a1864f17a9bdc00625d9218a2 Author: orpiske AuthorDate: Sun May 7 01:12:57 2023 + [create-pull-request] automated change --- .../org/apache/camel/springboot/catalog/components/as2.json | 4 +++- .../camel/springboot/catalog/components/azure-cosmosdb.json | 6 -- .../org/apache/camel/springboot/catalog/components/jpa.json | 5 - .../src/main/docs/azure-cosmosdb.json | 7 +++ .../cosmosdb/springboot/CosmosDbComponentConfiguration.java | 13 + 5 files changed, 31 insertions(+), 4 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/as2.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/as2.json index 69249337ec3..ed92465ed7c 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/as2.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/as2.json @@ -43,6 +43,7 @@ "ediMessageTransferEncoding": { "kind": "parameter", "displayName": "Edi Message Transfer Encoding", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.as2.AS2Configuration", "configurationField": "configuration", "description": "The transfer encoding of EDI message." }, "ediMessageType": { "kind": "parameter", "displayName": "Edi Message Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.http.entity.ContentType", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.as2.AS2Configuration", "configurationField": "configuration", "description": "The content type of EDI message. One of application\/edifact, application\/edi-x12, application\/edi-consent" }, "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.as2.AS2Configuration", "configurationField": "configuration", "description": "The value of the From header of AS2 message." }, +"hostnameVerifier": { "kind": "parameter", "displayName": "Hostname Verifier", "group": "common", "label": "", "required": false, "type": "object", "javaType": "javax.net.ssl.HostnameVerifier", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.as2.AS2Configuration", "configurationField": "configuration", "description": "Set hostname verifier for SSL session." }, "httpConnectionPoolSize": { "kind": "parameter", "displayName": "Http Connection Pool Size", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5", "configurationClass": "org.apache.camel.component.as2.AS2Configuration", "configurationField": "configuration", "description": "The maximum size of the connection pool for http connections (client only)" }, "httpConnectionPoolTtl": { "kind": "parameter", "displayName": "Http Connection Pool Ttl", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "15m", "configurationClass": "org.apache.camel.component.as2.AS2Configuration", "configurationField": "configuration", "description": "The time to live for connections in the connection pool (client only)" }, "httpConnectionTimeout": { "kind": "parameter", "displayName": "Http Connection Timeout", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5s", "configurationClass": "org.apache.camel.component.as2.AS2Configuration", "configurationField": "configuration", "description": "The timeout of the http connection (client only)" }, @@ -53,6 +54,7 @@ "server": { "kind": "parameter", "displayName": "Server", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue":
[GitHub] [camel-spring-boot] oscerd merged pull request #828: [Github Actions] Periodic Sync Camel Spring Boot (Camel 3)
oscerd merged PR #828: URL: https://github.com/apache/camel-spring-boot/pull/828 -- 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 #10000: Xml in jbang
davsclaus commented on PR #1: URL: https://github.com/apache/camel/pull/1#issuecomment-1537359239 @grgrzybek great work so far. Yeah we need to think how to make `` work in `` for declaring beans ala Spring/Blueprint, and then also allow to use in the Camel route DSL. Since camel-app is in the model, then it gets exposed to yaml-dsl and other DSLs. Today the yaml-dsl have special "beans" support. And yeah I dont like the jsr-xxx number - nobody remember these numbers. So we need to come up with a better name. Also I wonder if its needed at all, as it can detect `@Inject` and the Camel annotations as well `@BeanInject` and so on. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.x updated: Regen for commit 189e44eb0f1ee6f89dfe510e8b4b0601c0e9a612 (#10012)
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 e9cd93b5635 Regen for commit 189e44eb0f1ee6f89dfe510e8b4b0601c0e9a612 (#10012) e9cd93b5635 is described below commit e9cd93b563520156c9cab104aa6200cffcdc12aa Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sun May 7 10:34:29 2023 +0200 Regen for commit 189e44eb0f1ee6f89dfe510e8b4b0601c0e9a612 (#10012) Signed-off-by: GitHub Co-authored-by: davsclaus --- .../builder/endpoint/dsl/AS2EndpointBuilderFactory.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AS2EndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AS2EndpointBuilderFactory.java index 4d012531317..9d24f2204e1 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AS2EndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AS2EndpointBuilderFactory.java @@ -219,7 +219,7 @@ public interface AS2EndpointBuilderFactory { } /** * The content type of EDI message. One of application/edifact, - * application/edi-x12, application/edi-consent. + * application/edi-x12, application/edi-consent, application/xml. * * The option is a: * codeorg.apache.http.entity.ContentType/code type. @@ -236,7 +236,7 @@ public interface AS2EndpointBuilderFactory { } /** * The content type of EDI message. One of application/edifact, - * application/edi-x12, application/edi-consent. + * application/edi-x12, application/edi-consent, application/xml. * * The option will be converted to a * codeorg.apache.http.entity.ContentType/code type. @@ -1180,7 +1180,7 @@ public interface AS2EndpointBuilderFactory { } /** * The content type of EDI message. One of application/edifact, - * application/edi-x12, application/edi-consent. + * application/edi-x12, application/edi-consent, application/xml. * * The option is a: * codeorg.apache.http.entity.ContentType/code type. @@ -1197,7 +1197,7 @@ public interface AS2EndpointBuilderFactory { } /** * The content type of EDI message. One of application/edifact, - * application/edi-x12, application/edi-consent. + * application/edi-x12, application/edi-consent, application/xml. * * The option will be converted to a * codeorg.apache.http.entity.ContentType/code type. @@ -2120,7 +2120,7 @@ public interface AS2EndpointBuilderFactory { } /** * The content type of EDI message. One of application/edifact, - * application/edi-x12, application/edi-consent. + * application/edi-x12, application/edi-consent, application/xml. * * The option is a: * codeorg.apache.http.entity.ContentType/code type. @@ -2137,7 +2137,7 @@ public interface AS2EndpointBuilderFactory { } /** * The content type of EDI message. One of application/edifact, - * application/edi-x12, application/edi-consent. + * application/edi-x12, application/edi-consent, application/xml. * * The option will be converted to a * codeorg.apache.http.entity.ContentType/code type.
[GitHub] [camel] davsclaus merged pull request #10012: Generated sources regen (Camel 3)
davsclaus merged PR #10012: URL: https://github.com/apache/camel/pull/10012 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.20.x updated: CAMEL-19322: camel-jbang - Source Dir to support application.properties
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 2e5dbb9c0de CAMEL-19322: camel-jbang - Source Dir to support application.properties 2e5dbb9c0de is described below commit 2e5dbb9c0dee8004c2c23c3e7c57627abab41849 Author: Claus Ibsen AuthorDate: Sun May 7 10:08:48 2023 +0200 CAMEL-19322: camel-jbang - Source Dir to support application.properties --- camel-dependencies/pom.xml | 2 +- .../apache/camel/support/RouteWatcherReloadStrategy.java | 2 +- .../java/org/apache/camel/dsl/jbang/core/commands/Run.java | 14 +- parent/pom.xml | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index e656ed71cf8..9dbba385c9d 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -455,7 +455,7 @@ 2.0.27 42.5.1 0.8.9 -4.7.2 +4.7.3 0.10.0 2.0.7 1.0-alpha-2 diff --git a/core/camel-support/src/main/java/org/apache/camel/support/RouteWatcherReloadStrategy.java b/core/camel-support/src/main/java/org/apache/camel/support/RouteWatcherReloadStrategy.java index cb78a1224fd..90c773871d6 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/RouteWatcherReloadStrategy.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/RouteWatcherReloadStrategy.java @@ -144,7 +144,7 @@ public class RouteWatcherReloadStrategy extends FileWatcherResourceReloadStrateg if (name.endsWith(".properties")) { onPropertiesReload(resource, true); } else { -onRouteReload(List.of(resource), true); +onRouteReload(List.of(resource), false); } }); } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java index 987cdb58f51..b44bbd1b756 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java @@ -105,8 +105,7 @@ public class Run extends CamelCommand { List files = new ArrayList<>(); @Option(names = { "--source-dir" }, -description = "Source directory for loading Camel file(s) to run. When using this, then files cannot be specified at the same time." - + " Multiple directories can be specified separated by comma.") +description = "Source directory for dynamically loading Camel file(s) to run. When using this, then files cannot be specified at the same time.") String sourceDir; @Option(names = { "--background" }, defaultValue = "false", description = "Run in the background") @@ -615,7 +614,12 @@ public class Run extends CamelCommand { private Properties loadProfileProperties() throws Exception { Properties answer = null; -File profilePropertiesFile = new File(getProfile() + ".properties"); +File profilePropertiesFile; +if (sourceDir != null) { +profilePropertiesFile = new File(sourceDir, getProfile() + ".properties"); +} else { +profilePropertiesFile = new File(getProfile() + ".properties"); +} if (profilePropertiesFile.exists()) { answer = loadProfileProperties(profilePropertiesFile); // logging level/color may be configured in the properties file @@ -625,9 +629,9 @@ public class Run extends CamelCommand { loggingJson = "true".equals(answer.getProperty("loggingJson", loggingJson ? "true" : "false")); if (propertiesFiles == null) { -propertiesFiles = "file:" + getProfile() + ".properties"; +propertiesFiles = "file:" + profilePropertiesFile.getPath(); } else { -propertiesFiles = propertiesFiles + ",file:" + profilePropertiesFile.getName(); +propertiesFiles = propertiesFiles + ",file:" + profilePropertiesFile.getPath(); } repos = answer.getProperty("camel.jbang.repos", repos); mavenSettings = answer.getProperty("camel.jbang.maven-settings", mavenSettings); diff --git a/parent/pom.xml b/parent/pom.xml index c4a54ccd69b..29cf057f32a 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -441,7 +441,7 @@ 2.0.27 42.5.1 0.8.9 -4.7.2 +4.7.3 0.10.0 2.0.7 1.0-alpha-2
[camel] branch camel-3.x updated: CAMEL-19322: camel-jbang - Source Dir to support application.properties
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 44754fc56c4 CAMEL-19322: camel-jbang - Source Dir to support application.properties 44754fc56c4 is described below commit 44754fc56c49010de6d2510ecda58c0d838256e1 Author: Claus Ibsen AuthorDate: Sun May 7 10:08:48 2023 +0200 CAMEL-19322: camel-jbang - Source Dir to support application.properties --- camel-dependencies/pom.xml | 2 +- .../apache/camel/support/RouteWatcherReloadStrategy.java | 4 ++-- .../java/org/apache/camel/dsl/jbang/core/commands/Run.java | 14 +- parent/pom.xml | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 0cc4d84d48d..7998a470711 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -446,7 +446,7 @@ 2.0.27 42.5.1 0.8.9 -4.7.2 +4.7.3 0.10.0 1.2.4 2.0.7 diff --git a/core/camel-support/src/main/java/org/apache/camel/support/RouteWatcherReloadStrategy.java b/core/camel-support/src/main/java/org/apache/camel/support/RouteWatcherReloadStrategy.java index f63af35d3ec..590061ca839 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/RouteWatcherReloadStrategy.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/RouteWatcherReloadStrategy.java @@ -149,7 +149,7 @@ public class RouteWatcherReloadStrategy extends FileWatcherResourceReloadStrateg if (name.endsWith(".properties")) { onPropertiesReload(resource, true); } else { -onRouteReload(List.of(resource), true); +onRouteReload(List.of(resource), false); } }); } @@ -190,7 +190,7 @@ public class RouteWatcherReloadStrategy extends FileWatcherResourceReloadStrateg pr.onReload(resource.getLocation(), changed); // trigger all routes to be reloaded if (reloadRoutes) { -onRouteReload(null, true); +onRouteReload(null, false); } } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java index 46d2c9573a3..93409de5073 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java @@ -105,8 +105,7 @@ public class Run extends CamelCommand { List files = new ArrayList<>(); @Option(names = { "--source-dir" }, -description = "Source directory for loading Camel file(s) to run. When using this, then files cannot be specified at the same time." - + " Multiple directories can be specified separated by comma.") +description = "Source directory for dynamically loading Camel file(s) to run. When using this, then files cannot be specified at the same time.") String sourceDir; @Option(names = { "--background" }, defaultValue = "false", description = "Run in the background") @@ -616,7 +615,12 @@ public class Run extends CamelCommand { private Properties loadProfileProperties() throws Exception { Properties answer = null; -File profilePropertiesFile = new File(getProfile() + ".properties"); +File profilePropertiesFile; +if (sourceDir != null) { +profilePropertiesFile = new File(sourceDir, getProfile() + ".properties"); +} else { +profilePropertiesFile = new File(getProfile() + ".properties"); +} if (profilePropertiesFile.exists()) { answer = loadProfileProperties(profilePropertiesFile); // logging level/color may be configured in the properties file @@ -626,9 +630,9 @@ public class Run extends CamelCommand { loggingJson = "true".equals(answer.getProperty("loggingJson", loggingJson ? "true" : "false")); if (propertiesFiles == null) { -propertiesFiles = "file:" + getProfile() + ".properties"; +propertiesFiles = "file:" + profilePropertiesFile.getPath(); } else { -propertiesFiles = propertiesFiles + ",file:" + profilePropertiesFile.getName(); +propertiesFiles = propertiesFiles + ",file:" + profilePropertiesFile.getPath(); } repos = answer.getProperty("camel.jbang.repos", repos);
[camel] branch main updated: CAMEL-19322: camel-jbang - Source Dir to support application.properties
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 d9a8b4942aa CAMEL-19322: camel-jbang - Source Dir to support application.properties d9a8b4942aa is described below commit d9a8b4942aae0e763bd1e0ce56976050984b1a21 Author: Claus Ibsen AuthorDate: Sun May 7 10:08:48 2023 +0200 CAMEL-19322: camel-jbang - Source Dir to support application.properties --- camel-dependencies/pom.xml | 2 +- .../apache/camel/support/RouteWatcherReloadStrategy.java | 4 ++-- .../java/org/apache/camel/dsl/jbang/core/commands/Run.java | 14 +- parent/pom.xml | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 4b9b24fb23a..67644729b1a 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -410,7 +410,7 @@ 2.0.28 42.5.1 0.8.9 -4.7.2 +4.7.3 0.10.0 3.0.0 2.0.7 diff --git a/core/camel-support/src/main/java/org/apache/camel/support/RouteWatcherReloadStrategy.java b/core/camel-support/src/main/java/org/apache/camel/support/RouteWatcherReloadStrategy.java index 00707899e7b..df932199758 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/RouteWatcherReloadStrategy.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/RouteWatcherReloadStrategy.java @@ -148,7 +148,7 @@ public class RouteWatcherReloadStrategy extends FileWatcherResourceReloadStrateg if (name.endsWith(".properties")) { onPropertiesReload(resource, true); } else { -onRouteReload(List.of(resource), true); +onRouteReload(List.of(resource), false); } }); } @@ -189,7 +189,7 @@ public class RouteWatcherReloadStrategy extends FileWatcherResourceReloadStrateg pr.onReload(resource.getLocation(), changed); // trigger all routes to be reloaded if (reloadRoutes) { -onRouteReload(null, true); +onRouteReload(null, false); } } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java index f7a42879d57..353d875f9b4 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java @@ -106,8 +106,7 @@ public class Run extends CamelCommand { List files = new ArrayList<>(); @Option(names = { "--source-dir" }, -description = "Source directory for loading Camel file(s) to run. When using this, then files cannot be specified at the same time." - + " Multiple directories can be specified separated by comma.") +description = "Source directory for dynamically loading Camel file(s) to run. When using this, then files cannot be specified at the same time.") String sourceDir; @Option(names = { "--background" }, defaultValue = "false", description = "Run in the background") @@ -618,7 +617,12 @@ public class Run extends CamelCommand { private Properties loadProfileProperties() throws Exception { Properties answer = null; -File profilePropertiesFile = new File(getProfile() + ".properties"); +File profilePropertiesFile; +if (sourceDir != null) { +profilePropertiesFile = new File(sourceDir, getProfile() + ".properties"); +} else { +profilePropertiesFile = new File(getProfile() + ".properties"); +} if (profilePropertiesFile.exists()) { answer = loadProfileProperties(profilePropertiesFile); // logging level/color may be configured in the properties file @@ -628,9 +632,9 @@ public class Run extends CamelCommand { loggingJson = "true".equals(answer.getProperty("loggingJson", loggingJson ? "true" : "false")); if (propertiesFiles == null) { -propertiesFiles = "file:" + getProfile() + ".properties"; +propertiesFiles = "file:" + profilePropertiesFile.getPath(); } else { -propertiesFiles = propertiesFiles + ",file:" + profilePropertiesFile.getName(); +propertiesFiles = propertiesFiles + ",file:" + profilePropertiesFile.getPath(); } repos = answer.getProperty("camel.jbang.repos", repos); mavenSettings =
[GitHub] [camel-karavan] davsclaus closed issue #753: cxf component- as service/consumer
davsclaus closed issue #753: cxf component- as service/consumer URL: https://github.com/apache/camel-karavan/issues/753 -- 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 commented on issue #758: How to localize in cloud-app?
davsclaus commented on issue #758: URL: https://github.com/apache/camel-karavan/issues/758#issuecomment-1537354207 There is only support currently for english language. -- 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 #10010: CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention
github-actions[bot] commented on PR #10010: URL: https://github.com/apache/camel/pull/10010#issuecomment-1537353657 :no_entry_sign: There are (likely) no components to be tested in this PR -- 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 (e4a8f67651a -> 9eec6ffb097)
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 e4a8f67651a Regen for commit e1484aa61dfb3aaa19954e7b86dea3a5bee1b408 add 189e44eb0f1 Regen for commit e1484aa61dfb3aaa19954e7b86dea3a5bee1b408 (#10011) add 9eec6ffb097 Regen for commit 189e44eb0f1ee6f89dfe510e8b4b0601c0e9a612 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 (e4a8f67651a) \ N -- N -- N refs/heads/regen_bot_3x (9eec6ffb097) 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: .../builder/endpoint/dsl/AS2EndpointBuilderFactory.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #10012: Generated sources regen (Camel 3)
github-actions[bot] opened a new pull request, #10012: URL: https://github.com/apache/camel/pull/10012 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] davsclaus merged pull request #10011: Generated sources regen (Camel 3)
davsclaus merged PR #10011: URL: https://github.com/apache/camel/pull/10011 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.x updated: Regen for commit e1484aa61dfb3aaa19954e7b86dea3a5bee1b408 (#10011)
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 189e44eb0f1 Regen for commit e1484aa61dfb3aaa19954e7b86dea3a5bee1b408 (#10011) 189e44eb0f1 is described below commit 189e44eb0f1ee6f89dfe510e8b4b0601c0e9a612 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sun May 7 09:07:39 2023 +0200 Regen for commit e1484aa61dfb3aaa19954e7b86dea3a5bee1b408 (#10011) Signed-off-by: GitHub Co-authored-by: davsclaus --- .../generated/resources/org/apache/camel/catalog/components/as2.json| 2 +- .../src/generated/resources/org/apache/camel/component/as2/as2.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json index cd0c132bf7f..c9ccab0a96a 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/as2.json @@ -41,7 +41,7 @@ "compressionAlgorithm": { "kind": "parameter", "displayName": "Compression Algorithm", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.as2.api.AS2CompressionAlgorithm", "enum": [ "ZLIB" ], "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.as2.AS2Configuration", "configurationField": "configuration", "description": "The algorithm used to compress EDI message." }, "dispositionNotificationTo": { "kind": "parameter", "displayName": "Disposition Notification To", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.as2.AS2Configuration", "configurationField": "configuration", "description": "The value of the Disposition-Notification-To header. Assigning a value to this parameter requests a mes [...] "ediMessageTransferEncoding": { "kind": "parameter", "displayName": "Edi Message Transfer Encoding", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.as2.AS2Configuration", "configurationField": "configuration", "description": "The transfer encoding of EDI message." }, -"ediMessageType": { "kind": "parameter", "displayName": "Edi Message Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.http.entity.ContentType", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.as2.AS2Configuration", "configurationField": "configuration", "description": "The content type of EDI message. One of application\/edifact, application\/edi-x12, application\/edi-consent" }, +"ediMessageType": { "kind": "parameter", "displayName": "Edi Message Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.http.entity.ContentType", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.as2.AS2Configuration", "configurationField": "configuration", "description": "The content type of EDI message. One of application\/edifact, application\/edi-x12, application\/edi-consen [...] "from": { "kind": "parameter", "displayName": "From", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.as2.AS2Configuration", "configurationField": "configuration", "description": "The value of the From header of AS2 message." }, "hostnameVerifier": { "kind": "parameter", "displayName": "Hostname Verifier", "group": "common", "label": "", "required": false, "type": "object", "javaType": "javax.net.ssl.HostnameVerifier", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.as2.AS2Configuration", "configurationField": "configuration", "description": "Set hostname verifier for SSL session." }, "httpConnectionPoolSize": { "kind": "parameter", "displayName": "Http Connection Pool Size", "group": "common", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5", "configurationClass": "org.apache.camel.component.as2.AS2Configuration",
[camel] branch regen_bot_3x updated (9fffe88e7b3 -> e4a8f67651a)
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 9fffe88e7b3 Regen for commit 9d40582c4b72c8679e870793a84365e0bbaac274 add e1484aa61df CAMEL-17495 Backport from the main branch. Added support of media type "application/xml" for AS2 component (#10008) add e4a8f67651a Regen for commit e1484aa61dfb3aaa19954e7b86dea3a5bee1b408 No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/components/as2.json | 2 +- .../camel/component/as2/api/AS2ClientManager.java | 26 ++-- .../camel/component/as2/api/AS2MediaType.java | 4 + .../camel/component/as2/api/AS2MimeType.java | 4 + .../api/entity/ApplicationEDIConsentEntity.java| 2 +- .../as2/api/entity/ApplicationEDIFACTEntity.java | 2 +- .../as2/api/entity/ApplicationEDIX12Entity.java| 2 +- ...cationEDIEntity.java => ApplicationEntity.java} | 6 +- ...EDIX12Entity.java => ApplicationXMLEntity.java} | 8 +- .../component/as2/api/entity/EntityParser.java | 21 ++-- .../camel/component/as2/api/util/EntityUtils.java | 9 +- .../component/as2/api/util/HttpMessageUtils.java | 47 .../camel/component/as2/api/AS2MessageTest.java| 10 +- .../component/as2/api/util/EntityUtilsTest.java| 20 +-- .../org/apache/camel/component/as2/as2.json| 2 +- .../camel/component/as2/AS2Configuration.java | 3 +- .../apache/camel/component/as2/AS2Consumer.java| 4 +- .../camel/component/as2/AS2ClientManagerIT.java| 134 +++-- .../camel/component/as2/AS2ServerManagerIT.java| 83 + 19 files changed, 297 insertions(+), 92 deletions(-) rename components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/{ApplicationEDIEntity.java => ApplicationEntity.java} (92%) copy components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/{ApplicationEDIX12Entity.java => ApplicationXMLEntity.java} (77%)
[GitHub] [camel] github-actions[bot] opened a new pull request, #10011: Generated sources regen (Camel 3)
github-actions[bot] opened a new pull request, #10011: URL: https://github.com/apache/camel/pull/10011 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] github-actions[bot] commented on pull request #10010: CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention
github-actions[bot] commented on PR #10010: URL: https://github.com/apache/camel/pull/10010#issuecomment-1537302691 :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. 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] orpiske opened a new pull request, #10010: CAMEL-19060: use LongAdder in DefaultInflightRepository to reduce contention
orpiske opened a new pull request, #10010: URL: https://github.com/apache/camel/pull/10010 This seems to help (mostly?) consumers when there is heavy contention. For instance, with Disruptor on a 6 consumer / 3 producer thread configuration: ``` GEOMETRIC MEAN (RATE): Test: 1041550.6594790532 | Baseline: 703258.587167714 Delta: 338292.0723113392 The geometric mean rate was greater for the test than for the baseline ``` Where "Test" is this patch and "Baseline" is 4.0.0-M3. -- 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