[camel] branch main updated: Upgrade kudu
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 a00e40e Upgrade kudu a00e40e is described below commit a00e40e118b0ad425370eac15dd14cb6a0cf04fe Author: Claus Ibsen AuthorDate: Fri Mar 25 06:32:57 2022 +0100 Upgrade kudu --- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index e8f381c..647a22e 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -374,7 +374,7 @@ 1.6.10 5.12.1 5.12.1 -1.14.0 +1.15.0 0.12 21.0 0.12 diff --git a/parent/pom.xml b/parent/pom.xml index e7b3fad..14103dd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -358,7 +358,7 @@ 1.6.10 5.12.1 5.12.1 -1.14.0 +1.15.0 1.8 0.12 0.12
[camel] 02/02: Dependency upgrades
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 commit 5fbdc17d7370f60d424a8b907e6e8a37f6c7cc88 Author: Claus Ibsen AuthorDate: Fri Mar 25 06:28:53 2022 +0100 Dependency upgrades --- camel-dependencies/pom.xml | 10 +- parent/pom.xml | 10 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 25dc030..e8f381c 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -258,8 +258,8 @@ 5.1 2.4.10 2.1.11 -6.2.0.Final -5.4.32.Final +6.2.3.Final +5.6.7.Final 2.6.1 2.6.1 4.1.5 @@ -384,7 +384,7 @@ 1.0.0 0.2.0 2.17.2 -1.2.10 +1.2.11 8.11.1 [8,9) 1.6 @@ -408,8 +408,8 @@ 3.2.3 3.0.0-M4 3.3.1 -4.2.7 -1.8.3 +4.2.9 +1.8.4 2.0.1 3.0 3.0.1 diff --git a/parent/pom.xml b/parent/pom.xml index 1e6de15..e7b3fad 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -239,8 +239,8 @@ 5.1 2.4.10 2.1.11 -6.2.0.Final -5.4.32.Final +6.2.3.Final +5.6.7.Final 2.6.1 2.6.1 1.7 @@ -367,7 +367,7 @@ 1.0.0 2.17.2 -1.2.10 +1.2.11 8.11.1 [8,9) 0.2.0 @@ -395,8 +395,8 @@ 3.2.3 3.0.0-M4 3.3.1 -4.2.7 -1.8.3 +4.2.9 +1.8.4 2.0.1 3.0.1 3.0
[camel] 01/02: Upgrade spring 5.3.17
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
commit 74ef275dd1086142aeda759c0d13fbc1fb9b4827
Author: Claus Ibsen
AuthorDate: Fri Mar 25 06:24:30 2022 +0100
Upgrade spring 5.3.17
---
camel-dependencies/pom.xml | 6 +++---
parent/pom.xml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 3c474731..25dc030 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -516,14 +516,14 @@
2.0-M4-groovy-3.0
4.3.5
2.6.2
-5.5.9
+5.5.10
2.3.6.RELEASE
2.4.2
5.6.2
${spring5-version}
[5,6)
-3.1.1
-5.3.16
+3.1.3
+5.3.17
1.5
3.14.7
1.17.2
diff --git a/parent/pom.xml b/parent/pom.xml
index 6e5d3d4..1e6de15 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -504,14 +504,14 @@
2.0-M4-groovy-3.0
4.3.5
2.6.2
-5.5.9
+5.5.10
2.3.6.RELEASE
[5,6)
${spring5-version}
-5.3.16
+5.3.17
2.4.2
5.6.2
-3.1.1
+3.1.3
1.5
3.14.7
1.17.2
[camel] branch main updated (35723b1 -> 5fbdc17)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 35723b1 Upgrade debezium 1.8.1 new 74ef275 Upgrade spring 5.3.17 new 5fbdc17 Dependency upgrades 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 | 16 parent/pom.xml | 16 2 files changed, 16 insertions(+), 16 deletions(-)
[camel] branch main updated: Upgrade debezium 1.8.1
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 35723b1 Upgrade debezium 1.8.1 35723b1 is described below commit 35723b1aab2af8943659703c0b8ece4ed1c47666 Author: Claus Ibsen AuthorDate: Fri Mar 25 06:16:41 2022 +0100 Upgrade debezium 1.8.1 --- camel-dependencies/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index d445de9..3c474731 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -168,8 +168,8 @@ true 2.1.4 -8.0.27 -1.8.0.Final +8.0.28 +1.8.1.Final 1.9.5 1.4.0 10.14.2.0 diff --git a/parent/pom.xml b/parent/pom.xml index 5d3f896..6e5d3d4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -164,8 +164,8 @@ 3.2.13 6.5.2 3.2.0 -1.8.0.Final - 8.0.27 +1.8.1.Final + 8.0.28 0.3.0 2.1.5 3.9.6
[camel-quarkus] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new f3f4be0 Updated CHANGELOG.md f3f4be0 is described below commit f3f4be0a4cef197f1569b925c83d3d6341d4b1e4 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Mar 25 03:15:49 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 898030d..600dd26 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ - \[Camel 3.16\] rest-json example compliation error [\#3608](https://github.com/apache/camel-quarkus/issues/3608) - Use https instead of http to reference xsds [\#3604](https://github.com/apache/camel-quarkus/issues/3604) - Increase FHIR extension test coverage [\#3601](https://github.com/apache/camel-quarkus/issues/3601) +- \[Camel 3.16.0\] - camel-kafka uses some reflection for readiness health check [\#3592](https://github.com/apache/camel-quarkus/issues/3592) - AWS Lambda example tests should use mock event server [\#3554](https://github.com/apache/camel-quarkus/issues/3554) - Improve slack test coverage [\#3541](https://github.com/apache/camel-quarkus/issues/3541) - Cannot build camel-quarkus-ipfs because repository.jboss.org is down [\#3532](https://github.com/apache/camel-quarkus/issues/3532) @@ -30,8 +31,10 @@ **Merged pull requests:** +- Upgrade Quarkus to 2.8.0.CR1 + Upgrade Camel to 3.16.0 [\#3653](https://github.com/apache/camel-quarkus/pull/3653) ([jamesnetherton](https://github.com/jamesnetherton)) +- Fix typo in docs & Added tests for NotNull validator checks [\#3652](https://github.com/apache/camel-quarkus/pull/3652) ([mmuzikar](https://github.com/mmuzikar)) - Avoid compiling regular expressions in loops [\#3649](https://github.com/apache/camel-quarkus/pull/3649) ([ppalaga](https://github.com/ppalaga)) -- Switch from `QuarkusIntegrationTest` to `QuarkusIntegrationTest` [\#3648](https://github.com/apache/camel-quarkus/pull/3648) ([jamesnetherton](https://github.com/jamesnetherton)) +- Switch from `NativeImageTest` to `QuarkusIntegrationTest` [\#3648](https://github.com/apache/camel-quarkus/pull/3648) ([jamesnetherton](https://github.com/jamesnetherton)) - file: Ensure FileTest.charset is fixed under Windows \#3530 [\#3647](https://github.com/apache/camel-quarkus/pull/3647) ([aldettinger](https://github.com/aldettinger)) - Tidy geronimo-jms\_2.0\_spec exclusions [\#3646](https://github.com/apache/camel-quarkus/pull/3646) ([ppalaga](https://github.com/ppalaga)) - file: Rewrite the charset related test \#3627 [\#3645](https://github.com/apache/camel-quarkus/pull/3645) ([aldettinger](https://github.com/aldettinger))
[camel-k] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new 3991dc0 Updated CHANGELOG.md 3991dc0 is described below commit 3991dc0fabb5968a94cf2cd677b5ca2d2d0393f6 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Mar 25 03:11:28 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74f083c..81cac97 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ **Closed issues:** - Jsonata does not evaluate correctly [\#3129](https://github.com/apache/camel-k/issues/3129) +- way to add a trusted root cert? \(non-maven\) [\#2820](https://github.com/apache/camel-k/issues/2820) - Be able to configure PodMonitor via prometheus trait [\#2812](https://github.com/apache/camel-k/issues/2812) - SEDA low performance issue [\#2808](https://github.com/apache/camel-k/issues/2808)
[camel-k-runtime] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/main by this push: new ac8130a Updated CHANGELOG.md ac8130a is described below commit ac8130a836158135403f86918abfe697a637e9a1 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Mar 25 03:08:30 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84d4da2..c61a92c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ **Merged pull requests:** +- build\(deps\): bump apache from 24 to 25 [\#803](https://github.com/apache/camel-k-runtime/pull/803) ([dependabot[bot]](https://github.com/apps/dependabot)) - build\(deps\): bump maven-site-plugin from 3.10.0 to 3.11.0 [\#802](https://github.com/apache/camel-k-runtime/pull/802) ([dependabot[bot]](https://github.com/apps/dependabot)) - build\(deps\): bump spock-core from 2.0-groovy-3.0 to 2.1-groovy-3.0 [\#801](https://github.com/apache/camel-k-runtime/pull/801) ([dependabot[bot]](https://github.com/apps/dependabot)) - build\(deps\): bump versions-maven-plugin from 2.9.0 to 2.10.0 [\#800](https://github.com/apache/camel-k-runtime/pull/800) ([dependabot[bot]](https://github.com/apps/dependabot))
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1078592957 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 2037743685-701-22c2dbb4-d735-4896-abd5-93403023e5b0 * Camel Quarkus Commit: 63c4a07af645cc048b75d8ca096087054d356975 * Quarkus Main Commit: Unknown * Link to build: https://github.com/apache/camel-quarkus/actions/runs/2037743685 -- This is an automated message from the Apache Git Service. To respond to the message, please 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 automatic-periodic-sync updated (a8bb47c -> 7ff8f64)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-karaf.git. from a8bb47c Prepare for next version add 7ff8f64 Regen No new revisions were added by this update. Summary of changes: .../resources/org/apache/camel/catalog/karaf/components/salesforce.json | 2 ++ 1 file changed, 2 insertions(+)
[GitHub] [camel-k] github-actions[bot] closed issue #2820: way to add a trusted root cert? (non-maven)
github-actions[bot] closed issue #2820: URL: https://github.com/apache/camel-k/issues/2820 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] github-actions[bot] commented on issue #1480: Create ConsoleYAMLSample for Integration and IntegrationPlatform CRDs on OpenShift
github-actions[bot] commented on issue #1480: URL: https://github.com/apache/camel-k/issues/1480#issuecomment-1078523774 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] github-actions[bot] commented on issue #1773: Default to using Micrometer for integration monitoring
github-actions[bot] commented on issue #1773: URL: https://github.com/apache/camel-k/issues/1773#issuecomment-1078523766 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] github-actions[bot] commented on issue #1784: builder: explore mvnd
github-actions[bot] commented on issue #1784: URL: https://github.com/apache/camel-k/issues/1784#issuecomment-1078523756 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (36daf1c -> 2ef1e93)
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. discard 36daf1c Regen for commit cbdc15d9e3672543b0561f14a6329aa27452cfd2 add 1409138 CAMEL-17849: fix invalid log message during kafka consumer shutdown add 8aa2219 CAMEL-17850: fix trying to unlock an invalid lock add c0d0f38 camel-kafka: fix idempotent tests add d964ded (chores) camel-kafka: cleanup Kafka consumer initialization tasks add 2ef1e93 Regen This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (36daf1c) \ N -- N -- N refs/heads/regen_bot (2ef1e93) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../camel/component/kafka/KafkaConsumer.java | 6 +- .../camel/component/kafka/KafkaFetchRecords.java | 101 - .../kafka/KafkaIdempotentRepositoryEagerIT.java| 8 +- .../kafka/KafkaIdempotentRepositoryNonEagerIT.java | 12 +-- .../KafkaIdempotentRepositoryPersistenceIT.java| 10 +- 5 files changed, 80 insertions(+), 57 deletions(-)
[GitHub] [camel] github-actions[bot] closed pull request #7266: Generated sources regen
github-actions[bot] closed pull request #7266: URL: https://github.com/apache/camel/pull/7266 -- This is an automated message from the Apache Git Service. To respond to the message, please 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: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 7ff8f64 Regen
7ff8f64 is described below
commit 7ff8f6477804515ffb4144a084b8fc52bbade01a
Author: Claus Ibsen
AuthorDate: Thu Mar 24 21:40:36 2022 +0100
Regen
---
.../resources/org/apache/camel/catalog/karaf/components/salesforce.json | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/salesforce.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/salesforce.json
index de1185d..60eab17 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/salesforce.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/salesforce.json
@@ -72,6 +72,7 @@
"sObjectName": { "kind": "property", "displayName": "SObject Name",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "SObject name if required or
supported by API" },
"sObjectQuery": { "kind": "property", "displayName": "SObject Query",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Salesforce SOQL query string" },
"sObjectSearch": { "kind": "property", "displayName": "SObject Search",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Salesforce SOSL search string"
},
+"streamQueryResult": { "kind": "property", "displayName": "Stream query
result", "group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "false", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "If true, streams SOQL query
result and transparently handles subsequent requests if t [...]
"updateTopic": { "kind": "property", "displayName": "Update Topic",
"group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Whether to update an existing
Push Topic when using the Streaming API, defaults to false" },
"config": { "kind": "property", "displayName": "Config", "group": "common
(advanced)", "label": "common,advanced", "required": false, "type": "object",
"javaType": "org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"deprecated": false, "autowired": false, "secret": false, "description":
"Global endpoint configuration - use to set values that are common to all
endpoints" },
"httpClientProperties": { "kind": "property", "displayName": "Http Client
Properties", "group": "common (advanced)", "label": "common,advanced",
"required": false, "type": "object", "javaType":
"java.util.Map", "deprecated": false,
"autowired": false, "secret": false, "description": "Used to set any properties
that can be configured on the underlying HTTP client. Have a look at properties
of SalesforceHttpClient and the Jetty HttpClient for all ava [...]
@@ -161,6 +162,7 @@
"sObjectName": { "kind": "parameter", "displayName": "SObject Name",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "SObject name if required
or supported by API" },
"sObjectQuery": { "kind": "parameter", "displayName": "SObject Query",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration",
[camel-spring-boot] branch main updated (3c0bd87 -> d400e9d)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. from 3c0bd87 Remove unusued code new 4ec75fc Upgrade to sprint boot 2.6.5 new d400e9d 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: archetypes/camel-archetype-spring-boot/pom.xml | 2 +- .../camel/springboot/catalog/components/salesforce.json| 2 ++ .../camel-salesforce-starter/src/main/docs/salesforce.json | 7 +++ .../springboot/SalesforceComponentConfiguration.java | 14 ++ pom.xml| 2 +- 5 files changed, 25 insertions(+), 2 deletions(-)
[camel-spring-boot] 01/02: Upgrade to sprint boot 2.6.5
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 4ec75fc48307a6364c76160ee06d89eb490a5e79 Author: Claus Ibsen AuthorDate: Thu Mar 24 21:13:55 2022 +0100 Upgrade to sprint boot 2.6.5 --- archetypes/camel-archetype-spring-boot/pom.xml | 2 +- pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archetypes/camel-archetype-spring-boot/pom.xml b/archetypes/camel-archetype-spring-boot/pom.xml index 7324361..997aa0d 100644 --- a/archetypes/camel-archetype-spring-boot/pom.xml +++ b/archetypes/camel-archetype-spring-boot/pom.xml @@ -34,7 +34,7 @@ maven-archetype - 2.6.4 + 2.6.5 src/test/resources/settings.xml diff --git a/pom.xml b/pom.xml index 020355a..f57eccc 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -2.6.4 +2.6.5 3.17.0-SNAPSHOT
[camel-spring-boot] 02/02: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit d400e9dd566b1951a7daf7a9b46a14f30b3c7779
Author: Claus Ibsen
AuthorDate: Thu Mar 24 21:25:24 2022 +0100
Regen
---
.../camel/springboot/catalog/components/salesforce.json| 2 ++
.../camel-salesforce-starter/src/main/docs/salesforce.json | 7 +++
.../springboot/SalesforceComponentConfiguration.java | 14 ++
3 files changed, 23 insertions(+)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
index 0afd904..5cac4e8 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
@@ -72,6 +72,7 @@
"sObjectName": { "kind": "property", "displayName": "SObject Name",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "SObject name if required or
supported by API" },
"sObjectQuery": { "kind": "property", "displayName": "SObject Query",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Salesforce SOQL query string" },
"sObjectSearch": { "kind": "property", "displayName": "SObject Search",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Salesforce SOSL search string"
},
+"streamQueryResult": { "kind": "property", "displayName": "Stream query
result", "group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "false", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "If true, streams SOQL query
result and transparently handles subsequent requests if t [...]
"updateTopic": { "kind": "property", "displayName": "Update Topic",
"group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Whether to update an existing
Push Topic when using the Streaming API, defaults to false" },
"config": { "kind": "property", "displayName": "Config", "group": "common
(advanced)", "label": "common,advanced", "required": false, "type": "object",
"javaType": "org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"deprecated": false, "autowired": false, "secret": false, "description":
"Global endpoint configuration - use to set values that are common to all
endpoints" },
"httpClientProperties": { "kind": "property", "displayName": "Http Client
Properties", "group": "common (advanced)", "label": "common,advanced",
"required": false, "type": "object", "javaType":
"java.util.Map", "deprecated": false,
"autowired": false, "secret": false, "description": "Used to set any properties
that can be configured on the underlying HTTP client. Have a look at properties
of SalesforceHttpClient and the Jetty HttpClient for all ava [...]
@@ -161,6 +162,7 @@
"sObjectName": { "kind": "parameter", "displayName": "SObject Name",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "SObject name if required
or supported by API" },
"sObjectQuery": { "kind": "parameter", "displayName": "SObject Query",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
[camel] branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 2ef1e93 Regen
2ef1e93 is described below
commit 2ef1e93ba10ff21612e00e67b8fcc9f4ee801a3f
Author: Claus Ibsen
AuthorDate: Thu Mar 24 21:11:03 2022 +0100
Regen
---
.../camel/catalog/components/salesforce.json | 2 +
.../dsl/SalesforceComponentBuilderFactory.java | 19
.../dsl/SalesforceEndpointBuilderFactory.java | 111 +
3 files changed, 132 insertions(+)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
index de1185d..60eab17 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/salesforce.json
@@ -72,6 +72,7 @@
"sObjectName": { "kind": "property", "displayName": "SObject Name",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "SObject name if required or
supported by API" },
"sObjectQuery": { "kind": "property", "displayName": "SObject Query",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Salesforce SOQL query string" },
"sObjectSearch": { "kind": "property", "displayName": "SObject Search",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Salesforce SOSL search string"
},
+"streamQueryResult": { "kind": "property", "displayName": "Stream query
result", "group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "false", "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "If true, streams SOQL query
result and transparently handles subsequent requests if t [...]
"updateTopic": { "kind": "property", "displayName": "Update Topic",
"group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "config", "description": "Whether to update an existing
Push Topic when using the Streaming API, defaults to false" },
"config": { "kind": "property", "displayName": "Config", "group": "common
(advanced)", "label": "common,advanced", "required": false, "type": "object",
"javaType": "org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"deprecated": false, "autowired": false, "secret": false, "description":
"Global endpoint configuration - use to set values that are common to all
endpoints" },
"httpClientProperties": { "kind": "property", "displayName": "Http Client
Properties", "group": "common (advanced)", "label": "common,advanced",
"required": false, "type": "object", "javaType":
"java.util.Map", "deprecated": false,
"autowired": false, "secret": false, "description": "Used to set any properties
that can be configured on the underlying HTTP client. Have a look at properties
of SalesforceHttpClient and the Jetty HttpClient for all ava [...]
@@ -161,6 +162,7 @@
"sObjectName": { "kind": "parameter", "displayName": "SObject Name",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.salesforce.SalesforceEndpointConfig",
"configurationField": "configuration", "description": "SObject name if required
or supported by API" },
"sObjectQuery": { "kind": "parameter", "displayName": "SObject Query",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
[camel] branch main updated (cbdc15d -> d964ded)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from cbdc15d Upgrade to activemq 5.17.0 add 1409138 CAMEL-17849: fix invalid log message during kafka consumer shutdown add 8aa2219 CAMEL-17850: fix trying to unlock an invalid lock add c0d0f38 camel-kafka: fix idempotent tests add d964ded (chores) camel-kafka: cleanup Kafka consumer initialization tasks No new revisions were added by this update. Summary of changes: .../camel/component/kafka/KafkaConsumer.java | 6 +- .../camel/component/kafka/KafkaFetchRecords.java | 101 - .../kafka/KafkaIdempotentRepositoryEagerIT.java| 8 +- .../kafka/KafkaIdempotentRepositoryNonEagerIT.java | 12 +-- .../KafkaIdempotentRepositoryPersistenceIT.java| 10 +- 5 files changed, 80 insertions(+), 57 deletions(-)
[GitHub] [camel] orpiske merged pull request #7264: Multiple Kafka minor fixes
orpiske merged pull request #7264: URL: https://github.com/apache/camel/pull/7264 -- This is an automated message from the Apache Git Service. To respond to the message, please 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 (022db35 -> 36daf1c)
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 022db35 CAMEL-17839: camel-health - Allow to configure initial state of health-checks (readiness). This mostly affect scheduled consumers which can be in either DOWN or UNKNOWN state before doing their first poll. By default we are careful and report as DOWN as we are not ready. But this allows users to not care and set it as UP or UNKNOWN. add 959eacd CAMEL-17818: camel-salesforce: stream query results add 7aac023 Upgrade to activemq 5.17.0 add f7f5573 Polished add cbdc15d Upgrade to activemq 5.17.0 add 36daf1c Regen for commit cbdc15d9e3672543b0561f14a6329aa27452cfd2 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- .../camel/catalog/components/salesforce.json | 2 + components/camel-cxf/pom.xml | 7 ++ .../apache/camel/component/http/HttpComponent.java | 3 +- .../salesforce/SalesforceComponentConfigurer.java | 6 ++ .../salesforce/SalesforceEndpointConfigurer.java | 6 ++ .../salesforce/SalesforceEndpointUriFactory.java | 3 +- .../camel/component/salesforce/salesforce.json | 2 + .../src/main/docs/salesforce-component.adoc| 6 +- .../salesforce/SalesforceEndpointConfig.java | 16 +++ .../api/dto/AbstractQueryRecordsBase.java | 33 ++ .../dto/analytics/reports/QueryRecordsReport.java | 14 +-- .../internal/dto/QueryRecordsPushTopic.java| 13 +-- .../internal/processor/AbstractRestProcessor.java | 28 +- .../internal/processor/JsonRestProcessor.java | 52 +- .../internal/processor/QueryResultIterator.java| 95 ++ .../CompositeApiBatchIntegrationTest.java | 12 +-- .../salesforce/CompositeApiIntegrationTest.java| 12 +-- .../salesforce/RecentIntegrationTest.java | 12 +-- .../salesforce/RestApiIntegrationTest.java | 77 -- .../dto/generated/QueryRecordsAccount.java | 13 +-- .../dto/generated/QueryRecordsContact.java | 13 +-- .../dto/generated/QueryRecordsLine_Item__c.java| 13 +-- .../AbstractRestProcessorApprovalTest.java | 7 ++ .../resources/sobject-query-records-optional.vm| 12 +-- .../src/main/resources/sobject-query-records.vm| 12 +-- .../test/resources/generated/QueryRecordsCase.java | 12 +-- .../QueryRecordsComplexCalculatedFormula.java | 12 +-- .../dsl/SalesforceComponentBuilderFactory.java | 19 .../dsl/SalesforceEndpointBuilderFactory.java | 111 + parent/pom.xml | 2 +- 31 files changed, 446 insertions(+), 181 deletions(-) create mode 100644 components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/QueryResultIterator.java
[GitHub] [camel] github-actions[bot] opened a new pull request #7266: Generated sources regen
github-actions[bot] opened a new pull request #7266: URL: https://github.com/apache/camel/pull/7266 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (1b9ff05 -> 022db35)
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. discard 1b9ff05 Regen for commit 959eacd46af42dd10555a728777f6966cdd53867 omit 959eacd CAMEL-17818: camel-salesforce: stream query results This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/regen_bot (022db35) \ O -- O -- O (1b9ff05) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../camel/catalog/components/salesforce.json | 2 - .../salesforce/SalesforceComponentConfigurer.java | 6 -- .../salesforce/SalesforceEndpointConfigurer.java | 6 -- .../salesforce/SalesforceEndpointUriFactory.java | 3 +- .../camel/component/salesforce/salesforce.json | 2 - .../src/main/docs/salesforce-component.adoc| 6 +- .../salesforce/SalesforceEndpointConfig.java | 16 --- .../api/dto/AbstractQueryRecordsBase.java | 33 -- .../dto/analytics/reports/QueryRecordsReport.java | 14 ++- .../internal/dto/QueryRecordsPushTopic.java| 13 ++- .../internal/processor/AbstractRestProcessor.java | 28 +- .../internal/processor/JsonRestProcessor.java | 52 +- .../internal/processor/QueryResultIterator.java| 95 -- .../CompositeApiBatchIntegrationTest.java | 12 ++- .../salesforce/CompositeApiIntegrationTest.java| 12 ++- .../salesforce/RecentIntegrationTest.java | 12 ++- .../salesforce/RestApiIntegrationTest.java | 77 ++ .../dto/generated/QueryRecordsAccount.java | 13 ++- .../dto/generated/QueryRecordsContact.java | 13 ++- .../dto/generated/QueryRecordsLine_Item__c.java| 13 ++- .../AbstractRestProcessorApprovalTest.java | 7 -- .../resources/sobject-query-records-optional.vm| 12 ++- .../src/main/resources/sobject-query-records.vm| 12 ++- .../test/resources/generated/QueryRecordsCase.java | 12 ++- .../QueryRecordsComplexCalculatedFormula.java | 12 ++- .../dsl/SalesforceComponentBuilderFactory.java | 19 .../dsl/SalesforceEndpointBuilderFactory.java | 111 - 27 files changed, 177 insertions(+), 436 deletions(-) delete mode 100644 components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/QueryResultIterator.java
[GitHub] [camel] github-actions[bot] closed pull request #7265: Generated sources regen
github-actions[bot] closed pull request #7265: URL: https://github.com/apache/camel/pull/7265 -- This is an automated message from the Apache Git Service. To respond to the message, please 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 (b21e302 -> 1b9ff05)
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 b21e302 camel-test-infra-kafka: enable singleton services for Strimzi add ed842b6 CAMEL-17820: camel-jbang - Additional files from CLI is automatic added to classpath to make it easy to use them by Camel. add 022db35 CAMEL-17839: camel-health - Allow to configure initial state of health-checks (readiness). This mostly affect scheduled consumers which can be in either DOWN or UNKNOWN state before doing their first poll. By default we are careful and report as DOWN as we are not ready. But this allows users to not care and set it as UP or UNKNOWN. add 959eacd CAMEL-17818: camel-salesforce: stream query results add 1b9ff05 Regen for commit 959eacd46af42dd10555a728777f6966cdd53867 No new revisions were added by this update. Summary of changes: .../camel/catalog/components/salesforce.json | 2 + .../salesforce/SalesforceComponentConfigurer.java | 6 ++ .../salesforce/SalesforceEndpointConfigurer.java | 6 ++ .../salesforce/SalesforceEndpointUriFactory.java | 3 +- .../camel/component/salesforce/salesforce.json | 2 + .../src/main/docs/salesforce-component.adoc| 6 +- .../salesforce/SalesforceEndpointConfig.java | 16 +++ .../api/dto/AbstractQueryRecordsBase.java | 33 ++ .../dto/analytics/reports/QueryRecordsReport.java | 14 +-- .../internal/dto/QueryRecordsPushTopic.java| 13 +-- .../internal/processor/AbstractRestProcessor.java | 28 +- .../internal/processor/JsonRestProcessor.java | 52 +- .../internal/processor/QueryResultIterator.java| 95 ++ .../CompositeApiBatchIntegrationTest.java | 12 +-- .../salesforce/CompositeApiIntegrationTest.java| 12 +-- .../salesforce/RecentIntegrationTest.java | 12 +-- .../salesforce/RestApiIntegrationTest.java | 77 -- .../dto/generated/QueryRecordsAccount.java | 13 +-- .../dto/generated/QueryRecordsContact.java | 13 +-- .../dto/generated/QueryRecordsLine_Item__c.java| 13 +-- .../AbstractRestProcessorApprovalTest.java | 7 ++ .../resources/sobject-query-records-optional.vm| 12 +-- .../src/main/resources/sobject-query-records.vm| 12 +-- .../test/resources/generated/QueryRecordsCase.java | 12 +-- .../QueryRecordsComplexCalculatedFormula.java | 12 +-- .../support/ScheduledPollConsumerHealthCheck.java | 2 +- .../dsl/SalesforceComponentBuilderFactory.java | 19 .../dsl/SalesforceEndpointBuilderFactory.java | 111 + .../apache/camel/dsl/jbang/core/commands/Run.java | 13 ++- .../apache/camel/main/ExtraFilesClassLoader.java | 40 +--- .../java/org/apache/camel/main/KameletMain.java| 10 +- 31 files changed, 481 insertions(+), 197 deletions(-) create mode 100644 components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/processor/QueryResultIterator.java copy core/camel-main/src/test/java/org/apache/camel/main/MySedaBlockingQueueFactory.java => dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/ExtraFilesClassLoader.java (54%)
[GitHub] [camel] github-actions[bot] opened a new pull request #7265: Generated sources regen
github-actions[bot] opened a new pull request #7265: URL: https://github.com/apache/camel/pull/7265 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Upgrade to activemq 5.17.0
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 cbdc15d Upgrade to activemq 5.17.0
cbdc15d is described below
commit cbdc15d9e3672543b0561f14a6329aa27452cfd2
Author: Claus Ibsen
AuthorDate: Thu Mar 24 18:50:53 2022 +0100
Upgrade to activemq 5.17.0
---
components/camel-cxf/pom.xml | 7 +++
1 file changed, 7 insertions(+)
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 5507c1a..57a7e62 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -288,6 +288,13 @@
+commons-net
+commons-net
+${commons-net-version}
+test
+
+
+
org.apache.cxf
cxf-rt-rs-extension-providers
test
[camel] branch main updated: Polished
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 f7f5573 Polished f7f5573 is described below commit f7f55732d47eabf15f241797451521040f25dfed Author: Claus Ibsen AuthorDate: Thu Mar 24 18:43:07 2022 +0100 Polished --- .../src/main/java/org/apache/camel/component/http/HttpComponent.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java index 3382f73..5d3fd45 100644 --- a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java +++ b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java @@ -717,8 +717,7 @@ public class HttpComponent extends HttpCommonComponent implements RestProducerFa } /** - * The timeout in milliseconds used when requesting a connection from the connection manager. A timeout value of - * zero is interpreted as an infinite timeout. + * The timeout in milliseconds used when requesting a connection from the connection manager. * * A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined * (system default).
[camel] branch main updated: Upgrade to activemq 5.17.0
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 7aac023 Upgrade to activemq 5.17.0 7aac023 is described below commit 7aac02347cca64d1cf84c790292c61ec5c5ec20e Author: Claus Ibsen AuthorDate: Thu Mar 24 18:17:29 2022 +0100 Upgrade to activemq 5.17.0 --- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index c049b66..d445de9 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -34,7 +34,7 @@ 1.1.3 2.20.0 -5.16.4 +5.17.0 2.12.3 2.7 1.19.0 diff --git a/parent/pom.xml b/parent/pom.xml index 13871bdc4..5d3f896 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -50,7 +50,7 @@ 1.1.3 -5.16.4 +5.17.0 2.20.0 2.12.3 2.0.0.AM26
[camel] branch main updated: CAMEL-17818: camel-salesforce: stream query results
This is an automated email from the ASF dual-hosted git repository. jeremyross 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 959eacd CAMEL-17818: camel-salesforce: stream query results 959eacd is described below commit 959eacd46af42dd10555a728777f6966cdd53867 Author: Jeremy Ross AuthorDate: Thu Mar 24 11:27:26 2022 -0500 CAMEL-17818: camel-salesforce: stream query results --- .../salesforce/SalesforceComponentConfigurer.java | 6 ++ .../salesforce/SalesforceEndpointConfigurer.java | 6 ++ .../salesforce/SalesforceEndpointUriFactory.java | 3 +- .../camel/component/salesforce/salesforce.json | 2 + .../src/main/docs/salesforce-component.adoc| 6 +- .../salesforce/SalesforceEndpointConfig.java | 16 .../api/dto/AbstractQueryRecordsBase.java | 33 +++- .../dto/analytics/reports/QueryRecordsReport.java | 14 +--- .../internal/dto/QueryRecordsPushTopic.java| 13 +-- .../internal/processor/AbstractRestProcessor.java | 28 ++- .../internal/processor/JsonRestProcessor.java | 52 +++- .../internal/processor/QueryResultIterator.java| 95 ++ .../CompositeApiBatchIntegrationTest.java | 12 +-- .../salesforce/CompositeApiIntegrationTest.java| 12 +-- .../salesforce/RecentIntegrationTest.java | 12 +-- .../salesforce/RestApiIntegrationTest.java | 77 -- .../dto/generated/QueryRecordsAccount.java | 13 +-- .../dto/generated/QueryRecordsContact.java | 13 +-- .../dto/generated/QueryRecordsLine_Item__c.java| 13 +-- .../AbstractRestProcessorApprovalTest.java | 7 ++ .../resources/sobject-query-records-optional.vm| 12 +-- .../src/main/resources/sobject-query-records.vm| 12 +-- .../test/resources/generated/QueryRecordsCase.java | 12 +-- .../QueryRecordsComplexCalculatedFormula.java | 12 +-- 24 files changed, 304 insertions(+), 177 deletions(-) diff --git a/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceComponentConfigurer.java b/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceComponentConfigurer.java index 1018e7c..173d977 100644 --- a/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceComponentConfigurer.java +++ b/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceComponentConfigurer.java @@ -191,6 +191,8 @@ public class SalesforceComponentConfigurer extends PropertyConfigurerSupport imp case "sObjectSearch": getOrCreateConfig(target).setSObjectSearch(property(camelContext, java.lang.String.class, value)); return true; case "sslcontextparameters": case "sslContextParameters": target.setSslContextParameters(property(camelContext, org.apache.camel.support.jsse.SSLContextParameters.class, value)); return true; +case "streamqueryresult": +case "streamQueryResult": getOrCreateConfig(target).setStreamQueryResult(property(camelContext, java.lang.Boolean.class, value)); return true; case "updatetopic": case "updateTopic": getOrCreateConfig(target).setUpdateTopic(property(camelContext, boolean.class, value)); return true; case "useglobalsslcontextparameters": @@ -371,6 +373,8 @@ public class SalesforceComponentConfigurer extends PropertyConfigurerSupport imp case "sObjectSearch": return java.lang.String.class; case "sslcontextparameters": case "sslContextParameters": return org.apache.camel.support.jsse.SSLContextParameters.class; +case "streamqueryresult": +case "streamQueryResult": return java.lang.Boolean.class; case "updatetopic": case "updateTopic": return boolean.class; case "useglobalsslcontextparameters": @@ -552,6 +556,8 @@ public class SalesforceComponentConfigurer extends PropertyConfigurerSupport imp case "sObjectSearch": return getOrCreateConfig(target).getSObjectSearch(); case "sslcontextparameters": case "sslContextParameters": return target.getSslContextParameters(); +case "streamqueryresult": +case "streamQueryResult": return getOrCreateConfig(target).getStreamQueryResult(); case "updatetopic": case "updateTopic": return getOrCreateConfig(target).isUpdateTopic(); case "useglobalsslcontextparameters": diff --git a/components/camel-salesforce/camel-salesforce-component/src/generated/java/org/apache/camel/component/salesforce/SalesforceEndpointConfigurer.java
[camel] branch main updated: CAMEL-17839: camel-health - Allow to configure initial state of health-checks (readiness). This mostly affect scheduled consumers which can be in either DOWN or UNKNOWN st
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 022db35 CAMEL-17839: camel-health - Allow to configure initial state
of health-checks (readiness). This mostly affect scheduled consumers which can
be in either DOWN or UNKNOWN state before doing their first poll. By default we
are careful and report as DOWN as we are not ready. But this allows users to
not care and set it as UP or UNKNOWN.
022db35 is described below
commit 022db35210eb5d0117654bba1d43db28b1044dc4
Author: Claus Ibsen
AuthorDate: Thu Mar 24 18:07:27 2022 +0100
CAMEL-17839: camel-health - Allow to configure initial state of
health-checks (readiness). This mostly affect scheduled consumers which can be
in either DOWN or UNKNOWN state before doing their first poll. By default we
are careful and report as DOWN as we are not ready. But this allows users to
not care and set it as UP or UNKNOWN.
---
.../java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java
b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java
index 089e04f..4148603 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java
@@ -38,7 +38,7 @@ public class ScheduledPollConsumerHealthCheck implements
HealthCheck {
public ScheduledPollConsumerHealthCheck(ScheduledPollConsumer consumer,
String id) {
this.registry =
HealthCheckRegistry.get(consumer.getEndpoint().getCamelContext());
-this.initialState = registry.getInitialState();
+this.initialState = registry != null ? registry.getInitialState() :
State.DOWN;
this.consumer = consumer;
this.id = id;
this.sanitizedBaseUri =
URISupport.sanitizeUri(consumer.getEndpoint().getEndpointBaseUri());
[camel-website-pub] branch asf-site updated (fe9c288 -> 79ec031)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website-pub.git. discard fe9c288 Website updated to 9ce96a4010b15895ed3c1483cf47a78925288c74 discard 0bbe957 Website updated to 325e929157412b27394080f4d4dba3d821476ddf new fd092f5 Website updated to 325e929157412b27394080f4d4dba3d821476ddf new 79ec031 Website updated to 39288c6239c7eedd54ab0a773fd4e760719483c2 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (fe9c288) \ N -- N -- N refs/heads/asf-site (79ec031) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 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: .htaccess | 26 +- blog/2022/03/camel-release-stats/index.html|2 +- blog/2022/03/resume-api-v2/index.html |2 +- .../03/secrets-properties-functions/index.html | 38 + blog/index.html|2 +- blog/index.xml | 14 +- blog/page/10/index.html|2 +- blog/page/11/index.html|2 +- blog/page/12/index.html|2 +- blog/page/13/index.html|2 +- blog/page/14/index.html|2 +- blog/page/15/index.html|2 +- blog/page/16/index.html|2 +- blog/page/17/index.html|2 +- blog/page/18/index.html|2 +- blog/page/19/index.html|2 +- blog/page/2/index.html |2 +- blog/page/20/index.html|2 +- blog/page/21/index.html|2 +- blog/page/22/index.html|2 +- blog/page/23/index.html|2 +- blog/page/24/index.html|2 +- blog/page/25/index.html|2 +- blog/page/26/index.html|2 +- blog/page/27/index.html|2 +- blog/page/28/index.html|2 +- blog/page/29/index.html|2 +- blog/page/3/index.html |2 +- blog/page/30/index.html|2 +- blog/page/31/index.html|2 +- blog/page/32/index.html|2 +- blog/page/33/index.html|2 +- blog/page/34/index.html|2 +- blog/page/35/index.html|2 +- blog/page/36/index.html|2 +- blog/page/37/index.html|2 +- blog/page/38/index.html|2 +- blog/page/39/index.html|2 +- blog/page/4/index.html |2 +- blog/page/40/index.html|2 +- blog/page/41/index.html|2 +- blog/page/42/index.html|2 +- blog/page/43/index.html|2 +- blog/page/44/index.html|2 +- blog/page/45/index.html|2 +- blog/page/46/index.html|2 +- blog/page/47/index.html|2 +- blog/page/48/index.html|2 +- blog/page/49/index.html|2 +- blog/page/5/index.html |2 +- blog/page/50/index.html|2 +- blog/page/51/index.html|2 +- blog/page/52/index.html|2 +- blog/page/53/index.html|2 +- blog/page/54/index.html|2 +- blog/page/55/index.html|2 +- blog/page/56/index.html|2 +-
[camel] branch main updated: CAMEL-17820: camel-jbang - Additional files from CLI is automatic added to classpath to make it easy to use them by Camel.
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 ed842b6 CAMEL-17820: camel-jbang - Additional files from CLI is
automatic added to classpath to make it easy to use them by Camel.
ed842b6 is described below
commit ed842b6a2e57ed0799d81efd53bda002c16f3187
Author: Claus Ibsen
AuthorDate: Thu Mar 24 16:39:42 2022 +0100
CAMEL-17820: camel-jbang - Additional files from CLI is automatic added to
classpath to make it easy to use them by Camel.
---
.../apache/camel/dsl/jbang/core/commands/Run.java | 13 +-
.../apache/camel/main/ExtraFilesClassLoader.java | 54 ++
.../java/org/apache/camel/main/KameletMain.java| 10 +++-
3 files changed, 74 insertions(+), 3 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 57390a1..9e2e0ce 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -229,12 +229,18 @@ class Run implements Callable {
StringJoiner js = new StringJoiner(",");
StringJoiner sjReload = new StringJoiner(",");
+StringJoiner sjClasspathFiles = new StringJoiner(",");
+
for (String file : files) {
-if (!acceptFile(file)) {
+if (!knownFile(file)) {
+// non known files to be added on classpath
+sjClasspathFiles.add(file);
continue;
}
+// process known files as its likely DSLs or configuration files
+
// check for properties files
if (file.endsWith(".properties")) {
if (!ResourceHelper.hasScheme(file) &&
!file.startsWith("github:")) {
@@ -303,6 +309,9 @@ class Run implements Callable {
}
}
main.addInitialProperty("camel.main.routesIncludePattern",
js.toString());
+if (sjClasspathFiles.length() > 0) {
+main.addInitialProperty("camel.jbang.classpathFiles",
sjClasspathFiles.toString());
+}
// we can only reload if file based
if (reload && sjReload.length() > 0) {
@@ -454,7 +463,7 @@ class Run implements Callable {
}
}
-private boolean acceptFile(String file) {
+private boolean knownFile(String file) {
String ext = FileUtil.onlyExt(file, true);
return Arrays.stream(ACCEPTED_FILE_EXT).anyMatch(e ->
e.equalsIgnoreCase(ext));
}
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/ExtraFilesClassLoader.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/ExtraFilesClassLoader.java
new file mode 100644
index 000..4005a09
--- /dev/null
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/ExtraFilesClassLoader.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.main;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+/**
+ * Classloader used to load the extra files that were present in the CLI
arguments
+ */
+final class ExtraFilesClassLoader extends ClassLoader {
+
+final String[] files;
+
+public ExtraFilesClassLoader(ClassLoader parent, String[] files) {
+super(parent);
+this.files = files;
+}
+
+@Override
+protected URL findResource(String name) {
+return getResource(name);
+}
+
+@Override
+public URL getResource(String name) {
+for (String n : files) {
+if (name.equals(n)) {
+try {
+return new File(name).toURI().toURL();
+} catch (MalformedURLException e) {
+// ignore
+}
+}
+}
+return null;
+}
+
+}
diff --git
[GitHub] [camel-website] oscerd merged pull request #807: Added Blog post about Secrets Properties Functions introduced in Came…
oscerd merged pull request #807: URL: https://github.com/apache/camel-website/pull/807 -- This is an automated message from the Apache Git Service. To respond to the message, please 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-website] branch main updated: Added Blog post about Secrets Properties Functions introduced in Camel 3.16.0
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-website.git The following commit(s) were added to refs/heads/main by this push: new 39288c6 Added Blog post about Secrets Properties Functions introduced in Camel 3.16.0 39288c6 is described below commit 39288c6239c7eedd54ab0a773fd4e760719483c2 Author: Andrea Cosentino AuthorDate: Thu Mar 24 12:27:22 2022 +0100 Added Blog post about Secrets Properties Functions introduced in Camel 3.16.0 --- .../2022/03/secrets-properties-functions/index.md | 197 + 1 file changed, 197 insertions(+) diff --git a/content/blog/2022/03/secrets-properties-functions/index.md b/content/blog/2022/03/secrets-properties-functions/index.md new file mode 100644 index 000..66ceeca --- /dev/null +++ b/content/blog/2022/03/secrets-properties-functions/index.md @@ -0,0 +1,197 @@ +--- +title: "Camel 3.16.0 new feature: Load properties from Vault/Secrets cloud services" +date: 2022-03-24 +draft: false +authors: ["oscerd"] +categories: ["Camel"] +preview: "How to retrieve properties from a Cloud vault service" +--- + +In the last weeks, together with Claus, we've been working on a new feature: loading properties from Vault/Secrets cloud services. + +It will arrive with Camel 3.16.0, currently on vote and to be released by the end of this week (24/3). + +This post introduces the new features and provide some examples. + +## Secrets Management in Camel + +In the past there were many discussions around the possibility of managing secrets in Camel through Vault Services. + +The hidden troubles are a lot when we talk about Secrets Management: +- Ability to automatically retrieve secrets after a secret rotation has been completed +- Writing the function (script, serverless function etc.) to operate the rotation +- Being notified once a rotation happens + +We choose to start from the beginning: retrieve secrets from a vault service and use them as properties in the Camel configuration. + +### Supported Services + +In 3.16.0 we're supporting two of the main services available in the cloud space: + +- AWS Secret Manager +- Google Cloud Secret Manager + +### How it works + +The Vault feature works by specifying a particular prefix while using the Properties component. + +For example for AWS: + +``` + + + + + + +``` + +or + +``` + + + + + + +``` + +This notation will allow to run the following workflow while starting a camel route: +- Connect and authenticate to AWS Secret Manager (or GCP) +- Retrieve the value related to the secret named `username` +- Substitute the property with the secret value just returned + +For using the particular Properties Function the two requirements are adding the `camel-aws-secret-manager` JAR for using the AWS one or +adding the `camel-google-secret-manager` JAR for GCP and setting up the credentials to access the cloud service. + +### Setting up the Properties Function + +Each of the Secret management cloud services require different parameters to complete authentication and authorization. + +For both the Properties Functions currently available we provide two different approaches: +- Environment variables +- Main Configuration properties + + AWS Secrets Manager + +The AWS Secret Manager Properties Function configurations through enviroment variables are the following: + +``` +export $CAMEL_VAULT_AWS_USE_DEFAULT_CREDENTIALS_PROVIDER=accessKey +export $CAMEL_VAULT_AWS_SECRET_KEY=secretKey +export $CAMEL_VAULT_AWS_REGION=region +``` + +While as Main Configuration properties it is possible to define the credentials through the following: + +``` +camel.vault.aws.accessKey = accessKey +camel.vault.aws.secretKey = secretKey +camel.vault.aws.region = region +``` + +The above examples are not considering the Default Credentials Provider chain coming from AWS SDK, but the Properties Function can be configured even in that way. This is how to do that through enviroment variables: + +``` +export $CAMEL_VAULT_AWS_USE_DEFAULT_CREDENTIALS_PROVIDER=true +export $CAMEL_VAULT_AWS_REGION=region +``` + +This could be done even with main configuration properties: + +``` +camel.vault.aws.defaultCredentialsProvider = true +camel.vault.aws.region = region +``` + + GCP Secret Manager + +The GCP Secret Manager Properties Function configurations through enviroment variables are the following: + +``` +export $CAMEL_VAULT_GCP_SERVICE_ACCOUNT_KEY=file:path/to/service.accountkey +export $CAMEL_VAULT_GCP_PROJECT_ID=projectId +``` + +While as Main Configuration properties it is possible to define the credentials through the following: + +``` +camel.vault.gcp.serviceAccountKey = accessKey +camel.vault.gcp.projectId = secretKey +``` + +The above examples are not considering the Default Credentials Provider coming from GCP, but the Properties Function can be
[camel] branch regen_bot updated (55e9e3f -> b21e302)
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 55e9e3f Revert "Restore Google Secret manager link in security.adoc"
add b21e302 camel-test-infra-kafka: enable singleton services for Strimzi
No new revisions were added by this update.
Summary of changes:
.../infra/common/services/SingletonService.java} | 53 +-
.../infra/kafka/services/KafkaServiceFactory.java | 29 +++-
2 files changed, 58 insertions(+), 24 deletions(-)
rename
test-infra/{camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalSingletonKafkaService.java
=>
camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/SingletonService.java}
(50%)
[GitHub] [camel-website] github-actions[bot] commented on pull request #807: Added Blog post about Secrets Properties Functions introduced in Came…
github-actions[bot] commented on pull request #807: URL: https://github.com/apache/camel-website/pull/807#issuecomment-1077717048 Preview is available at https://pr-807--camel.netlify.app -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] mmuzikar opened a new issue #808: Strange formatting for code number labels
mmuzikar opened a new issue #808: URL: https://github.com/apache/camel-website/issues/808 When `<1>,<2>,...` is used in docs there's some strange formatting between the labels and their descriptions. For example in [infinispan](https://camel.apache.org/components/next/infinispan-component.html#_examples) and [knative](https://camel.apache.org/components/next/knative-component.html#_knative_environment). There's different spacing between the labels and descriptions in each list:  Reproducible on Firefox and Chromium, happens on multiple computers with different resolutions. -- This is an automated message from the Apache Git Service. To respond to the message, please 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 (d4a2f0c -> 55e9e3f)
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 d4a2f0c (chores) camel-test-infra-kafka: use a common constant for the Kafka 3 image name add 55e9e3f Revert "Restore Google Secret manager link in security.adoc" No new revisions were added by this update. Summary of changes: docs/user-manual/modules/ROOT/pages/security.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
[GitHub] [camel-quarkus] aldettinger merged pull request #3652: Fix typo in docs & Added tests for NotNull validator checks
aldettinger merged pull request #3652: URL: https://github.com/apache/camel-quarkus/pull/3652 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] branch main updated: Fix typo in docs & Added tests for NotNull validator checks
This is an automated email from the ASF dual-hosted git repository.
aldettinger pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/main by this push:
new 82ebfd4 Fix typo in docs & Added tests for NotNull validator checks
82ebfd4 is described below
commit 82ebfd453cfec9ad03cde4f425681469b7965e19
Author: Martin Muzikar <46345469+mmuzi...@users.noreply.github.com>
AuthorDate: Wed Mar 23 13:09:52 2022 +0100
Fix typo in docs & Added tests for NotNull validator checks
---
docs/modules/ROOT/pages/reference/extensions/bean-validator.adoc | 2 +-
extensions/bean-validator/runtime/src/main/doc/usage.adoc | 2 +-
.../component/bean/validator/it/BeanValidatorResource.java| 8
.../quarkus/component/bean/validator/it/BeanValidatorTest.java| 5 -
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/docs/modules/ROOT/pages/reference/extensions/bean-validator.adoc
b/docs/modules/ROOT/pages/reference/extensions/bean-validator.adoc
index 89a9c98..b5efce7 100644
--- a/docs/modules/ROOT/pages/reference/extensions/bean-validator.adoc
+++ b/docs/modules/ROOT/pages/reference/extensions/bean-validator.adoc
@@ -45,7 +45,7 @@ Check the xref:user-guide/index.adoc[User guide] for more
information about writ
Implementation of this extension leverages the
https://quarkus.io/guides/validation[Quarkus Hibernate Validator extension].
-Therefore it is not possible to configure the `ValidatorFactory` by Camel's
properties ('constraintValidatorFactory`, `messageInterpolator`,
`traversableResolver`, `validationProviderResolver` and `validatorFactory`).
+Therefore it is not possible to configure the `ValidatorFactory` by Camel's
properties (`constraintValidatorFactory`, `messageInterpolator`,
`traversableResolver`, `validationProviderResolver` and `validatorFactory`).
You can configure the `ValidatorFactory` by the creation of beans which will
be injected into the default `ValidatorFactory` (created by Quarkus).
See the
https://quarkus.io/guides/validation#hibernate-validator-extension-and-cdi[Quarkus
CDI documentation] for more information.
diff --git a/extensions/bean-validator/runtime/src/main/doc/usage.adoc
b/extensions/bean-validator/runtime/src/main/doc/usage.adoc
index 1c85a6f..0c927a5 100644
--- a/extensions/bean-validator/runtime/src/main/doc/usage.adoc
+++ b/extensions/bean-validator/runtime/src/main/doc/usage.adoc
@@ -2,7 +2,7 @@
Implementation of this extension leverages the
https://quarkus.io/guides/validation[Quarkus Hibernate Validator extension].
-Therefore it is not possible to configure the `ValidatorFactory` by Camel's
properties ('constraintValidatorFactory`, `messageInterpolator`,
`traversableResolver`, `validationProviderResolver` and `validatorFactory`).
+Therefore it is not possible to configure the `ValidatorFactory` by Camel's
properties (`constraintValidatorFactory`, `messageInterpolator`,
`traversableResolver`, `validationProviderResolver` and `validatorFactory`).
You can configure the `ValidatorFactory` by the creation of beans which will
be injected into the default `ValidatorFactory` (created by Quarkus).
See the
https://quarkus.io/guides/validation#hibernate-validator-extension-and-cdi[Quarkus
CDI documentation] for more information.
diff --git
a/integration-tests/bean-validator/src/main/java/org/apache/camel/quarkus/component/bean/validator/it/BeanValidatorResource.java
b/integration-tests/bean-validator/src/main/java/org/apache/camel/quarkus/component/bean/validator/it/BeanValidatorResource.java
index e648a14..af9f29e 100644
---
a/integration-tests/bean-validator/src/main/java/org/apache/camel/quarkus/component/bean/validator/it/BeanValidatorResource.java
+++
b/integration-tests/bean-validator/src/main/java/org/apache/camel/quarkus/component/bean/validator/it/BeanValidatorResource.java
@@ -50,6 +50,14 @@ public class BeanValidatorResource {
return get(new Car(manufactor, plate), endpoint);
}
+@Path("/get/{optional}/{manufactor}")
+@GET
+@Produces(MediaType.TEXT_PLAIN)
+public Response getNull(@PathParam("optional") String endpoint,
@PathParam("manufactor") String manufactor)
+throws Exception {
+return get(new Car(manufactor, null), endpoint);
+}
+
private Response get(Car car, String endpoint) throws Exception {
LOG.info("bean-validator: " + car.getManufacturer() + "/" +
car.getLicensePlate());
Exchange out = producerTemplate.request("direct:" + endpoint, e ->
e.getMessage().setBody(car));
diff --git
a/integration-tests/bean-validator/src/test/java/org/apache/camel/quarkus/component/bean/validator/it/BeanValidatorTest.java
b/integration-tests/bean-validator/src/test/java/org/apache/camel/quarkus/component/bean/validator/it/BeanValidatorTest.java
index 9a31d80..8785041 100644
---
[camel-kamelets] branch regen_bot updated (590cf8c -> 8cfdf2b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git. from 590cf8c Use URI notation for some of the parameters we define in actions - XJ Action add 437d469 AWS S3 Sink: Add an optional keyName parameter add 8cfdf2b AWS S3 Sink: Add an optional keyName parameter No new revisions were added by this update. Summary of changes: kamelets/aws-s3-sink.kamelet.yaml | 14 +++--- .../src/main/resources/kamelets/aws-s3-sink.kamelet.yaml | 14 +++--- 2 files changed, 14 insertions(+), 14 deletions(-)
[camel] branch main updated: camel-test-infra-kafka: enable singleton services for Strimzi
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 b21e302 camel-test-infra-kafka: enable singleton services for Strimzi
b21e302 is described below
commit b21e302e6c553b5fb5f57f1bb2f2b6099844ec97
Author: Otavio Rodolfo Piske
AuthorDate: Thu Mar 24 13:03:06 2022 +0100
camel-test-infra-kafka: enable singleton services for Strimzi
---
.../infra/common/services/SingletonService.java} | 53 +-
.../infra/kafka/services/KafkaServiceFactory.java | 29 +++-
2 files changed, 58 insertions(+), 24 deletions(-)
diff --git
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalSingletonKafkaService.java
b/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/SingletonService.java
similarity index 50%
rename from
test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalSingletonKafkaService.java
rename to
test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/SingletonService.java
index b3b1f09..e30fc73 100644
---
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalSingletonKafkaService.java
+++
b/test-infra/camel-test-infra-common/src/test/java/org/apache/camel/test/infra/common/services/SingletonService.java
@@ -15,45 +15,54 @@
* limitations under the License.
*/
-package org.apache.camel.test.infra.kafka.services;
+package org.apache.camel.test.infra.common.services;
import org.junit.jupiter.api.extension.ExtensionContext;
-import org.testcontainers.containers.KafkaContainer;
-import org.testcontainers.utility.DockerImageName;
+import org.slf4j.LoggerFactory;
-public class ContainerLocalSingletonKafkaService extends
ContainerLocalKafkaService
-implements ExtensionContext.Store.CloseableResource {
+/**
+ * This is a wrapper class for creating singleton services
+ *
+ * @param The type of the service to be wrapped
+ */
+public class SingletonService implements
ExtensionContext.Store.CloseableResource, TestService {
+private final T service;
+private final String name;
-public ContainerLocalSingletonKafkaService(KafkaContainer container) {
-super(container);
+public SingletonService(T service, String name) {
+this.service = service;
+this.name = name;
}
-public ContainerLocalSingletonKafkaService() {
-super();
+protected void addToStore(ExtensionContext extensionContext) {
+
extensionContext.getRoot().getStore(ExtensionContext.Namespace.GLOBAL).getOrComputeIfAbsent(name,
s -> {
+LoggerFactory.getLogger(SingletonService.class).debug("Registering
singleton service {}", name);
+service.initialize();
+return this;
+});
}
@Override
-public void beforeAll(ExtensionContext extensionContext) {
-
extensionContext.getRoot().getStore(ExtensionContext.Namespace.GLOBAL).getOrComputeIfAbsent("kafka",
s -> {
-super.initialize();
-return this;
-});
+public void registerProperties() {
+service.registerProperties();
+}
+
+@Override
+public void initialize() {
+service.initialize();
}
@Override
-public void afterAll(ExtensionContext extensionContext) {
-// no op
+public void shutdown() {
+service.shutdown();
}
@Override
public void close() {
-super.shutdown();
+service.shutdown();
}
-public static ContainerLocalSingletonKafkaService kafka3Container() {
-KafkaContainer container
-= new
KafkaContainer(DockerImageName.parse(ContainerLocalKafkaService.KAFKA3_IMAGE_NAME))
-.withEmbeddedZookeeper();
-return new ContainerLocalSingletonKafkaService(container);
+protected T getService() {
+return service;
}
}
diff --git
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java
index 43ba6b3..ae15028 100644
---
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java
+++
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/KafkaServiceFactory.java
@@ -18,8 +18,31 @@
package org.apache.camel.test.infra.kafka.services;
import org.apache.camel.test.infra.common.services.SimpleTestServiceBuilder;
+import org.apache.camel.test.infra.common.services.SingletonService;
+import org.junit.jupiter.api.extension.ExtensionContext;
[GitHub] [camel] davsclaus commented on pull request #7263: [CAMEL-17841] Add checkpoint batch size & timeout parameters
davsclaus commented on pull request #7263: URL: https://github.com/apache/camel/pull/7263#issuecomment-1077667199 So maybe make a PR that is batch size only as a first PR. And then work on timeout/interval as a 2nd PR that uses a background thread. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske closed pull request #7262: camel-test-infra-kafka: enable singleton services for Strimzi
orpiske closed pull request #7262: URL: https://github.com/apache/camel/pull/7262 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] oscerd closed issue #857: AWS S3 Sink: Add an optional keyName parameter
oscerd closed issue #857: URL: https://github.com/apache/camel-kamelets/issues/857 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-kamelets] oscerd merged pull request #858: AWS S3 Sink: Add an optional keyName parameter
oscerd merged pull request #858: URL: https://github.com/apache/camel-kamelets/pull/858 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] branch main updated (590cf8c -> 8cfdf2b)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git. from 590cf8c Use URI notation for some of the parameters we define in actions - XJ Action new 437d469 AWS S3 Sink: Add an optional keyName parameter new 8cfdf2b AWS S3 Sink: Add an optional keyName parameter 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: kamelets/aws-s3-sink.kamelet.yaml | 14 +++--- .../src/main/resources/kamelets/aws-s3-sink.kamelet.yaml | 14 +++--- 2 files changed, 14 insertions(+), 14 deletions(-)
[camel-kamelets] 01/02: AWS S3 Sink: Add an optional keyName parameter
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 437d469359cc479f5486441b1e2e3ecf8b83ddd6
Author: Andrea Cosentino
AuthorDate: Thu Mar 24 14:55:42 2022 +0100
AWS S3 Sink: Add an optional keyName parameter
---
kamelets/aws-s3-sink.kamelet.yaml | 14 +++---
.../src/main/resources/kamelets/aws-s3-sink.kamelet.yaml | 10 +-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/kamelets/aws-s3-sink.kamelet.yaml
b/kamelets/aws-s3-sink.kamelet.yaml
index e8224c4..5838d29 100644
--- a/kamelets/aws-s3-sink.kamelet.yaml
+++ b/kamelets/aws-s3-sink.kamelet.yaml
@@ -37,11 +37,11 @@ spec:
When using a default Credentials Provider the S3 client will load the
credentials through this provider and won't use the static credential. This is
reason for not having the access key and secret key as mandatory parameter for
this Kamelet.
- The Kamelet expects the following headers to be set:
+ The Kamelet can use the following header to be set:
- `file` / `ce-file`: as the file name to upload
- If the header won't be set the exchange ID will be used as file name.
+ If the header won't be set, the Kamelet parameter `keyName` should be
populated. The `keyName` parameter could be a simple value language from the
Apache Camel.
required:
- bucketNameOrArn
- region
@@ -97,6 +97,10 @@ spec:
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:checkbox'
default: false
+ keyName:
+title: Key Name
+description: The key name for saving an element in the bucket.
+type: string
dependencies:
- "camel:core"
- "camel:aws2-s3"
@@ -117,11 +121,6 @@ spec:
- set-header:
name: CamelAwsS3Key
simple: "${header[ce-file]}"
- otherwise:
-steps:
-- set-header:
-name: CamelAwsS3Key
-simple: "${exchangeId}"
- to:
uri: "aws2-s3:{{bucketNameOrArn}}"
parameters:
@@ -132,3 +131,4 @@ spec:
useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
uriEndpointOverride: "{{?uriEndpointOverride}}"
overrideEndpoint: "{{overrideEndpoint}}"
+keyName: "{{?keyName}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
index e8224c4..5b5a492 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
@@ -97,6 +97,10 @@ spec:
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:checkbox'
default: false
+ keyName:
+title: Key Name
+description: The key name for saving an element in the bucket.
+type: string
dependencies:
- "camel:core"
- "camel:aws2-s3"
@@ -117,11 +121,6 @@ spec:
- set-header:
name: CamelAwsS3Key
simple: "${header[ce-file]}"
- otherwise:
-steps:
-- set-header:
-name: CamelAwsS3Key
-simple: "${exchangeId}"
- to:
uri: "aws2-s3:{{bucketNameOrArn}}"
parameters:
@@ -132,3 +131,4 @@ spec:
useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
uriEndpointOverride: "{{?uriEndpointOverride}}"
overrideEndpoint: "{{overrideEndpoint}}"
+keyName: "{{?keyName}}"
[camel-kamelets] 02/02: AWS S3 Sink: Add an optional keyName parameter
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit 8cfdf2b3b05f2e88310e7e76d75aab3b682dc0c5 Author: Andrea Cosentino AuthorDate: Thu Mar 24 14:57:09 2022 +0100 AWS S3 Sink: Add an optional keyName parameter --- .../src/main/resources/kamelets/aws-s3-sink.kamelet.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml index 5b5a492..5838d29 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml @@ -37,11 +37,11 @@ spec: When using a default Credentials Provider the S3 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet. - The Kamelet expects the following headers to be set: + The Kamelet can use the following header to be set: - `file` / `ce-file`: as the file name to upload - If the header won't be set the exchange ID will be used as file name. + If the header won't be set, the Kamelet parameter `keyName` should be populated. The `keyName` parameter could be a simple value language from the Apache Camel. required: - bucketNameOrArn - region
[GitHub] [camel] davsclaus commented on pull request #7263: [CAMEL-17841] Add checkpoint batch size & timeout parameters
davsclaus commented on pull request #7263: URL: https://github.com/apache/camel/pull/7263#issuecomment-1077666599 The timeout only works when a new message arrives to be processed. In case you have 103 messages in a batch, and then no other messages arrives for 2 hours, then that batch group is stale. The timeout needs to run as a background thread checker that can trigger the timeout. That is more complex to do. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] kevinlacire opened a new pull request #7263: [CAMEL-17841] Add checkpoint batch size & timeout parameters
kevinlacire opened a new pull request #7263: URL: https://github.com/apache/camel/pull/7263 - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [ ] Each commit in the pull request should have a meaningful subject line and body. - [ ] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/main/CONTRIBUTING.md -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kamelets] 01/02: AWS S3 Sink: Add an optional keyName parameter
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sink-s3
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git
commit 2893cb2fd19a7abdaa4d305b1d8602eb31732da2
Author: Andrea Cosentino
AuthorDate: Thu Mar 24 14:55:42 2022 +0100
AWS S3 Sink: Add an optional keyName parameter
---
kamelets/aws-s3-sink.kamelet.yaml | 14 +++---
.../src/main/resources/kamelets/aws-s3-sink.kamelet.yaml | 10 +-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/kamelets/aws-s3-sink.kamelet.yaml
b/kamelets/aws-s3-sink.kamelet.yaml
index e8224c4..5838d29 100644
--- a/kamelets/aws-s3-sink.kamelet.yaml
+++ b/kamelets/aws-s3-sink.kamelet.yaml
@@ -37,11 +37,11 @@ spec:
When using a default Credentials Provider the S3 client will load the
credentials through this provider and won't use the static credential. This is
reason for not having the access key and secret key as mandatory parameter for
this Kamelet.
- The Kamelet expects the following headers to be set:
+ The Kamelet can use the following header to be set:
- `file` / `ce-file`: as the file name to upload
- If the header won't be set the exchange ID will be used as file name.
+ If the header won't be set, the Kamelet parameter `keyName` should be
populated. The `keyName` parameter could be a simple value language from the
Apache Camel.
required:
- bucketNameOrArn
- region
@@ -97,6 +97,10 @@ spec:
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:checkbox'
default: false
+ keyName:
+title: Key Name
+description: The key name for saving an element in the bucket.
+type: string
dependencies:
- "camel:core"
- "camel:aws2-s3"
@@ -117,11 +121,6 @@ spec:
- set-header:
name: CamelAwsS3Key
simple: "${header[ce-file]}"
- otherwise:
-steps:
-- set-header:
-name: CamelAwsS3Key
-simple: "${exchangeId}"
- to:
uri: "aws2-s3:{{bucketNameOrArn}}"
parameters:
@@ -132,3 +131,4 @@ spec:
useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
uriEndpointOverride: "{{?uriEndpointOverride}}"
overrideEndpoint: "{{overrideEndpoint}}"
+keyName: "{{?keyName}}"
diff --git
a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
index e8224c4..5b5a492 100644
---
a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
+++
b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
@@ -97,6 +97,10 @@ spec:
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:checkbox'
default: false
+ keyName:
+title: Key Name
+description: The key name for saving an element in the bucket.
+type: string
dependencies:
- "camel:core"
- "camel:aws2-s3"
@@ -117,11 +121,6 @@ spec:
- set-header:
name: CamelAwsS3Key
simple: "${header[ce-file]}"
- otherwise:
-steps:
-- set-header:
-name: CamelAwsS3Key
-simple: "${exchangeId}"
- to:
uri: "aws2-s3:{{bucketNameOrArn}}"
parameters:
@@ -132,3 +131,4 @@ spec:
useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
uriEndpointOverride: "{{?uriEndpointOverride}}"
overrideEndpoint: "{{overrideEndpoint}}"
+keyName: "{{?keyName}}"
[camel-kamelets] branch sink-s3 created (now be92760)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch sink-s3 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git. at be92760 AWS S3 Sink: Add an optional keyName parameter This branch includes the following new commits: new 2893cb2 AWS S3 Sink: Add an optional keyName parameter new be92760 AWS S3 Sink: Add an optional keyName parameter 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.
[camel-kamelets] 02/02: AWS S3 Sink: Add an optional keyName parameter
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch sink-s3 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git commit be92760d30518d3494d9cb6bd2221501e42dcf0f Author: Andrea Cosentino AuthorDate: Thu Mar 24 14:57:09 2022 +0100 AWS S3 Sink: Add an optional keyName parameter --- .../src/main/resources/kamelets/aws-s3-sink.kamelet.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml index 5b5a492..5838d29 100644 --- a/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml +++ b/library/camel-kamelets/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml @@ -37,11 +37,11 @@ spec: When using a default Credentials Provider the S3 client will load the credentials through this provider and won't use the static credential. This is reason for not having the access key and secret key as mandatory parameter for this Kamelet. - The Kamelet expects the following headers to be set: + The Kamelet can use the following header to be set: - `file` / `ce-file`: as the file name to upload - If the header won't be set the exchange ID will be used as file name. + If the header won't be set, the Kamelet parameter `keyName` should be populated. The `keyName` parameter could be a simple value language from the Apache Camel. required: - bucketNameOrArn - region
[camel-quarkus] 05/10: Fix #3592 add some ReflectiveClassBuildItem for camel-kafka (#3594)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit fa1642a0af71382244279a314ca6fcbb6084fc07
Author: Amos Feng
AuthorDate: Fri Mar 11 17:06:30 2022 +0800
Fix #3592 add some ReflectiveClassBuildItem for camel-kafka (#3594)
---
CHANGELOG.md | 2 +-
.../component/kafka/deployment/KafkaProcessor.java | 26 ++
.../quarkus/test/support/kafka/InjectKafka.java| 27 ++
.../test/support/kafka/KafkaTestResource.java | 7 +++
integration-tests/kafka/pom.xml| 4 ++
.../kafka/it/CamelKafkaHealthCheckIT.java | 23 +
.../kafka/it/CamelKafkaHealthCheckTest.java| 59 ++
.../kafka/it/KafkaHealthCheckProfile.java | 29 +++
8 files changed, 176 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14454d4..898030d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,7 +31,7 @@
**Merged pull requests:**
- Avoid compiling regular expressions in loops
[\#3649](https://github.com/apache/camel-quarkus/pull/3649)
([ppalaga](https://github.com/ppalaga))
-- Switch from `NativeImageTest` to `QuarkusIntegrationTest`
[\#3648](https://github.com/apache/camel-quarkus/pull/3648)
([jamesnetherton](https://github.com/jamesnetherton))
+- Switch from `QuarkusIntegrationTest` to `QuarkusIntegrationTest`
[\#3648](https://github.com/apache/camel-quarkus/pull/3648)
([jamesnetherton](https://github.com/jamesnetherton))
- file: Ensure FileTest.charset is fixed under Windows \#3530
[\#3647](https://github.com/apache/camel-quarkus/pull/3647)
([aldettinger](https://github.com/aldettinger))
- Tidy geronimo-jms\_2.0\_spec exclusions
[\#3646](https://github.com/apache/camel-quarkus/pull/3646)
([ppalaga](https://github.com/ppalaga))
- file: Rewrite the charset related test \#3627
[\#3645](https://github.com/apache/camel-quarkus/pull/3645)
([aldettinger](https://github.com/aldettinger))
diff --git
a/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
b/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
index 90e2945..270a7a1 100644
---
a/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
+++
b/extensions/kafka/deployment/src/main/java/org/apache/camel/quarkus/component/kafka/deployment/KafkaProcessor.java
@@ -16,7 +16,9 @@
*/
package org.apache.camel.quarkus.component.kafka.deployment;
+import java.util.Collection;
import java.util.Optional;
+import java.util.stream.Stream;
import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
import io.quarkus.deployment.Capabilities;
@@ -24,19 +26,28 @@ import io.quarkus.deployment.Capability;
import io.quarkus.deployment.IsNormal;
import io.quarkus.deployment.annotations.BuildProducer;
import io.quarkus.deployment.annotations.BuildStep;
+import io.quarkus.deployment.builditem.CombinedIndexBuildItem;
import
io.quarkus.deployment.builditem.DevServicesLauncherConfigResultBuildItem;
import io.quarkus.deployment.builditem.FeatureBuildItem;
import io.quarkus.deployment.builditem.RunTimeConfigurationDefaultBuildItem;
+import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
import io.quarkus.deployment.dev.devservices.GlobalDevServicesConfig;
import io.quarkus.kafka.client.deployment.KafkaBuildTimeConfig;
import org.apache.camel.quarkus.component.kafka.KafkaClientFactoryProducer;
import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.ConfigProvider;
+import org.jboss.jandex.ClassInfo;
+import org.jboss.jandex.DotName;
+import org.jboss.jandex.IndexView;
class KafkaProcessor {
private static final String FEATURE = "camel-kafka";
private static final String CAMEL_KAFKA_BROKERS =
"camel.component.kafka.brokers";
private static final String KAFKA_BOOTSTRAP_SERVERS =
"kafka.bootstrap.servers";
+private static final DotName[] KAFKA_CLIENTS_TYPES = {
+DotName.createSimple("org.apache.kafka.clients.producer.Producer"),
+DotName.createSimple("org.apache.kafka.clients.consumer.Consumer")
+};
@BuildStep
FeatureBuildItem feature() {
@@ -68,4 +79,19 @@ class KafkaProcessor {
}
}
}
+
+@BuildStep
+public void reflectiveClasses(CombinedIndexBuildItem combinedIndex,
+BuildProducer reflectiveClass) {
+IndexView index = combinedIndex.getIndex();
+
+Stream.of(KAFKA_CLIENTS_TYPES)
+.map(index::getAllKnownImplementors)
+.flatMap(Collection::stream)
+.map(ClassInfo::toString)
+.forEach(name -> reflectiveClass.produce(new
ReflectiveClassBuildItem(false, true, name)));
+
[camel-quarkus] 09/10: Add Camel 3.16.0 staging repository
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit f1a894874139e0d350f961fc8da644abfa4d197b Author: James Netherton AuthorDate: Wed Mar 23 13:09:07 2022 + Add Camel 3.16.0 staging repository --- pom.xml | 46 +- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 54404cc..3ea6866 100644 --- a/pom.xml +++ b/pom.xml @@ -276,6 +276,28 @@ +central +Maven Central Repo +https://repo.maven.apache.org/maven2 + +false + + +true + + + +apache.staging.camel + https://repository.apache.org/content/repositories/orgapachecamel-1420/ +Apache Camel 3.16.0 Staging Repo + +false + + +true + + + apache.snapshots https://repository.apache.org/snapshots/ Apache Snapshot Repo @@ -285,10 +307,32 @@ false - + +central +Maven Central Repo +https://repo.maven.apache.org/maven2 + +false + + +true + + + +apache.staging.camel + https://repository.apache.org/content/repositories/orgapachecamel-1420/ +Apache Camel 3.16.0 Staging Repo + +false + + +true + + + apache.snapshots https://repository.apache.org/snapshots/
[camel-quarkus] 08/10: Reformat POMs
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 5bfa653f89af627d1bb5662775345b54bdf17a0f
Author: James Netherton
AuthorDate: Wed Mar 23 15:14:50 2022 +
Reformat POMs
---
integration-tests/compression/pom.xml | 13 +
integration-tests/kafka/pom.xml | 13 +
poms/bom/pom.xml | 4 ++--
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/integration-tests/compression/pom.xml
b/integration-tests/compression/pom.xml
index a633066..bf7d493 100644
--- a/integration-tests/compression/pom.xml
+++ b/integration-tests/compression/pom.xml
@@ -134,6 +134,19 @@
org.apache.camel.quarkus
+camel-quarkus-mock-deployment
+${project.version}
+pom
+test
+
+
+*
+*
+
+
+
+
+org.apache.camel.quarkus
camel-quarkus-zip-deflater-deployment
${project.version}
pom
diff --git a/integration-tests/kafka/pom.xml b/integration-tests/kafka/pom.xml
index d298715..a9f8d24 100644
--- a/integration-tests/kafka/pom.xml
+++ b/integration-tests/kafka/pom.xml
@@ -171,6 +171,19 @@
org.apache.camel.quarkus
+
camel-quarkus-microprofile-health-deployment
+${project.version}
+pom
+test
+
+
+*
+*
+
+
+
+
+org.apache.camel.quarkus
camel-quarkus-mock-deployment
${project.version}
pom
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index a07c5d9..982311d 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -6190,7 +6190,7 @@
ca.uhn.hapi.fhir
-hapi-fhir-structures-hl7org-dstu2
+hapi-fhir-server
${hapi-fhir.version}
@@ -6200,7 +6200,7 @@
ca.uhn.hapi.fhir
-hapi-fhir-server
+hapi-fhir-structures-hl7org-dstu2
${hapi-fhir.version}
[camel-quarkus] 07/10: Temporarilly disable Aws2KinesisTest.kinesis due to #3638
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 25f9ee0d5166d0244af3f89d1869ae7293427da9
Author: James Netherton
AuthorDate: Fri Mar 18 12:22:02 2022 +
Temporarilly disable Aws2KinesisTest.kinesis due to #3638
---
.../apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTest.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTest.java
b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTest.java
index cfc8a43..e35ca1c 100644
---
a/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTest.java
+++
b/integration-test-groups/aws2/aws2-kinesis/src/test/java/org/apache/camel/quarkus/component/aws2/kinesis/it/Aws2KinesisTest.java
@@ -32,6 +32,7 @@ import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.ConfigProvider;
import org.hamcrest.Matchers;
import org.jboss.logging.Logger;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.testcontainers.containers.localstack.LocalStackContainer.Service;
import software.amazon.awssdk.core.ResponseInputStream;
@@ -51,6 +52,7 @@ class Aws2KinesisTest {
@Aws2Client(Service.S3)
S3Client client;
+@Disabled("https://github.com/apache/camel-quarkus/issues/3638;)
@Test
public void kinesis() {
final String msg = "kinesis-" +
java.util.UUID.randomUUID().toString().replace("-", "");
[camel-quarkus] 03/10: Test for Debezium mysql - passing additionalProperties results in wrong properties beeing passed #3488
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 295bcaf18e0b84cd7127836672cb03e8c0af32b3
Author: JiriOndrusek
AuthorDate: Mon Feb 21 15:51:05 2022 +0100
Test for Debezium mysql - passing additionalProperties results in wrong
properties beeing passed #3488
---
.../common/it/AbstractDebeziumResource.java| 29 +-
.../common/it/postgres/DebeziumPostgresTest.java | 15 +++
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git
a/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/AbstractDebeziumResource.java
b/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/AbstractDebeziumResource.java
index ff49301..0e74a9b 100644
---
a/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/AbstractDebeziumResource.java
+++
b/integration-tests/debezium/src/main/java/org/apache/camel/quarkus/component/debezium/common/it/AbstractDebeziumResource.java
@@ -16,11 +16,20 @@
*/
package org.apache.camel.quarkus.component.debezium.common.it;
+import java.util.Map;
+import java.util.stream.Collectors;
+
import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import org.apache.camel.CamelContext;
import org.apache.camel.ConsumerTemplate;
import org.apache.camel.Exchange;
import org.apache.camel.component.debezium.DebeziumConstants;
+import org.apache.camel.component.debezium.DebeziumEndpoint;
import org.eclipse.microprofile.config.Config;
import org.eclipse.microprofile.config.inject.ConfigProperty;
@@ -41,10 +50,23 @@ public abstract class AbstractDebeziumResource {
@Inject
Config config;
+@Inject
+CamelContext camelContext;
+
public AbstractDebeziumResource(Type type) {
this.type = type;
}
+@Path("/getAdditionalProperties")
+@GET
+@Produces(MediaType.APPLICATION_JSON)
+public Map getAdditionalProperties() {
+DebeziumEndpoint endpoint = (DebeziumEndpoint)
camelContext.getEndpoint(getEndpointUrl()
++ "=CET");
+return
endpoint.getConfiguration().getAdditionalProperties().entrySet().stream()
+.collect(Collectors.toMap(Map.Entry::getKey, e -> (String)
e.getValue()));
+}
+
String getEndpoinUrl(String hostname, String port, String username, String
password, String databaseServerName,
String offsetStorageFileName) {
return type.getComponent() + ":localhost?"
@@ -90,6 +112,11 @@ public abstract class AbstractDebeziumResource {
}
private Exchange receiveAsExchange() {
+String endpoint = getEndpointUrl();
+return consumerTemplate.receive(endpoint, TIMEOUT);
+}
+
+protected String getEndpointUrl() {
String endpoint = getEndpoinUrl(
config.getValue(type.getPropertyHostname(), String.class),
config.getValue(type.getPropertyPort(), String.class),
@@ -97,6 +124,6 @@ public abstract class AbstractDebeziumResource {
config.getValue(type.getPropertyPassword(), String.class),
"qa",
config.getValue(type.getPropertyOffsetFileName(),
String.class));
-return consumerTemplate.receive(endpoint, TIMEOUT);
+return endpoint;
}
}
diff --git
a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java
b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java
index c610735..4a7148a 100644
---
a/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java
+++
b/integration-tests/debezium/src/test/java/org/apache/camel/quarkus/component/debezium/common/it/postgres/DebeziumPostgresTest.java
@@ -22,6 +22,7 @@ import java.sql.SQLException;
import io.quarkus.test.common.QuarkusTestResource;
import io.quarkus.test.junit.QuarkusTest;
+import io.restassured.RestAssured;
import
org.apache.camel.quarkus.component.debezium.common.it.AbstractDebeziumTest;
import org.apache.camel.quarkus.component.debezium.common.it.Type;
import org.eclipse.microprofile.config.Config;
@@ -30,8 +31,12 @@ import org.jboss.logging.Logger;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
+import static org.hamcrest.Matchers.is;
+
@QuarkusTest
@QuarkusTestResource(DebeziumPostgresTestResource.class)
@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
@@ -51,6
[camel-quarkus] branch main updated (9997920 -> a4664f9)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git.
from 9997920 Updated CHANGELOG.md
new 539800b Upgrade to Quarkus 2.8.0.CR1
new 381a945 Upgrade Camel to 3.16.0
new 295bcaf Test for Debezium mysql - passing additionalProperties
results in wrong properties beeing passed #3488
new 43641cd Work around Tika version incompatibilities between Quarkus
Tika & Camel Tika #3599
new fa1642a Fix #3592 add some ReflectiveClassBuildItem for camel-kafka
(#3594)
new 571e7f0 3579 Improve quartz test coverage
new 25f9ee0 Temporarilly disable Aws2KinesisTest.kinesis due to #3638
new 5bfa653 Reformat POMs
new f1a8948 Add Camel 3.16.0 staging repository
new a4664f9 Keep antora.yml pointing at 3.15.x until 3.16.0 is released
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.md | 2 +-
docs/antora.yml| 12 +-
.../examples/components/elasticsearch-rest.yml | 2 +-
docs/modules/ROOT/examples/dataformats/ical.yml| 2 +-
.../ROOT/examples/dataformats/jacksonXml.yml | 2 +-
docs/modules/ROOT/pages/migration-guide/2.8.0.adoc | 2 +-
.../reference/extensions/elasticsearch-rest.adoc | 6 +-
.../ROOT/pages/reference/extensions/fhir.adoc | 2 +-
.../ROOT/pages/reference/extensions/ical.adoc | 4 +-
.../pages/reference/extensions/jacksonxml.adoc | 4 +-
.../ROOT/pages/reference/extensions/quartz.adoc| 58 ++
.../ROOT/pages/reference/extensions/yaml-dsl.adoc | 6 -
.../pages/user-guide/defining-camel-routes.adoc| 6 +-
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
.../camel/quarkus/component/fhir/FhirConfig.java | 2 +-
.../camel/quarkus/component/fhir/FhirFlags.java| 2 +-
.../main/resources/META-INF/quarkus-extension.yaml | 2 +-
.../main/resources/META-INF/quarkus-extension.yaml | 2 +-
.../component/kafka/deployment/KafkaProcessor.java | 26 +++
.../deployment/MicroProfileHealthProcessor.java| 5 -
.../MicroProfileHealthCamelChecksDisabledTest.java | 6 +-
extensions/openapi-java/deployment/pom.xml | 5 +
.../openapi/java/deployment/RESTOpenAPITest.java | 4 +-
.../openapi/java/deployment/RestRoutes.java| 7 +-
.../src/test/resources/application.properties | 2 +-
.../resources/routes/{my-route.xml => rests.xml} | 4 +-
.../src/test/resources/routes/routes.xml | 14 +-
.../deployment/OpenTelemetryProcessor.java | 2 +-
extensions/quartz/deployment/pom.xml | 10 +
.../quartz/deployment/QuartzProcessor.java | 58 +-
extensions/quartz/runtime/pom.xml | 14 ++
.../quartz/runtime/src/main/doc/limitations.adoc | 4 +
extensions/quartz/runtime/src/main/doc/usage.adoc | 46 +
.../CamelQuarkusQuartzConnectionProvider.java | 66 +++
extensions/tika/runtime/pom.xml| 11 +-
.../camel/quarkus/component/tika/TikaRecorder.java | 33 +++-
.../tika/graalvm/TikaProducerSubstitutions.java| 77
.../component/aws2/kinesis/it/Aws2KinesisTest.java | 2 +
.../it/CoreFaultToleranceProducers.java| 4 +-
.../src/main/resources/application.properties | 2 +-
.../component/stream/it/StreamResource.java| 2 +-
.../quarkus/component/stream/it/StreamTest.java| 2 +-
.../quarkus/test/support/kafka/InjectKafka.java} | 7 +-
.../test/support/kafka/KafkaTestResource.java | 7 +
integration-tests/compression/pom.xml | 13 ++
.../common/it/AbstractDebeziumResource.java| 29 ++-
.../common/it/postgres/DebeziumPostgresTest.java | 15 ++
.../component/file/it/FileWatchResource.java | 4 +-
integration-tests/google-storage/pom.xml | 5 +
.../storage/it/GoogleStorageTestResource.java | 13 +-
integration-tests/http/pom.xml | 2 +-
.../kafka/oauth/it/container/KafkaContainer.java | 30 +--
integration-tests/kafka/pom.xml| 17 ++
.../quarkus/component/kafka/CamelKafkaRoutes.java | 2 +-
...elKafkaIT.java => CamelKafkaHealthCheckIT.java} | 2 +-
.../kafka/it/CamelKafkaHealthCheckTest.java| 59 ++
.../kafka/it/KafkaHealthCheckProfile.java} | 9 +-
.../src/main/resources/rests/my-rests.xml | 8 +-
.../src/main/resources/routes/my-routes.xml| 7 +
.../src/main/resources/rests/my-rests.xml | 8 +-
.../src/main/resources/routes/my-routes.xml| 7 +
.../camel/quarkus/main/CoreMainXmlJaxbTest.java| 2 +-
[camel-quarkus] 01/10: Upgrade to Quarkus 2.8.0.CR1
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 539800b08a07a04447794d62f43917fe0ced2652
Author: James Netherton
AuthorDate: Thu Jan 20 07:52:37 2022 +
Upgrade to Quarkus 2.8.0.CR1
---
docs/antora.yml| 6 ++---
.../deployment/OpenTelemetryProcessor.java | 2 +-
integration-tests/http/pom.xml | 2 +-
.../kafka/oauth/it/container/KafkaContainer.java | 30 +-
integration-tests/vertx-websocket/pom.xml | 2 +-
pom.xml| 11
poms/build-parent/pom.xml | 9 +++
7 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index e4edba8..247a721 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,9 +31,9 @@ asciidoc:
target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.15.0 # replace ${camel.version}
camel-docs-version: 3.15.x # replace ${camel.docs.components.version}
-quarkus-version: 2.7.5.Final # replace ${quarkus.version}
-graalvm-version: 21.3.1 # replace ${graalvm.version}
-graalvm-docs-version: 21.3
+quarkus-version: 2.8.0.CR1 # replace ${quarkus.version}
+graalvm-version: 22.0.0.2 # replace ${graalvm.version}
+graalvm-docs-version: 22.0
# attributes used in xrefs to other Antora components
cq-camel-components: 3.15.x@components # replace
${camel.docs.components.xref}
quarkus-examples-version: latest
diff --git
a/extensions/opentelemetry/deployment/src/main/java/org/apache/camel/quarkus/component/opentelemetry/deployment/OpenTelemetryProcessor.java
b/extensions/opentelemetry/deployment/src/main/java/org/apache/camel/quarkus/component/opentelemetry/deployment/OpenTelemetryProcessor.java
index 3622992..1040841 100644
---
a/extensions/opentelemetry/deployment/src/main/java/org/apache/camel/quarkus/component/opentelemetry/deployment/OpenTelemetryProcessor.java
+++
b/extensions/opentelemetry/deployment/src/main/java/org/apache/camel/quarkus/component/opentelemetry/deployment/OpenTelemetryProcessor.java
@@ -19,7 +19,7 @@ package
org.apache.camel.quarkus.component.opentelemetry.deployment;
import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.builditem.FeatureBuildItem;
-import
io.quarkus.opentelemetry.deployment.tracing.TracerProcessor.TracerEnabled;
+import io.quarkus.opentelemetry.deployment.tracing.TracerEnabled;
import
org.apache.camel.quarkus.component.opentelemetry.OpenTelemetryTracerProducer;
class OpenTelemetryProcessor {
diff --git a/integration-tests/http/pom.xml b/integration-tests/http/pom.xml
index 0bb8a2a..793de20 100644
--- a/integration-tests/http/pom.xml
+++ b/integration-tests/http/pom.xml
@@ -61,7 +61,7 @@
io.quarkus
-quarkus-undertow-websockets
+quarkus-websockets
io.quarkus
diff --git
a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
index 31885bf..e95e062 100644
---
a/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
+++
b/integration-tests/kafka-oauth/src/test/java/org/apache/camel/quarkus/kafka/oauth/it/container/KafkaContainer.java
@@ -16,17 +16,20 @@
*/
package org.apache.camel.quarkus.kafka.oauth.it.container;
-import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import javax.json.Json;
+import javax.json.stream.JsonParser;
+
import com.github.dockerjava.api.command.InspectContainerResponse;
-import io.strimzi.StrimziKafkaContainer;
+import io.strimzi.test.container.StrimziKafkaContainer;
+import org.apache.commons.io.IOUtils;
import org.jboss.logging.Logger;
import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.Network;
@@ -45,19 +48,22 @@ public class KafkaContainer extends
FixedHostPortGenericContainer supportedKafkaVersions = new
ArrayList<>(3);
+private static final List supportedKafkaVersions = new
ArrayList<>();
static {
-InputStream inputStream =
StrimziKafkaContainer.class.getResourceAsStream("/kafka-versions.txt");
-InputStreamReader streamReader = new InputStreamReader(inputStream,
StandardCharsets.UTF_8);
-
-try (BufferedReader bufferedReader = new
[camel-quarkus] 02/10: Upgrade Camel to 3.16.0
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 381a9459f8ff41d76a4c4349ce028a1b9c6305b6
Author: James Netherton
AuthorDate: Wed Feb 9 11:13:37 2022 +
Upgrade Camel to 3.16.0
---
docs/antora.yml| 6 +-
.../examples/components/elasticsearch-rest.yml | 2 +-
docs/modules/ROOT/examples/dataformats/ical.yml| 2 +-
.../ROOT/examples/dataformats/jacksonXml.yml | 2 +-
docs/modules/ROOT/pages/migration-guide/2.8.0.adoc | 2 +-
.../reference/extensions/elasticsearch-rest.adoc | 6 +-
.../ROOT/pages/reference/extensions/fhir.adoc | 2 +-
.../ROOT/pages/reference/extensions/ical.adoc | 4 +-
.../pages/reference/extensions/jacksonxml.adoc | 4 +-
.../ROOT/pages/reference/extensions/yaml-dsl.adoc | 6 --
.../pages/user-guide/defining-camel-routes.adoc| 6 +-
.../main/resources/META-INF/quarkus-extension.yaml | 1 +
.../camel/quarkus/component/fhir/FhirConfig.java | 2 +-
.../camel/quarkus/component/fhir/FhirFlags.java| 2 +-
.../main/resources/META-INF/quarkus-extension.yaml | 2 +-
.../main/resources/META-INF/quarkus-extension.yaml | 2 +-
.../deployment/MicroProfileHealthProcessor.java| 5 --
.../MicroProfileHealthCamelChecksDisabledTest.java | 6 +-
extensions/openapi-java/deployment/pom.xml | 5 ++
.../openapi/java/deployment/RESTOpenAPITest.java | 4 +-
.../openapi/java/deployment/RestRoutes.java| 7 +-
.../src/test/resources/application.properties | 2 +-
.../resources/routes/{my-route.xml => rests.xml} | 4 +-
.../resources/routes/{my-route.xml => routes.xml} | 16 ++--
.../it/CoreFaultToleranceProducers.java| 4 +-
.../src/main/resources/application.properties | 2 +-
.../component/stream/it/StreamResource.java| 2 +-
.../quarkus/component/stream/it/StreamTest.java| 2 +-
.../component/file/it/FileWatchResource.java | 4 +-
integration-tests/google-storage/pom.xml | 5 ++
.../storage/it/GoogleStorageTestResource.java | 13 +--
.../quarkus/component/kafka/CamelKafkaRoutes.java | 2 +-
.../src/main/resources/rests/my-rests.xml | 8 +-
.../src/main/resources/routes/my-routes.xml| 7 ++
.../src/main/resources/rests/my-rests.xml | 8 +-
.../src/main/resources/routes/my-routes.xml| 7 ++
.../camel/quarkus/main/CoreMainXmlJaxbTest.java| 2 +-
.../src/main/resources/routes/my-rests.yaml| 6 +-
.../it/health/CustomHealthCheckRepository.java | 17
.../microprofile/it/health/FailingHealthCheck.java | 2 +-
.../it/health/FailureThresholdHealthCheck.java | 51
.../it/health/MicroProfileHealthResource.java | 17 +---
.../src/main/resources/application.properties | 7 +-
.../it/health/MicroProfileHealthTest.java | 67
.../component/openapijava/it/OpenApiRoutes.java| 44 --
.../openapijava/it/common/OpenApiTest.java | 4 +-
integration-tests/platform-http/pom.xml| 17
.../platform/http/it/PlatformHttpRouteBuilder.java | 18 ++---
.../component/http/server/it/PlatformHttpTest.java | 4 +-
integration-tests/rest/pom.xml | 17
.../quarkus/component/rest/it/RestRoutes.java | 93 +++---
integration-tests/servlet/pom.xml | 21 -
.../quarkus/component/servlet/CamelRoute.java | 19 +++--
pom.xml| 8 +-
54 files changed, 237 insertions(+), 341 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 247a721..c742961 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -29,11 +29,11 @@ asciidoc:
min-maven-version: 3.8.1 # replace ${min-maven-version}
target-maven-version: 3.8.4 # replace ${target-maven-version}
-camel-version: 3.15.0 # replace ${camel.version}
-camel-docs-version: 3.15.x # replace ${camel.docs.components.version}
+camel-version: 3.16.0 # replace ${camel.version}
+camel-docs-version: 3.16.x # replace ${camel.docs.components.version}
quarkus-version: 2.8.0.CR1 # replace ${quarkus.version}
graalvm-version: 22.0.0.2 # replace ${graalvm.version}
graalvm-docs-version: 22.0
# attributes used in xrefs to other Antora components
-cq-camel-components: 3.15.x@components # replace
${camel.docs.components.xref}
+cq-camel-components: 3.16.x@components # replace
${camel.docs.components.xref}
quarkus-examples-version: latest
diff --git a/docs/modules/ROOT/examples/components/elasticsearch-rest.yml
b/docs/modules/ROOT/examples/components/elasticsearch-rest.yml
index 9532a39..e00e4ff 100644
--- a/docs/modules/ROOT/examples/components/elasticsearch-rest.yml
+++ b/docs/modules/ROOT/examples/components/elasticsearch-rest.yml
@@ -4,7 +4,7 @@ cqArtifactId:
[camel-quarkus] 04/10: Work around Tika version incompatibilities between Quarkus Tika & Camel Tika #3599
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 43641cdbf69f19e9bdd08185dc0d229a89e4c198
Author: James Netherton
AuthorDate: Tue Mar 8 10:50:20 2022 +
Work around Tika version incompatibilities between Quarkus Tika & Camel
Tika #3599
---
extensions/tika/runtime/pom.xml| 11 ++--
.../camel/quarkus/component/tika/TikaRecorder.java | 33 +-
.../tika/graalvm/TikaProducerSubstitutions.java| 77 ++
3 files changed, 115 insertions(+), 6 deletions(-)
diff --git a/extensions/tika/runtime/pom.xml b/extensions/tika/runtime/pom.xml
index 3470945..74ae8a2 100644
--- a/extensions/tika/runtime/pom.xml
+++ b/extensions/tika/runtime/pom.xml
@@ -58,11 +58,7 @@
org.apache.tika
-tika-core
-
-
-org.apache.tika
-tika-parsers
+*
@@ -74,6 +70,11 @@
io.quarkiverse.tika
quarkus-tika
+
+org.graalvm.nativeimage
+svm
+provided
+
diff --git
a/extensions/tika/runtime/src/main/java/org/apache/camel/quarkus/component/tika/TikaRecorder.java
b/extensions/tika/runtime/src/main/java/org/apache/camel/quarkus/component/tika/TikaRecorder.java
index 6d6760b..c5ea87f 100644
---
a/extensions/tika/runtime/src/main/java/org/apache/camel/quarkus/component/tika/TikaRecorder.java
+++
b/extensions/tika/runtime/src/main/java/org/apache/camel/quarkus/component/tika/TikaRecorder.java
@@ -18,9 +18,14 @@ package org.apache.camel.quarkus.component.tika;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.UnsupportedEncodingException;
import java.util.Collections;
import java.util.Set;
+import javax.xml.transform.TransformerConfigurationException;
+
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -36,12 +41,14 @@ import org.apache.camel.Producer;
import org.apache.camel.component.tika.TikaComponent;
import org.apache.camel.component.tika.TikaConfiguration;
import org.apache.camel.component.tika.TikaEndpoint;
+import org.apache.camel.component.tika.TikaParseOutputFormat;
import org.apache.camel.component.tika.TikaProducer;
import org.apache.tika.exception.TikaException;
import org.apache.tika.metadata.Metadata;
import org.apache.tika.mime.MediaType;
import org.apache.tika.parser.ParseContext;
import org.apache.tika.parser.Parser;
+import org.apache.tika.parser.html.BoilerpipeContentHandler;
@Recorder
public class TikaRecorder {
@@ -78,7 +85,7 @@ public class TikaRecorder {
@Override
public Producer createProducer() throws Exception {
TikaParser tikaParser = tikaParserProducer.tikaParser();
-return new TikaProducer(this, new Parser() {
+return new QuarkusTikaProducer(this, new Parser() {
@Override
public Set getSupportedTypes(ParseContext
parseContext) {
return Collections.emptySet();
@@ -99,4 +106,28 @@ public class TikaRecorder {
}
}
+// TODO: Remove this when Camel Tika & Quarkus Tika versions are aligned
+// https://github.com/apache/camel-quarkus/issues/3599
+static class QuarkusTikaProducer extends TikaProducer {
+
+public QuarkusTikaProducer(TikaEndpoint endpoint) {
+super(endpoint);
+}
+
+public QuarkusTikaProducer(TikaEndpoint endpoint, Parser parser) {
+super(endpoint, parser);
+}
+
+@Override
+protected ContentHandler getContentHandler(TikaConfiguration
configuration, OutputStream outputStream)
+throws TransformerConfigurationException,
UnsupportedEncodingException {
+TikaParseOutputFormat outputFormat =
configuration.getTikaParseOutputFormat();
+if (outputFormat.equals(TikaParseOutputFormat.textMain)) {
+return new BoilerpipeContentHandler(
+new OutputStreamWriter(outputStream,
configuration.getTikaParseOutputEncoding()));
+}
+return super.getContentHandler(configuration, outputStream);
+}
+}
+
}
diff --git
a/extensions/tika/runtime/src/main/java/org/apache/camel/quarkus/component/tika/graalvm/TikaProducerSubstitutions.java
b/extensions/tika/runtime/src/main/java/org/apache/camel/quarkus/component/tika/graalvm/TikaProducerSubstitutions.java
new file mode 100644
index 000..343edae
--- /dev/null
+++
b/extensions/tika/runtime/src/main/java/org/apache/camel/quarkus/component/tika/graalvm/TikaProducerSubstitutions.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software
[camel-quarkus] 06/10: 3579 Improve quartz test coverage
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 571e7f0f2c1e9f2056ea11dbe589bd693173cadd Author: JiriOndrusek AuthorDate: Tue Mar 8 09:44:20 2022 +0100 3579 Improve quartz test coverage --- .../ROOT/pages/reference/extensions/quartz.adoc| 58 ++ extensions/quartz/deployment/pom.xml | 10 + .../quartz/deployment/QuartzProcessor.java | 58 +- extensions/quartz/runtime/pom.xml | 14 ++ .../quartz/runtime/src/main/doc/limitations.adoc | 4 + extensions/quartz/runtime/src/main/doc/usage.adoc | 46 + .../CamelQuarkusQuartzConnectionProvider.java | 66 +++ integration-tests/quartz/pom.xml | 41 .../component/quartz/it/QuartzResource.java| 74 .../quarkus/component/quartz/it/QuartzRoutes.java | 28 ++- .../src/main/resources/application.properties | 47 + .../db/migration/V1.0.1__QuarkusQuartz.sql | 207 + .../src/main/resources/quartz-node-A.properties| 62 ++ .../src/main/resources/quartz-node-B.properties| 63 +++ .../src/main/resources/quartz-node-C.properties| 67 +++ .../quartz/src/main/resources/quartz.properties| 26 +++ .../quarkus/component/quartz/it/QuartzTest.java| 76 pom.xml| 1 + poms/bom/pom.xml | 5 + 19 files changed, 951 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/quartz.adoc b/docs/modules/ROOT/pages/reference/extensions/quartz.adoc index 99c7cdf..196d77f 100644 --- a/docs/modules/ROOT/pages/reference/extensions/quartz.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/quartz.adoc @@ -38,3 +38,61 @@ Or add the coordinates to your existing project: Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. + +== Usage + +=== Clustering + +There are two options how to run Quartz in clustered mode: + + Quarkus based + +This is the preferred option. Follow the https://quarkus.io/guides/quartz[scheduling periodic tasks quartz guide]. + +- Define database configuration in `application.properties`. +- Use for example `flyway` to create database tables required for `Quartz`. + += Quartz based with an Agroal datasource + +Follow the http://www.quartz-scheduler.org/documentation/quartz-1.8.6/configuration/ConfigJDBCJobStoreClustering.html#configure-clustering-with-jdbc-jobstore[Configure Clustering with JDBC-JobStore Guide] with different DS configuration: + +- Use `quartz.properties` to configure `JobStore`. +- Define datasource via quarkus (see the https://quarkus.io/guides/datasource[Quarkus datasource documentation)] and use `CamelQuarkusQuartzConnectionProvider` as `ConnectionProvider` in `quartz.properties`: + +``` +... +org.quartz.jobStore.dataSource = myDS + +# datasource configuration +org.quartz.dataSource.myDS.connectionProvider.class = org.apache.camel.quarkus.component.quartz.CamelQuarkusQuartzConnectionProvider +org.quartz.dataSource.myDSB.dataSourceName = ds_name_if_not_set_default_ds_will_be_used +``` + + +- You can use for example `flyway` to create database tables required for `Quartz`. + += Quartz based + +You can follow the http://www.quartz-scheduler.org/documentation/quartz-1.8.6/configuration/ConfigJDBCJobStoreClustering.html#configure-clustering-with-jdbc-jobstore[Configure Clustering with JDBC-JobStore Guide] without any modification: + +``` +... +org.quartz.jobStore.dataSource = myDS + +# datasource configuration +org.quartz.dataSource.myDS.driver = org.postgresql.Driver + +# datasource configuration +org.quartz.dataSource.myDS.URL=jdbc:postgresql://localhost:5432/default +org.quartz.dataSource.myDS.user = quarkus +org.quartz.dataSource.myDS.password = quarkus +``` + + +== Camel Quarkus limitations + +=== JDBC Job Store + +Quartz's property `org.quartz.jobStore.useProperties` is set to `true` and can not be modified. The value is forced by the Quarkus Quartz extension. +See the Quartz documentation for more information about `org.quartz.jobStore.useProperties`. + diff --git a/extensions/quartz/deployment/pom.xml b/extensions/quartz/deployment/pom.xml index 6c9eb0d..2420c69 100644 --- a/extensions/quartz/deployment/pom.xml +++ b/extensions/quartz/deployment/pom.xml @@ -33,6 +33,12 @@ io.quarkus quarkus-quartz-deployment + + +mchange-commons-java +com.mchange + + org.apache.camel.quarkus @@ -42,6 +48,10 @@ org.apache.camel.quarkus camel-quarkus-quartz + +io.quarkus +
[camel-quarkus] 10/10: Keep antora.yml pointing at 3.15.x until 3.16.0 is released
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit a4664f908041ac11874ec78d8ed3c6c618fb23e9
Author: James Netherton
AuthorDate: Wed Mar 23 15:40:16 2022 +
Keep antora.yml pointing at 3.15.x until 3.16.0 is released
---
docs/antora.yml | 6 +++---
pom.xml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index c742961..a621e2c 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -29,11 +29,11 @@ asciidoc:
min-maven-version: 3.8.1 # replace ${min-maven-version}
target-maven-version: 3.8.4 # replace ${target-maven-version}
-camel-version: 3.16.0 # replace ${camel.version}
-camel-docs-version: 3.16.x # replace ${camel.docs.components.version}
+camel-version: 3.15.0
+camel-docs-version: 3.15.x
quarkus-version: 2.8.0.CR1 # replace ${quarkus.version}
graalvm-version: 22.0.0.2 # replace ${graalvm.version}
graalvm-docs-version: 22.0
# attributes used in xrefs to other Antora components
-cq-camel-components: 3.16.x@components # replace
${camel.docs.components.xref}
+cq-camel-components: 3.15.x@components
quarkus-examples-version: latest
diff --git a/pom.xml b/pom.xml
index 3ea6866..4f06a59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -307,7 +307,7 @@
false
-
+
[GitHub] [camel-quarkus] jamesnetherton closed issue #3592: [Camel 3.16.0] - camel-kafka uses some reflection for readiness health check
jamesnetherton closed issue #3592: URL: https://github.com/apache/camel-quarkus/issues/3592 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton merged pull request #3653: Upgrade Quarkus to 2.8.0.CR1 + Upgrade Camel to 3.16.0
jamesnetherton merged pull request #3653: URL: https://github.com/apache/camel-quarkus/pull/3653 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton commented on issue #3657: Improve support for `InfinispanRemoteAggregationRepository` with Quarkus Infinispan
jamesnetherton commented on issue #3657: URL: https://github.com/apache/camel-quarkus/issues/3657#issuecomment-1077637460 Also it does not seem to work properly in native mode. There is something wrong with deserialization. For some reason it's trying to instantiate `AbstractMap`: ``` Caused by: java.lang.IllegalStateException: Instantiation failed unexpectedly at org.jboss.marshalling.reflect.SerializableClass.invokeConstructorNoException(SerializableClass.java:32) at org.jboss.marshalling.reflect.SerializableClass.callNonInitConstructor(SerializableClass.java:340) at org.jboss.marshalling.river.RiverUnmarshaller.doReadNewObject(RiverUnmarshaller.java:1417) at org.jboss.marshalling.river.RiverUnmarshaller.doReadObject(RiverUnmarshaller.java:298) at org.jboss.marshalling.river.RiverUnmarshaller.doReadObject(RiverUnmarshaller.java:246) at org.jboss.marshalling.river.RiverUnmarshaller.readFields(RiverUnmarshaller.java:1879) at org.jboss.marshalling.river.RiverUnmarshaller.doInitSerializable(RiverUnmarshaller.java:1793) at org.jboss.marshalling.river.RiverUnmarshaller.doReadNewObject(RiverUnmarshaller.java:1421) at org.jboss.marshalling.river.RiverUnmarshaller.doReadObject(RiverUnmarshaller.java:298) at org.jboss.marshalling.river.RiverUnmarshaller.doReadObject(RiverUnmarshaller.java:231) at org.jboss.marshalling.AbstractObjectInput.readObject(AbstractObjectInput.java:41) at org.infinispan.jboss.marshalling.commons.AbstractJBossMarshaller.objectFromObjectStream(AbstractJBossMarshaller.java:137) at org.infinispan.jboss.marshalling.commons.AbstractJBossMarshaller.objectFromByteBuffer(AbstractJBossMarshaller.java:115) at org.infinispan.commons.marshall.AbstractMarshaller.objectFromByteBuffer(AbstractMarshaller.java:82) at org.infinispan.client.hotrod.marshall.MarshallerUtil.bytes2obj(MarshallerUtil.java:57) ... 28 more Caused by: java.lang.InstantiationException: Only non-abstract instance classes can be instantiated using reflection at java.lang.reflect.Constructor.newInstance(Constructor.java:490) at org.jboss.marshalling.reflect.SerializableClass.invokeConstructorNoException(SerializableClass.java:21) ... 42 more Caused by: an exception which occurred: in object of type java.util.LinkedHashMap in field org.apache.camel.support.DefaultExchangeHolder.inHeaders in object org.apache.camel.support.DefaultExchangeHolder@bac388f in object of type org.apache.camel.support.DefaultExchangeHolder ``` -- This is an automated message from the Apache Git Service. To respond to the message, please 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: Revert "Restore Google Secret manager link in security.adoc"
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 55e9e3f Revert "Restore Google Secret manager link in security.adoc" 55e9e3f is described below commit 55e9e3f857ceb4ba69c8bac0dc36547dae1f909b Author: Andrea Cosentino AuthorDate: Thu Mar 24 13:18:07 2022 +0100 Revert "Restore Google Secret manager link in security.adoc" This reverts commit 252838e2be4fce2a8b40b2c3d38ed16539fc13bb. --- docs/user-manual/modules/ROOT/pages/security.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/security.adoc b/docs/user-manual/modules/ROOT/pages/security.adoc index 05d7f34..159771b 100644 --- a/docs/user-manual/modules/ROOT/pages/security.adoc +++ b/docs/user-manual/modules/ROOT/pages/security.adoc @@ -64,7 +64,8 @@ Camel also support accessing the secured configuration from an external vault sy The following _Vaults_ are supported by Camel: * xref:components::aws-secrets-manager-component.adoc[AWS Secrets Manager] -* xref:components::google-secret-manager-component.adoc[Google Secret Manager] +// TODO: Enable link when website build works again +// * xref:components::google-secret-manager-component.adoc[Google Secret Manager] Using AWS Vault
[GitHub] [camel] orpiske opened a new pull request #7262: camel-test-infra-kafka: enable singleton services for Strimzi
orpiske opened a new pull request #7262: URL: https://github.com/apache/camel/pull/7262 -- This is an automated message from the Apache Git Service. To respond to the message, please 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 (10effd4 -> d4a2f0c)
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 10effd4 CAMEL-17848: health-check - reported kind should be what kind the health-check is. add d4a2f0c (chores) camel-test-infra-kafka: use a common constant for the Kafka 3 image name No new revisions were added by this update. Summary of changes: .../camel/test/infra/kafka/services/ContainerLocalKafkaService.java | 4 +++- .../infra/kafka/services/ContainerLocalSingletonKafkaService.java | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-)
[GitHub] [camel] davsclaus commented on pull request #7261: [CAMEL-17844] Handle FunctionalInterface (lambas) in BeanInfo
davsclaus commented on pull request #7261: URL: https://github.com/apache/camel/pull/7261#issuecomment-1077571011 Also need to test that camel-karaf would still work, as it has special case for beans, the interface that was deleted was in use by camel-karaf, so we need to update its source code also -- This is an automated message from the Apache Git Service. To respond to the message, please 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-spring-boot] branch main updated: Remove unusued code
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 3c0bd87 Remove unusued code
3c0bd87 is described below
commit 3c0bd87663258bc898b1dbddaa007a97a9c8a1d8
Author: Claus Ibsen
AuthorDate: Thu Mar 24 13:18:44 2022 +0100
Remove unusued code
---
.../camel/spring/boot/model/RouteDetails.java | 216 -
.../camel/spring/boot/model/RouteDetailsInfo.java | 42
.../apache/camel/spring/boot/model/RouteInfo.java | 73 ---
3 files changed, 331 deletions(-)
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteDetails.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteDetails.java
deleted file mode 100644
index 2bd137c..000
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/model/RouteDetails.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.spring.boot.model;
-
-import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import org.apache.camel.api.management.mbean.ManagedRouteMBean;
-import org.apache.camel.api.management.mbean.RouteError;
-
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class RouteDetails {
-
-private long deltaProcessingTime;
-
-private long exchangesInflight;
-
-private long exchangesTotal;
-
-private long externalRedeliveries;
-
-private long failuresHandled;
-
-private String firstExchangeCompletedExchangeId;
-
-private Date firstExchangeCompletedTimestamp;
-
-private String firstExchangeFailureExchangeId;
-
-private Date firstExchangeFailureTimestamp;
-
-private String lastExchangeCompletedExchangeId;
-
-private Date lastExchangeCompletedTimestamp;
-
-private String lastExchangeFailureExchangeId;
-
-private Date lastExchangeFailureTimestamp;
-
-private long lastProcessingTime;
-
-private String load01;
-
-private String load05;
-
-private String load15;
-
-private long maxProcessingTime;
-
-private long meanProcessingTime;
-
-private long minProcessingTime;
-
-private Long oldestInflightDuration;
-
-private String oldestInflightExchangeId;
-
-private long redeliveries;
-
-private long totalProcessingTime;
-
-private RouteError lastError;
-
-private boolean hasRouteController;
-
-public RouteDetails(ManagedRouteMBean managedRoute) {
-try {
-this.deltaProcessingTime = managedRoute.getDeltaProcessingTime();
-this.exchangesInflight = managedRoute.getExchangesInflight();
-this.exchangesTotal = managedRoute.getExchangesTotal();
-this.externalRedeliveries = managedRoute.getExternalRedeliveries();
-this.failuresHandled = managedRoute.getFailuresHandled();
-this.firstExchangeCompletedExchangeId =
managedRoute.getFirstExchangeCompletedExchangeId();
-this.firstExchangeCompletedTimestamp =
managedRoute.getFirstExchangeCompletedTimestamp();
-this.firstExchangeFailureExchangeId =
managedRoute.getFirstExchangeFailureExchangeId();
-this.firstExchangeFailureTimestamp =
managedRoute.getFirstExchangeFailureTimestamp();
-this.lastExchangeCompletedExchangeId =
managedRoute.getLastExchangeCompletedExchangeId();
-this.lastExchangeCompletedTimestamp =
managedRoute.getLastExchangeCompletedTimestamp();
-this.lastExchangeFailureExchangeId =
managedRoute.getLastExchangeFailureExchangeId();
-this.lastExchangeFailureTimestamp =
managedRoute.getLastExchangeFailureTimestamp();
-this.lastProcessingTime = managedRoute.getLastProcessingTime();
-this.load01 = managedRoute.getLoad01();
-this.load05 = managedRoute.getLoad05();
-this.load15 = managedRoute.getLoad15();
-this.maxProcessingTime = managedRoute.getMaxProcessingTime();
-this.meanProcessingTime = managedRoute.getMeanProcessingTime();
-
[camel-spring-boot] branch main updated: camel-spring-boot - Add missing option to GCP vault configuration.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 54ce34f camel-spring-boot - Add missing option to GCP vault
configuration.
54ce34f is described below
commit 54ce34f0d50334b40be4bb81f10331a04577afc0
Author: Claus Ibsen
AuthorDate: Thu Mar 24 13:15:47 2022 +0100
camel-spring-boot - Add missing option to GCP vault configuration.
---
core/camel-spring-boot/src/main/docs/spring-boot.json | 7 +++
.../camel/spring/boot/vault/GcpVaultAutoConfiguration.java | 1 +
.../spring/boot/vault/GcpVaultConfigurationProperties.java | 14 ++
3 files changed, 22 insertions(+)
diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.json
b/core/camel-spring-boot/src/main/docs/spring-boot.json
index b987c4f..e21cdd2 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.json
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.json
@@ -1350,6 +1350,13 @@
"sourceType":
"org.apache.camel.spring.boot.vault.GcpVaultConfigurationProperties"
},
{
+ "name": "camel.vault.gcp.use-default-instance",
+ "type": "java.lang.Boolean",
+ "description": "Define if we want to use the GCP Client Default Instance
or not",
+ "sourceType":
"org.apache.camel.spring.boot.vault.GcpVaultConfigurationProperties",
+ "defaultValue": false
+},
+{
"name": "management.endpoint.camelroutecontroller.cache.time-to-live",
"type": "java.time.Duration",
"description": "Maximum time that a response can be cached.",
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultAutoConfiguration.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultAutoConfiguration.java
index 5318a3f..6b53399 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultAutoConfiguration.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultAutoConfiguration.java
@@ -36,6 +36,7 @@ public class GcpVaultAutoConfiguration {
GcpVaultConfiguration answer = new GcpVaultConfiguration();
answer.setServiceAccountKey(config.getServiceAccountKey());
answer.setProjectId(config.getProjectId());
+answer.setUseDefaultInstance(config.isUseDefaultInstance());
return answer;
}
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationProperties.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationProperties.java
index 83421a1..5660834 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationProperties.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/vault/GcpVaultConfigurationProperties.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.spring.boot.vault;
+import org.apache.camel.spi.Metadata;
import org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties(prefix = "camel.vault.gcp")
@@ -31,6 +32,11 @@ public class GcpVaultConfigurationProperties {
*/
private String projectId;
+/**
+ * Define if we want to use the GCP Client Default Instance or not
+ */
+private boolean useDefaultInstance;
+
public String getServiceAccountKey() {
return serviceAccountKey;
}
@@ -46,4 +52,12 @@ public class GcpVaultConfigurationProperties {
public void setProjectId(String projectId) {
this.projectId = projectId;
}
+
+public boolean isUseDefaultInstance() {
+return useDefaultInstance;
+}
+
+public void setUseDefaultInstance(boolean useDefaultInstance) {
+this.useDefaultInstance = useDefaultInstance;
+}
}
[camel] branch regen_bot updated (61b9254 -> 10effd4)
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 61b9254 Regen for commit b113e6562d150289329beb499abc852c0e4db82b add 12b84942 CAMEL-17848: camel-jbang - Health check reporting overall status readiness vs liveness add 10effd4 CAMEL-17848: health-check - reported kind should be what kind the health-check is. No new revisions were added by this update. Summary of changes: .../camel/impl/health/AbstractHealthCheck.java | 12 +++- .../support/ScheduledPollConsumerHealthCheck.java | 11 +++- .../org/apache/camel/main/VertxHttpServer.java | 69 +- 3 files changed, 47 insertions(+), 45 deletions(-)
[GitHub] [camel-website] davsclaus commented on pull request #807: Added Blog post about Secrets Properties Functions introduced in Came…
davsclaus commented on pull request #807: URL: https://github.com/apache/camel-website/pull/807#issuecomment-1077561910 Very good blog post -- This is an automated message from the Apache Git Service. To respond to the message, please 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 (fe1cc22 -> 61b9254)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git. omit fe1cc22 Regen for commit c7a7f4f346036cf5356c751099c186b8bb846414 add 61b9254 Regen for commit b113e6562d150289329beb499abc852c0e4db82b This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (fe1cc22) \ N -- N -- N refs/heads/regen_bot (61b9254) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[GitHub] [camel] oscerd commented on pull request #7261: [CAMEL-17844] Handle FunctionalInterface (lambas) in BeanInfo
oscerd commented on pull request #7261: URL: https://github.com/apache/camel/pull/7261#issuecomment-1077531594 > Is there a way to automatically format the source in such a way that `sourcecheck` passes? If you run a full build the code will autoformat. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] bjornomy commented on pull request #7261: [CAMEL-17844] Handle FunctionalInterface (lambas) in BeanInfo
bjornomy commented on pull request #7261: URL: https://github.com/apache/camel/pull/7261#issuecomment-1077530755 Is there a way to automatically format the source in such a way that `sourcecheck` passes? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] bjornomy opened a new pull request #7261: [CAMEL-17844] Handle FunctionalInterface (lambas) in BeanInfo
bjornomy opened a new pull request #7261: URL: https://github.com/apache/camel/pull/7261 This PR aims to fix a regression regarding FunctionalInterfaces in BeanInfo. * let BeanInfo ignore methods from synthetic classes (proxies and lambdas) when choosing what method to call on a bean * remove BeanInfoTypeResolver, as it's not longer necesary - [X] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [X] Each commit in the pull request should have a meaningful subject line and body. - [X] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. - [X] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [ ] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/main/CONTRIBUTING.md -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton opened a new issue #3658: Improve Infinispan extension test coverage
jamesnetherton opened a new issue #3658: URL: https://github.com/apache/camel-quarkus/issues/3658 * Operations CLEAR CLEARASYNC COMPUTE COMPUTEASYNC CONTAINSKEY CONTAINSVALUE GET GETORDEFAULT PUT PUTALL PUTALLASYNC PUTASYNC PUTIFABSENT PUTIFABSENTASYNC QUERY REMOVE REMOVEASYNC REPLACE REPLACEASYNC SIZE STATS * Idempotent repository * Aggregation repository * Custom mapping functions * Custom event listeners -- This is an automated message from the Apache Git Service. To respond to the message, please 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-test-infra-kafka: use a common constant for the Kafka 3 image name
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 d4a2f0c (chores) camel-test-infra-kafka: use a common constant for
the Kafka 3 image name
d4a2f0c is described below
commit d4a2f0cb0fea7570b535666ee7c77c9822035075
Author: Otavio Rodolfo Piske
AuthorDate: Thu Mar 24 11:31:26 2022 +0100
(chores) camel-test-infra-kafka: use a common constant for the Kafka 3
image name
---
.../camel/test/infra/kafka/services/ContainerLocalKafkaService.java | 4 +++-
.../infra/kafka/services/ContainerLocalSingletonKafkaService.java | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
index bd3f00a..2aaa9e7 100644
---
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
+++
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalKafkaService.java
@@ -25,6 +25,8 @@ import org.testcontainers.containers.KafkaContainer;
import org.testcontainers.utility.DockerImageName;
public class ContainerLocalKafkaService implements KafkaService,
ContainerService {
+public static final String KAFKA3_IMAGE_NAME =
"confluentinc/cp-kafka:7.0.1";
+
private static final Logger LOG =
LoggerFactory.getLogger(ContainerLocalKafkaService.class);
private final KafkaContainer kafka;
@@ -72,7 +74,7 @@ public class ContainerLocalKafkaService implements
KafkaService, ContainerServic
}
public static ContainerLocalKafkaService kafka3Container() {
-KafkaContainer container = new
KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.0.1"));
+KafkaContainer container = new
KafkaContainer(DockerImageName.parse(KAFKA3_IMAGE_NAME));
container = container.withEmbeddedZookeeper();
return new ContainerLocalKafkaService(container);
diff --git
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalSingletonKafkaService.java
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalSingletonKafkaService.java
index 3f27568..b3b1f09 100644
---
a/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalSingletonKafkaService.java
+++
b/test-infra/camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalSingletonKafkaService.java
@@ -52,7 +52,8 @@ public class ContainerLocalSingletonKafkaService extends
ContainerLocalKafkaServ
public static ContainerLocalSingletonKafkaService kafka3Container() {
KafkaContainer container
-= new
KafkaContainer(DockerImageName.parse("confluentinc/cp-kafka:7.0.1")).withEmbeddedZookeeper();
+= new
KafkaContainer(DockerImageName.parse(ContainerLocalKafkaService.KAFKA3_IMAGE_NAME))
+.withEmbeddedZookeeper();
return new ContainerLocalSingletonKafkaService(container);
}
}
[GitHub] [camel] orpiske merged pull request #7257: (chores) camel-test-infra-kafka: use a common constant for the Kafka 3 image name
orpiske merged pull request #7257: URL: https://github.com/apache/camel/pull/7257 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] oscerd opened a new pull request #807: Added Blog post about Secrets Properties Functions introduced in Came…
oscerd opened a new pull request #807: URL: https://github.com/apache/camel-website/pull/807 …l 3.16.0 -- This is an automated message from the Apache Git Service. To respond to the message, please 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-website] 01/01: Added Blog post about Secrets Properties Functions introduced in Camel 3.16.0
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch load-properties-functions in repository https://gitbox.apache.org/repos/asf/camel-website.git commit 5177c3e7146c56dd1dd5fd748aad8a21233ac4b7 Author: Andrea Cosentino AuthorDate: Thu Mar 24 12:27:22 2022 +0100 Added Blog post about Secrets Properties Functions introduced in Camel 3.16.0 --- .../2022/03/secrets-properties-functions/index.md | 197 + 1 file changed, 197 insertions(+) diff --git a/content/blog/2022/03/secrets-properties-functions/index.md b/content/blog/2022/03/secrets-properties-functions/index.md new file mode 100644 index 000..66ceeca --- /dev/null +++ b/content/blog/2022/03/secrets-properties-functions/index.md @@ -0,0 +1,197 @@ +--- +title: "Camel 3.16.0 new feature: Load properties from Vault/Secrets cloud services" +date: 2022-03-24 +draft: false +authors: ["oscerd"] +categories: ["Camel"] +preview: "How to retrieve properties from a Cloud vault service" +--- + +In the last weeks, together with Claus, we've been working on a new feature: loading properties from Vault/Secrets cloud services. + +It will arrive with Camel 3.16.0, currently on vote and to be released by the end of this week (24/3). + +This post introduces the new features and provide some examples. + +## Secrets Management in Camel + +In the past there were many discussions around the possibility of managing secrets in Camel through Vault Services. + +The hidden troubles are a lot when we talk about Secrets Management: +- Ability to automatically retrieve secrets after a secret rotation has been completed +- Writing the function (script, serverless function etc.) to operate the rotation +- Being notified once a rotation happens + +We choose to start from the beginning: retrieve secrets from a vault service and use them as properties in the Camel configuration. + +### Supported Services + +In 3.16.0 we're supporting two of the main services available in the cloud space: + +- AWS Secret Manager +- Google Cloud Secret Manager + +### How it works + +The Vault feature works by specifying a particular prefix while using the Properties component. + +For example for AWS: + +``` + + + + + + +``` + +or + +``` + + + + + + +``` + +This notation will allow to run the following workflow while starting a camel route: +- Connect and authenticate to AWS Secret Manager (or GCP) +- Retrieve the value related to the secret named `username` +- Substitute the property with the secret value just returned + +For using the particular Properties Function the two requirements are adding the `camel-aws-secret-manager` JAR for using the AWS one or +adding the `camel-google-secret-manager` JAR for GCP and setting up the credentials to access the cloud service. + +### Setting up the Properties Function + +Each of the Secret management cloud services require different parameters to complete authentication and authorization. + +For both the Properties Functions currently available we provide two different approaches: +- Environment variables +- Main Configuration properties + + AWS Secrets Manager + +The AWS Secret Manager Properties Function configurations through enviroment variables are the following: + +``` +export $CAMEL_VAULT_AWS_USE_DEFAULT_CREDENTIALS_PROVIDER=accessKey +export $CAMEL_VAULT_AWS_SECRET_KEY=secretKey +export $CAMEL_VAULT_AWS_REGION=region +``` + +While as Main Configuration properties it is possible to define the credentials through the following: + +``` +camel.vault.aws.accessKey = accessKey +camel.vault.aws.secretKey = secretKey +camel.vault.aws.region = region +``` + +The above examples are not considering the Default Credentials Provider chain coming from AWS SDK, but the Properties Function can be configured even in that way. This is how to do that through enviroment variables: + +``` +export $CAMEL_VAULT_AWS_USE_DEFAULT_CREDENTIALS_PROVIDER=true +export $CAMEL_VAULT_AWS_REGION=region +``` + +This could be done even with main configuration properties: + +``` +camel.vault.aws.defaultCredentialsProvider = true +camel.vault.aws.region = region +``` + + GCP Secret Manager + +The GCP Secret Manager Properties Function configurations through enviroment variables are the following: + +``` +export $CAMEL_VAULT_GCP_SERVICE_ACCOUNT_KEY=file:path/to/service.accountkey +export $CAMEL_VAULT_GCP_PROJECT_ID=projectId +``` + +While as Main Configuration properties it is possible to define the credentials through the following: + +``` +camel.vault.gcp.serviceAccountKey = accessKey +camel.vault.gcp.projectId = secretKey +``` + +The above examples are not considering the Default Credentials Provider coming from GCP, but the Properties Function can be configured even in that way. This is how to do that through enviroment variables: + +``` +export $CAMEL_VAULT_GCP_USE_DEFAULT_INSTANCE=true +export
[camel-website] branch load-properties-functions created (now 5177c3e)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch load-properties-functions in repository https://gitbox.apache.org/repos/asf/camel-website.git. at 5177c3e Added Blog post about Secrets Properties Functions introduced in Camel 3.16.0 This branch includes the following new commits: new 5177c3e Added Blog post about Secrets Properties Functions introduced in Camel 3.16.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[GitHub] [camel-quarkus] jamesnetherton opened a new issue #3657: Improve support for `InfinispanRemoteAggregationRepository` with Quarkus Infinispan
jamesnetherton opened a new issue #3657: URL: https://github.com/apache/camel-quarkus/issues/3657 There is some commentary about moving away from the (deprecated) `JbossUserMarshaller` and Java serialization here: https://github.com/apache/camel/blob/main/components/camel-infinispan/camel-infinispan/src/main/java/org/apache/camel/component/infinispan/remote/InfinispanRemoteAggregationRepository.java When testing the scenario where the Infinispan client is configured & managed by the Camel component, it works ok. When the client is managed by the Quarkus Infinispan extension, things get a little complicated. You have to create `hotrod-client.properties` and manually set the marshaller. This isn't ideal because it prohibits some nice functionality provided by the default `ProtoStreamMarshaller`. -- This is an automated message from the Apache Git Service. To respond to the message, please 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 created (now 10effd4)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. at 10effd4 CAMEL-17848: health-check - reported kind should be what kind the health-check is. This branch includes the following new commits: new 12b84942 CAMEL-17848: camel-jbang - Health check reporting overall status readiness vs liveness new 10effd4 CAMEL-17848: health-check - reported kind should be what kind the health-check is. 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.
[camel] 02/02: CAMEL-17848: health-check - reported kind should be what kind the health-check is.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 10effd44e309c51c94907b561562f6e16f13c9c0
Author: Claus Ibsen
AuthorDate: Thu Mar 24 12:17:48 2022 +0100
CAMEL-17848: health-check - reported kind should be what kind the
health-check is.
---
.../org/apache/camel/impl/health/AbstractHealthCheck.java| 12 +---
.../camel/support/ScheduledPollConsumerHealthCheck.java | 11 +--
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git
a/core/camel-health/src/main/java/org/apache/camel/impl/health/AbstractHealthCheck.java
b/core/camel-health/src/main/java/org/apache/camel/impl/health/AbstractHealthCheck.java
index ec2b1ac..c29ef1d 100644
---
a/core/camel-health/src/main/java/org/apache/camel/impl/health/AbstractHealthCheck.java
+++
b/core/camel-health/src/main/java/org/apache/camel/impl/health/AbstractHealthCheck.java
@@ -134,9 +134,15 @@ public abstract class AbstractHealthCheck implements
HealthCheck, CamelContextAw
builder.state(registry.getInitialState());
// what kind of check is this
-HealthCheck.Kind kind = (Kind) options.getOrDefault(CHECK_KIND,
Kind.ALL);
-builder.detail(CHECK_KIND, kind.name());
-
+HealthCheck.Kind kind;
+if (isLiveness() && isReadiness()) {
+// if we can do both then use kind from what type we were invoked
as
+kind = (Kind) options.getOrDefault(CHECK_KIND, Kind.ALL);
+} else {
+// we can only be either live or ready so report that
+kind = isLiveness() ? Kind.LIVENESS : Kind.READINESS;
+}
+builder.detail(CHECK_KIND, kind);
// Extract relevant information from meta data.
int invocationCount = (Integer) meta.getOrDefault(INVOCATION_COUNT, 0);
int failureCount = (Integer) meta.getOrDefault(FAILURE_COUNT, 0);
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java
b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java
index e3a1f4b..089e04f 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java
@@ -67,8 +67,15 @@ public class ScheduledPollConsumerHealthCheck implements
HealthCheck {
builder.detail(FAILURE_ENDPOINT_URI, sanitizedUri);
// what kind of check is this
-HealthCheck.Kind kind = (Kind) options.getOrDefault(CHECK_KIND,
Kind.ALL);
-builder.detail(CHECK_KIND, kind.name());
+HealthCheck.Kind kind;
+if (isLiveness() && isReadiness()) {
+// if we can do both then use kind from what type we were invoked
as
+kind = (Kind) options.getOrDefault(CHECK_KIND, Kind.ALL);
+} else {
+// we can only be either live or ready so report that
+kind = isLiveness() ? Kind.LIVENESS : Kind.READINESS;
+}
+builder.detail(CHECK_KIND, kind);
if (!isEnabled()) {
builder.message("Disabled");
[camel] 01/02: CAMEL-17848: camel-jbang - Health check reporting overall status readiness vs liveness
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 12b84942014cc21eea1373c8c4b21174bfe505ee
Author: Claus Ibsen
AuthorDate: Thu Mar 24 12:07:13 2022 +0100
CAMEL-17848: camel-jbang - Health check reporting overall status readiness
vs liveness
---
.../org/apache/camel/main/VertxHttpServer.java | 69 +-
1 file changed, 29 insertions(+), 40 deletions(-)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java
index e6450b8..adc3bf2 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java
@@ -207,6 +207,7 @@ public final class VertxHttpServer {
boolean all = ctx.currentRoute() == health;
boolean liv = ctx.currentRoute() == live;
+boolean rdy = ctx.currentRoute() == ready;
Collection res;
if (all) {
@@ -221,13 +222,33 @@ public final class VertxHttpServer {
sb.append("{\n");
HealthCheckRegistry registry =
HealthCheckRegistry.get(context);
-String level = registry.getExposureLevel();
+String level = ctx.request().getParam("exposureLevel");
+if (level == null) {
+level = registry.getExposureLevel();
+}
+
+// are we UP
+boolean up;
+if (rdy) {
+// readiness requires that all are UP
+up = res.stream().allMatch(r ->
r.getState().equals(HealthCheck.State.UP));
+} else {
+// liveness will fail if there is any down
+up = res.stream().noneMatch(r ->
r.getState().equals(HealthCheck.State.DOWN));
+}
+
if ("oneline".equals(level)) {
-healthCheckOneline(sb, res);
+// only brief status
+healthCheckStatus(sb, up);
} else if ("full".equals(level)) {
-healthCheckFull(sb, res);
+// include all details
+List list = new ArrayList<>(res);
+healthCheckDetails(sb, list, up);
} else {
-healthCheckDefault(sb, res);
+// include only DOWN details
+List downs = res.stream().filter(r ->
r.getState().equals(HealthCheck.State.DOWN))
+.collect(Collectors.toList());
+healthCheckDetails(sb, downs, up);
}
sb.append("}\n");
ctx.end(sb.toString());
@@ -240,8 +261,7 @@ public final class VertxHttpServer {
phc.addHttpEndpoint("/q/health");
}
-private static void healthCheckOneline(StringBuilder sb,
Collection res) {
-boolean up = res.stream().noneMatch(r ->
r.getState().equals(HealthCheck.State.DOWN));
+private static void healthCheckStatus(StringBuilder sb, boolean up) {
if (up) {
sb.append("\"status\": \"UP\"\n");
} else {
@@ -249,15 +269,9 @@ public final class VertxHttpServer {
}
}
-private static void healthCheckFull(StringBuilder sb,
Collection res) {
-// we just want a brief summary or either UP or DOWN
-boolean up = res.stream().noneMatch(r ->
r.getState().equals(HealthCheck.State.DOWN));
-if (up) {
-sb.append("\"status\": \"UP\"");
-} else {
-sb.append("\"status\": \"DOWN\"");
-}
-List checks = new ArrayList<>(res);
+private static void healthCheckDetails(StringBuilder sb,
List checks, boolean up) {
+healthCheckStatus(sb, up);
+
if (!checks.isEmpty()) {
sb.append(",\n");
sb.append("\"checks\": [\n");
@@ -277,31 +291,6 @@ public final class VertxHttpServer {
}
}
-private static void healthCheckDefault(StringBuilder sb,
Collection res) {
-// we just want a brief summary or either UP or DOWN
-boolean up = res.stream().noneMatch(r ->
r.getState().equals(HealthCheck.State.DOWN));
-if (up) {
-sb.append("\"status\": \"UP\"\n");
-} else {
-// when we are DOWN then grab the only downs
-List down
-= res.stream().filter(r ->
r.getState().equals(HealthCheck.State.DOWN)).collect(Collectors.toList());
-sb.append("\"status\": \"DOWN\",\n");
-sb.append("\"checks\": [\n");
-for (int i = 0; i < down.size(); i++) {
-HealthCheck.Result d = down.get(i);
-
[GitHub] [camel] oscerd merged pull request #7260: Generated sources regen
oscerd merged pull request #7260: URL: https://github.com/apache/camel/pull/7260 -- This is an automated message from the Apache Git Service. To respond to the message, please 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 (ed64c5e -> fe1cc22)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch regen_bot
in repository https://gitbox.apache.org/repos/asf/camel.git.
omit ed64c5e Regen for commit c68d5931effc8e7f15560db2c8a1aa4f64d1f942
add 8e3ee21 [CAMEL-17845] verify integration tests results
add 2e97841 [CAMEL-17845] fix flaky tests
add dacf6e6 [CAMEL-17845] Use single Kafka server when running IT
add c7a7f4f [CAMEL-17845][CAMEL-17725] Make singleton services thread safe
add fe1cc22 Regen for commit c7a7f4f346036cf5356c751099c186b8bb846414
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ed64c5e)
\
N -- N -- N refs/heads/regen_bot (fe1cc22)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
components/camel-kafka/pom.xml | 1 +
.../integration/BaseEmbeddedKafkaTestSupport.java | 4 ++-
.../kafka/integration/KafkaConsumerFullIT.java | 4 +--
.../integration/KafkaConsumerHealthCheckIT.java| 4 +--
.../integration/KafkaConsumerManualCommitIT.java | 2 ++
.../integration/KafkaConsumerTopicIsPatternIT.java | 5 ++--
.../FhirLocalSingletonContainerService.java| 11 +++-
.../ContainerLocalSingletonKafkaService.java} | 30 +++---
.../infra/kafka/services/KafkaServiceFactory.java | 9 +++
9 files changed, 45 insertions(+), 25 deletions(-)
copy
test-infra/{camel-test-infra-fhir/src/test/java/org/apache/camel/test/infra/fhir/services/FhirLocalSingletonContainerService.java
=>
camel-test-infra-kafka/src/test/java/org/apache/camel/test/infra/kafka/services/ContainerLocalSingletonKafkaService.java}
(58%)
[GitHub] [camel] github-actions[bot] opened a new pull request #7260: Generated sources regen
github-actions[bot] opened a new pull request #7260: URL: https://github.com/apache/camel/pull/7260 Regen bot :robot: found some uncommited changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 02/02: CAMEL-17848: health-check - reported kind should be what kind the health-check is.
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
commit 10effd44e309c51c94907b561562f6e16f13c9c0
Author: Claus Ibsen
AuthorDate: Thu Mar 24 12:17:48 2022 +0100
CAMEL-17848: health-check - reported kind should be what kind the
health-check is.
---
.../org/apache/camel/impl/health/AbstractHealthCheck.java| 12 +---
.../camel/support/ScheduledPollConsumerHealthCheck.java | 11 +--
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git
a/core/camel-health/src/main/java/org/apache/camel/impl/health/AbstractHealthCheck.java
b/core/camel-health/src/main/java/org/apache/camel/impl/health/AbstractHealthCheck.java
index ec2b1ac..c29ef1d 100644
---
a/core/camel-health/src/main/java/org/apache/camel/impl/health/AbstractHealthCheck.java
+++
b/core/camel-health/src/main/java/org/apache/camel/impl/health/AbstractHealthCheck.java
@@ -134,9 +134,15 @@ public abstract class AbstractHealthCheck implements
HealthCheck, CamelContextAw
builder.state(registry.getInitialState());
// what kind of check is this
-HealthCheck.Kind kind = (Kind) options.getOrDefault(CHECK_KIND,
Kind.ALL);
-builder.detail(CHECK_KIND, kind.name());
-
+HealthCheck.Kind kind;
+if (isLiveness() && isReadiness()) {
+// if we can do both then use kind from what type we were invoked
as
+kind = (Kind) options.getOrDefault(CHECK_KIND, Kind.ALL);
+} else {
+// we can only be either live or ready so report that
+kind = isLiveness() ? Kind.LIVENESS : Kind.READINESS;
+}
+builder.detail(CHECK_KIND, kind);
// Extract relevant information from meta data.
int invocationCount = (Integer) meta.getOrDefault(INVOCATION_COUNT, 0);
int failureCount = (Integer) meta.getOrDefault(FAILURE_COUNT, 0);
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java
b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java
index e3a1f4b..089e04f 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/ScheduledPollConsumerHealthCheck.java
@@ -67,8 +67,15 @@ public class ScheduledPollConsumerHealthCheck implements
HealthCheck {
builder.detail(FAILURE_ENDPOINT_URI, sanitizedUri);
// what kind of check is this
-HealthCheck.Kind kind = (Kind) options.getOrDefault(CHECK_KIND,
Kind.ALL);
-builder.detail(CHECK_KIND, kind.name());
+HealthCheck.Kind kind;
+if (isLiveness() && isReadiness()) {
+// if we can do both then use kind from what type we were invoked
as
+kind = (Kind) options.getOrDefault(CHECK_KIND, Kind.ALL);
+} else {
+// we can only be either live or ready so report that
+kind = isLiveness() ? Kind.LIVENESS : Kind.READINESS;
+}
+builder.detail(CHECK_KIND, kind);
if (!isEnabled()) {
builder.message("Disabled");
[camel] 01/02: CAMEL-17848: camel-jbang - Health check reporting overall status readiness vs liveness
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
commit 12b84942014cc21eea1373c8c4b21174bfe505ee
Author: Claus Ibsen
AuthorDate: Thu Mar 24 12:07:13 2022 +0100
CAMEL-17848: camel-jbang - Health check reporting overall status readiness
vs liveness
---
.../org/apache/camel/main/VertxHttpServer.java | 69 +-
1 file changed, 29 insertions(+), 40 deletions(-)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java
index e6450b8..adc3bf2 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/VertxHttpServer.java
@@ -207,6 +207,7 @@ public final class VertxHttpServer {
boolean all = ctx.currentRoute() == health;
boolean liv = ctx.currentRoute() == live;
+boolean rdy = ctx.currentRoute() == ready;
Collection res;
if (all) {
@@ -221,13 +222,33 @@ public final class VertxHttpServer {
sb.append("{\n");
HealthCheckRegistry registry =
HealthCheckRegistry.get(context);
-String level = registry.getExposureLevel();
+String level = ctx.request().getParam("exposureLevel");
+if (level == null) {
+level = registry.getExposureLevel();
+}
+
+// are we UP
+boolean up;
+if (rdy) {
+// readiness requires that all are UP
+up = res.stream().allMatch(r ->
r.getState().equals(HealthCheck.State.UP));
+} else {
+// liveness will fail if there is any down
+up = res.stream().noneMatch(r ->
r.getState().equals(HealthCheck.State.DOWN));
+}
+
if ("oneline".equals(level)) {
-healthCheckOneline(sb, res);
+// only brief status
+healthCheckStatus(sb, up);
} else if ("full".equals(level)) {
-healthCheckFull(sb, res);
+// include all details
+List list = new ArrayList<>(res);
+healthCheckDetails(sb, list, up);
} else {
-healthCheckDefault(sb, res);
+// include only DOWN details
+List downs = res.stream().filter(r ->
r.getState().equals(HealthCheck.State.DOWN))
+.collect(Collectors.toList());
+healthCheckDetails(sb, downs, up);
}
sb.append("}\n");
ctx.end(sb.toString());
@@ -240,8 +261,7 @@ public final class VertxHttpServer {
phc.addHttpEndpoint("/q/health");
}
-private static void healthCheckOneline(StringBuilder sb,
Collection res) {
-boolean up = res.stream().noneMatch(r ->
r.getState().equals(HealthCheck.State.DOWN));
+private static void healthCheckStatus(StringBuilder sb, boolean up) {
if (up) {
sb.append("\"status\": \"UP\"\n");
} else {
@@ -249,15 +269,9 @@ public final class VertxHttpServer {
}
}
-private static void healthCheckFull(StringBuilder sb,
Collection res) {
-// we just want a brief summary or either UP or DOWN
-boolean up = res.stream().noneMatch(r ->
r.getState().equals(HealthCheck.State.DOWN));
-if (up) {
-sb.append("\"status\": \"UP\"");
-} else {
-sb.append("\"status\": \"DOWN\"");
-}
-List checks = new ArrayList<>(res);
+private static void healthCheckDetails(StringBuilder sb,
List checks, boolean up) {
+healthCheckStatus(sb, up);
+
if (!checks.isEmpty()) {
sb.append(",\n");
sb.append("\"checks\": [\n");
@@ -277,31 +291,6 @@ public final class VertxHttpServer {
}
}
-private static void healthCheckDefault(StringBuilder sb,
Collection res) {
-// we just want a brief summary or either UP or DOWN
-boolean up = res.stream().noneMatch(r ->
r.getState().equals(HealthCheck.State.DOWN));
-if (up) {
-sb.append("\"status\": \"UP\"\n");
-} else {
-// when we are DOWN then grab the only downs
-List down
-= res.stream().filter(r ->
r.getState().equals(HealthCheck.State.DOWN)).collect(Collectors.toList());
-sb.append("\"status\": \"DOWN\",\n");
-sb.append("\"checks\": [\n");
-for (int i = 0; i < down.size(); i++) {
-HealthCheck.Result d = down.get(i);
-
[camel] branch main updated (61b9254 -> 10effd4)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git. from 61b9254 Regen for commit b113e6562d150289329beb499abc852c0e4db82b new 12b84942 CAMEL-17848: camel-jbang - Health check reporting overall status readiness vs liveness new 10effd4 CAMEL-17848: health-check - reported kind should be what kind the health-check is. 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/impl/health/AbstractHealthCheck.java | 12 +++- .../support/ScheduledPollConsumerHealthCheck.java | 11 +++- .../org/apache/camel/main/VertxHttpServer.java | 69 +- 3 files changed, 47 insertions(+), 45 deletions(-)
