[camel] branch regen_bot updated (006ff4c -> 58f2885)
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 006ff4c Regen for commit a35c5ec526c53a985b4aec5a6820dc34cdfef684 add 2e0d5fd Upgrade Log4j to version 2.17.2 add 2ea18b7 Sync deps add 58f2885 Regen for commit 2ea18b7ef1a2545e21a49ec275aa8ce14456674d 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 (006ff4c) \ N -- N -- N refs/heads/regen_bot (58f2885) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request #7053: Generated sources regen
github-actions[bot] opened a new pull request #7053: URL: https://github.com/apache/camel/pull/7053 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: Regen for commit a35c5ec526c53a985b4aec5a6820dc34cdfef684
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 34e03b9 Regen for commit a35c5ec526c53a985b4aec5a6820dc34cdfef684 34e03b9 is described below commit 34e03b9ece44587ab47b4429d1d6e9171b60c704 Author: oscerd AuthorDate: Mon Feb 28 07:41:27 2022 + Regen for commit a35c5ec526c53a985b4aec5a6820dc34cdfef684 Signed-off-by: GitHub --- .../resources/org/apache/camel/catalog/others.properties | 1 - .../org/apache/camel/catalog/others/console.json | 15 --- 2 files changed, 16 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties index 5f99325..2ecc8b0 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties @@ -8,7 +8,6 @@ cloud cloudevents cluster componentdsl -console csimple-joor cxf-transport debug diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json deleted file mode 100644 index b1048bd..000 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "other": { -"kind": "other", -"name": "console", -"title": "Console", -"description": "Camel Developer Console", -"deprecated": false, -"firstVersion": "3.15.0", -"label": "core", -"supportLevel": "Preview", -"groupId": "org.apache.camel", -"artifactId": "camel-console", -"version": "3.16.0-SNAPSHOT" - } -}
[GitHub] [camel] oscerd merged pull request #7052: Generated sources regen
oscerd merged pull request #7052: URL: https://github.com/apache/camel/pull/7052 -- 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 (ed2e6cf -> 006ff4c)
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 ed2e6cf CAMEL-17701: camel-core-model - Add labels to EIP options add b4a4b32 Upgrade AWS SDK v2 to version 2.17.138 add a35c5ec Sync deps and regen add 006ff4c Regen for commit a35c5ec526c53a985b4aec5a6820dc34cdfef684 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request #7052: Generated sources regen
github-actions[bot] opened a new pull request #7052: URL: https://github.com/apache/camel/pull/7052 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 (8f644b3d -> ed2e6cf)
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 8f644b3d Regen for commit 9241613b8fb8a79908224b15f6e9b34549eb51cb add ed2e6cf CAMEL-17701: camel-core-model - Add labels to EIP options No new revisions were added by this update. Summary of changes: .../models/faultToleranceConfiguration.json| 26 +++--- .../org/apache/camel/catalog/models/filter.json| 2 +- .../camel/model/faultToleranceConfiguration.json | 26 +++--- .../resources/org/apache/camel/model/filter.json | 2 +- .../model/ExpressionSubElementDefinition.java | 1 + .../model/FaultToleranceConfigurationCommon.java | 26 +++--- .../org/apache/camel/model/FilterDefinition.java | 1 + .../org/apache/camel/model/FromDefinition.java | 8 --- 8 files changed, 48 insertions(+), 44 deletions(-)
[camel] branch main updated (a35c5ec -> 2ea18b7)
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. from a35c5ec Sync deps and regen new 2e0d5fd Upgrade Log4j to version 2.17.2 new 2ea18b7 Sync deps 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 | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] 02/02: Sync deps
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 2ea18b7ef1a2545e21a49ec275aa8ce14456674d Author: Andrea Cosentino AuthorDate: Mon Feb 28 08:00:44 2022 +0100 Sync deps --- camel-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 9128640..2365c12 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -382,7 +382,7 @@ 0.14.1 1.0.0 0.2.0 -2.17.1 +2.17.2 1.2.10 8.11.1 [8,9)
[camel] 01/02: Upgrade Log4j to version 2.17.2
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 2e0d5fd24111b993b7e06df55fe66e0365283c9c Author: Andrea Cosentino AuthorDate: Mon Feb 28 07:49:13 2022 +0100 Upgrade Log4j to version 2.17.2 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 19d706f..f3c196d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -365,7 +365,7 @@ 8.12.42 1.0.0 -2.17.1 +2.17.2 1.2.10 8.11.1 [8,9)
[camel] branch main updated (ed2e6cf -> a35c5ec)
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. from ed2e6cf CAMEL-17701: camel-core-model - Add labels to EIP options new b4a4b32 Upgrade AWS SDK v2 to version 2.17.138 new a35c5ec Sync deps and regen The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: camel-dependencies/pom.xml | 2 +- .../src/generated/resources/org/apache/camel/catalog/others.properties | 1 + .../generated/resources/org/apache/camel/catalog/others}/console.json | 0 parent/pom.xml | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) copy {core/camel-console/src/generated/resources => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/console.json (100%)
[camel] 01/02: Upgrade AWS SDK v2 to version 2.17.138
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 b4a4b326acdffdf468c7cea04b74b9d9063a6731 Author: Andrea Cosentino AuthorDate: Mon Feb 28 06:53:18 2022 +0100 Upgrade AWS SDK v2 to version 2.17.138 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 28ed48d..19d706f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -82,7 +82,7 @@ 1.11.0 1.11.0 4.1.1 -2.17.137 +2.17.138 2.6.1 1.2.14 2.13.1
[camel] 02/02: Sync deps and regen
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 a35c5ec526c53a985b4aec5a6820dc34cdfef684 Author: Andrea Cosentino AuthorDate: Mon Feb 28 07:40:39 2022 +0100 Sync deps and regen --- camel-dependencies/pom.xml| 2 +- .../resources/org/apache/camel/catalog/others.properties | 1 + .../org/apache/camel/catalog/others/console.json | 15 +++ 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 1524b21..9128640 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -65,7 +65,7 @@ 1.11.0 1.11.0 4.1.1 -2.17.137 +2.17.138 2.6.1 1.2.14 4.20.0 diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties index 2ecc8b0..5f99325 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties @@ -8,6 +8,7 @@ cloud cloudevents cluster componentdsl +console csimple-joor cxf-transport debug diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json new file mode 100644 index 000..b1048bd --- /dev/null +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json @@ -0,0 +1,15 @@ +{ + "other": { +"kind": "other", +"name": "console", +"title": "Console", +"description": "Camel Developer Console", +"deprecated": false, +"firstVersion": "3.15.0", +"label": "core", +"supportLevel": "Preview", +"groupId": "org.apache.camel", +"artifactId": "camel-console", +"version": "3.16.0-SNAPSHOT" + } +}
[camel] branch main updated: CAMEL-17701: camel-core-model - Add labels to EIP options
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 ed2e6cf CAMEL-17701: camel-core-model - Add labels to EIP options ed2e6cf is described below commit ed2e6cf7afab9b011ccfd683f46f2ea6879e783f Author: Claus Ibsen AuthorDate: Mon Feb 28 07:22:14 2022 +0100 CAMEL-17701: camel-core-model - Add labels to EIP options --- .../models/faultToleranceConfiguration.json| 26 +++--- .../org/apache/camel/catalog/models/filter.json| 2 +- .../camel/model/faultToleranceConfiguration.json | 26 +++--- .../resources/org/apache/camel/model/filter.json | 2 +- .../model/ExpressionSubElementDefinition.java | 1 + .../model/FaultToleranceConfigurationCommon.java | 26 +++--- .../org/apache/camel/model/FilterDefinition.java | 1 + .../org/apache/camel/model/FromDefinition.java | 8 --- 8 files changed, 48 insertions(+), 44 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/faultToleranceConfiguration.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/faultToleranceConfiguration.json index b656bc9..ccb1a99 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/faultToleranceConfiguration.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/faultToleranceConfiguration.json @@ -12,19 +12,19 @@ "output": false }, "properties": { -"circuitBreaker": { "kind": "attribute", "displayName": "Circuit Breaker", "label": "circuitbreaker", "required": false, "type": "object", "javaType": "io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker", "deprecated": false, "autowired": false, "secret": false, "description": "Refers to an existing io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker instance to lookup and use from the registry. When using this, then any other circuit breaker options are not in [...] -"delay": { "kind": "attribute", "displayName": "Delay", "label": "circuitbreaker", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5000", "description": "Control how long the circuit breaker stays open. The default is 5 seconds." }, -"successThreshold": { "kind": "attribute", "displayName": "Success Threshold", "label": "circuitbreaker", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1", "description": "Controls the number of trial calls which are allowed when the circuit breaker is half-open" }, -"requestVolumeThreshold": { "kind": "attribute", "displayName": "Request Volume Threshold", "label": "circuitbreaker", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "20", "description": "Controls the size of the rolling window used when the circuit breaker is closed" }, -"failureRatio": { "kind": "attribute", "displayName": "Failure Ratio", "label": "circuitbreaker", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "50", "description": "Configures the failure rate threshold in percentage. If the failure rate is equal or greater than the threshold the CircuitBreaker transitions to open and starts short-circuiting calls. The threshold must be greater than 0 [...] -"timeoutEnabled": { "kind": "attribute", "displayName": "Timeout Enabled", "label": "timeout", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether timeout is enabled or not on the circuit breaker. Default is false." }, -"timeoutDuration": { "kind": "attribute", "displayName": "Timeout Duration", "label": "timeout", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Configures the thread execution timeout. Default value is 1 second." }, -"timeoutPoolSize": { "kind": "attribute", "displayName": "Timeout Pool Size", "label": "timeout", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "10", "description": "Configures the pool size of the thread pool when timeout is enabled. Default value is 10." }, -"timeoutScheduledExecutorService": { "kind": "attribute", "displayName": "Timeout Scheduled Executor Service", "label":
svn commit: r52760 - /release/camel/camel-k/1.8.1/
Author: acosentino Date: Mon Feb 28 05:44:29 2022 New Revision: 52760 Log: Camel K 1.8.1 Added: release/camel/camel-k/1.8.1/ - copied from r52759, dev/camel/camel-k/1.8.1/
[GitHub] [camel-spring-boot] oscerd merged pull request #444: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
oscerd merged pull request #444: URL: https://github.com/apache/camel-spring-boot/pull/444 -- 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: [create-pull-request] automated change
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-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new 5161e7d [create-pull-request] automated change 5161e7d is described below commit 5161e7d681fed25f60e108a926397cfb0b46137a Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Mon Feb 28 01:13:53 2022 + [create-pull-request] automated change --- tooling/camel-spring-boot-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index b727fcc..3ce1ced 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -4301,7 +4301,7 @@ org.apache.cassandra cassandra-all -3.11.11 +3.11.12 org.apache.cxf.services.sts
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1053841054 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 1907671723-572-46beb2c0-aa6f-49c3-b5fd-109c3b55bd33 * Camel Quarkus Commit: 3a4315f7ef2c54b584b64f69617f7ec91af94603 * Camel Main Commit: cdaf5193834e16757b3cb2933dc1dadf59e35a92 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/1907671723 -- 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] zhfeng commented on pull request #7040: CAMEL-17474: camel-core - set transacted when copying exchange in mul…
zhfeng commented on pull request #7040: URL: https://github.com/apache/camel/pull/7040#issuecomment-1053836005 @davsclaus I add a similar fix for RecipientList and Split EIP. This issue only happens when it copies the exchange and sends it to more then one sub-route in the transacted context. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] zhfeng commented on pull request #7040: CAMEL-17474: camel-core - set transacted when copying exchange in mul…
zhfeng commented on pull request #7040: URL: https://github.com/apache/camel/pull/7040#issuecomment-1053762556 @jeremyross yeah, I think it could reslove the issue when using spring transactions. -- 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] zhfeng commented on a change in pull request #7040: CAMEL-17474: camel-core - set transacted when copying exchange in mul…
zhfeng commented on a change in pull request #7040: URL: https://github.com/apache/camel/pull/7040#discussion_r815524876 ## File path: core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java ## @@ -910,6 +910,7 @@ protected Integer getExchangeIndex(Exchange exchange) { for (Processor processor : processors) { // copy exchange, and do not share the unit of work Exchange copy = processorExchangeFactory.createCorrelatedCopy(exchange, false); + copy.adapt(ExtendedExchange.class).setTransacted(exchange.isTransacted()); Review comment: Thansk @davsclaus and I will take a look. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request #444: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
github-actions[bot] opened a new pull request #444: URL: https://github.com/apache/camel-spring-boot/pull/444 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch automatic-periodic-sync updated (113e924 -> cf168ad)
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-spring-boot.git. omit 113e924 [create-pull-request] automated change add e952e45 [create-pull-request] automated change add 4b971ba CAMEL-17715: upgrade to spring boot 2.6.4 add cf168ad [create-pull-request] automated change 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 (113e924) \ N -- N -- N refs/heads/automatic-periodic-sync (cf168ad) 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: archetypes/camel-archetype-spring-boot/pom.xml | 2 +- pom.xml| 2 +- tooling/camel-spring-boot-dependencies/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
[camel-k] branch dependabot/go_modules/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring-0.54.1 created (now 078a11c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring-0.54.1 in repository https://gitbox.apache.org/repos/asf/camel-k.git. at 078a11c chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring No new revisions were added by this update.
[GitHub] [camel-k] dependabot[bot] opened a new pull request #3037: chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring from 0.42.1 to 0.54.1
dependabot[bot] opened a new pull request #3037: URL: https://github.com/apache/camel-k/pull/3037 Bumps [github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring](https://github.com/prometheus-operator/prometheus-operator) from 0.42.1 to 0.54.1. Release notes Sourced from https://github.com/prometheus-operator/prometheus-operator/releases;>github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring's releases. 0.54.1 / 2021-02-24 [BUGFIX] Updated relabelConfig validation to accept Prometheus default config on labeldrop relabelConfig. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4579;>#4579 [BUGFIX] Fixed relabelConfigs for labelmap action. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4574;>#4574 0.54.0 / 2022-01-26 [FEATURE] Support SNS Receiver in AlertmanagerConfig CR. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4468;>#4468 [ENHANCEMENT] Specify SA token automounting on pod-level for operator and prometheus operand. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4514;>#4514 [ENHANCEMENT] Support following redirects and Oauth2 in HTTP Client config in raw alertmanager config secret. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4499;>#4499 [ENHANCEMENT] Add Replicas column for Thanos Ruler. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4496;>#4496 [ENHANCEMENT] Set User-Agent for the kubernetes client. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4506;>#4506 [BUGFIX] Avoid race during recreation of StatefulSet(s). https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4504;>#4504 [BUGFIX] Add validation for proberSpec url field in ProbeSpec. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4483;>#4483 [BUGFIX] Add validation for relabel configs. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4429;>#4429 [BUGFIX] Add validation for scrapeTimeout validation. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4491;>#4491 0.53.1 / 2021-12-20 [BUGFIX] Fixed the validation pattern for the february month in the AlertManagerConfig CRD. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4458;>#4458 0.53.0 / 2021-12-16 [CHANGE] Added startup probe to Prometheus. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4433;>#4433 https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4369;>#4369 [FEATURE] Added support for mute time intervals in the AlertManagerConfig CRD. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4388;>#4388 [FEATURE] Added support for new matching syntax in the routes configuration of the AlertmanagerConfig CRD. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4332;>#4332 [FEATURE] Added support for new matching syntax in the inhibit rules configuration of the AlertmanagerConfig CRD. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4329;>#4329 [FEATURE] Added headers in the Remote Read configuration of the Prometheus CRD. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4323;>#4323 [FEATURE] Added retryOnRateLimit in the Remote Write configuration of the Prometheus CRD. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4420;>#4420 [FEATURE] Added support for PagerDuty links and images in the AlertManagerConfig CR. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4425;>#4425 [ENHANCEMENT] Optimized the generated Prometheus configuration to make it compatible with the new Prometheus agent mode. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4417;>#4417 [BUGFIX] Improved validation for the Alertmanager CRD to match with upstream Alertmanager. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4434;>#4434 [BUGFIX] Fixed propagation of annotations from spec.podMetadata to the StatefulSet's pods. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4422;>#4422 [BUGFIX] Ensured that group_by values are unique in the generated Alertmanager configuration. https://github-redirect.dependabot.com/prometheus-operator/prometheus-operator/issues/4413;>#4413 [BUGFIX] Fixed generated secrets being larger than the maximum size limit of 1048576 bytes.
[GitHub] [camel-k] dependabot[bot] closed pull request #2981: chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring from 0.42.1 to 0.54.0
dependabot[bot] closed pull request #2981: URL: https://github.com/apache/camel-k/pull/2981 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] dependabot[bot] commented on pull request #2981: chore(deps): bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring from 0.42.1 to 0.54.0
dependabot[bot] commented on pull request #2981: URL: https://github.com/apache/camel-k/pull/2981#issuecomment-1053751685 Superseded by #3037. -- 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 (5b5e2c5 -> 8f644b3d)
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 5b5e2c5 Regen for commit 9241613b8fb8a79908224b15f6e9b34549eb51cb add 8f644b3d Regen for commit 9241613b8fb8a79908224b15f6e9b34549eb51cb 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 (5b5e2c5) \ N -- N -- N refs/heads/regen_bot (8f644b3d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[camel] branch main updated: Regen for commit 9241613b8fb8a79908224b15f6e9b34549eb51cb
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 8f644b3d Regen for commit 9241613b8fb8a79908224b15f6e9b34549eb51cb 8f644b3d is described below commit 8f644b3de8c354ee8efe51ab5c8b37d812412b4e Author: oscerd AuthorDate: Sun Feb 27 19:18:45 2022 + Regen for commit 9241613b8fb8a79908224b15f6e9b34549eb51cb Signed-off-by: GitHub --- .../resources/org/apache/camel/catalog/others.properties | 1 - .../org/apache/camel/catalog/others/console.json | 15 --- 2 files changed, 16 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties index 5f99325..2ecc8b0 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties @@ -8,7 +8,6 @@ cloud cloudevents cluster componentdsl -console csimple-joor cxf-transport debug diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json deleted file mode 100644 index b1048bd..000 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "other": { -"kind": "other", -"name": "console", -"title": "Console", -"description": "Camel Developer Console", -"deprecated": false, -"firstVersion": "3.15.0", -"label": "core", -"supportLevel": "Preview", -"groupId": "org.apache.camel", -"artifactId": "camel-console", -"version": "3.16.0-SNAPSHOT" - } -}
[GitHub] [camel] oscerd merged pull request #7051: Generated sources regen
oscerd merged pull request #7051: URL: https://github.com/apache/camel/pull/7051 -- 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 (39a57ca -> 5b5e2c5)
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 39a57ca Regen for commit 13a2f2e3c9178c5575bc1701f0dfdbf654e2722d add 9241613 Regen for commit 13a2f2e3c9178c5575bc1701f0dfdbf654e2722d add 5b5e2c5 Regen for commit 9241613b8fb8a79908224b15f6e9b34549eb51cb 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 (39a57ca) \ N -- N -- N refs/heads/regen_bot (5b5e2c5) 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: .../resources/org/apache/camel/catalog/others.properties | 1 - .../org/apache/camel/catalog/others/console.json | 15 --- 2 files changed, 16 deletions(-) delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json
[GitHub] [camel] github-actions[bot] opened a new pull request #7051: Generated sources regen
github-actions[bot] opened a new pull request #7051: URL: https://github.com/apache/camel/pull/7051 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: Regen for commit 13a2f2e3c9178c5575bc1701f0dfdbf654e2722d
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 9241613 Regen for commit 13a2f2e3c9178c5575bc1701f0dfdbf654e2722d 9241613 is described below commit 9241613b8fb8a79908224b15f6e9b34549eb51cb Author: oscerd AuthorDate: Sun Feb 27 18:04:08 2022 + Regen for commit 13a2f2e3c9178c5575bc1701f0dfdbf654e2722d Signed-off-by: GitHub --- .../resources/org/apache/camel/catalog/others.properties | 1 + .../org/apache/camel/catalog/others/console.json | 15 +++ 2 files changed, 16 insertions(+) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties index 2ecc8b0..5f99325 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties @@ -8,6 +8,7 @@ cloud cloudevents cluster componentdsl +console csimple-joor cxf-transport debug diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json new file mode 100644 index 000..b1048bd --- /dev/null +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json @@ -0,0 +1,15 @@ +{ + "other": { +"kind": "other", +"name": "console", +"title": "Console", +"description": "Camel Developer Console", +"deprecated": false, +"firstVersion": "3.15.0", +"label": "core", +"supportLevel": "Preview", +"groupId": "org.apache.camel", +"artifactId": "camel-console", +"version": "3.16.0-SNAPSHOT" + } +}
[GitHub] [camel] oscerd merged pull request #7050: Generated sources regen
oscerd merged pull request #7050: URL: https://github.com/apache/camel/pull/7050 -- 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 (5552435 -> 39a57ca)
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 5552435 Regen for commit 2d395bd8a82535cdf8caa914a47a03d254de0846 add 13a2f2e Regen for commit 2d395bd8a82535cdf8caa914a47a03d254de0846 add 39a57ca Regen for commit 13a2f2e3c9178c5575bc1701f0dfdbf654e2722d 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 (5552435) \ N -- N -- N refs/heads/regen_bot (39a57ca) 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: .../src/generated/resources/org/apache/camel/catalog/others.properties | 1 + .../generated/resources/org/apache/camel/catalog/others}/console.json| 0 2 files changed, 1 insertion(+) copy {core/camel-console/src/generated/resources => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/console.json (100%)
[GitHub] [camel] github-actions[bot] opened a new pull request #7050: Generated sources regen
github-actions[bot] opened a new pull request #7050: URL: https://github.com/apache/camel/pull/7050 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: Regen for commit 2d395bd8a82535cdf8caa914a47a03d254de0846
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 13a2f2e Regen for commit 2d395bd8a82535cdf8caa914a47a03d254de0846 13a2f2e is described below commit 13a2f2e3c9178c5575bc1701f0dfdbf654e2722d Author: davsclaus AuthorDate: Sun Feb 27 17:00:19 2022 + Regen for commit 2d395bd8a82535cdf8caa914a47a03d254de0846 Signed-off-by: GitHub --- .../resources/org/apache/camel/catalog/others.properties | 1 - .../org/apache/camel/catalog/others/console.json | 15 --- 2 files changed, 16 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties index 5f99325..2ecc8b0 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties @@ -8,7 +8,6 @@ cloud cloudevents cluster componentdsl -console csimple-joor cxf-transport debug diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json deleted file mode 100644 index b1048bd..000 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "other": { -"kind": "other", -"name": "console", -"title": "Console", -"description": "Camel Developer Console", -"deprecated": false, -"firstVersion": "3.15.0", -"label": "core", -"supportLevel": "Preview", -"groupId": "org.apache.camel", -"artifactId": "camel-console", -"version": "3.16.0-SNAPSHOT" - } -}
[GitHub] [camel] oscerd merged pull request #7049: Generated sources regen
oscerd merged pull request #7049: URL: https://github.com/apache/camel/pull/7049 -- 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 (c592d93 -> 5552435)
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 c592d93 Regen for commit 4be2b35f780958c47bb609fe8ca51298ca5a6524 (#7048) add 2d395bd CAMEL-17701: camel-core-model - Add labels to EIP options add 5552435 Regen for commit 2d395bd8a82535cdf8caa914a47a03d254de0846 No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/models/aggregate.json | 30 +++--- .../org/apache/camel/catalog/models/bean.json | 3 +-- .../camel/catalog/models/circuitBreaker.json | 2 +- .../apache/camel/catalog/models/contextScan.json | 2 +- .../apache/camel/catalog/models/convertBodyTo.json | 4 +-- .../org/apache/camel/catalog/models/delay.json | 4 +-- .../apache/camel/catalog/models/description.json | 2 +- .../apache/camel/catalog/models/dynamicRouter.json | 4 +-- .../apache/camel/catalog/models/templateBean.json | 4 +-- .../camel/catalog/models/templatedRouteBean.json | 4 +-- .../org/apache/camel/catalog/others.properties | 1 - .../org/apache/camel/catalog/others/console.json | 15 --- .../apache/camel/catalog/schemas/camel-spring.xsd | 23 ++--- .../org/apache/camel/model/aggregate.json | 30 +++--- .../resources/org/apache/camel/model/bean.json | 3 +-- .../org/apache/camel/model/circuitBreaker.json | 2 +- .../org/apache/camel/model/contextScan.json| 2 +- .../org/apache/camel/model/convertBodyTo.json | 4 +-- .../resources/org/apache/camel/model/delay.json| 4 +-- .../org/apache/camel/model/description.json| 2 +- .../org/apache/camel/model/dynamicRouter.json | 4 +-- .../org/apache/camel/model/templateBean.json | 4 +-- .../org/apache/camel/model/templatedRouteBean.json | 4 +-- .../apache/camel/model/AggregateDefinition.java| 25 ++ .../org/apache/camel/model/BeanDefinition.java | 16 +--- .../apache/camel/model/BeanFactoryDefinition.java | 14 ++ .../org/apache/camel/model/CatchDefinition.java| 6 +++-- .../org/apache/camel/model/ChoiceDefinition.java | 5 ++-- .../camel/model/CircuitBreakerDefinition.java | 1 + .../apache/camel/model/ContextScanDefinition.java | 3 ++- .../apache/camel/model/ConvertBodyDefinition.java | 9 --- .../apache/camel/model/DataFormatDefinition.java | 1 + .../camel/model/DataFormatDefinitionAware.java | 1 + .../org/apache/camel/model/DelayDefinition.java| 10 .../apache/camel/model/DescriptionDefinition.java | 5 .../camel/model/DynamicRouterDefinition.java | 4 +-- .../camel/model/OptionalIdentifiedDefinition.java | 1 + .../java/org/apache/camel/xml/in/ModelParser.java | 1 - .../dsl/yaml/deserializers/ModelDeserializers.java | 8 +- .../src/generated/resources/camel-yaml-dsl.json| 3 --- .../src/generated/resources/camelYamlDsl.json | 3 --- 41 files changed, 129 insertions(+), 144 deletions(-) delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json
[GitHub] [camel] github-actions[bot] opened a new pull request #7049: Generated sources regen
github-actions[bot] opened a new pull request #7049: URL: https://github.com/apache/camel/pull/7049 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 (1f2a0ff -> c592d93)
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 1f2a0ff CAMEL-17293: camel-jbang/camel-yaml-dsl - Add support for camel-k spec/configuration add c592d93 Regen for commit 4be2b35f780958c47bb609fe8ca51298ca5a6524 (#7048) No new revisions were added by this update. Summary of changes: .../src/generated/resources/org/apache/camel/catalog/others.properties | 1 + .../generated/resources/org/apache/camel/catalog/others}/console.json| 0 2 files changed, 1 insertion(+) copy {core/camel-console/src/generated/resources => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/console.json (100%)
[camel] branch main updated: CAMEL-17701: camel-core-model - Add labels to EIP options
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 2d395bd CAMEL-17701: camel-core-model - Add labels to EIP options 2d395bd is described below commit 2d395bd8a82535cdf8caa914a47a03d254de0846 Author: Claus Ibsen AuthorDate: Sun Feb 27 17:06:12 2022 +0100 CAMEL-17701: camel-core-model - Add labels to EIP options --- .../org/apache/camel/catalog/models/aggregate.json | 30 +++--- .../org/apache/camel/catalog/models/bean.json | 3 +-- .../camel/catalog/models/circuitBreaker.json | 2 +- .../apache/camel/catalog/models/contextScan.json | 2 +- .../apache/camel/catalog/models/convertBodyTo.json | 4 +-- .../org/apache/camel/catalog/models/delay.json | 4 +-- .../apache/camel/catalog/models/description.json | 2 +- .../apache/camel/catalog/models/dynamicRouter.json | 4 +-- .../apache/camel/catalog/models/templateBean.json | 4 +-- .../camel/catalog/models/templatedRouteBean.json | 4 +-- .../apache/camel/catalog/schemas/camel-spring.xsd | 23 ++--- .../org/apache/camel/model/aggregate.json | 30 +++--- .../resources/org/apache/camel/model/bean.json | 3 +-- .../org/apache/camel/model/circuitBreaker.json | 2 +- .../org/apache/camel/model/contextScan.json| 2 +- .../org/apache/camel/model/convertBodyTo.json | 4 +-- .../resources/org/apache/camel/model/delay.json| 4 +-- .../org/apache/camel/model/description.json| 2 +- .../org/apache/camel/model/dynamicRouter.json | 4 +-- .../org/apache/camel/model/templateBean.json | 4 +-- .../org/apache/camel/model/templatedRouteBean.json | 4 +-- .../apache/camel/model/AggregateDefinition.java| 25 ++ .../org/apache/camel/model/BeanDefinition.java | 16 +--- .../apache/camel/model/BeanFactoryDefinition.java | 14 ++ .../org/apache/camel/model/CatchDefinition.java| 6 +++-- .../org/apache/camel/model/ChoiceDefinition.java | 5 ++-- .../camel/model/CircuitBreakerDefinition.java | 1 + .../apache/camel/model/ContextScanDefinition.java | 3 ++- .../apache/camel/model/ConvertBodyDefinition.java | 9 --- .../apache/camel/model/DataFormatDefinition.java | 1 + .../camel/model/DataFormatDefinitionAware.java | 1 + .../org/apache/camel/model/DelayDefinition.java| 10 .../apache/camel/model/DescriptionDefinition.java | 5 .../camel/model/DynamicRouterDefinition.java | 4 +-- .../camel/model/OptionalIdentifiedDefinition.java | 1 + .../java/org/apache/camel/xml/in/ModelParser.java | 1 - .../dsl/yaml/deserializers/ModelDeserializers.java | 8 +- .../src/generated/resources/camel-yaml-dsl.json| 3 --- .../src/generated/resources/camelYamlDsl.json | 3 --- 39 files changed, 129 insertions(+), 128 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/aggregate.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/aggregate.json index d5c2049..6706227 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/aggregate.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/aggregate.json @@ -13,10 +13,10 @@ }, "properties": { "correlationExpression": { "kind": "expression", "displayName": "Correlation Expression", "required": true, "type": "object", "javaType": "org.apache.camel.model.ExpressionSubElementDefinition", "oneOf": [ "constant", "csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser", "joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "autowired": false, "secret": false, "desc [...] -"completionPredicate": { "kind": "expression", "displayName": "Completion Predicate", "required": false, "type": "object", "javaType": "org.apache.camel.model.ExpressionSubElementDefinition", "oneOf": [ "constant", "csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser", "joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "autowired": false, "secret": false, "asPredi [...] -"completionTimeoutExpression": { "kind": "expression", "displayName": "Completion Timeout Expression", "required": false, "type": "object", "javaType": "org.apache.camel.model.ExpressionSubElementDefinition", "oneOf": [ "constant", "csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser", "joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple", "spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated":
[camel] branch regen_bot updated (d5e16d6 -> 1f2a0ff)
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 d5e16d6 Regen for commit 4be2b35f780958c47bb609fe8ca51298ca5a6524 add 1f2a0ff CAMEL-17293: camel-jbang/camel-yaml-dsl - Add support for camel-k spec/configuration 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 (d5e16d6) \ N -- N -- N refs/heads/regen_bot (1f2a0ff) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/others.properties | 1 - .../org/apache/camel/catalog/others/console.json | 15 --- .../IntegrationConfigurationPropertiesSource.java} | 28 + .../camel/dsl/yaml/YamlRoutesBuilderLoader.java| 43 +++ ...derTest.groovy => IntegrationLoaderTest.groovy} | 49 ++ 5 files changed, 75 insertions(+), 61 deletions(-) delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json copy dsl/{camel-dsl-modeline/src/main/java/org/apache/camel/dsl/modeline/PropertyTrait.java => camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/IntegrationConfigurationPropertiesSource.java} (74%) copy dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/{KameletIntegrationLoaderTest.groovy => IntegrationLoaderTest.groovy} (51%)
[camel] branch main updated: Regen for commit 4be2b35f780958c47bb609fe8ca51298ca5a6524 (#7048)
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 c592d93 Regen for commit 4be2b35f780958c47bb609fe8ca51298ca5a6524 (#7048) c592d93 is described below commit c592d93b863141f11be2008042ee8e2ea40afa69 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sun Feb 27 16:28:17 2022 +0100 Regen for commit 4be2b35f780958c47bb609fe8ca51298ca5a6524 (#7048) Signed-off-by: GitHub Co-authored-by: oscerd --- .../resources/org/apache/camel/catalog/others.properties | 1 + .../org/apache/camel/catalog/others/console.json | 15 +++ 2 files changed, 16 insertions(+) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties index 2ecc8b0..5f99325 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties @@ -8,6 +8,7 @@ cloud cloudevents cluster componentdsl +console csimple-joor cxf-transport debug diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json new file mode 100644 index 000..b1048bd --- /dev/null +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json @@ -0,0 +1,15 @@ +{ + "other": { +"kind": "other", +"name": "console", +"title": "Console", +"description": "Camel Developer Console", +"deprecated": false, +"firstVersion": "3.15.0", +"label": "core", +"supportLevel": "Preview", +"groupId": "org.apache.camel", +"artifactId": "camel-console", +"version": "3.16.0-SNAPSHOT" + } +}
[GitHub] [camel] davsclaus merged pull request #7048: Generated sources regen
davsclaus merged pull request #7048: URL: https://github.com/apache/camel/pull/7048 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #7048: Generated sources regen
davsclaus commented on pull request #7048: URL: https://github.com/apache/camel/pull/7048#issuecomment-1053589052 Its weird what happens in the build that either delete or adds camel-console - this one should be included so I can't see what makes the CI build sometime remove it -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: CAMEL-17293: camel-jbang/camel-yaml-dsl - Add support for camel-k spec/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.git The following commit(s) were added to refs/heads/main by this push: new 1f2a0ff CAMEL-17293: camel-jbang/camel-yaml-dsl - Add support for camel-k spec/configuration 1f2a0ff is described below commit 1f2a0ff41cd66ea338dedc9b99b6dc399fe02aec Author: Claus Ibsen AuthorDate: Sun Feb 27 16:10:15 2022 +0100 CAMEL-17293: camel-jbang/camel-yaml-dsl - Add support for camel-k spec/configuration --- .../IntegrationConfigurationPropertiesSource.java | 85 ++ .../camel/dsl/yaml/YamlRoutesBuilderLoader.java| 43 +++ .../camel/dsl/yaml/IntegrationLoaderTest.groovy| 56 ++ 3 files changed, 184 insertions(+) diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/IntegrationConfigurationPropertiesSource.java b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/IntegrationConfigurationPropertiesSource.java new file mode 100644 index 000..9c326ed --- /dev/null +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/IntegrationConfigurationPropertiesSource.java @@ -0,0 +1,85 @@ +/* + * 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.dsl.yaml; + +import java.io.InputStream; +import java.util.Properties; + +import org.apache.camel.CamelContext; +import org.apache.camel.CamelContextAware; +import org.apache.camel.spi.PropertiesSource; +import org.apache.camel.support.ResourceHelper; +import org.apache.camel.util.OrderedProperties; +import org.apache.camel.util.StringHelper; + +/** + * {@link PropertiesSource} for camel-k integration spec/configuration values. + */ +public class IntegrationConfigurationPropertiesSource implements PropertiesSource, CamelContextAware { + +private final Properties properties = new OrderedProperties(); +private CamelContext camelContext; + +@Override +public CamelContext getCamelContext() { +return camelContext; +} + +@Override +public void setCamelContext(CamelContext camelContext) { +this.camelContext = camelContext; +} + +@Override +public String getName() { +return "integration-configuration"; +} + +@Override +public String getProperty(String name) { +return properties.getProperty(name); +} + +public void parseConfigurationValue(String line) { +if (line.contains("=")) { +String key = StringHelper.before(line, "=").trim(); +String value = StringHelper.after(line, "=").trim(); +properties.setProperty(key, value); +} else { +if (ResourceHelper.hasScheme(line)) { +// it is a properties file so load resource +try (InputStream is = ResourceHelper.resolveResourceAsInputStream(camelContext, line)) { +Properties prop = new Properties(); +prop.load(is); +for (String k : prop.stringPropertyNames()) { +String v = prop.getProperty(k); +String key = k.trim(); +String value = v.trim(); +properties.setProperty(key, value); +} +} catch (Exception e) { +// ignore +} +} +} +} + +@Override +public String toString() { +return "camel-yaml-dsl"; +} +} diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java index 23a5b53..9040a16 100644 --- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java +++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/main/java/org/apache/camel/dsl/yaml/YamlRoutesBuilderLoader.java @@ -52,6 +52,7 @@ import org.apache.camel.model.rest.RestDefinition; import org.apache.camel.model.rest.VerbDefinition; import
[camel] branch regen_bot updated (5c7b8c6 -> d5e16d6)
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 5c7b8c6 Regen for commit 776dd0562e5fc68a2010e7281a5170ba4c0ea29a add 4be2b35 Regen for commit 776dd0562e5fc68a2010e7281a5170ba4c0ea29a add d5e16d6 Regen for commit 4be2b35f780958c47bb609fe8ca51298ca5a6524 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 (5c7b8c6) \ N -- N -- N refs/heads/regen_bot (d5e16d6) 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: .../src/generated/resources/org/apache/camel/catalog/others.properties | 1 + .../generated/resources/org/apache/camel/catalog/others}/console.json| 0 2 files changed, 1 insertion(+) copy {core/camel-console/src/generated/resources => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/console.json (100%)
[GitHub] [camel] github-actions[bot] opened a new pull request #7048: Generated sources regen
github-actions[bot] opened a new pull request #7048: URL: https://github.com/apache/camel/pull/7048 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: Regen for commit 776dd0562e5fc68a2010e7281a5170ba4c0ea29a
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 4be2b35 Regen for commit 776dd0562e5fc68a2010e7281a5170ba4c0ea29a 4be2b35 is described below commit 4be2b35f780958c47bb609fe8ca51298ca5a6524 Author: oscerd AuthorDate: Sun Feb 27 13:12:33 2022 + Regen for commit 776dd0562e5fc68a2010e7281a5170ba4c0ea29a Signed-off-by: GitHub --- .../resources/org/apache/camel/catalog/others.properties | 1 - .../org/apache/camel/catalog/others/console.json | 15 --- 2 files changed, 16 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties index 5f99325..2ecc8b0 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties @@ -8,7 +8,6 @@ cloud cloudevents cluster componentdsl -console csimple-joor cxf-transport debug diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json deleted file mode 100644 index b1048bd..000 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "other": { -"kind": "other", -"name": "console", -"title": "Console", -"description": "Camel Developer Console", -"deprecated": false, -"firstVersion": "3.15.0", -"label": "core", -"supportLevel": "Preview", -"groupId": "org.apache.camel", -"artifactId": "camel-console", -"version": "3.16.0-SNAPSHOT" - } -}
[GitHub] [camel] oscerd merged pull request #7047: Generated sources regen
oscerd merged pull request #7047: URL: https://github.com/apache/camel/pull/7047 -- 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 (693254c -> 5c7b8c6)
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 693254c Regen for commit e3f41eb6dfbba51a8050f256110af5481c38dd90 add 776dd05 Regen for commit e3f41eb6dfbba51a8050f256110af5481c38dd90 add 5c7b8c6 Regen for commit 776dd0562e5fc68a2010e7281a5170ba4c0ea29a 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 (693254c) \ N -- N -- N refs/heads/regen_bot (5c7b8c6) 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: .../resources/org/apache/camel/catalog/others.properties | 1 - .../org/apache/camel/catalog/others/console.json | 15 --- 2 files changed, 16 deletions(-) delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json
[GitHub] [camel] github-actions[bot] opened a new pull request #7047: Generated sources regen
github-actions[bot] opened a new pull request #7047: URL: https://github.com/apache/camel/pull/7047 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: Regen for commit e3f41eb6dfbba51a8050f256110af5481c38dd90
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 776dd05 Regen for commit e3f41eb6dfbba51a8050f256110af5481c38dd90 776dd05 is described below commit 776dd0562e5fc68a2010e7281a5170ba4c0ea29a Author: oscerd AuthorDate: Sun Feb 27 12:20:47 2022 + Regen for commit e3f41eb6dfbba51a8050f256110af5481c38dd90 Signed-off-by: GitHub --- .../resources/org/apache/camel/catalog/others.properties | 1 + .../org/apache/camel/catalog/others/console.json | 15 +++ 2 files changed, 16 insertions(+) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties index 2ecc8b0..5f99325 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties @@ -8,6 +8,7 @@ cloud cloudevents cluster componentdsl +console csimple-joor cxf-transport debug diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json new file mode 100644 index 000..b1048bd --- /dev/null +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json @@ -0,0 +1,15 @@ +{ + "other": { +"kind": "other", +"name": "console", +"title": "Console", +"description": "Camel Developer Console", +"deprecated": false, +"firstVersion": "3.15.0", +"label": "core", +"supportLevel": "Preview", +"groupId": "org.apache.camel", +"artifactId": "camel-console", +"version": "3.16.0-SNAPSHOT" + } +}
[GitHub] [camel] oscerd merged pull request #7046: Generated sources regen
oscerd merged pull request #7046: URL: https://github.com/apache/camel/pull/7046 -- 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 (cdbefbb -> 693254c)
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 cdbefbb Regen for commit f32cbcff7ac452424d127bc37c79ddbb5ee489c1 add b2ba105 Upgrade cassandra 3.11.12 add e3f41eb Regen for commit f32cbcff7ac452424d127bc37c79ddbb5ee489c1 add 693254c Regen for commit e3f41eb6dfbba51a8050f256110af5481c38dd90 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 (cdbefbb) \ N -- N -- N refs/heads/regen_bot (693254c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml| 4 ++-- .../generated/resources/org/apache/camel/catalog/others.properties| 1 + .../generated/resources/org/apache/camel/catalog/others}/console.json | 0 parent/pom.xml| 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) copy {core/camel-console/src/generated/resources => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/console.json (100%)
[GitHub] [camel] github-actions[bot] opened a new pull request #7046: Generated sources regen
github-actions[bot] opened a new pull request #7046: URL: https://github.com/apache/camel/pull/7046 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-3.11.x updated (0f3fd44 -> c6a6033)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot-3.11.x in repository https://gitbox.apache.org/repos/asf/camel.git. omit 0f3fd44 Regen for commit 4ebeafb9a4ea5092bba21db4b59c3dab2ac589c1 add c6a6033 Regen for commit 4ebeafb9a4ea5092bba21db4b59c3dab2ac589c1 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 (0f3fd44) \ N -- N -- N refs/heads/regen_bot-3.11.x (c6a6033) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[camel] branch main updated: Regen for commit f32cbcff7ac452424d127bc37c79ddbb5ee489c1
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 e3f41eb Regen for commit f32cbcff7ac452424d127bc37c79ddbb5ee489c1 e3f41eb is described below commit e3f41eb6dfbba51a8050f256110af5481c38dd90 Author: davsclaus AuthorDate: Sun Feb 27 10:35:32 2022 + Regen for commit f32cbcff7ac452424d127bc37c79ddbb5ee489c1 Signed-off-by: GitHub --- .../resources/org/apache/camel/catalog/others.properties | 1 - .../org/apache/camel/catalog/others/console.json | 15 --- .../META-INF/services/org/apache/camel/other.properties | 2 +- .../META-INF/services/org/apache/camel/other.properties | 2 +- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties index 5f99325..2ecc8b0 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others.properties @@ -8,7 +8,6 @@ cloud cloudevents cluster componentdsl -console csimple-joor cxf-transport debug diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json deleted file mode 100644 index b1048bd..000 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "other": { -"kind": "other", -"name": "console", -"title": "Console", -"description": "Camel Developer Console", -"deprecated": false, -"firstVersion": "3.15.0", -"label": "core", -"supportLevel": "Preview", -"groupId": "org.apache.camel", -"artifactId": "camel-console", -"version": "3.16.0-SNAPSHOT" - } -} diff --git a/components/camel-test/camel-test-cdi-junit5/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-test/camel-test-cdi-junit5/src/generated/resources/META-INF/services/org/apache/camel/other.properties index 6e8f9ff..b14ac04 100644 --- a/components/camel-test/camel-test-cdi-junit5/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ b/components/camel-test/camel-test-cdi-junit5/src/generated/resources/META-INF/services/org/apache/camel/other.properties @@ -3,5 +3,5 @@ name=test-cdi-junit5 groupId=org.apache.camel artifactId=camel-test-cdi-junit5 version=3.16.0-SNAPSHOT -projectName=Camel :: Test :: CDI:: JUnit5 +projectName=Camel :: Test :: CDI :: JUnit5 projectDescription=Camel unit testing with CDI and JUnit5 diff --git a/components/camel-test/camel-test-spring-junit5/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/components/camel-test/camel-test-spring-junit5/src/generated/resources/META-INF/services/org/apache/camel/other.properties index dd472bf..15aec84 100644 --- a/components/camel-test/camel-test-spring-junit5/src/generated/resources/META-INF/services/org/apache/camel/other.properties +++ b/components/camel-test/camel-test-spring-junit5/src/generated/resources/META-INF/services/org/apache/camel/other.properties @@ -3,5 +3,5 @@ name=test-spring-junit5 groupId=org.apache.camel artifactId=camel-test-spring-junit5 version=3.16.0-SNAPSHOT -projectName=Camel :: Test :: Spring:: JUnit5 +projectName=Camel :: Test :: Spring :: JUnit5 projectDescription=Camel unit testing with Spring and JUnit 5
[GitHub] [camel] oscerd merged pull request #7044: Generated sources regen
oscerd merged pull request #7044: URL: https://github.com/apache/camel/pull/7044 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch camel-3.11.x updated: Regen for commit 4ebeafb9a4ea5092bba21db4b59c3dab2ac589c1
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-3.11.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.11.x by this push: new c6a6033 Regen for commit 4ebeafb9a4ea5092bba21db4b59c3dab2ac589c1 c6a6033 is described below commit c6a60338698c36cd1b6a4c21990d17e6cd77af0b Author: davsclaus AuthorDate: Sun Feb 27 10:41:42 2022 + Regen for commit 4ebeafb9a4ea5092bba21db4b59c3dab2ac589c1 Signed-off-by: GitHub --- .../resources/org/apache/camel/catalog/components/ahc-wss.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ahc-wss.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ahc-wss.json index ef43bd4..4c3f41b 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ahc-wss.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/ahc-wss.json @@ -11,7 +11,7 @@ "supportLevel": "Stable", "groupId": "org.apache.camel", "artifactId": "camel-ahc-ws", -"version": "3.11.1-SNAPSHOT", +"version": "3.11.6-SNAPSHOT", "scheme": "ahc-wss", "extendsScheme": "ahc", "alternativeSchemes": "ahc-ws,ahc-wss",
[GitHub] [camel] oscerd merged pull request #7045: Generated sources regen
oscerd merged pull request #7045: URL: https://github.com/apache/camel/pull/7045 -- 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_3.14.x updated (3de02b9 -> b1c7d69)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 3de02b9 CAMEL-17712: Clear thread local when camel context is stopped. add b1c7d69 Upgrade cassandra 3.11.12 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
[camel] branch regen_bot-3.11.x updated (1351dd1 -> 0f3fd44)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot-3.11.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 1351dd1 CAMEL-17712: Clear thread local when camel context is stopped. add 4ebeafb Upgrade cassandra 3.11.12 add 0f3fd44 Regen for commit 4ebeafb9a4ea5092bba21db4b59c3dab2ac589c1 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml| 4 ++-- .../resources/org/apache/camel/catalog/components/ahc-wss.json| 2 +- parent/pom.xml| 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request #7045: Generated sources regen
github-actions[bot] opened a new pull request #7045: URL: https://github.com/apache/camel/pull/7045 Regen bot :robot: found some uncommited changes after running build on :camel: camel-3.11.x. Please do not delete `regen_bot-3.11.x` 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 (ce0bcbe -> cdbefbb)
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 ce0bcbe Regen for commit 9fbfb3dc5454b80689a12bc5e5910669c364b077 add f32cbcf Polished add cdbefbb Regen for commit f32cbcff7ac452424d127bc37c79ddbb5ee489c1 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 (ce0bcbe) \ N -- N -- N refs/heads/regen_bot (cdbefbb) 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-test/camel-test-cdi-junit5/pom.xml | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- components/camel-test/camel-test-spring-junit5/pom.xml | 2 +- .../resources/META-INF/services/org/apache/camel/other.properties | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
[camel] branch regen_bot updated (cae2be4 -> ce0bcbe)
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 cae2be4 Upgrade spring boot 4.3.5 add 8e97a7d Upgrade micrometer 1.8.3 add 9fbfb3d CAMEL-17690: camel-test-main - Annotation based testing (#7041) add ce0bcbe Regen for commit 9fbfb3dc5454b80689a12bc5e5910669c364b077 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- .../org/apache/camel/catalog/others.properties | 1 - .../org/apache/camel/catalog/others/console.json | 15 - .../camel-test/camel-test-main-junit5/pom.xml | 15 + .../src/main/docs/test-main-junit5.adoc| 405 +++- .../camel/test/main/junit5/AdviceRouteMapping.java | 63 .../camel/test/main/junit5/CamelMainContext.java | 420 + .../camel/test/main/junit5/CamelMainExtension.java | 178 + .../camel/test/main/junit5/CamelMainTest.java | 198 ++ .../test/main/junit5/CamelMainTestSupport.java | 38 +- .../apache/camel/test/main/junit5/Configure.java | 62 +++ .../camel/test/main/junit5/DebuggerCallback.java | 41 ++ .../camel/test/main/junit5/MainForTest.java} | 30 +- .../camel/test/main/junit5/ReplaceInRegistry.java | 85 + .../junit5/{ => annotation}/AdviceRouteTest.java | 40 +- .../DumpRouteCoverageTest.java}| 36 +- .../InheritanceTest.java} | 20 +- .../main/junit5/annotation/MockEndpointTest.java | 93 + .../annotation/MockEndpointsAndSkipTest.java | 83 .../{ => annotation}/OverridePropertiesTest.java | 32 +- .../ReplaceBeanFromFieldInheritanceTest.java} | 16 +- .../ReplaceBeanFromFieldTest.java} | 44 ++- .../ReplaceBeanFromFieldWithMockTest.java | 76 .../ReplaceBeanFromMethodInheritanceTest.java} | 16 +- .../ReplaceBeanFromMethodTest.java}| 36 +- .../ReplaceBeanFromMethodWithMockTest.java | 70 .../{ => annotation}/ReplaceRouteFromTest.java | 31 +- .../annotation/SupportParameterizedTest.java | 55 +++ .../junit5/annotation/SupportRepeatedTest.java | 55 +++ .../junit5/annotation/TestInstanceDefaultTest.java | 61 +++ .../annotation/TestInstancePerClassTest.java | 69 .../annotation/TestInstancePerMethodTest.java | 63 ...UseSeveralPropertyPlaceholderLocationsTest.java | 26 +- .../WithConfigurationClassTest.java} | 28 +- .../annotation/WithDebuggerCallbackTest.java | 71 .../junit5/{ => annotation}/WithMainClassTest.java | 24 +- .../LoadCustomConfigurationDefaultPackageTest.java | 26 +- .../LoadCustomConfigurationSamePackageTest.java| 28 +- .../EchoRouteBuilder.java} | 15 +- .../test/main/junit5/{ => common}/Greetings.java | 2 +- .../main/junit5/{ => common}/MyConfiguration.java | 2 +- .../{Greetings.java => common/MyMainClass.java}| 14 +- .../MySatefulRouteBuilder.java}| 15 +- .../{Greetings.java => common/MyStatefulBean.java} | 15 +- .../main/junit5/{ => legacy}/AdviceRouteTest.java | 4 +- .../{ => legacy}/OverridePropertiesTest.java | 4 +- .../main/junit5/{ => legacy}/ReplaceBeanTest.java | 5 +- .../ReplaceBeanWithMockTest.java} | 40 +- .../junit5/{ => legacy}/ReplaceRouteFromTest.java | 4 +- .../SupportParameterizedTest.java} | 27 +- .../SupportRepeatedTest.java} | 27 +- .../junit5/legacy/TestInstanceDefaultTest.java | 59 +++ .../junit5/legacy/TestInstancePerClassTest.java| 61 +++ .../junit5/legacy/TestInstancePerMethodTest.java | 61 +++ ...UseSeveralPropertyPlaceholderLocationsTest.java | 4 +- .../junit5/{ => legacy}/WithMainClassTest.java | 7 +- .../LoadCustomConfigurationDefaultPackageTest.java | 4 +- .../LoadCustomConfigurationSamePackageTest.java| 4 +- .../custom-same-package-application.properties | 0 .../custom-same-package-application.properties | 0 .../src/test/resources/routes/my-route.xml | 2 +- parent/pom.xml | 2 +- 62 files changed, 2668 insertions(+), 362 deletions(-) delete mode 100644 catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/console.json create mode 100644 components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/AdviceRouteMapping.java create mode 100644 components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainContext.java create mode 100644 components/camel-test/camel-test-main-junit5/src/main/java/org/apache/camel/test/main/junit5/CamelMainExtension.java create mode 100644
[GitHub] [camel] github-actions[bot] opened a new pull request #7044: Generated sources regen
github-actions[bot] opened a new pull request #7044: URL: https://github.com/apache/camel/pull/7044 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 (d880a7c -> cae2be4)
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 d880a7c CAMEL-17673: camel-core-model - Cleanup Rest DSL add cae2be4 Upgrade spring boot 4.3.5 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] branch camel-3.11.x updated: Upgrade cassandra 3.11.12
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.11.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.11.x by this push: new 4ebeafb Upgrade cassandra 3.11.12 4ebeafb is described below commit 4ebeafb9a4ea5092bba21db4b59c3dab2ac589c1 Author: Claus Ibsen AuthorDate: Sun Feb 27 10:53:38 2022 +0100 Upgrade cassandra 3.11.12 --- 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 cca7bdd..b521779 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -111,8 +111,8 @@ false 1 true -4.11.1 -3.11.8 +4.14.0 +3.11.12 2.0 3.2.12 false diff --git a/parent/pom.xml b/parent/pom.xml index affe24f..c4c48a5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -95,8 +95,8 @@ 0.9.5.5 2.9.2 2.6.3 -4.11.1 -3.11.8 +4.14.0 +3.11.12 2.0 1.2 3.2.12
[camel] branch main updated: Upgrade cassandra 3.11.12
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 b2ba105 Upgrade cassandra 3.11.12 b2ba105 is described below commit b2ba10508c8b750ec886e03b84cac9f0bea263a3 Author: Claus Ibsen AuthorDate: Sun Feb 27 10:48:23 2022 +0100 Upgrade cassandra 3.11.12 --- 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 9324e1e..1524b21 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -120,8 +120,8 @@ 1 dynamic true -4.11.1 -3.11.11 +4.14.0 +3.11.12 2.0 3.2.12 false diff --git a/parent/pom.xml b/parent/pom.xml index d8a88bb..28ed48d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -105,8 +105,8 @@ 0.9.5.5 3.0.5 2.6.6 -4.11.1 -3.11.11 +4.14.0 +3.11.12 2.0 1.2 3.2.12
[camel] branch camel-3.14.x updated: Upgrade cassandra 3.11.12
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.14.x by this push: new b1c7d69 Upgrade cassandra 3.11.12 b1c7d69 is described below commit b1c7d6932cafe652e499958159671badd7835fc6 Author: Claus Ibsen AuthorDate: Sun Feb 27 10:49:27 2022 +0100 Upgrade cassandra 3.11.12 --- 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 409836a..11a0392 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -119,8 +119,8 @@ 1 dynamic true -4.11.1 -3.11.11 +4.14.0 +3.11.12 2.0 3.2.12 false diff --git a/parent/pom.xml b/parent/pom.xml index a554d6f..c0593d1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -103,8 +103,8 @@ 0.9.5.5 2.9.2 2.6.5 -4.11.1 -3.11.11 +4.14.0 +3.11.12 2.0 1.2 3.2.12
[camel] branch regen_bot updated (ce993c6 -> d880a7c)
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 ce993c6 Regen for commit 3a6510c7e18b129253d3cb7783a763154c4a0a7f add d880a7c CAMEL-17673: camel-core-model - Cleanup Rest DSL No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/models/apiKey.json|2 +- .../org/apache/camel/catalog/models/basicAuth.json |2 +- .../apache/camel/catalog/models/bearerToken.json |2 +- .../org/apache/camel/catalog/models/mutualTLS.json |2 +- .../org/apache/camel/catalog/models/oauth2.json|2 +- .../apache/camel/catalog/models/openIdConnect.json |2 +- .../org/apache/camel/catalog/models/param.json |2 +- .../camel/catalog/models/responseHeader.json |2 +- .../camel/catalog/models/responseMessage.json |4 +- .../org/apache/camel/catalog/models/rest.json |2 +- .../camel/catalog/models/securityRequirements.json |2 +- .../org/apache/camel/catalog/others.properties |1 + .../org/apache/camel/catalog/others}/console.json |0 .../apache/camel/catalog/schemas/camel-spring.xsd | 328 ++-- .../apache/camel/openapi/RestOpenApiReader.java| 80 +- .../apache/camel/swagger/RestSwaggerReader.java| 28 +- .../org/apache/camel/model/rest/apiKey.json|2 +- .../org/apache/camel/model/rest/basicAuth.json |2 +- .../org/apache/camel/model/rest/bearerToken.json |2 +- .../org/apache/camel/model/rest/jaxb.index | 20 +- .../org/apache/camel/model/rest/mutualTLS.json |2 +- .../org/apache/camel/model/rest/oauth2.json|2 +- .../org/apache/camel/model/rest/openIdConnect.json |2 +- .../org/apache/camel/model/rest/param.json |2 +- .../apache/camel/model/rest/responseHeader.json|2 +- .../apache/camel/model/rest/responseMessage.json |4 +- .../org/apache/camel/model/rest/rest.json |2 +- .../camel/model/rest/securityRequirements.json |2 +- ...stSecurityApiKey.java => ApiKeyDefinition.java} | 12 +- ...rityBasicAuth.java => BasicAuthDefinition.java} |6 +- ...BearerToken.java => BearerTokenDefinition.java} |6 +- ...rityMutualTLS.java => MutualTLSDefinition.java} |6 +- ...stSecurityOAuth2.java => OAuth2Definition.java} | 26 +- ...IdConnect.java => OpenIdConnectDefinition.java} |6 +- ...onParamDefinition.java => ParamDefinition.java} | 34 +- ...finition.java => ResponseHeaderDefinition.java} | 30 +- ...inition.java => ResponseMessageDefinition.java} | 26 +- .../apache/camel/model/rest/RestDefinition.java| 42 +- .../camel/model/rest/RestSecuritiesDefinition.java | 32 +- ...nt.java => SecurityRequirementsDefinition.java} |6 +- .../apache/camel/model/rest/VerbDefinition.java| 12 +- .../rest/FromRestGetPlaceholderParamTest.java |6 +- .../java/org/apache/camel/xml/in/ModelParser.java | 226 +-- .../ROOT/pages/camel-3x-upgrade-guide-3_16.adoc| 10 + .../dsl/yaml/deserializers/ModelDeserializers.java | 1704 ++-- .../deserializers/ModelDeserializersResolver.java | 56 +- .../src/generated/resources/camel-yaml-dsl.json| 486 +++--- .../src/generated/resources/camelYamlDsl.json | 486 +++--- .../openapi/RestDefinitionEmitterTest.java |6 +- .../swagger/RestDefinitionEmitterTest.java |6 +- 50 files changed, 1872 insertions(+), 1863 deletions(-) copy {core/camel-console/src/generated/resources => catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others}/console.json (100%) rename core/camel-core-model/src/main/java/org/apache/camel/model/rest/{RestSecurityApiKey.java => ApiKeyDefinition.java} (91%) rename core/camel-core-model/src/main/java/org/apache/camel/model/rest/{RestSecurityBasicAuth.java => BasicAuthDefinition.java} (88%) rename core/camel-core-model/src/main/java/org/apache/camel/model/rest/{RestSecurityBearerToken.java => BearerTokenDefinition.java} (90%) rename core/camel-core-model/src/main/java/org/apache/camel/model/rest/{RestSecurityMutualTLS.java => MutualTLSDefinition.java} (88%) rename core/camel-core-model/src/main/java/org/apache/camel/model/rest/{RestSecurityOAuth2.java => OAuth2Definition.java} (83%) rename core/camel-core-model/src/main/java/org/apache/camel/model/rest/{RestSecurityOpenIdConnect.java => OpenIdConnectDefinition.java} (90%) rename core/camel-core-model/src/main/java/org/apache/camel/model/rest/{RestOperationParamDefinition.java => ParamDefinition.java} (86%) rename core/camel-core-model/src/main/java/org/apache/camel/model/rest/{RestOperationResponseHeaderDefinition.java => ResponseHeaderDefinition.java} (84%) rename core/camel-core-model/src/main/java/org/apache/camel/model/rest/{RestOperationResponseMsgDefinition.java => ResponseMessageDefinition.java} (81%)
[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 f32cbcf Polished f32cbcf is described below commit f32cbcff7ac452424d127bc37c79ddbb5ee489c1 Author: Claus Ibsen AuthorDate: Sun Feb 27 10:41:59 2022 +0100 Polished --- components/camel-test/camel-test-cdi-junit5/pom.xml| 2 +- components/camel-test/camel-test-spring-junit5/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-test/camel-test-cdi-junit5/pom.xml b/components/camel-test/camel-test-cdi-junit5/pom.xml index 3d65788..daaac44 100644 --- a/components/camel-test/camel-test-cdi-junit5/pom.xml +++ b/components/camel-test/camel-test-cdi-junit5/pom.xml @@ -29,7 +29,7 @@ camel-test-cdi-junit5 jar -Camel :: Test :: CDI:: JUnit5 +Camel :: Test :: CDI :: JUnit5 Camel unit testing with CDI and JUnit5 diff --git a/components/camel-test/camel-test-spring-junit5/pom.xml b/components/camel-test/camel-test-spring-junit5/pom.xml index fefc7d5..5ee69cf 100644 --- a/components/camel-test/camel-test-spring-junit5/pom.xml +++ b/components/camel-test/camel-test-spring-junit5/pom.xml @@ -29,7 +29,7 @@ camel-test-spring-junit5 jar -Camel :: Test :: Spring:: JUnit5 +Camel :: Test :: Spring :: JUnit5 Camel unit testing with Spring and JUnit 5
[GitHub] [camel] davsclaus merged pull request #7041: CAMEL-17690: camel-test-main - Annotation based testing
davsclaus merged pull request #7041: URL: https://github.com/apache/camel/pull/7041 -- 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-examples] davsclaus merged pull request #80: Use camel-test-infra instead of testcontainers directly
davsclaus merged pull request #80: URL: https://github.com/apache/camel-examples/pull/80 -- 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-examples] branch main updated: Use camel-test-infra instead of testcontainers directly (#80)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-examples.git The following commit(s) were added to refs/heads/main by this push: new e32c11f Use camel-test-infra instead of testcontainers directly (#80) e32c11f is described below commit e32c11f8ab1881c83805d98e7d0f9025f0d23302 Author: Nicolas Filotto AuthorDate: Sun Feb 27 10:38:46 2022 +0100 Use camel-test-infra instead of testcontainers directly (#80) --- .../aws/main-endpointdsl-aws2-s3-kafka/pom.xml | 7 +- .../org/apache/camel/example/AwsS3KafkaTest.java | 45 +++--- .../java/org/apache/camel/example/AwsS3Test.java | 35 ++-- .../java/org/apache/camel/example/AwsS3Test.java | 35 ++-- .../java/org/apache/camel/example/AwsSQSTest.java | 35 ++-- .../pom.xml| 7 +- .../org/apache/camel/example/KafkaAwsS3Test.java | 45 +++--- .../aws/main-endpointdsl-kafka-aws2-s3/pom.xml | 7 +- .../org/apache/camel/example/KafkaAwsS3Test.java | 45 +++--- examples/aws/pom.xml | 13 +-- examples/couchbase-log/pom.xml | 13 +-- .../org/apache/camel/example/CouchbaseTest.java| 60 ++ examples/debezium/pom.xml | 27 +++--- .../debezium/KinesisProducerToCassandra.java | 2 +- .../src/main/resources/application.properties | 2 +- .../camel/example/debezium/DebeziumTest.java | 95 +- examples/kafka/pom.xml | 13 +-- .../example/kafka/MessagePublisherClient.java | 2 +- .../src/main/resources/application.properties | 3 +- .../org/apache/camel/example/kafka/KafkaTest.java | 18 ++-- examples/mongodb/pom.xml | 13 +-- .../apache/camel/example/mongodb/MongoDBTest.java | 19 ++--- examples/spring-pulsar/pom.xml | 13 +-- .../src/main/resources/camel-common.xml| 10 +-- .../org/apache/camel/example/SpringPulsarTest.java | 26 ++ examples/vertx-kafka/pom.xml | 13 +-- .../vertx/kafka/MessagePublisherClient.java| 2 +- .../src/main/resources/application.properties | 3 +- .../camel/example/vertx/kafka/VertxKafkaTest.java | 17 ++-- 29 files changed, 204 insertions(+), 421 deletions(-) diff --git a/examples/aws/main-endpointdsl-aws2-s3-kafka/pom.xml b/examples/aws/main-endpointdsl-aws2-s3-kafka/pom.xml index 38404a0..f1d2178 100644 --- a/examples/aws/main-endpointdsl-aws2-s3-kafka/pom.xml +++ b/examples/aws/main-endpointdsl-aws2-s3-kafka/pom.xml @@ -88,9 +88,10 @@ -org.testcontainers -kafka -${testcontainers-version} +org.apache.camel +camel-test-infra-kafka +${project.version} +test-jar test diff --git a/examples/aws/main-endpointdsl-aws2-s3-kafka/src/test/java/org/apache/camel/example/AwsS3KafkaTest.java b/examples/aws/main-endpointdsl-aws2-s3-kafka/src/test/java/org/apache/camel/example/AwsS3KafkaTest.java index 8b22514..2032301 100644 --- a/examples/aws/main-endpointdsl-aws2-s3-kafka/src/test/java/org/apache/camel/example/AwsS3KafkaTest.java +++ b/examples/aws/main-endpointdsl-aws2-s3-kafka/src/test/java/org/apache/camel/example/AwsS3KafkaTest.java @@ -25,61 +25,40 @@ import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.aws2.s3.AWS2S3Component; import org.apache.camel.component.aws2.s3.AWS2S3Constants; import org.apache.camel.main.MainConfigurationProperties; +import org.apache.camel.test.infra.aws.common.services.AWSService; +import org.apache.camel.test.infra.aws2.clients.AWSSDKClientUtils; +import org.apache.camel.test.infra.aws2.services.AWSServiceFactory; +import org.apache.camel.test.infra.kafka.services.KafkaService; +import org.apache.camel.test.infra.kafka.services.KafkaServiceFactory; import org.apache.camel.test.main.junit5.CamelMainTestSupport; import org.junit.jupiter.api.Test; -import org.testcontainers.containers.KafkaContainer; -import org.testcontainers.containers.localstack.LocalStackContainer; -import org.testcontainers.containers.wait.strategy.Wait; -import org.testcontainers.junit.jupiter.Container; -import org.testcontainers.junit.jupiter.Testcontainers; -import org.testcontainers.utility.DockerImageName; -import software.amazon.awssdk.auth.credentials.AwsBasicCredentials; -import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider; -import software.amazon.awssdk.regions.Region; -import software.amazon.awssdk.services.s3.S3Client; +import org.junit.jupiter.api.extension.RegisterExtension; import static org.apache.camel.util.PropertiesHelper.asProperties; import static org.junit.jupiter.api.Assertions.assertTrue; -import static
[GitHub] [camel] davsclaus commented on pull request #7041: CAMEL-17690: camel-test-main - Annotation based testing
davsclaus commented on pull request #7041: URL: https://github.com/apache/camel/pull/7041#issuecomment-1053428386 Yeah okay -- 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 micrometer 1.8.3
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 8e97a7d Upgrade micrometer 1.8.3 8e97a7d is described below commit 8e97a7d2b47a20f580fec4f9e293a50d3829f8ba Author: Claus Ibsen AuthorDate: Sun Feb 27 09:58:36 2022 +0100 Upgrade micrometer 1.8.3 --- 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 17f30f2..9324e1e 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -408,7 +408,7 @@ 3.0.0-M4 3.3.1 4.2.7 -1.8.1 +1.8.3 2.0 3.0 3.0 diff --git a/parent/pom.xml b/parent/pom.xml index eb321b1..d8a88bb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -395,7 +395,7 @@ 3.0.0-M4 3.3.1 4.2.7 -1.8.1 +1.8.3 2.0 3.0 3.0
[camel] branch main updated: Upgrade spring boot 4.3.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.git The following commit(s) were added to refs/heads/main by this push: new cae2be4 Upgrade spring boot 4.3.5 cae2be4 is described below commit cae2be4dede9c3726e494498e63abcf6dd466bb3 Author: Claus Ibsen AuthorDate: Sun Feb 27 09:57:01 2022 +0100 Upgrade spring boot 4.3.5 --- 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 b5e4aa9..17f30f2 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -513,7 +513,7 @@ 3.2.0 1.6.5.0_1 2.0-M4-groovy-3.0 -4.3.4 +4.3.5 2.5.6 5.5.6 2.3.6.RELEASE diff --git a/parent/pom.xml b/parent/pom.xml index c940e9c..eb321b1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -501,7 +501,7 @@ 3.2.0 1.6.5.0_1 2.0-M4-groovy-3.0 -4.3.4 +4.3.5 2.5.6 5.5.6 2.3.6.RELEASE
[camel-spring-boot] branch camel-spring-boot-3.11.x updated: Upgrade to spring boot 2.5.10
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-spring-boot-3.11.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/camel-spring-boot-3.11.x by this push: new a3ab196 Upgrade to spring boot 2.5.10 a3ab196 is described below commit a3ab196dcdac64815de652835237fb96f71a65c1 Author: Claus Ibsen AuthorDate: Sun Feb 27 09:56:39 2022 +0100 Upgrade to spring boot 2.5.10 --- 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 ac004b7..acd41b9 100644 --- a/archetypes/camel-archetype-spring-boot/pom.xml +++ b/archetypes/camel-archetype-spring-boot/pom.xml @@ -34,7 +34,7 @@ maven-archetype - 2.5.9 + 2.5.10 src/test/resources/settings.xml diff --git a/pom.xml b/pom.xml index 5d7c69c..da7c8a3 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -2.5.9 +2.5.10 3.11.6-SNAPSHOT
[camel-spring-boot] branch camel-spring-boot-3.14.x updated: CAMEL-17715: upgrade to spring boot 2.6.4
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-spring-boot-3.14.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/camel-spring-boot-3.14.x by this push: new 74c65d1 CAMEL-17715: upgrade to spring boot 2.6.4 74c65d1 is described below commit 74c65d1e903e59a3d9353adfda3d298f442fd528 Author: Claus Ibsen AuthorDate: Sun Feb 27 09:53:24 2022 +0100 CAMEL-17715: upgrade to spring boot 2.6.4 --- 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 079e7d0..f8f8b05 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.3 + 2.6.4 src/test/resources/settings.xml diff --git a/pom.xml b/pom.xml index 3dba51b..d00f4cb 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -2.6.3 +2.6.4 3.14.2-SNAPSHOT
[camel-spring-boot] branch main updated: CAMEL-17715: upgrade to spring boot 2.6.4
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 4b971ba CAMEL-17715: upgrade to spring boot 2.6.4 4b971ba is described below commit 4b971baaa2dd6aab9a3003bc72e72ae04f3a18f6 Author: Claus Ibsen AuthorDate: Sun Feb 27 09:53:24 2022 +0100 CAMEL-17715: upgrade to spring boot 2.6.4 --- 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 2a6c27c..a07139c 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.3 + 2.6.4 src/test/resources/settings.xml diff --git a/pom.xml b/pom.xml index 870c3a0..297a6b0 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -2.6.3 +2.6.4 3.16.0-SNAPSHOT
[GitHub] [camel-spring-boot] oscerd merged pull request #443: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
oscerd merged pull request #443: URL: https://github.com/apache/camel-spring-boot/pull/443 -- 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: [create-pull-request] automated change
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-spring-boot.git The following commit(s) were added to refs/heads/main by this push: new e952e45 [create-pull-request] automated change e952e45 is described below commit e952e45be7aed510e863bdfd76e450b9d5c39c99 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sun Feb 27 01:08:53 2022 + [create-pull-request] automated change --- .../catalog/components/azure-servicebus.json | 16 +++- .../src/main/docs/azure-servicebus.json| 15 +-- .../ServiceBusComponentConfiguration.java | 29 +- .../springboot/ServiceBusComponentConverter.java | 2 ++ 4 files changed, 53 insertions(+), 9 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-servicebus.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-servicebus.json index 3070d25..de60998 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-servicebus.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-servicebus.json @@ -31,9 +31,9 @@ "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...] "consumerOperation": { "kind": "property", "displayName": "Consumer Operation", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.azure.servicebus.ServiceBusConsumerOperationDefinition", "enum": [ "receiveMessages", "peekMessages" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "receiveMessages", "configurationClass": "org.apache.camel.component.azure.servicebus.ServiceBusConfiguration", [...] "disableAutoComplete": { "kind": "property", "displayName": "Disable Auto Complete", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.azure.servicebus.ServiceBusConfiguration", "configurationField": "configuration", "description": "Disables auto-complete and auto-abandon of received messages. By defaul [...] -"maxAutoLockRenewDuration": { "kind": "property", "displayName": "Max Auto Lock Renew Duration", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5min", "configurationClass": "org.apache.camel.component.azure.servicebus.ServiceBusConfiguration", "configurationField": "configuration", "description": "Sets the amount of time to continue auto-renewin [...] +"maxAutoLockRenewDuration": { "kind": "property", "displayName": "Max Auto Lock Renew Duration", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "java.time.Duration", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "5m", "configurationClass": "org.apache.camel.component.azure.servicebus.ServiceBusConfiguration", "configurationField": "configuration", "description": "Sets the amount of time to continue auto-renewing [...] "peekNumMaxMessages": { "kind": "property", "displayName": "Peek Num Max Messages", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.azure.servicebus.ServiceBusConfiguration", "configurationField": "configuration", "description": "Set the max number of messages to be peeked during the peek operation." }, -"prefetchCount": { "kind": "property", "displayName": "Prefetch Count", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 0, "configurationClass": "org.apache.camel.component.azure.servicebus.ServiceBusConfiguration", "configurationField": "configuration", "description": "Sets the prefetch count of the receiver. For both {link