Re: [I] Remove deprecated code and docs [camel-karavan]
jwgmeligmeyling commented on issue #896: URL: https://github.com/apache/camel-karavan/issues/896#issuecomment-1762670060 What was the rationale behind removing the Operator? I can't seem to find it in the release notes. (cc @sranjha) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
oscerd closed pull request #973: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) URL: https://github.com/apache/camel-spring-boot/pull/973 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] closed issue #2926: [CI] - Quarkus Main Branch Build Failure URL: https://github.com/apache/camel-quarkus/issues/2926 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1762633243 Build fixed with: * Camel Quarkus Commit: 2ed830fe6bb4890639c8d8873bd739c3c2b9ac46 * Quarkus Main Commit: 7dba0e3628b0dd4112e5e38d807d77564c1cd629 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/6514950470 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch release-2.0.x updated: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-2.0.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-2.0.x by this push:
new 7cf9927fc chore: nightly SBOM update
7cf9927fc is described below
commit 7cf9927fc1996695ec36a4edc90fdfc5e1d5b22c
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Oct 14 00:53:21 2023 +
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 328 -
1 file changed, 164 insertions(+), 164 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 1d6588994..0352d9d3c 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:1fab295c-8d24-49b9-aa77-5434a3d54457",
+ "serialNumber": "urn:uuid:02a0506a-049d-47c2-b48d-3d2c65678206",
"version": 1,
"metadata": {
-"timestamp": "2023-10-13T00:54:19Z",
+"timestamp": "2023-10-14T00:53:21Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231012005052-edc7f34f9a20?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231013082600-dce30dff21a7?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20231012005052-edc7f34f9a20",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231012005052-edc7f34f9a20?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231013082600-dce30dff21a7",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231013082600-dce30dff21a7?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k";,
@@ -3061,18 +3061,18 @@
}
},
{
- "bom-ref": "pkg:golang/golang.org/x/crypto@v0.11.0?type=module",
+ "bom-ref": "pkg:golang/golang.org/x/crypto@v0.14.0?type=module",
"type": "library",
"name": "golang.org/x/crypto",
- "version": "v0.11.0",
+ "version": "v0.14.0",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"e84c1dab7b4389cd66839c513b89a295c5827cc550848e0d92a596bea7a3a6e0"
+ "content":
"c01a865f35895ba9b55eb20a9401f41ecd4927bfbd281c2720ef2feba43d7077"
}
],
- "purl":
"pkg:golang/golang.org/x/crypto@v0.11.0?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/golang.org/x/crypto@v0.14.0?type=module\u0026goos=linux\u0026goarch=amd64",
"evidence": {
"licenses": [
{
@@ -3107,18 +3107,18 @@
}
},
{
- "bom-ref": "pkg:golang/golang.org/x/net@v0.12.0?type=module",
+ "bom-ref": "pkg:golang/golang.org/x/net@v0.17.0?type=module",
"type": "library",
"name": "golang.org/x/net",
- "version": "v0.12.0",
+ "version": "v0.17.0",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"71f6b07ef2884df52c14278920726b6d2c697aefc4f35921725ca94741954f9d"
+ "content":
"a5569771cbb6a333e30977b07ebd52ef1cdaff37174e2b72f5c09d5d06128c83"
}
],
- "purl":
"pkg:golang/golang.org/x/net@v0.12.0?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/golang.org/x/net@v0.17.0?type=module\u0026goos=linux\u0026goarch=amd64",
"evidence": {
"licenses": [
{
@@ -3176,18 +3176,18 @@
}
},
{
- "bom-ref": "pkg:golang/golang.org/x/sys@v0.10.0?type=module",
+ "bom-ref": "pkg:golang/golang.org/x/sys@v0.13.0?type=module",
"type": "library",
"name": "golang.org/x/sys",
- "version": "v0.10.0",
+ "version": "v0.13.0",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"4aa305a7d51c40965afa9998b802a377dc6ad5fd23e6b2dc0c89349a3e2a02c0"
+ "content":
"01ff2728f9ae172a625018d5a14f55db41626855ce72e648db5a74c9c5586061"
}
],
- "purl":
"pkg:golang/golang.org/x/sys@v0.10.0?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/golang.org/x/sys@v0.13.0?type=module\u0026goos=linux\u0026goarch=amd64",
"evidence": {
"licenses": [
{
@@ -3199,18 +3199,18 @@
}
},
{
- "bom-ref": "pkg:golang/golang.org/x/term@v0.10.0?type=module",
+ "bom-ref": "pkg:golang/golang.org/x/term@v0.13.0?type=module",
"type": "library",
"name": "golang.org/x/term",
- "version": "
Re: [I] [CI] - Camel Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1762438017 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 6514245763-1165-4ce22021-dcf0-45d6-911c-e6e820fbfe3b * Camel Quarkus Commit: b1d3b8d096946214428f477cd43220a91412dbb5 * Camel Main Commit: 7dba0e3628b0dd4112e5e38d807d77564c1cd629 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/6514245763 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[I] [CI] - Camel Main Branch Build Failure [camel-quarkus]
jamesnetherton opened a new issue, #2927: URL: https://github.com/apache/camel-quarkus/issues/2927 This is a placeholder issue used by the [nightly sync workflow](https://github.com/apache/camel-quarkus/actions/workflows/camel-master-cron.yaml) for the [`camel-main`](https://github.com/apache/camel-quarkus/tree/camel-main) branch. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch release-1.12.x updated: Periodic Sync of Camel K Main Branch for SBOM Generation
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-1.12.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-1.12.x by this push:
new d90d8b751 Periodic Sync of Camel K Main Branch for SBOM Generation
d90d8b751 is described below
commit d90d8b751dfee7ff1d5af2359d6a1215a26fd6af
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Oct 14 00:35:25 2023 +
Periodic Sync of Camel K Main Branch for SBOM Generation
---
camel-k-sbom/camel-k-sbom.json | 54 +-
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 438237843..2e3012501 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:fceb113e-3fe7-42b8-8a77-152ce22030cb",
+ "serialNumber": "urn:uuid:42f04be3-5263-425d-b366-ea81cfe272b0",
"version": 1,
"metadata": {
-"timestamp": "2023-10-13T00:38:07Z",
+"timestamp": "2023-10-14T00:35:25Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20231012003653-75422f3d2f66?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20231013003807-c16cddd23069?type=module",
"type": "application",
"name": "github.com/apache/camel-k",
- "version": "v0.0.0-20231012003653-75422f3d2f66",
- "purl":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20231012003653-75422f3d2f66?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231013003807-c16cddd23069",
+ "purl":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20231013003807-c16cddd23069?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k";,
@@ -510,18 +510,18 @@
}
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20231012003653-75422f3d2f66?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20231013003807-c16cddd23069?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/apis/camel",
- "version": "v0.0.0-20231012003653-75422f3d2f66",
+ "version": "v0.0.0-20231013003807-c16cddd23069",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"a03084128e4abe6f21823564fd82c4767bdd27afdd7be0a0386957a362440330"
+ "content":
"b21646942592958fd96dd23f8a385adab9413bd883b58fb76d6f0fbd11917fa9"
}
],
- "purl":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20231012003653-75422f3d2f66?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20231013003807-c16cddd23069?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/pkg/apis/camel";,
@@ -530,18 +530,18 @@
]
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20231012003653-75422f3d2f66?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20231013003807-c16cddd23069?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/client/camel",
- "version": "v0.0.0-20231012003653-75422f3d2f66",
+ "version": "v0.0.0-20231013003807-c16cddd23069",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"b68ecd284aee5b612719df715b677d0b678c51496887bd41a4fbad3f16c19617"
+ "content":
"6fdcbd71f65bd717d32712c7e4d9a3fd87eaaed095f0b93447c793221b5a18d6"
}
],
- "purl":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20231012003653-75422f3d2f66?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20231013003807-c16cddd23069?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/pkg/client/camel";,
@@ -550,18 +550,18 @@
]
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20231012003653-75422f3d2f66?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20231013003807-c16cddd23069?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/kamelet/repository",
-
[PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
github-actions[bot] opened a new pull request, #973: URL: https://github.com/apache/camel-spring-boot/pull/973 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch main updated: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/main by this push:
new 541270335 chore: nightly SBOM update
541270335 is described below
commit 54127033523ae8ecfd1400b07a327fc310ce3acb
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Oct 13 23:46:36 2023 +
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index c03c7b6b8..04871e67c 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json";,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:901e68e9-f233-4297-8ba3-64d312bfadc1",
+ "serialNumber": "urn:uuid:7387689d-7744-4ced-b2aa-fedc0b82dd0e",
"version": 1,
"metadata": {
-"timestamp": "2023-10-12T23:48:36Z",
+"timestamp": "2023-10-13T23:46:35Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231011235026-75fd59d09052?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231012234836-f2de7ff7de7f?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20231011235026-75fd59d09052",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231011235026-75fd59d09052?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231012234836-f2de7ff7de7f",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231012234836-f2de7ff7de7f?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k";,
@@ -3853,7 +3853,7 @@
],
"dependencies": [
{
- "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231011235026-75fd59d09052?type=module",
+ "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231012234836-f2de7ff7de7f?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.38?type=module",
[camel-examples] branch main updated: Fix example
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-examples.git The following commit(s) were added to refs/heads/main by this push: new d37d3b27 Fix example d37d3b27 is described below commit d37d3b279e4e28d140431a976c0004a4e9359bc6 Author: Claus Ibsen AuthorDate: Fri Oct 13 19:49:08 2023 +0200 Fix example --- jooq/src/main/resources/META-INF/spring/jooq-spring.xml | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/jooq/src/main/resources/META-INF/spring/jooq-spring.xml b/jooq/src/main/resources/META-INF/spring/jooq-spring.xml index d0fa0388..5e221220 100644 --- a/jooq/src/main/resources/META-INF/spring/jooq-spring.xml +++ b/jooq/src/main/resources/META-INF/spring/jooq-spring.xml @@ -35,13 +35,8 @@ - - - - - +
[camel-spring-boot-examples] branch main updated: Bump for next version
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git The following commit(s) were added to refs/heads/main by this push: new 59edde7 Bump for next version 59edde7 is described below commit 59edde7aa1cbcc3f1d347ff41e9dc45fa57d22ab Author: Claus Ibsen AuthorDate: Fri Oct 13 19:43:45 2023 +0200 Bump for next version --- actuator-http-metrics/pom.xml| 2 +- amqp/pom.xml | 2 +- aot-basic/pom.xml| 2 +- arangodb/pom.xml | 2 +- artemis/pom.xml | 2 +- aws-secrets-manager/pom.xml | 2 +- aws2-s3/pom.xml | 2 +- azure/camel-example-spring-boot-azure-eventhubs/pom.xml | 2 +- azure/camel-example-spring-boot-azure-servicebus/pom.xml | 2 +- azure/pom.xml| 2 +- dynamic-router-eip/pom.xml | 2 +- endpointdsl/pom.xml | 2 +- fhir-auth-tx/pom.xml | 2 +- fhir/pom.xml | 2 +- health-checks/pom.xml| 2 +- infinispan/pom.xml | 2 +- jira/pom.xml | 2 +- kafka-avro/pom.xml | 2 +- kafka-offsetrepository/pom.xml | 2 +- kamelet-chucknorris/pom.xml | 2 +- load-balancer-eip/pom.xml| 2 +- mail-ms-exchange-oauth2/pom.xml | 2 +- master/pom.xml | 2 +- metrics/pom.xml | 2 +- observation/client/pom.xml | 2 +- observation/loggingtracer/pom.xml| 2 +- observation/pom.xml | 2 +- observation/service1/pom.xml | 2 +- observation/service2/pom.xml | 2 +- opentelemetry/CarBooking/pom.xml | 2 +- opentelemetry/FlightBooking/pom.xml | 2 +- opentelemetry/HotelBooking/pom.xml | 2 +- opentelemetry/TripBooking/pom.xml| 2 +- opentelemetry/pom.xml| 2 +- paho-mqtt5-shared-subscriptions/pom.xml | 2 +- platform-http/pom.xml| 2 +- pojo/pom.xml | 2 +- pom.xml | 2 +- quartz/pom.xml | 2 +- rabbitmq/pom.xml | 2 +- reactive-streams/pom.xml | 2 +- resilience4j/client/pom.xml | 2 +- resilience4j/client2/pom.xml | 2 +- resilience4j/pom.xml | 2 +- resilience4j/service1/pom.xml| 2 +- resilience4j/service2/pom.xml| 2 +- rest-cxf/pom.xml | 2 +- rest-openapi-simple/pom.xml | 2 +- rest-openapi-springdoc/pom.xml | 2 +- rest-openapi/pom.xml | 2 +- route-reload/pom.xml | 2 +- routes-configuration/pom.xml | 2 +- routetemplate-xml/pom.xml| 2 +- routetemplate/pom.xml| 2 +- saga/pom.xml | 2 +- saga/saga-app/pom.xml| 2 +- saga/saga-flight-service/pom.xml | 2 +- saga/saga-payment-service/pom.xml| 2 +- saga/saga-train-service/pom.xml | 2 +- soap-cxf/pom.xml | 2 +- splitter-eip/pom.xml | 2 +- spring-boot/pom.xml | 2 +- spring-jdbc/pom.xml | 2 +- strimzi/pom.xml | 2 +- supervising-route-controller/pom.xml | 2 +- twitter-salesforce/pom.xml | 2 +- type-converter/pom.xml | 2 +- validator/pom.xml| 2 +- webhook/pom.xml | 2 +- widget-gadget/pom.xml
[camel-examples] branch main updated: Bump for next version
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-examples.git The following commit(s) were added to refs/heads/main by this push: new 9b3c10bf Bump for next version 9b3c10bf is described below commit 9b3c10bff1e43de369f283136d1221dd894384cd Author: Claus Ibsen AuthorDate: Fri Oct 13 19:43:23 2023 +0200 Bump for next version --- aggregate-dist/pom.xml | 2 +- aggregate/pom.xml| 2 +- as2/pom.xml | 2 +- aws/main-endpointdsl-aws2-s3-kafka/pom.xml | 2 +- aws/main-endpointdsl-aws2-s3/pom.xml | 2 +- aws/main-endpointdsl-aws2/aws2-eventbridge-creator/pom.xml | 2 +- aws/main-endpointdsl-aws2/aws2-s3-events-inject/pom.xml | 2 +- aws/main-endpointdsl-aws2/aws2-sqs-consumer/pom.xml | 2 +- aws/main-endpointdsl-aws2/pom.xml| 2 +- aws/main-endpointdsl-kafka-aws2-s3-restarting-policy/pom.xml | 2 +- aws/main-endpointdsl-kafka-aws2-s3/pom.xml | 2 +- aws/pom.xml | 2 +- azure/azure-eventhubs/pom.xml| 2 +- azure/azure-storage-blob/pom.xml | 2 +- azure/kafka-azure/pom.xml| 2 +- azure/pom.xml| 2 +- basic/pom.xml| 2 +- bigxml-split/pom.xml | 2 +- billboard-aggregate/pom.xml | 2 +- cafe-endpointdsl/pom.xml | 2 +- cafe/pom.xml | 2 +- cassandra-kubernetes/pom.xml | 2 +- console/pom.xml | 2 +- couchbase-log/pom.xml| 2 +- csimple-joor/pom.xml | 2 +- csimple/pom.xml | 2 +- debezium-eventhubs-blob/pom.xml | 2 +- debezium/pom.xml | 2 +- flight-recorder/pom.xml | 2 +- ftp/pom.xml | 2 +- google/google-pubsub/pom.xml | 2 +- google/pom.xml | 2 +- hazelcast-kubernetes/pom.xml | 2 +- java8/pom.xml| 2 +- jdbc/pom.xml | 2 +- jmx/pom.xml | 2 +- jooq/pom.xml | 2 +- kafka/pom.xml| 2 +- kamelet-chucknorris/pom.xml | 2 +- kamelet-main/pom.xml | 2 +- kamelet-sql/pom.xml | 2 +- kamelet/pom.xml | 2 +- kotlin/pom.xml | 2 +- loadbalancing/pom.xml| 2 +- main-endpointdsl/pom.xml | 2 +- main-health/pom.xml | 2 +- main-joor/pom.xml| 2 +- main-lambda/pom.xml | 2 +- main-tiny/pom.xml| 2 +- main-xml/pom.xml | 2 +- main-yaml/pom.xml| 2 +- main/pom.xml | 2 +- mapstruct/pom.xml| 2 +- minio/pom.xml| 2 +- mongodb/pom.xml | 2 +- netty-custom-correlation/pom.xml | 2 +- oaipmh/pom.xml | 2 +- pom.xml | 4 ++-- reactive-executor-vertx/pom.xml | 2 +- resume-api/pom.xml | 2 +- resume-api/resume-api-aws2-kinesis/pom.xml | 2 +- resume-api/resume-api-cassandraql/pom.xml| 2 +- resume-api/resume-api-common/pom.xml | 2 +- resume-api/resume-api-file-offset/pom.xml| 2 +- resume-api/resume-api-fileset-clusterized/pom.xml| 2 +- resume-api/resume-api-fileset-wal/pom.xml
[camel] branch regen_bot_3x updated (ebfb162106e -> 2204d1dedb6)
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 ebfb162106e Regen for commit 5be242b6e61e771a5066bafe8587081dca4d26e9 (#11710) add 2204d1dedb6 CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure CamelContext is inject eager. This fixes a problem with using global route configurations in Java and XML DSLs mixed. (#11719) No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/builder/RouteBuilder.java | 20 +++- .../camel/builder/RouteConfigurationBuilder.java | 6 ++ 2 files changed, 21 insertions(+), 5 deletions(-)
[camel-examples] branch main updated: Add git ignore
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-examples.git The following commit(s) were added to refs/heads/main by this push: new fb3dd87d Add git ignore fb3dd87d is described below commit fb3dd87d9e539cf54175ddfc22b9b47234e8eefe Author: Claus Ibsen AuthorDate: Fri Oct 13 13:18:27 2023 +0200 Add git ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5d69a553..445a59d7 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ components/camel-cxf/activemq-data *.swp .flattened-pom.xml .java-version +.camel-jbang \ No newline at end of file
[camel] 01/02: CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure CamelContext is inject eager. This fixes a problem with using global route configurations in Java and XML DSLs mixed. (
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 396e64c5c014f8eea416e3b1f3ee345dc90a0438
Author: Claus Ibsen
AuthorDate: Fri Oct 13 17:28:53 2023 +0200
CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure
CamelContext is inject eager. This fixes a problem with using global route
configurations in Java and XML DSLs mixed. (#11719)
---
.../java/org/apache/camel/builder/RouteBuilder.java | 20 +++-
.../camel/builder/RouteConfigurationBuilder.java | 6 ++
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
index d2eaf24ba07..f861dd30914 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
@@ -706,14 +706,11 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
// Implementation methods
// ---
+
protected void checkInitialized() throws Exception {
if (initialized.compareAndSet(false, true)) {
-// Set the CamelContext ErrorHandler here
CamelContext camelContext = getContext();
-if
(camelContext.adapt(ExtendedCamelContext.class).getErrorHandlerFactory() !=
null) {
-setErrorHandlerFactory(
-
camelContext.adapt(ExtendedCamelContext.class).getErrorHandlerFactory());
-}
+initializeCamelContext(camelContext);
List strategies = new
ArrayList<>(lifecycleInterceptors);
strategies.addAll(camelContext.getRegistry().findByType(RouteBuilderLifecycleStrategy.class));
@@ -739,6 +736,19 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
}
}
+protected void initializeCamelContext(CamelContext camelContext) {
+// Set the CamelContext ErrorHandler here
+if
(camelContext.adapt(ExtendedCamelContext.class).getErrorHandlerFactory() !=
null) {
+setErrorHandlerFactory(
+
camelContext.adapt(ExtendedCamelContext.class).getErrorHandlerFactory());
+}
+// inject camel context on collections
+getRouteCollection().setCamelContext(camelContext);
+getRestCollection().setCamelContext(camelContext);
+getRouteTemplateCollection().setCamelContext(camelContext);
+getTemplatedRouteCollection().setCamelContext(camelContext);
+}
+
protected void populateTemplatedRoutes() throws Exception {
populateTemplatedRoutes(notNullCamelContext());
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
index 0b22d14404f..b97083a3843 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
@@ -97,6 +97,12 @@ public abstract class RouteConfigurationBuilder extends
RouteBuilder implements
}
}
+@Override
+protected void initializeCamelContext(CamelContext camelContext) {
+super.initializeCamelContext(camelContext);
+getRouteConfigurationCollection().setCamelContext(camelContext);
+}
+
protected void populateRoutesConfiguration() throws Exception {
CamelContext camelContext = getContext();
if (camelContext == null) {
[camel] branch camel-3.21.x updated (3ad66a43619 -> 5e6192dbcb3)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-3.21.x in repository https://gitbox.apache.org/repos/asf/camel.git from 3ad66a43619 Upgrade Jetty to version 9.4.53.v20231009 (#11707) new 396e64c5c01 CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure CamelContext is inject eager. This fixes a problem with using global route configurations in Java and XML DSLs mixed. (#11719) new 5e6192dbcb3 Regen The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: camel-dependencies/pom.xml | 27 +- .../camel/catalog/archetypes/archetype-catalog.xml | 14 +- .../apache/camel/catalog/components/activemq.json | 2 +- .../org/apache/camel/catalog/components/amqp.json | 2 +- .../apache/camel/catalog/components/arangodb.json | 2 +- .../org/apache/camel/catalog/components/as2.json | 2 +- .../apache/camel/catalog/components/asterisk.json | 2 +- .../apache/camel/catalog/components/atlasmap.json | 2 +- .../org/apache/camel/catalog/components/atmos.json | 2 +- .../catalog/components/atmosphere-websocket.json | 2 +- .../org/apache/camel/catalog/components/atom.json | 2 +- .../org/apache/camel/catalog/components/avro.json | 2 +- .../camel/catalog/components/aws-cloudtrail.json | 2 +- .../catalog/components/aws-secrets-manager.json| 2 +- .../camel/catalog/components/aws2-athena.json | 2 +- .../apache/camel/catalog/components/aws2-cw.json | 2 +- .../apache/camel/catalog/components/aws2-ddb.json | 2 +- .../camel/catalog/components/aws2-ddbstream.json | 2 +- .../apache/camel/catalog/components/aws2-ec2.json | 2 +- .../apache/camel/catalog/components/aws2-ecs.json | 2 +- .../apache/camel/catalog/components/aws2-eks.json | 2 +- .../camel/catalog/components/aws2-eventbridge.json | 2 +- .../apache/camel/catalog/components/aws2-iam.json | 2 +- .../catalog/components/aws2-kinesis-firehose.json | 2 +- .../camel/catalog/components/aws2-kinesis.json | 2 +- .../apache/camel/catalog/components/aws2-kms.json | 2 +- .../camel/catalog/components/aws2-lambda.json | 2 +- .../apache/camel/catalog/components/aws2-mq.json | 2 +- .../apache/camel/catalog/components/aws2-msk.json | 2 +- .../apache/camel/catalog/components/aws2-s3.json | 2 +- .../apache/camel/catalog/components/aws2-ses.json | 2 +- .../apache/camel/catalog/components/aws2-sns.json | 2 +- .../apache/camel/catalog/components/aws2-sqs.json | 2 +- .../apache/camel/catalog/components/aws2-sts.json | 2 +- .../camel/catalog/components/aws2-translate.json | 2 +- .../camel/catalog/components/azure-cosmosdb.json | 2 +- .../camel/catalog/components/azure-eventhubs.json | 2 +- .../camel/catalog/components/azure-key-vault.json | 2 +- .../camel/catalog/components/azure-servicebus.json | 2 +- .../catalog/components/azure-storage-blob.json | 2 +- .../catalog/components/azure-storage-datalake.json | 2 +- .../catalog/components/azure-storage-queue.json| 2 +- .../camel/catalog/components/bean-validator.json | 2 +- .../org/apache/camel/catalog/components/bean.json | 2 +- .../apache/camel/catalog/components/bonita.json| 2 +- .../org/apache/camel/catalog/components/box.json | 2 +- .../apache/camel/catalog/components/braintree.json | 2 +- .../apache/camel/catalog/components/browse.json| 2 +- .../camel/catalog/components/caffeine-cache.json | 2 +- .../catalog/components/caffeine-loadcache.json | 2 +- .../camel/catalog/components/chatscript.json | 2 +- .../org/apache/camel/catalog/components/chunk.json | 2 +- .../org/apache/camel/catalog/components/class.json | 2 +- .../apache/camel/catalog/components/cm-sms.json| 2 +- .../apache/camel/catalog/components/coap+tcp.json | 2 +- .../org/apache/camel/catalog/components/coap.json | 2 +- .../apache/camel/catalog/components/coaps+tcp.json | 2 +- .../org/apache/camel/catalog/components/coaps.json | 2 +- .../apache/camel/catalog/components/cometd.json| 2 +- .../apache/camel/catalog/components/cometds.json | 2 +- .../apache/camel/catalog/components/consul.json| 2 +- .../camel/catalog/components/controlbus.json | 2 +- .../org/apache/camel/catalog/components/corda.json | 2 +- .../apache/camel/catalog/components/couchbase.json | 2 +- .../apache/camel/catalog/components/couchdb.json | 2 +- .../org/apache/camel/catalog/components/cql.json | 2 +- .../org/apache/camel/catalog/components/cron.json | 2 +- .../apache/camel/catalog/components/crypto.json| 2 +- .../org/apache/camel/catalog/components/cxf.json | 2 +- .../org/apache/camel/catalog/components/c
Re: [PR] Fix documented artifact group for camel-test-blueprint-junit5 [camel-karaf]
davsclaus merged PR #244: URL: https://github.com/apache/camel-karaf/pull/244 -- 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-karaf] branch main updated: Fix documented artifact group for camel-test-blueprint-junit5 (#244)
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-karaf.git The following commit(s) were added to refs/heads/main by this push: new f16a2cfd Fix documented artifact group for camel-test-blueprint-junit5 (#244) f16a2cfd is described below commit f16a2cfd402686ccbb21e46a53090fb7773a4acc Author: Ciprian Ciubotariu AuthorDate: Fri Oct 13 19:48:30 2023 +0300 Fix documented artifact group for camel-test-blueprint-junit5 (#244) --- .../src/main/docs/test-blueprint-junit5.adoc| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/camel-test-blueprint-junit5/src/main/docs/test-blueprint-junit5.adoc b/components/camel-test-blueprint-junit5/src/main/docs/test-blueprint-junit5.adoc index 9a1e9acc..4a819616 100644 --- a/components/camel-test-blueprint-junit5/src/main/docs/test-blueprint-junit5.adoc +++ b/components/camel-test-blueprint-junit5/src/main/docs/test-blueprint-junit5.adoc @@ -55,7 +55,7 @@ pom: [source,xml] --- - org.apache.camel + org.apache.camel.karaf camel-test-blueprint-junit5 3.18.0 test
[camel] branch camel-3.x updated: CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure CamelContext is inject eager. This fixes a problem with using global route configurations in Java an
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 2204d1dedb6 CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to
ensure CamelContext is inject eager. This fixes a problem with using global
route configurations in Java and XML DSLs mixed. (#11719)
2204d1dedb6 is described below
commit 2204d1dedb65296cad3f5df0f6235d4898c933bd
Author: Claus Ibsen
AuthorDate: Fri Oct 13 17:28:53 2023 +0200
CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure
CamelContext is inject eager. This fixes a problem with using global route
configurations in Java and XML DSLs mixed. (#11719)
---
.../java/org/apache/camel/builder/RouteBuilder.java | 20 +++-
.../camel/builder/RouteConfigurationBuilder.java | 6 ++
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
index d2eaf24ba07..f861dd30914 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
@@ -706,14 +706,11 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
// Implementation methods
// ---
+
protected void checkInitialized() throws Exception {
if (initialized.compareAndSet(false, true)) {
-// Set the CamelContext ErrorHandler here
CamelContext camelContext = getContext();
-if
(camelContext.adapt(ExtendedCamelContext.class).getErrorHandlerFactory() !=
null) {
-setErrorHandlerFactory(
-
camelContext.adapt(ExtendedCamelContext.class).getErrorHandlerFactory());
-}
+initializeCamelContext(camelContext);
List strategies = new
ArrayList<>(lifecycleInterceptors);
strategies.addAll(camelContext.getRegistry().findByType(RouteBuilderLifecycleStrategy.class));
@@ -739,6 +736,19 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
}
}
+protected void initializeCamelContext(CamelContext camelContext) {
+// Set the CamelContext ErrorHandler here
+if
(camelContext.adapt(ExtendedCamelContext.class).getErrorHandlerFactory() !=
null) {
+setErrorHandlerFactory(
+
camelContext.adapt(ExtendedCamelContext.class).getErrorHandlerFactory());
+}
+// inject camel context on collections
+getRouteCollection().setCamelContext(camelContext);
+getRestCollection().setCamelContext(camelContext);
+getRouteTemplateCollection().setCamelContext(camelContext);
+getTemplatedRouteCollection().setCamelContext(camelContext);
+}
+
protected void populateTemplatedRoutes() throws Exception {
populateTemplatedRoutes(notNullCamelContext());
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
index 0b22d14404f..b97083a3843 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
@@ -97,6 +97,12 @@ public abstract class RouteConfigurationBuilder extends
RouteBuilder implements
}
}
+@Override
+protected void initializeCamelContext(CamelContext camelContext) {
+super.initializeCamelContext(camelContext);
+getRouteConfigurationCollection().setCamelContext(camelContext);
+}
+
protected void populateRoutesConfiguration() throws Exception {
CamelContext camelContext = getContext();
if (camelContext == null) {
[camel] branch regen_bot updated (fb236e78d5b -> 0e213dec036)
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 fb236e78d5b CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure CamelContext is inject eager. This fixes a problem with using global route configurations in Java and XML DSLs mixed. (#11719) add 0ad23eca47a (chore) ci: auto-generate list of submodules (#11720) add 0e213dec036 Upgrade micrometer 1.11.5 and tracing 1.1.6 (#11718) No new revisions were added by this update. Summary of changes: .github/actions/component-test/component-test.sh | 15 --- parent/pom.xml | 4 ++-- 2 files changed, 14 insertions(+), 5 deletions(-)
[camel] branch regen_bot_40x updated (7df284428a6 -> 0e213dec036)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_40x in repository https://gitbox.apache.org/repos/asf/camel.git from 7df284428a6 Upgrading SBOM in the middle of the week add 1c87e4d964e Upgrade Jgit to version 6.7.0.202309050840-r (#11712) add 78eeca438f0 CAMEL-19827: camel-kafka - Consumer should fail-fast if invalid host:… (#11705) add 210252bc736 CAMEL-19982: camel-jbang - Allow --jvm-debug as last parameter (#11713) add 5db143ae80e Upgrade AWS SDK v2 to version 2.21.0 (#11716) add b35b2b9815d (chores) camel-core: avoid hitting the JVM slow path add ccc6630ab0a Upgrade Spring to version 6.0.13 (#11717) add 52e907266d2 Upgrade spring-ldap 3.1.2 add b8620d83c3a Changes to micrometer-component.adoc (#2311) (#11715) add f35ae7a2ef8 Upgrade reactor stuff add fb236e78d5b CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure CamelContext is inject eager. This fixes a problem with using global route configurations in Java and XML DSLs mixed. (#11719) add 0ad23eca47a (chore) ci: auto-generate list of submodules (#11720) add 0e213dec036 Upgrade micrometer 1.11.5 and tracing 1.1.6 (#11718) No new revisions were added by this update. Summary of changes: .github/actions/component-test/component-test.sh | 15 +- .../org/apache/camel/catalog/components/kafka.json | 310 +++-- .../component/kafka/KafkaComponentConfigurer.java | 6 + .../component/kafka/KafkaEndpointConfigurer.java | 6 + .../component/kafka/KafkaEndpointUriFactory.java | 3 +- .../org/apache/camel/component/kafka/kafka.json| 310 +++-- .../camel/component/kafka/KafkaConfiguration.java | 17 ++ .../camel/component/kafka/KafkaConsumer.java | 11 + .../health/KafkaConsumerBadPortHealthCheckIT.java | 2 + ...fkaConsumerBadPortSupervisingHealthCheckIT.java | 3 + .../KafkaConsumerUnresolvableHealthCheckIT.java| 2 + .../src/main/docs/micrometer-component.adoc| 89 ++ .../impl/converter/CoreTypeConverterRegistry.java | 2 +- .../org/apache/camel/builder/RouteBuilder.java | 21 +- .../camel/builder/RouteConfigurationBuilder.java | 6 + .../ROOT/pages/camel-4x-upgrade-guide-4_2.adoc | 15 + .../modules/ROOT/pages/camel-4x-upgrade-guide.adoc | 1 + .../dsl/jbang/core/commands/CamelCommand.java | 6 +- .../apache/camel/dsl/jbang/core/commands/Run.java | 9 +- parent/pom.xml | 16 +- 20 files changed, 458 insertions(+), 392 deletions(-) create mode 100644 docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_2.adoc
[camel] branch mm deleted (was 9435618c1a2)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch mm in repository https://gitbox.apache.org/repos/asf/camel.git was 9435618c1a2 Upgrade micrometer 1.11.5 and tracing 1.1.6 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch main updated: Upgrade micrometer 1.11.5 and tracing 1.1.6 (#11718)
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 0e213dec036 Upgrade micrometer 1.11.5 and tracing 1.1.6 (#11718) 0e213dec036 is described below commit 0e213dec0361e68f3ba7e6a9bb88e12537dc8ec0 Author: Claus Ibsen AuthorDate: Fri Oct 13 18:00:27 2023 +0200 Upgrade micrometer 1.11.5 and tracing 1.1.6 (#11718) --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 7e5e866fa17..7d02312176c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -331,8 +331,8 @@ 3.5.2 3.4.0 4.2.19 -1.11.4 -1.1.5 +1.11.5 +1.1.6 3.0.3 4.0.2 2.2.3
Re: [PR] Upgrade micrometer 1.11.5 and tracing 1.1.6 [camel]
davsclaus merged PR #11718: URL: https://github.com/apache/camel/pull/11718 -- 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-4.0.x updated: CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure CamelContext is inject eager. This fixes a problem with using global route configurations in Java
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.0.x by this push:
new 5536ceccf0f CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to
ensure CamelContext is inject eager. This fixes a problem with using global
route configurations in Java and XML DSLs mixed. (#11719)
5536ceccf0f is described below
commit 5536ceccf0f475b24eaf57bdb2907f9f2a1b9033
Author: Claus Ibsen
AuthorDate: Fri Oct 13 17:28:53 2023 +0200
CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure
CamelContext is inject eager. This fixes a problem with using global route
configurations in Java and XML DSLs mixed. (#11719)
---
.../java/org/apache/camel/builder/RouteBuilder.java | 20 +++-
.../camel/builder/RouteConfigurationBuilder.java | 6 ++
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
index aef44851022..8cd5cc374ba 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
@@ -703,14 +703,11 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
// Implementation methods
// ---
+
protected void checkInitialized() throws Exception {
if (initialized.compareAndSet(false, true)) {
-// Set the CamelContext ErrorHandler here
CamelContext camelContext = getContext();
-if
(camelContext.getCamelContextExtension().getErrorHandlerFactory() != null) {
-setErrorHandlerFactory(
-
camelContext.getCamelContextExtension().getErrorHandlerFactory());
-}
+initializeCamelContext(camelContext);
List strategies = new
ArrayList<>(lifecycleInterceptors);
strategies.addAll(camelContext.getRegistry().findByType(RouteBuilderLifecycleStrategy.class));
@@ -736,6 +733,19 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
}
}
+protected void initializeCamelContext(CamelContext camelContext) {
+// Set the CamelContext ErrorHandler here
+if (camelContext.getCamelContextExtension().getErrorHandlerFactory()
!= null) {
+setErrorHandlerFactory(
+
camelContext.getCamelContextExtension().getErrorHandlerFactory());
+}
+// inject camel context on collections
+getRouteCollection().setCamelContext(camelContext);
+getRestCollection().setCamelContext(camelContext);
+getRouteTemplateCollection().setCamelContext(camelContext);
+getTemplatedRouteCollection().setCamelContext(camelContext);
+}
+
protected void populateTemplatedRoutes() throws Exception {
populateTemplatedRoutes(notNullCamelContext());
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
index 270854e8407..8573c1ce7b4 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
@@ -97,6 +97,12 @@ public abstract class RouteConfigurationBuilder extends
RouteBuilder implements
}
}
+@Override
+protected void initializeCamelContext(CamelContext camelContext) {
+super.initializeCamelContext(camelContext);
+getRouteConfigurationCollection().setCamelContext(camelContext);
+}
+
protected void populateRoutesConfiguration() throws Exception {
CamelContext camelContext = getContext();
if (camelContext == null) {
Re: [I] Introduce and document support for AWS Elastic Container Registry (ECR) [camel-k]
jwgmeligmeyling commented on issue #4107: URL: https://github.com/apache/camel-k/issues/4107#issuecomment-1761734889 My point of the comment was: I don't think people can use it. So this documentation will never be provided. -- 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: (chore) ci: auto-generate list of submodules (#11720)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 0ad23eca47a (chore) ci: auto-generate list of submodules (#11720)
0ad23eca47a is described below
commit 0ad23eca47ab6e82200d91d479de3ebb0ab8a15a
Author: Nicolas Filotto
AuthorDate: Fri Oct 13 17:44:00 2023 +0200
(chore) ci: auto-generate list of submodules (#11720)
## Motivation
When we have a component that has submodules, for now, we need to specify
explicitly the list of submodules to test when using the GH `component-test`
which leads to
https://github.com/apache/camel/pull/11716#issuecomment-1761062508. Let's try
to generate the list.
## Modifications
* Auto-detect the pom files in subdirectories and include their directory
to the list of projects to test
* Support the use case where the provided component name is incorrect
---
.github/actions/component-test/component-test.sh | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/.github/actions/component-test/component-test.sh
b/.github/actions/component-test/component-test.sh
index 68efe60e73a..282b06a1a84 100755
--- a/.github/actions/component-test/component-test.sh
+++ b/.github/actions/component-test/component-test.sh
@@ -34,12 +34,21 @@ function main() {
for component in ${componentList}
do
if [[ ${component} = camel-* ]] ; then
- pl="$pl,components/${component}"
+ componentPath="components/${component}"
else
- pl="$pl,components/camel-${component}"
+ componentPath="components/camel-${component}"
+fi
+if [[ -d "${componentPath}" ]] ; then
+ pl="$pl$(find "${componentPath}" -name pom.xml -exec dirname {} \; |
sort | tr -s "\n" ",")"
fi
done
- pl="${pl:1}"
+ len=${#pl}
+ if [[ "$len" -gt "0" ]] ; then
+pl="${pl::len-1}"
+ else
+echo "The components to test don't exist"
+exit 1
+ fi
if [[ ${fastBuild} = "true" ]] ; then
echo "Launching a fast build against the projects ${pl} and their
dependencies"
Re: [PR] (chore) ci: auto-generate list of submodules [camel]
essobedo commented on PR #11720: URL: https://github.com/apache/camel/pull/11720#issuecomment-1761728402 That will be my goodbye gift, thank you all, I really enjoyed contributing to the Camel project and its ecosystem. bb 👋 -- 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 auto-generate-list-of-sub-components deleted (was 7b4f138977e)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch auto-generate-list-of-sub-components in repository https://gitbox.apache.org/repos/asf/camel.git was 7b4f138977e (chore) ci: auto-generate list of submodules The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] (chore) ci: auto-generate list of submodules [camel]
essobedo merged PR #11720: URL: https://github.com/apache/camel/pull/11720 -- 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 (f35ae7a2ef8 -> fb236e78d5b)
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 f35ae7a2ef8 Upgrade reactor stuff add fb236e78d5b CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure CamelContext is inject eager. This fixes a problem with using global route configurations in Java and XML DSLs mixed. (#11719) No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/builder/RouteBuilder.java | 21 - .../camel/builder/RouteConfigurationBuilder.java| 6 ++ 2 files changed, 22 insertions(+), 5 deletions(-)
Re: [PR] (chore) ci: auto-generate list of submodules [camel]
oscerd commented on PR #11720: URL: https://github.com/apache/camel/pull/11720#issuecomment-1761712864 Thanks a lot! This will save a lot of time -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] (chore) ci: auto-generate list of submodules [camel]
github-actions[bot] commented on PR #11720: URL: https://github.com/apache/camel/pull/11720#issuecomment-1761711050 :robot: The Apache Camel test robot will run the tests for you :+1: -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] (chore) ci: auto-generate list of submodules [camel]
essobedo commented on PR #11720: URL: https://github.com/apache/camel/pull/11720#issuecomment-1761710796 /component-test aws -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] (chore) ci: auto-generate list of submodules [camel]
essobedo opened a new pull request, #11720: URL: https://github.com/apache/camel/pull/11720 ## Motivation When we have a component that has submodules, we have to specify explicitly the list. Let's try to generate the list. ## Modifications * Auto-detect the pom files in subdirectories and include their directory to the list of projects to test * Support the use case where the provided component name is incorrect -- 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 rc deleted (was 8e0b3195ebe)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch rc in repository https://gitbox.apache.org/repos/asf/camel.git was 8e0b3195ebe CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure CamelContext is inject eager. This fixes a problem with using global route configurations in Java and XML DSLs mixed. The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch main updated: CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure CamelContext is inject eager. This fixes a problem with using global route configurations in Java and XML
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 fb236e78d5b CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to
ensure CamelContext is inject eager. This fixes a problem with using global
route configurations in Java and XML DSLs mixed. (#11719)
fb236e78d5b is described below
commit fb236e78d5b96c292f47999cf654a80f6c2352ea
Author: Claus Ibsen
AuthorDate: Fri Oct 13 17:28:53 2023 +0200
CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure
CamelContext is inject eager. This fixes a problem with using global route
configurations in Java and XML DSLs mixed. (#11719)
---
.../java/org/apache/camel/builder/RouteBuilder.java | 21 -
.../camel/builder/RouteConfigurationBuilder.java| 6 ++
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
index 0c72cba8f95..d3a032bc011 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
@@ -714,14 +714,11 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
// Implementation methods
// ---
+
protected void checkInitialized() throws Exception {
if (initialized.compareAndSet(false, true)) {
-// Set the CamelContext ErrorHandler here
CamelContext camelContext = getContext();
-if
(camelContext.getCamelContextExtension().getErrorHandlerFactory() != null) {
-setErrorHandlerFactory(
-
camelContext.getCamelContextExtension().getErrorHandlerFactory());
-}
+initializeCamelContext(camelContext);
List strategies = new
ArrayList<>(lifecycleInterceptors);
strategies.addAll(camelContext.getRegistry().findByType(RouteBuilderLifecycleStrategy.class));
@@ -737,6 +734,7 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
getRouteCollection().setResource(getResource());
getRestCollection().setResource(getResource());
getRouteTemplateCollection().setResource(getResource());
+getTemplatedRouteCollection().setResource(getResource());
for (RegistryBeanDefinition def : beans) {
def.setResource(getResource());
}
@@ -752,6 +750,19 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
}
}
+protected void initializeCamelContext(CamelContext camelContext) {
+// Set the CamelContext ErrorHandler here
+if (camelContext.getCamelContextExtension().getErrorHandlerFactory()
!= null) {
+setErrorHandlerFactory(
+
camelContext.getCamelContextExtension().getErrorHandlerFactory());
+}
+// inject camel context on collections
+getRouteCollection().setCamelContext(camelContext);
+getRestCollection().setCamelContext(camelContext);
+getRouteTemplateCollection().setCamelContext(camelContext);
+getTemplatedRouteCollection().setCamelContext(camelContext);
+}
+
protected void populateTemplatedRoutes() throws Exception {
populateTemplatedRoutes(notNullCamelContext());
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
index 75a0de88b31..61e2f59daee 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
@@ -97,6 +97,12 @@ public abstract class RouteConfigurationBuilder extends
RouteBuilder implements
}
}
+@Override
+protected void initializeCamelContext(CamelContext camelContext) {
+super.initializeCamelContext(camelContext);
+getRouteConfigurationCollection().setCamelContext(camelContext);
+}
+
protected void populateRoutesConfiguration() throws Exception {
CamelContext camelContext = getContext();
if (camelContext == null) {
Re: [PR] CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure Cam… [camel]
davsclaus commented on PR #11719: URL: https://github.com/apache/camel/pull/11719#issuecomment-1761707394 > I also noticed this because it reminded me of [CAMEL-19766](https://issues.apache.org/jira/browse/CAMEL-19766). I found that adding " CamelContextAware.trySetCamelContext(getRouteCollection(), getCamelContext());" in JaxbXmlRoutesBuilderLoader.java also resolves the issue. Thanks. Yeah its a little bit different how they setup camel context. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure Cam… [camel]
davsclaus merged PR #11719: URL: https://github.com/apache/camel/pull/11719 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Introduce and document support for AWS Elastic Container Registry (ECR) [camel-k]
oscerd commented on issue #4107: URL: https://github.com/apache/camel-k/issues/4107#issuecomment-1761707369 The only way to eventually support or document this is having a walkthrough from people using it daily with camel k. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch auto-generate-list-of-sub-components created (now 7b4f138977e)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch auto-generate-list-of-sub-components in repository https://gitbox.apache.org/repos/asf/camel.git at 7b4f138977e (chore) ci: auto-generate list of submodules This branch includes the following new commits: new 7b4f138977e (chore) ci: auto-generate list of submodules The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] 01/01: (chore) ci: auto-generate list of submodules
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch auto-generate-list-of-sub-components
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 7b4f138977eeb8e15ff6b458f69a26d38075ceb3
Author: Nicolas Filotto
AuthorDate: Fri Oct 13 17:24:33 2023 +0200
(chore) ci: auto-generate list of submodules
---
.github/actions/component-test/component-test.sh | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/.github/actions/component-test/component-test.sh
b/.github/actions/component-test/component-test.sh
index 68efe60e73a..282b06a1a84 100755
--- a/.github/actions/component-test/component-test.sh
+++ b/.github/actions/component-test/component-test.sh
@@ -34,12 +34,21 @@ function main() {
for component in ${componentList}
do
if [[ ${component} = camel-* ]] ; then
- pl="$pl,components/${component}"
+ componentPath="components/${component}"
else
- pl="$pl,components/camel-${component}"
+ componentPath="components/camel-${component}"
+fi
+if [[ -d "${componentPath}" ]] ; then
+ pl="$pl$(find "${componentPath}" -name pom.xml -exec dirname {} \; |
sort | tr -s "\n" ",")"
fi
done
- pl="${pl:1}"
+ len=${#pl}
+ if [[ "$len" -gt "0" ]] ; then
+pl="${pl::len-1}"
+ else
+echo "The components to test don't exist"
+exit 1
+ fi
if [[ ${fastBuild} = "true" ]] ; then
echo "Launching a fast build against the projects ${pl} and their
dependencies"
Re: [PR] CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure Cam… [camel]
klease commented on PR #11719: URL: https://github.com/apache/camel/pull/11719#issuecomment-1761688401 I also noticed this because it reminded me of CAMEL-19766. I found that adding " CamelContextAware.trySetCamelContext(getRouteCollection(), getCamelContext());" in JaxbXmlRoutesBuilderLoader.java also resolves the issue. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Introduce and document support for AWS Elastic Container Registry (ECR) [camel-k]
jwgmeligmeyling commented on issue #4107: URL: https://github.com/apache/camel-k/issues/4107#issuecomment-1761669243 I'm not sure if Camel can even work with ECR. After some experiments, ECR seems to only support pushing to the repository name directly, and not an image name under the repository URL. See also: https://stackoverflow.com/questions/48567787/ecs-ecr-is-common-practice-to-have-one-repository-per-image-and-associated-ver -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure Cam… [camel]
github-actions[bot] commented on PR #11719: URL: https://github.com/apache/camel/pull/11719#issuecomment-1761664981 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure Cam… [camel]
davsclaus opened a new pull request, #11719: URL: https://github.com/apache/camel/pull/11719 …elContext is inject eager. This fixes a problem with using global route configurations in Java and XML DSLs mixed. # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure CamelContext is inject eager. This fixes a problem with using global route configurations in Java and XML DSLs mixed.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch rc
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8e0b3195ebe25986ab9eafe5eb2b648ab2868459
Author: Claus Ibsen
AuthorDate: Fri Oct 13 16:59:40 2023 +0200
CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure
CamelContext is inject eager. This fixes a problem with using global route
configurations in Java and XML DSLs mixed.
---
.../java/org/apache/camel/builder/RouteBuilder.java | 21 -
.../camel/builder/RouteConfigurationBuilder.java| 6 ++
2 files changed, 22 insertions(+), 5 deletions(-)
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
index 0c72cba8f95..d3a032bc011 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteBuilder.java
@@ -714,14 +714,11 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
// Implementation methods
// ---
+
protected void checkInitialized() throws Exception {
if (initialized.compareAndSet(false, true)) {
-// Set the CamelContext ErrorHandler here
CamelContext camelContext = getContext();
-if
(camelContext.getCamelContextExtension().getErrorHandlerFactory() != null) {
-setErrorHandlerFactory(
-
camelContext.getCamelContextExtension().getErrorHandlerFactory());
-}
+initializeCamelContext(camelContext);
List strategies = new
ArrayList<>(lifecycleInterceptors);
strategies.addAll(camelContext.getRegistry().findByType(RouteBuilderLifecycleStrategy.class));
@@ -737,6 +734,7 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
getRouteCollection().setResource(getResource());
getRestCollection().setResource(getResource());
getRouteTemplateCollection().setResource(getResource());
+getTemplatedRouteCollection().setResource(getResource());
for (RegistryBeanDefinition def : beans) {
def.setResource(getResource());
}
@@ -752,6 +750,19 @@ public abstract class RouteBuilder extends BuilderSupport
implements RoutesBuild
}
}
+protected void initializeCamelContext(CamelContext camelContext) {
+// Set the CamelContext ErrorHandler here
+if (camelContext.getCamelContextExtension().getErrorHandlerFactory()
!= null) {
+setErrorHandlerFactory(
+
camelContext.getCamelContextExtension().getErrorHandlerFactory());
+}
+// inject camel context on collections
+getRouteCollection().setCamelContext(camelContext);
+getRestCollection().setCamelContext(camelContext);
+getRouteTemplateCollection().setCamelContext(camelContext);
+getTemplatedRouteCollection().setCamelContext(camelContext);
+}
+
protected void populateTemplatedRoutes() throws Exception {
populateTemplatedRoutes(notNullCamelContext());
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
index 75a0de88b31..61e2f59daee 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/builder/RouteConfigurationBuilder.java
@@ -97,6 +97,12 @@ public abstract class RouteConfigurationBuilder extends
RouteBuilder implements
}
}
+@Override
+protected void initializeCamelContext(CamelContext camelContext) {
+super.initializeCamelContext(camelContext);
+getRouteConfigurationCollection().setCamelContext(camelContext);
+}
+
protected void populateRoutesConfiguration() throws Exception {
CamelContext camelContext = getContext();
if (camelContext == null) {
[camel] branch rc created (now 8e0b3195ebe)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch rc in repository https://gitbox.apache.org/repos/asf/camel.git at 8e0b3195ebe CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure CamelContext is inject eager. This fixes a problem with using global route configurations in Java and XML DSLs mixed. This branch includes the following new commits: new 8e0b3195ebe CAMEL-19967: Fix RouteBuilder/RouteConfigurationBuilder to ensure CamelContext is inject eager. This fixes a problem with using global route configurations in Java and XML DSLs mixed. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Re: [PR] feat(database): Add multiple datasources example [camel-k-examples]
zhfeng commented on code in PR #88:
URL: https://github.com/apache/camel-k-examples/pull/88#discussion_r1358367106
##
generic-examples/databases/H2DBMultiDatasources.java:
##
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+// camel-k: language=java
+// camel-k: dependency=mvn:io.quarkus:quarkus-jdbc-h2
+// camel-k: build-property=quarkus.datasource.default.db-kind=h2
+// camel-k: property=quarkus.datasource.default.username=username-default
+// camel-k: property=quarkus.datasource.default.jdbc.url=jdbc:h2:mem:default
+// camel-k: build-property=quarkus.datasource.testing.db-kind=h2
+// camel-k: property=quarkus.datasource.testing.username=username-testing
+// camel-k: property=quarkus.datasource.testing.jdbc.url=jdbc:h2:mem:testing
+// camel-k: trait=camel.runtime-version=3.2.0
+
+import io.agroal.api.AgroalDataSource;
+import io.quarkus.agroal.DataSource;
+import org.apache.camel.builder.RouteBuilder;
+import jakarta.inject.Inject;
+
+public class H2DBMultiDatasources extends RouteBuilder {
+
+@Inject
+@DataSource("default")
+AgroalDataSource dataSource1;
Review Comment:
Yeah, I agree that there is no need to delcare the dataSource here.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] feat(database): Add multiple datasources example [camel-k-examples]
gansheer commented on code in PR #88:
URL: https://github.com/apache/camel-k-examples/pull/88#discussion_r1358367165
##
generic-examples/databases/H2DBMultiDatasources.java:
##
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+// camel-k: language=java
+// camel-k: dependency=mvn:io.quarkus:quarkus-jdbc-h2
+// camel-k: build-property=quarkus.datasource.default.db-kind=h2
+// camel-k: property=quarkus.datasource.default.username=username-default
+// camel-k: property=quarkus.datasource.default.jdbc.url=jdbc:h2:mem:default
+// camel-k: build-property=quarkus.datasource.testing.db-kind=h2
+// camel-k: property=quarkus.datasource.testing.username=username-testing
+// camel-k: property=quarkus.datasource.testing.jdbc.url=jdbc:h2:mem:testing
+// camel-k: trait=camel.runtime-version=3.2.0
+
+import io.agroal.api.AgroalDataSource;
+import io.quarkus.agroal.DataSource;
+import org.apache.camel.builder.RouteBuilder;
+import jakarta.inject.Inject;
+
+public class H2DBMultiDatasources extends RouteBuilder {
+
+@Inject
+@DataSource("default")
+AgroalDataSource dataSource1;
Review Comment:
I just checked, and it is as you say they are not mandatory. I will remove
them.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Re: [PR] feat(database): Add multiple datasources example [camel-k-examples]
jamesnetherton commented on code in PR #88:
URL: https://github.com/apache/camel-k-examples/pull/88#discussion_r1358345526
##
generic-examples/databases/H2DBMultiDatasources.java:
##
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+// camel-k: language=java
+// camel-k: dependency=mvn:io.quarkus:quarkus-jdbc-h2
+// camel-k: build-property=quarkus.datasource.default.db-kind=h2
+// camel-k: property=quarkus.datasource.default.username=username-default
+// camel-k: property=quarkus.datasource.default.jdbc.url=jdbc:h2:mem:default
+// camel-k: build-property=quarkus.datasource.testing.db-kind=h2
+// camel-k: property=quarkus.datasource.testing.username=username-testing
+// camel-k: property=quarkus.datasource.testing.jdbc.url=jdbc:h2:mem:testing
+// camel-k: trait=camel.runtime-version=3.2.0
+
+import io.agroal.api.AgroalDataSource;
+import io.quarkus.agroal.DataSource;
+import org.apache.camel.builder.RouteBuilder;
+import jakarta.inject.Inject;
+
+public class H2DBMultiDatasources extends RouteBuilder {
+
+@Inject
+@DataSource("default")
+AgroalDataSource dataSource1;
Review Comment:
I was curious about having to inject the `DataSource`. Is it definitely
required?
I tested with a plain Camel Quarkus app earlier today and it was enough to
just refer to the DS by name via the `dataSource` URI param.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[PR] feat(database): Add multiple datasources example [camel-k-examples]
gansheer opened a new pull request, #88: URL: https://github.com/apache/camel-k-examples/pull/88 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] feat(trait): let Camel runtime manages Kamelets [camel-k]
github-actions[bot] commented on PR #4812: URL: https://github.com/apache/camel-k/pull/4812#issuecomment-1761589041 :camel: **Thank you for contributing!** Code Coverage Report :heavy_check_mark: - Coverage changed: 33.4% --> 33.6% (Coverage difference: **+.2%**) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] chore(trait): user can't disable platform traits [camel-k]
github-actions[bot] commented on PR #4817: URL: https://github.com/apache/camel-k/pull/4817#issuecomment-1761581106 :camel: **Thank you for contributing!** Code Coverage Report :heavy_check_mark: - Coverage unchanged. -- 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 5398 deleted (was f9e7302ad5)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch 5398 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was f9e7302ad5 Change description of this project which is presented in google result The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel-quarkus] branch camel-4.0.0-upgrade deleted (was 6a5e3b62f7)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch camel-4.0.0-upgrade in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was 6a5e3b62f7 Revisit #4048 to Springless JPA extension (#5147) This change permanently discards the following revisions: discard 6a5e3b62f7 Revisit #4048 to Springless JPA extension (#5147) discard 7b5aa73482 Upgrade Camel to 4.0.0
[camel-quarkus] branch camel-4.1.0-upgrade deleted (was 9c0d54a123)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch camel-4.1.0-upgrade in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was 9c0d54a123 Add Camel 4.1.0 staging repository This change permanently discards the following revisions: discard 9c0d54a123 Add Camel 4.1.0 staging repository discard 81cc2e670a Rework Kemelet build time resource processing for #5230 discard 8c5936340f Fixed azure tests discard 7b0820e29e Synced + generated discard c822c51e0f Generated files discard a79993983f Implement ignoreLoadingError methods in RouteCollector impls discard 40b763164c Implement getClassLoaders method for CamelQuarkusClassResolver discard f6f964a05f Rework NATS native fix for missing sun.security.x509.X509Key discard d6479ea848 Fix pdf integration tests native compilation discard 431ebd68a1 Implement newInstance(Class, Class, String) in DryModeInjector discard 8077b00c16 Generated files discard 3c20143ffa Resolved conflict + generated files discard 89d4054fa2 Reverted some changes of converters because of 17fb33e7498533a6eb328c7f1ea95078a3c9e68e discard 5ba0d4fc9d Checking bigger timeout interval on CI discard 33f27ecc20 Generated files discard c23bb1eee6 Fixed enablement of typeConverter statisctics because of CAMEL-19398 discard 037ad6ce5f Fixed converters comiplation error CAMEL-19398 + generated files discard 8fa6d0113b Fix Quarkus recorder serialization issues for RouteTemplateDefinition resources discard e5360d1cf2 Add initial support for request validation in rest-openapi extension discard 090f3680bb Disabled tests using kubernetess client, see #5318 discard 336a54dfd6 Enabled RouteConfigurationsTest#sendContentToXmlRouteShouldTriggerOnExceptionInYamlRouteConfiguration f discard edcdc8c6c9 Regen files discard 2e932aa177 Antora conflict discard b2a98944ec Enabled infinispan-quarkus-client tests #5232 discard 8cd9664bf5 Enabled infinispan #5232 discard 6bf2480c66 Enabled flatpak test #5260 discard 60e860e9de Kudu dependency conflict fix + generated files discard bf7fc978d3 Generated files discard e1c8aef8ca flatpack - disabled test because of CAMEL-19837 discard 9707ea8c0b Fixed main-command-mode tests becaise of recent changes of Timer discard 932ccb5522 Twilio - disabled tests because of #5254 discard e149be04c9 Fixed Kamelet because of timer change (CAMEL-19817) discard ec2699e7da Disabled Fop and Pdf native discard 8553cadc66 Tika - aded explabation and limitation regarding pdf, see #5234 discard 3277faad77 Auto-geerated files discard f2e5c490a0 Fixed dependency confilct after upgrade of Snakeyaml engine to 2.7 i Camel + generated files discard 32864c7363 Fixed pdf tests discard 763af80e7b Disabled tika tests using pdfbox (see #5234) discard 4ebe5d8003 Disabled infinispan-quarkus-client tests + native (newer Quarkus is required) discard d89a353975 Fixed nats - needs more investigation discard 81dd1bd5e1 Generated changes discard e937549b70 Fixed compilatin errors in Pdf and Fop because of CAMEL-19796 discard ca1e414675 Fixed main-xml-jaxb because of CAMEL-19765 discard b3da917eac fixed foundation/core tests discard 2835740cc8 Disabled infinispan tests + native (newer Quarkus is required) discard 4a946ce6dd Generated files + workaround for kamelets discard 455f1a5e24 Upgrade Camel to 4.1.0
Re: [PR] feat(trait): let Camel runtime manages Kamelets [camel-k]
github-actions[bot] commented on PR #4812: URL: https://github.com/apache/camel-k/pull/4812#issuecomment-1761528591 :camel: **Thank you for contributing!** Code Coverage Report :heavy_check_mark: - Coverage changed: 33.4% --> 33.6% (Coverage difference: **+.2%**) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] feat(trait): let Camel runtime manages Kamelets [camel-k]
github-actions[bot] commented on PR #4812: URL: https://github.com/apache/camel-k/pull/4812#issuecomment-1761512190 :camel: **Thank you for contributing!** :camel: Unable to create **Coverage Report** :warning:. Merge conflicts found. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (52e907266d2 -> f35ae7a2ef8)
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 52e907266d2 Upgrade spring-ldap 3.1.2 add b8620d83c3a Changes to micrometer-component.adoc (#2311) (#11715) add f35ae7a2ef8 Upgrade reactor stuff No new revisions were added by this update. Summary of changes: .../src/main/docs/micrometer-component.adoc| 89 +++--- parent/pom.xml | 4 +- 2 files changed, 28 insertions(+), 65 deletions(-)
[camel] branch regen_bot updated (ccc6630ab0a -> 52e907266d2)
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 ccc6630ab0a Upgrade Spring to version 6.0.13 (#11717) add 52e907266d2 Upgrade spring-ldap 3.1.2 No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch main updated: Upgrade reactor stuff
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 f35ae7a2ef8 Upgrade reactor stuff f35ae7a2ef8 is described below commit f35ae7a2ef85900b1001d7f70a4b711ab7c27f00 Author: Claus Ibsen AuthorDate: Fri Oct 13 15:01:32 2023 +0200 Upgrade reactor stuff --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index c79c1b67cd4..7e5e866fa17 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -393,8 +393,8 @@ 2.3.2 2.3.1 1.0.4 -3.5.10 -1.1.11 +3.5.11 +1.1.12 3.23.2 2.1.0 5.3.1
[camel] branch main updated: Changes to micrometer-component.adoc (#2311) (#11715)
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 b8620d83c3a Changes to micrometer-component.adoc (#2311) (#11715)
b8620d83c3a is described below
commit b8620d83c3a913e5062213782fb457b774716b3c
Author: JiriOndrusek
AuthorDate: Fri Oct 13 14:59:11 2023 +0200
Changes to micrometer-component.adoc (#2311) (#11715)
Co-authored-by: Andreas Jonsson <102945921+rhae...@users.noreply.github.com>
---
.../src/main/docs/micrometer-component.adoc| 89 +++---
1 file changed, 26 insertions(+), 63 deletions(-)
diff --git
a/components/camel-micrometer/src/main/docs/micrometer-component.adoc
b/components/camel-micrometer/src/main/docs/micrometer-component.adoc
index ccc211b4303..70284236a27 100644
--- a/components/camel-micrometer/src/main/docs/micrometer-component.adoc
+++ b/components/camel-micrometer/src/main/docs/micrometer-component.adoc
@@ -73,62 +73,10 @@ You should define a dedicated registry by providing
a `MeterRegistry` bean. Micrometer registries primarily determine the backend
monitoring system
to be used. A `CompositeMeterRegistry` can be used to address more than one
monitoring target.
-For example using Spring Java Configuration:
-[source,java]
-
-@Configuration
-public static class MyConfig extends SingleRouteCamelConfiguration {
-
-@Bean
-@Override
-public RouteBuilder route() {
-return new RouteBuilder() {
-@Override
-public void configure() throws Exception {
-// define Camel routes here
-}
-};
-}
-
-@Bean(name = MicrometerConstants.METRICS_REGISTRY_NAME)
-public MeterRegistry getMeterRegistry() {
-CompositeMeterRegistry registry = ...;
-registry.add(...);
-// ...
-return registry;
-}
-}
-
-
-Or using CDI:
-
-[source,java]
-
-class MyBean extends RouteBuilder {
-
-@Override
-public void configure() {
- from("...")
- // Register the 'my-meter' meter in the MetricRegistry below
- .to("micrometer:meter:my-meter");
-}
-
-@Produces
-// If multiple MetricRegistry beans
-// @Named(MicrometerConstants.METRICS_REGISTRY_NAME)
-MetricRegistry registry() {
-CompositeMeterRegistry registry = ...;
-registry.add(...);
-// ...
-return registry;
-}
-}
-
== Default Camel Metrics
-
Some Camel specific metrics are available out of the box.
[width="100%",options="header"]
@@ -496,8 +444,7 @@ MicrometerMessageHistoryService service =
context.hasService(MicrometerMessageHi
String json = service.dumpStatisticsAsJson();
-If JMX is enabled in the CamelContext, the MBean is registered in the
`type=services` tree
-with `name=MicrometerMessageHistory`.
+If JMX is enabled in the CamelContext, the MBean is registered in the
`type=services` tree with `name=MicrometerMessageHistory`.
== Micrometer event notification
@@ -537,9 +484,7 @@ See more details at Advanced configuration of CamelContext
using Spring.
== Exposing Micrometer statistics in JMX
-Micrometer uses `MeterRegistry` implementations in order to publish
statistics. While in production scenarios
-it is advisable to select a dedicated backend like Prometheus or Graphite, it
may be sufficient for
-test or local deployments to publish statistics to JMX.
+Micrometer uses `MeterRegistry` implementations in order to publish
statistics. While in production scenarios it is advisable to select a dedicated
backend like Prometheus or Graphite, it may be sufficient for test or local
deployments to publish statistics to JMX.
In order to achieve this, add the following dependency:
@@ -554,9 +499,12 @@ In order to achieve this, add the following dependency:
and add a `JmxMeterRegistry` instance:
+[tabs]
+
+Java::
++
[source,java]
-
@Bean(name = MicrometerConstants.METRICS_REGISTRY_NAME)
public MeterRegistry getMeterRegistry() {
CompositeMeterRegistry meterRegistry = new CompositeMeterRegistry();
@@ -567,17 +515,32 @@ and add a `JmxMeterRegistry` instance:
HierarchicalNameMapper.DEFAULT));
return meterRegistry;
}
-}
-The `HierarchicalNameMapper` strategy determines how meter name and tags are
assembled into
-an MBean name.
+CDI::
++
+[source,java]
+
+@Produces
+@Named(MicrometerConstants.METRICS_REGISTRY_NAME))
+public MeterRegistry getMeterRegistry() {
+CompositeMeterRegistry meterRegistry = new CompositeMeterRegistry();
+meterRegistry.add(...);
+meterRegistry.add(new JmxMeterRegistry(
+ CamelJmxConfig.DEFAULT,
+ Clock.SYSTEM,
+ HierarchicalNameMapper.DEFAULT));
+return meterRegistry;
+}
+
+
+
+The `HierarchicalNameMa
Re: [PR] Changes to micrometer-component.adoc (#2311) [camel]
davsclaus merged PR #11715: URL: https://github.com/apache/camel/pull/11715 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Upgrade micrometer 1.11.5 and tracing 1.1.6 [camel]
github-actions[bot] commented on PR #11718: URL: https://github.com/apache/camel/pull/11718#issuecomment-1761480724 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Upgrade micrometer 1.11.5 and tracing 1.1.6 [camel]
davsclaus opened a new pull request, #11718: URL: https://github.com/apache/camel/pull/11718 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch mm created (now 9435618c1a2)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch mm in repository https://gitbox.apache.org/repos/asf/camel.git at 9435618c1a2 Upgrade micrometer 1.11.5 and tracing 1.1.6 This branch includes the following new commits: new 9435618c1a2 Upgrade micrometer 1.11.5 and tracing 1.1.6 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] 01/01: Upgrade micrometer 1.11.5 and tracing 1.1.6
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch mm in repository https://gitbox.apache.org/repos/asf/camel.git commit 9435618c1a27cdac292be95274c7fc9ac1bff122 Author: Claus Ibsen AuthorDate: Fri Oct 13 14:58:40 2023 +0200 Upgrade micrometer 1.11.5 and tracing 1.1.6 --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index c79c1b67cd4..e084da75cd4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -331,8 +331,8 @@ 3.5.2 3.4.0 4.2.19 -1.11.4 -1.1.5 +1.11.5 +1.1.6 3.0.3 4.0.2 2.2.3
[camel] branch main updated: Upgrade spring-ldap 3.1.2
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 52e907266d2 Upgrade spring-ldap 3.1.2 52e907266d2 is described below commit 52e907266d2197279ea4f63341bd91e71846ac91 Author: Claus Ibsen AuthorDate: Fri Oct 13 14:57:33 2023 +0200 Upgrade spring-ldap 3.1.2 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2de5bc8359f..c79c1b67cd4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -422,7 +422,7 @@ 2.3-groovy-4.0 5.0.3 3.1.2 -3.1.1 +3.1.2 3.0.4 6.0.13 3.0.9
[camel] branch regen_bot updated (b35b2b9815d -> ccc6630ab0a)
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 b35b2b9815d (chores) camel-core: avoid hitting the JVM slow path add ccc6630ab0a Upgrade Spring to version 6.0.13 (#11717) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch spring-version-6.0.13 deleted (was 14f47229e3c)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch spring-version-6.0.13 in repository https://gitbox.apache.org/repos/asf/camel.git was 14f47229e3c Upgrade Spring to version 6.0.13 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[camel] branch main updated: Upgrade Spring to version 6.0.13 (#11717)
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 ccc6630ab0a Upgrade Spring to version 6.0.13 (#11717) ccc6630ab0a is described below commit ccc6630ab0aab852d2e1d3cef2da9eeb7e9eca2f Author: Andrea Cosentino AuthorDate: Fri Oct 13 14:34:21 2023 +0200 Upgrade Spring to version 6.0.13 (#11717) Signed-off-by: Andrea Cosentino --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index b16f7428bbc..2de5bc8359f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -424,7 +424,7 @@ 3.1.2 3.1.1 3.0.4 -6.0.12 +6.0.13 3.0.9 6.1.4 4.0.6
Re: [PR] Upgrade Spring to version 6.0.13 [camel]
oscerd merged PR #11717: URL: https://github.com/apache/camel/pull/11717 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Upgrade Spring to version 6.0.13 [camel]
oscerd opened a new pull request, #11717: URL: https://github.com/apache/camel/pull/11717 # Description # Target - [x] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch spring-version-6.0.13 created (now 14f47229e3c)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch spring-version-6.0.13 in repository https://gitbox.apache.org/repos/asf/camel.git at 14f47229e3c Upgrade Spring to version 6.0.13 This branch includes the following new commits: new 14f47229e3c Upgrade Spring to version 6.0.13 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Re: [PR] Upgrade Spring to version 6.0.13 [camel]
github-actions[bot] commented on PR #11717: URL: https://github.com/apache/camel/pull/11717#issuecomment-1761416147 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: Upgrade Spring to version 6.0.13
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch spring-version-6.0.13 in repository https://gitbox.apache.org/repos/asf/camel.git commit 14f47229e3c3452c0ebd6acce896590e4cf157d1 Author: Andrea Cosentino AuthorDate: Fri Oct 13 14:06:51 2023 +0200 Upgrade Spring to version 6.0.13 Signed-off-by: Andrea Cosentino --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9ee049c018e..2c892a2b8a6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -424,7 +424,7 @@ 3.1.2 3.1.1 3.0.4 -6.0.12 +6.0.13 3.0.9 6.1.4 4.0.6
[camel-k] branch release-1.10.x updated: Bump x/Net to version 0.17.0 (#4824)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-1.10.x by this push: new d3f5adc35 Bump x/Net to version 0.17.0 (#4824) d3f5adc35 is described below commit d3f5adc3540549e97ea52441b921624d0888bc8a Author: Andrea Cosentino AuthorDate: Fri Oct 13 13:23:22 2023 +0200 Bump x/Net to version 0.17.0 (#4824) Signed-off-by: Andrea Cosentino --- go.mod | 17 - go.sum | 39 ++- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 8117d76b4..50dc156bb 100644 --- a/go.mod +++ b/go.mod @@ -44,8 +44,8 @@ require ( go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 - golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 + golang.org/x/sync v0.1.0 + golang.org/x/term v0.13.0 golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 gopkg.in/inf.v0 v0.9.1 gopkg.in/yaml.v2 v2.4.0 @@ -135,13 +135,12 @@ require ( github.com/vbatts/tar-split v0.11.2 // indirect go.opencensus.io v0.23.0 // indirect go.uber.org/atomic v1.9.0 // indirect - golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect - golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect - golang.org/x/net v0.0.0-2022052938-2e3eb7b945c2 // indirect - golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect - golang.org/x/text v0.3.7 // indirect - golang.org/x/tools v0.1.10 // indirect - golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect + golang.org/x/crypto v0.14.0 // indirect + golang.org/x/mod v0.8.0 // indirect + golang.org/x/net v0.17.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect + golang.org/x/tools v0.6.0 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/api v0.81.0 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/go.sum b/go.sum index c7f6014a4..1638773ac 100644 --- a/go.sum +++ b/go.sum @@ -1517,6 +1517,7 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50/go.mod h1:NUSPSUX/bi6SeDMUh6brw0nXpxHnc96TguQh0+r/ssA= github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go.mod h1:GlGEuHIJweS1mbCqG+7vt2nvWLzLLnRHbXz5JKd/Qbg= @@ -1628,8 +1629,9 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA= golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1670,8 +1672,10 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.6.0-
Re: [PR] Bump x/Net to version 0.17.0 [camel-k]
oscerd merged PR #4824: URL: https://github.com/apache/camel-k/pull/4824 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Bump x/Net to version 0.17.0 [camel-k]
oscerd commented on PR #4824: URL: https://github.com/apache/camel-k/pull/4824#issuecomment-1761352164 Failing tests are unrelated. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Rewrite Karavan Designer to use Functional Components and State [camel-karavan]
jasham commented on issue #836: URL: https://github.com/apache/camel-karavan/issues/836#issuecomment-1761326353 Greetings, This library is very useful. I am using this library for one of my personal projects, but the code and logic are currently written in Typescript and I am trying to convert it to JSX but facing some issues because I am not that good in Typescript. It will be very helpful if the JSX version is available for this. **Thanks, Jasham** -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Changes to micrometer-component.adoc (#2311) [camel]
JiriOndrusek commented on code in PR #11715: URL: https://github.com/apache/camel/pull/11715#discussion_r1358108251 ## components/camel-micrometer/src/main/docs/micrometer-component.adoc: ## @@ -592,3 +555,5 @@ For example to capture data with Prometheus, you can add the following dependenc See the following table for options to specify what metrics to capture, or to turn it off. include::spring-boot:partial$starter.adoc[] + +endif::[] Review Comment: done -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Added build-catalog-tool-timeout parameter to install command. [camel-k]
github-actions[bot] commented on PR #4821: URL: https://github.com/apache/camel-k/pull/4821#issuecomment-1761281823 :camel: **Thank you for contributing!** Code Coverage Report :heavy_check_mark: - Coverage unchanged. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Added build-catalog-tool-timeout parameter to install command. [camel-k]
github-actions[bot] commented on PR #4821: URL: https://github.com/apache/camel-k/pull/4821#issuecomment-1761281001 :camel: **Thank you for contributing!** Code Coverage Report :heavy_check_mark: - Coverage unchanged. -- 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-4.0.x-4.4.6 deleted (was bb8852a0c20)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch camel-4.0.x-4.4.6 in repository https://gitbox.apache.org/repos/asf/camel.git was bb8852a0c20 Upgrade Vertx to version 4.4.6 (#11692) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] CAMEL-19541: replaced Thread.sleep() in camel-quartz [camel]
orpiske commented on code in PR #11711:
URL: https://github.com/apache/camel/pull/11711#discussion_r1358058977
##
components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredRecoveryTest.java:
##
@@ -55,14 +58,22 @@ public void testQuartzPersistentStoreClusteredApp() throws
Exception {
log.warn("Crashed...");
log.warn("Crashed...");
-Thread.sleep(2000);
+Awaitility.await().timeout(2000, TimeUnit.MILLISECONDS);
// as well as the second one which will run in slave mode as it will
not be able to acquire the same lock
AbstractXmlApplicationContext app2 =
newAppContext("SpringQuartzConsumerRecoveryClusteredAppTwo.xml");
app2.start();
// wait long enough until the second app takes it over...
-Thread.sleep(2000);
+Awaitility.await().untilAsserted(() -> {
+CamelContext camel2 = app2.getBean("camelContext2-" +
getClass().getSimpleName(), CamelContext.class);
+
+MockEndpoint mock2 = camel2.getEndpoint("mock:result",
MockEndpoint.class);
+mock2.expectedMinimumMessageCount(2);
+mock2.expectedMessagesMatches(new ClusteringPredicate(false));
+
+mock2.assertIsSatisfied();
+});
Review Comment:
Same as above.
##
components/camel-quartz/src/test/java/org/apache/camel/component/quartz/SpringQuartzConsumerTwoAppsClusteredFailoverTest.java:
##
@@ -65,7 +66,15 @@ public void testQuartzPersistentStoreClusteredApp() throws
Exception {
log.warn("Crashed...");
// wait long enough until the second app takes it over...
-Thread.sleep(2000);
+Awaitility.await().untilAsserted(() -> {
+CamelContext camel2 = app2.getBean("camelContext2-" +
getClass().getSimpleName(), CamelContext.class);
+
+MockEndpoint mock2 = camel2.getEndpoint("mock:result",
MockEndpoint.class);
+mock2.expectedMinimumMessageCount(3);
+mock2.expectedMessagesMatches(new ClusteringPredicate(false));
+
+mock2.assertIsSatisfied();
+});
Review Comment:
We can probably shorten the asserted block.
##
components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/CronScheduledRoutePolicyTest.java:
##
@@ -330,10 +331,16 @@ public void configure() {
ServiceHelper.suspendService(context.getRoute("test").getConsumer());
-Thread.sleep(5000);
-template.sendBody("direct:start", "Ready or not, Here, I come");
+try {
+Awaitility.await().timeout(5,
TimeUnit.SECONDS).catchUncaughtExceptions().untilAsserted(() -> {
+template.sendBody("direct:start", "Ready or not, Here, I
come");
+success.assertIsSatisfied();
+});
+} catch (CamelExecutionException e) {
+throw new CamelExecutionException(e.getMessage(),
e.getExchange(), e);
+}
Review Comment:
Hm, this seems a bit strange to me. I think it would probably be better to
separate error handling from the test assertion.
##
components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java:
##
@@ -34,7 +34,6 @@ public void testMultiplePoliciesOnRoute() throws Exception {
for (int i = 0; i < size; i++) {
template.sendBody(url, "Message " + i);
-Thread.sleep(3);
}
Review Comment:
I think we need this `Thread.sleep` if we want to throttle sending the
messages. I have seen this pattern elsewhere. I don't think you need to fix
this one right now (see: https://issues.apache.org/jira/browse/CAMEL-19986)
--
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 (5db143ae80e -> b35b2b9815d)
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 5db143ae80e Upgrade AWS SDK v2 to version 2.21.0 (#11716) add b35b2b9815d (chores) camel-core: avoid hitting the JVM slow path No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[I] Don't materialize Integration generated sources [camel-k]
squakez opened a new issue, #4825: URL: https://github.com/apache/camel-k/issues/4825 ### Requirement As seen in https://github.com/apache/camel-k/pull/4812, there could be situations where we want to use a generated source only for operator capabilities, without the need to have it available at runtime. We should extend this behavior, having a concept of environment source which are in memory and not stored as Configmaps, as it happens now. ### Problem a ### Proposal _No response_ ### Open questions _No response_ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] feat(trait): let Camel runtime manages Kamelets [camel-k]
github-actions[bot] commented on PR #4812: URL: https://github.com/apache/camel-k/pull/4812#issuecomment-1761255306 :camel: **Thank you for contributing!** :camel: Unable to create **Coverage Report** :warning:. Merge conflicts found. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch release-2.0.x updated: chore(deps): xnet 1.17.0
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.0.x by this push: new dce30dff2 chore(deps): xnet 1.17.0 dce30dff2 is described below commit dce30dff21a753385c8ddfb07f0a75b9e1fb9ac0 Author: Pasquale Congiusti AuthorDate: Fri Oct 13 10:26:00 2023 +0200 chore(deps): xnet 1.17.0 --- go.mod | 10 +- go.sum | 20 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 6f83ba54e..4aed89b1b 100644 --- a/go.mod +++ b/go.mod @@ -38,8 +38,8 @@ require ( go.uber.org/zap v1.24.0 golang.org/x/oauth2 v0.10.0 golang.org/x/sync v0.3.0 - golang.org/x/term v0.10.0 - golang.org/x/text v0.11.0 + golang.org/x/term v0.13.0 + golang.org/x/text v0.13.0 golang.org/x/time v0.3.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.25.6 @@ -135,10 +135,10 @@ require ( github.com/vbatts/tar-split v0.11.3 // indirect go.opencensus.io v0.24.0 // indirect go.uber.org/atomic v1.9.0 // indirect - golang.org/x/crypto v0.11.0 // indirect + golang.org/x/crypto v0.14.0 // indirect golang.org/x/mod v0.10.0 // indirect - golang.org/x/net v0.12.0 // indirect - golang.org/x/sys v0.10.0 // indirect + golang.org/x/net v0.17.0 // indirect + golang.org/x/sys v0.13.0 // indirect golang.org/x/tools v0.9.1 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/api v0.126.0 // indirect diff --git a/go.sum b/go.sum index 39a48ddfa..0fd17f532 100644 --- a/go.sum +++ b/go.sum @@ -776,8 +776,8 @@ golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= -golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -870,8 +870,8 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-2022202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -976,13 +976,13 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220906165534-d0df966e6959/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFN
Re: [PR] chore(deps): x/net 1.17.0 [camel-k]
squakez merged PR #4823: URL: https://github.com/apache/camel-k/pull/4823 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] (chores) camel-core: avoid hitting the JVM slow path [camel]
orpiske merged PR #11656: URL: https://github.com/apache/camel/pull/11656 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] (chores) camel-core: avoid hitting the JVM slow path [camel]
orpiske commented on PR #11656: URL: https://github.com/apache/camel/pull/11656#issuecomment-1761250609 This one is good to go. No issues on my CI. -- 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: (chores) camel-core: avoid hitting the JVM slow path
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 b35b2b9815d (chores) camel-core: avoid hitting the JVM slow path
b35b2b9815d is described below
commit b35b2b9815d22f2fd358ebdb79e9146869dd6ac9
Author: Otavio Rodolfo Piske
AuthorDate: Thu Oct 5 16:29:31 2023 +0200
(chores) camel-core: avoid hitting the JVM slow path
In most cases, the type checks will be false, which causes the JVM to hit
its slow path checking the type.
This already happens subsequently, so adjust it to check only for equality
at first.
---
.../java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java
index d9b1a39f425..17a4a8425f1 100644
---
a/core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java
+++
b/core/camel-base/src/main/java/org/apache/camel/impl/converter/CoreTypeConverterRegistry.java
@@ -107,7 +107,7 @@ public abstract class CoreTypeConverterRegistry extends
ServiceSupport implement
return null;
}
-if (type.isInstance(value)) {
+if (type.equals(value.getClass())) {
// same instance
return (T) value;
}
Re: [PR] Changes to micrometer-component.adoc (#2311) [camel]
davsclaus commented on code in PR #11715: URL: https://github.com/apache/camel/pull/11715#discussion_r1358050660 ## components/camel-micrometer/src/main/docs/micrometer-component.adoc: ## @@ -592,3 +555,5 @@ For example to capture data with Prometheus, you can add the following dependenc See the following table for options to specify what metrics to capture, or to turn it off. include::spring-boot:partial$starter.adoc[] + +endif::[] Review Comment: Remove this -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Remove restriction for only testing projects with a native profile [camel-quarkus-examples]
jamesnetherton merged PR #167: URL: https://github.com/apache/camel-quarkus-examples/pull/167 -- 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-examples] branch camel-quarkus-main updated: Remove restriction for only testing projects with a native profile
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch camel-quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus-examples.git
The following commit(s) were added to refs/heads/camel-quarkus-main by this
push:
new 9a967c5 Remove restriction for only testing projects with a native
profile
9a967c5 is described below
commit 9a967c5cbd57139c62d544b4a58a901583975e31
Author: James Netherton
AuthorDate: Fri Oct 13 09:37:47 2023 +0100
Remove restriction for only testing projects with a native profile
---
.github/generate-test-groups.groovy | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/generate-test-groups.groovy
b/.github/generate-test-groups.groovy
index 6987c2d..8190abf 100644
--- a/.github/generate-test-groups.groovy
+++ b/.github/generate-test-groups.groovy
@@ -22,7 +22,7 @@ int groupId = 0
// Distribute example projects across a bounded set of test groups and output
as JSON
new File(".").eachFileRecurse { file ->
-if (file.getName() == "pom.xml" && file.text.contains("native")) {
+if (file.getName() == "pom.xml") {
if (GROUPS[groupId] == null) {
GROUPS[groupId] = [:]
GROUPS[groupId].name = "group-${String.format("%02d", groupId +
1)}"
[camel-karaf] branch camel-karaf-3.21.x updated: CAMEL-19984: Re-add Camel-Cassandraql Karaf feature (#247)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch camel-karaf-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/camel-karaf-3.21.x by this
push:
new 18cde723 CAMEL-19984: Re-add Camel-Cassandraql Karaf feature (#247)
18cde723 is described below
commit 18cde7238cd41eb12affd470650cd1dfddba8c6e
Author: Nicolas Filotto
AuthorDate: Fri Oct 13 11:34:13 2023 +0200
CAMEL-19984: Re-add Camel-Cassandraql Karaf feature (#247)
## Motivation
The feature was removed by
https://issues.apache.org/jira/browse/CAMEL-16422 due to a DSE import package
that was missing because the artifact `native-protocol` did not export the
version expected by `java-driver-core`, it is no longer the case so it can be
added back
## Modifications
* Restore the feature `camel-cassandraql` as it was in 3.9.0
* Set the version of the dependencies corresponding to the version of
`java-driver-core` used
---
.../karaf/features/src/main/resources/features.xml | 24 ++
pom.xml| 5 -
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 182b0f95..9bec2f75 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -574,6 +574,30 @@
mvn:com.github.ben-manes.caffeine/caffeine/${caffeine-version}
mvn:org.apache.camel/camel-caffeine-lrucache/${project.version}
+
+camel-core
+mvn:com.datastax.oss/java-driver-shaded-guava/${cassandra-shaded-guava}
+mvn:io.netty/netty-resolver/${netty-version}
+mvn:io.netty/netty-handler/${netty-version}
+mvn:io.netty/netty-transport-native-epoll/${netty-version}
+mvn:io.netty/netty-transport-native-unix-common/${netty-version}
+mvn:io.netty/netty-buffer/${netty-version}
+mvn:io.netty/netty-common/${netty-version}
+mvn:io.netty/netty-transport/${netty-version}
+mvn:io.netty/netty-codec/${netty-version}
+
+mvn:io.dropwizard.metrics/metrics-core/${cassandra-metrics-version}
+mvn:io.dropwizard.metrics/metrics-json/${cassandra-metrics-version}
+mvn:com.fasterxml.jackson.core/jackson-core/${cassandra-jackson2-version}
+mvn:com.fasterxml.jackson.core/jackson-databind/${cassandra-jackson2-version}
+mvn:com.fasterxml.jackson.core/jackson-annotations/${cassandra-jackson2-version}
+mvn:com.datastax.oss/java-driver-core/${cassandra-driver-version}
+mvn:com.datastax.oss/java-driver-query-builder/${cassandra-driver-version}
+mvn:com.typesafe/config/${typesafe-config}
+mvn:org.hdrhistogram/HdrHistogram/${hdrhistrogram-version}
+mvn:com.datastax.oss/native-protocol/${datastax-native-protocol}
+mvn:org.apache.camel/camel-cassandraql/${project.version}
+
camel-core
mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}
diff --git a/pom.xml b/pom.xml
index 35014fe9..61b9b1df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,12 +145,15 @@
2.12.3
1.12
0.9.5.5_1
+2.13.2
+4.1.18
+25.1-jre-graal-sub-1
3.6.2_1
1.5.1
2.3.1_2
3.1_7
1.3.3_1
-1.4.10
+1.5.1
2.17_1
0.2
0.3
Re: [PR] CAMEL-19984: Re-add Camel-Cassandraql Karaf feature [camel-karaf]
essobedo merged PR #246: URL: https://github.com/apache/camel-karaf/pull/246 -- 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
