[camel] branch main updated: Regen for commit f55802ec6303da9a071731cda3262c28b683cbd6
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 c0f55fcc691 Regen for commit f55802ec6303da9a071731cda3262c28b683cbd6 c0f55fcc691 is described below commit c0f55fcc691eabeebcf96575e4d7d8f9a0bc2326 Author: davsclaus AuthorDate: Wed Jun 15 05:30:56 2022 + Regen for commit f55802ec6303da9a071731cda3262c28b683cbd6 Signed-off-by: GitHub --- .../resources/org/apache/camel/catalog/others/kamelet-main.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kamelet-main.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kamelet-main.json index eb4296a221f..f567316db9f 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kamelet-main.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/kamelet-main.json @@ -7,7 +7,7 @@ "deprecated": false, "firstVersion": "3.11.0", "label": "jbang", -"supportLevel": "Experimental", +"supportLevel": "Preview", "groupId": "org.apache.camel", "artifactId": "camel-kamelet-main", "version": "3.18.0-SNAPSHOT"
[GitHub] [camel] oscerd merged pull request #7784: Generated sources regen
oscerd merged PR #7784: URL: https://github.com/apache/camel/pull/7784 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 02/02: 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 ab4465580ce00b9bb59d21a7d13eae5c64bb9ad0
Author: Andrea Cosentino
AuthorDate: Wed Jun 15 07:47:56 2022 +0200
Sync deps and regen
---
camel-dependencies/pom.xml | 2 +-
.../camel/catalog/components/debezium-oracle.json | 2 ++
.../dsl/DebeziumOracleComponentBuilderFactory.java | 19
.../dsl/DebeziumOracleEndpointBuilderFactory.java | 36 ++
4 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 2e87c1f8a2d..e8224931ab6 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -63,7 +63,7 @@
1.11.0
1.11.0
4.2.0
-2.17.210
+2.17.211
2.6.1
1.2.14
4.29.1
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-oracle.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-oracle.json
index d6c1d14bf43..d3de9059613 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-oracle.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/debezium-oracle.json
@@ -88,6 +88,7 @@
"logMiningBufferType": { "kind": "property", "displayName": "Log Mining
Buffer Type", "group": "oracle", "label": "consumer,oracle", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "memory",
"configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "The buffer type
controls ho [...]
"logMiningScnGapDetectionGapSizeMin": { "kind": "property", "displayName":
"Log Mining Scn Gap Detection Gap Size Min", "group": "oracle", "label":
"consumer,oracle", "required": false, "type": "integer", "javaType": "long",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
100, "configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "Used [...]
"logMiningScnGapDetectionTimeIntervalMaxMs": { "kind": "property",
"displayName": "Log Mining Scn Gap Detection Time Interval Max Ms", "group":
"oracle", "label": "consumer,oracle", "required": false, "type": "duration",
"javaType": "long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "20s", "configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "descri [...]
+"logMiningSessionMaxMs": { "kind": "property", "displayName": "Log Mining
Session Max Ms", "group": "oracle", "label": "consumer,oracle", "required":
false, "type": "duration", "javaType": "long", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "0ms",
"configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "The maximum number of
milliseconds [...]
"logMiningSleepTimeDefaultMs": { "kind": "property", "displayName": "Log
Mining Sleep Time Default Ms", "group": "oracle", "label": "consumer,oracle",
"required": false, "type": "duration", "javaType": "long", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "1s",
"configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "The amount of time that
[...]
"logMiningSleepTimeIncrementMs": { "kind": "property", "displayName": "Log
Mining Sleep Time Increment Ms", "group": "oracle", "label": "consumer,oracle",
"required": false, "type": "duration", "javaType": "long", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "200ms",
"configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "The maximum amou [...]
"logMiningSleepTimeMaxMs": { "kind": "property", "displayName": "Log
Mining Sleep Time Max Ms", "group": "oracle", "label": "consumer,oracle",
"required": false, "type": "duration", "javaType": "long", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "3s",
"configurationClass":
"org.apache.camel.component.debezium.configuration.OracleConnectorEmbeddedDebeziumConfiguration",
"configurationField": "configuration", "description": "The maximum amount of
time that [...]
@@ -204,6 +205,7 @@
[camel] 01/02: Upgrade AWS SDK v2 to version 2.17.211
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 5f7f6939038eb48852b9645076eb1b99e46159bd Author: Andrea Cosentino AuthorDate: Wed Jun 15 06:47:58 2022 +0200 Upgrade AWS SDK v2 to version 2.17.211 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 32d300dd057..c46e7a1f3ec 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -80,7 +80,7 @@ 1.11.0 1.11.0 4.2.0 -2.17.210 +2.17.211 2.6.1 1.2.14 2.13.3
[camel] branch main updated (f55802ec630 -> ab4465580ce)
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 f55802ec630 camel-jbang - change support level to preview new 5f7f6939038 Upgrade AWS SDK v2 to version 2.17.211 new ab4465580ce 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 +- .../camel/catalog/components/debezium-oracle.json | 2 ++ .../dsl/DebeziumOracleComponentBuilderFactory.java | 19 .../dsl/DebeziumOracleEndpointBuilderFactory.java | 36 ++ parent/pom.xml | 2 +- 5 files changed, 59 insertions(+), 2 deletions(-)
[GitHub] [camel-k] tadayosi commented on issue #3341: How to deal with `SNAPSHOT` dependencies?
tadayosi commented on issue #3341: URL: https://github.com/apache/camel-k/issues/3341#issuecomment-1156014489 Currently, to really rebuild an integration with a new kit we need to do something like this: ``` $ kubectl delete ik # as mostly kits are 'platform' and cannot be removed with `kamel kit delete` $ kamel rebuild ``` maybe should we provide some flag to `kamel rebuild` that also forces removing a relevant kit? -- 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 (fdb36b57025 -> bf219b37364)
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 fdb36b57025 Regen for commit 1bc4cad90dd0c03004b18f504acbcbf3f5b8b654
add 877195b791a Polished
add 907dceaf210 camel-jbang - Cleanup and removed unused code
add f55802ec630 camel-jbang - change support level to preview
add bf219b37364 Regen for commit f55802ec6303da9a071731cda3262c28b683cbd6
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 (fdb36b57025)
\
N -- N -- N refs/heads/regen_bot (bf219b37364)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.../apache/camel/catalog/others/kamelet-main.json | 2 +-
.../modules/ROOT/pages/camel-jbang.adoc| 5 +-
dsl/camel-jbang/camel-jbang-core/pom.xml | 11 +--
.../apache/camel/dsl/jbang/core/api/Converter.java | 23 -
.../apache/camel/dsl/jbang/core/api/Extractor.java | 21
.../apache/camel/dsl/jbang/core/api/Printer.java | 21
.../camel/dsl/jbang/core/api/TemplateParser.java | 25 -
.../dsl/jbang/core/commands/AbstractSearch.java| 106 -
.../apache/camel/dsl/jbang/core/commands/Init.java | 8 +-
.../apache/camel/dsl/jbang/core/commands/Run.java | 6 +-
.../core/{commands => common}/GistHelper.java | 2 +-
.../core/{commands => common}/GitHubHelper.java| 2 +-
.../dsl/jbang/core/common/MatchExtractor.java | 46 -
.../{exceptions => }/ResourceDoesNotExist.java | 2 +-
.../common/exceptions/ResourceAlreadyExists.java | 28 --
.../jbang/core/components/ComponentConverter.java | 37 ---
.../components/ComponentDescriptionMatching.java | 34 ---
.../jbang/core/components/ComponentPrinter.java| 28 --
.../dsl/jbang/core/kamelets/KameletConverter.java | 35 ---
.../core/kamelets/KameletDescriptionMatching.java | 34 ---
.../dsl/jbang/core/kamelets/KameletPrinter.java| 28 --
.../jbang/core/languages/LanguageConverter.java| 37 ---
.../languages/LanguageDescriptionMatching.java | 34 ---
.../dsl/jbang/core/languages/LanguagePrinter.java | 28 --
.../dsl/jbang/core/others/OtherConverter.java | 37 ---
.../core/others/OtherDescriptionMatching.java | 34 ---
.../camel/dsl/jbang/core/others/OtherPrinter.java | 28 --
.../camel/dsl/jbang/core/types/Component.java | 24 -
.../apache/camel/dsl/jbang/core/types/Kamelet.java | 23 -
.../camel/dsl/jbang/core/types/Language.java | 21
.../apache/camel/dsl/jbang/core/types/Other.java | 20
dsl/camel-jbang/camel-jbang-main/pom.xml | 2 +-
dsl/camel-kamelet-main/pom.xml | 2 +-
.../src/generated/resources/kamelet-main.json | 2 +-
.../src/main/docs/kamelet-main.adoc| 2 +-
35 files changed, 18 insertions(+), 780 deletions(-)
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/api/Converter.java
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/api/Extractor.java
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/api/Printer.java
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/api/TemplateParser.java
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/AbstractSearch.java
rename
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/{commands
=> common}/GistHelper.java (99%)
rename
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/{commands
=> common}/GitHubHelper.java (99%)
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/MatchExtractor.java
rename
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/{exceptions
=> }/ResourceDoesNotExist.java (94%)
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/exceptions/ResourceAlreadyExists.java
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/components/ComponentConverter.java
[GitHub] [camel-k] squakez commented on issue #3341: How to deal with `SNAPSHOT` dependencies?
squakez commented on issue #3341: URL: https://github.com/apache/camel-k/issues/3341#issuecomment-1156004211 Yes, that's correct. In this case an Integration rebuild needs an IntegrationKit rebuild as well. In order to have a refresh of the dependency you will need to identify the IntegrationKit and delete it as well, to make it sure it won't be reused. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1156003520 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 2499427384-783-994b23b5-bfa1-4805-b3e1-9a9aefabe9cb * Camel Quarkus Commit: 2fdf5accb36dd51f645121fd9b989528b71760bc * Quarkus Main Commit: 476fb78fe7b3be25213854b24d2021384b84c35a * Link to build: https://github.com/apache/camel-quarkus/actions/runs/2499427384 -- 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 (30283bba874 -> fdb36b57025)
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 30283bba874 Cleanup deprecated (#7783) add 1bc4cad90dd Upgrade debezium 1.9.3 add fdb36b57025 Regen for commit 1bc4cad90dd0c03004b18f504acbcbf3f5b8b654 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml |2 +- .../camel/catalog/components/debezium-oracle.json |2 + .../DebeziumOracleComponentConfigurer.java |6 + .../debezium/DebeziumOracleEndpointConfigurer.java |6 + .../debezium/DebeziumOracleEndpointUriFactory.java |3 +- ...acleConnectorEmbeddedDebeziumConfiguration.java | 1338 ++-- .../camel/component/debezium/debezium-oracle.json |2 + .../dsl/DebeziumOracleComponentBuilderFactory.java | 19 + parent/pom.xml |2 +- 9 files changed, 716 insertions(+), 664 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #7784: Generated sources regen
github-actions[bot] opened a new pull request, #7784: URL: https://github.com/apache/camel/pull/7784 Regen bot :robot: found some uncommitted changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] squakez commented on pull request #3309: MultiArchitecture support
squakez commented on PR #3309: URL: https://github.com/apache/camel-k/pull/3309#issuecomment-1156002895 I am curious to see what do you have in the Build configuration. Can you please post the result of `kubectl get build -o yaml`? -- 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 (a4bbf2e1795 -> 30283bba874)
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 a4bbf2e1795 CAMEL-18193: camel-language - Language component should load resource from classpath by default add 30283bba874 Cleanup deprecated (#7783) No new revisions were added by this update. Summary of changes: dsl/camel-jbang/camel-jbang-core/pom.xml | 18 - .../camel/dsl/jbang/core/commands/Build.java | 35 -- .../dsl/jbang/core/commands/CamelJBangMain.java| 16 - .../camel/dsl/jbang/core/commands/Deploy.java | 121 -- .../camel/dsl/jbang/core/commands/Image.java | 237 .../dsl/jbang/core/commands/KubernetesHelper.java | 242 .../camel/dsl/jbang/core/commands/Manifest.java| 113 -- .../camel/dsl/jbang/core/commands/Package.java | 35 -- .../camel/dsl/jbang/core/commands/Profile.java | 38 -- .../dsl/jbang/core/commands/ProfileHelper.java | 89 - .../camel/dsl/jbang/core/commands/Search.java | 47 --- .../dsl/jbang/core/commands/SearchComponents.java | 89 - .../dsl/jbang/core/commands/SearchKamelets.java| 82 - .../dsl/jbang/core/commands/SearchLanguages.java | 87 - .../dsl/jbang/core/commands/SearchOthers.java | 88 - .../camel/dsl/jbang/core/commands/UberJar.java | 410 - .../camel/dsl/jbang/core/commands/Undeploy.java| 84 - 17 files changed, 1831 deletions(-) delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Build.java delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Deploy.java delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Image.java delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/KubernetesHelper.java delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Manifest.java delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Package.java delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Profile.java delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ProfileHelper.java delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Search.java delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/SearchComponents.java delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/SearchKamelets.java delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/SearchLanguages.java delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/SearchOthers.java delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/UberJar.java delete mode 100644 dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Undeploy.java
[camel] 02/02: camel-jbang - change support level to preview
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit f55802ec6303da9a071731cda3262c28b683cbd6 Author: Claus Ibsen AuthorDate: Wed Jun 15 06:44:45 2022 +0200 camel-jbang - change support level to preview --- dsl/camel-jbang/camel-jbang-core/pom.xml | 11 +-- dsl/camel-jbang/camel-jbang-main/pom.xml | 2 +- dsl/camel-kamelet-main/pom.xml| 2 +- .../src/generated/resources/kamelet-main.json | 2 +- dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc| 2 +- 5 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/pom.xml b/dsl/camel-jbang/camel-jbang-core/pom.xml index a72cf1a9db4..0d8d578ccd2 100644 --- a/dsl/camel-jbang/camel-jbang-core/pom.xml +++ b/dsl/camel-jbang/camel-jbang-core/pom.xml @@ -39,7 +39,7 @@ 3.12.0 jbang -Experimental +Preview @@ -51,19 +51,10 @@ org.apache.camel camel-kamelet-main - - -org.apache.camel -camel-grape - org.apache.camel camel-resourceresolver-github - -org.apache.camel -camel-file-watch - commons-io commons-io diff --git a/dsl/camel-jbang/camel-jbang-main/pom.xml b/dsl/camel-jbang/camel-jbang-main/pom.xml index a573003bcb6..c38a4b32a44 100644 --- a/dsl/camel-jbang/camel-jbang-main/pom.xml +++ b/dsl/camel-jbang/camel-jbang-main/pom.xml @@ -38,7 +38,7 @@ 3.12.0 jbang -Experimental +Preview true dist diff --git a/dsl/camel-kamelet-main/pom.xml b/dsl/camel-kamelet-main/pom.xml index 598408c0637..8302083e0a0 100644 --- a/dsl/camel-kamelet-main/pom.xml +++ b/dsl/camel-kamelet-main/pom.xml @@ -35,8 +35,8 @@ 3.11.0 -Experimental jbang +Preview diff --git a/dsl/camel-kamelet-main/src/generated/resources/kamelet-main.json b/dsl/camel-kamelet-main/src/generated/resources/kamelet-main.json index eb4296a221f..f567316db9f 100644 --- a/dsl/camel-kamelet-main/src/generated/resources/kamelet-main.json +++ b/dsl/camel-kamelet-main/src/generated/resources/kamelet-main.json @@ -7,7 +7,7 @@ "deprecated": false, "firstVersion": "3.11.0", "label": "jbang", -"supportLevel": "Experimental", +"supportLevel": "Preview", "groupId": "org.apache.camel", "artifactId": "camel-kamelet-main", "version": "3.18.0-SNAPSHOT" diff --git a/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc b/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc index f7043bebce2..edb80de30ce 100644 --- a/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc +++ b/dsl/camel-kamelet-main/src/main/docs/kamelet-main.adoc @@ -4,7 +4,7 @@ :artifactid: camel-kamelet-main :description: Main to run Kamelet standalone :since: 3.11 -:supportlevel: Experimental +:supportlevel: Preview //Manually maintained attributes :group: DSL
[camel] branch main updated (877195b791a -> f55802ec630)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 877195b791a Polished
new 907dceaf210 camel-jbang - Cleanup and removed unused code
new f55802ec630 camel-jbang - change support level to preview
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:
dsl/camel-jbang/camel-jbang-core/pom.xml | 11 +--
.../apache/camel/dsl/jbang/core/api/Converter.java | 23 -
.../apache/camel/dsl/jbang/core/api/Extractor.java | 21
.../apache/camel/dsl/jbang/core/api/Printer.java | 21
.../camel/dsl/jbang/core/api/TemplateParser.java | 25 -
.../dsl/jbang/core/commands/AbstractSearch.java| 106 -
.../apache/camel/dsl/jbang/core/commands/Init.java | 8 +-
.../apache/camel/dsl/jbang/core/commands/Run.java | 6 +-
.../core/{commands => common}/GistHelper.java | 2 +-
.../core/{commands => common}/GitHubHelper.java| 2 +-
.../dsl/jbang/core/common/MatchExtractor.java | 46 -
.../{exceptions => }/ResourceDoesNotExist.java | 2 +-
.../common/exceptions/ResourceAlreadyExists.java | 28 --
.../jbang/core/components/ComponentConverter.java | 37 ---
.../components/ComponentDescriptionMatching.java | 34 ---
.../jbang/core/components/ComponentPrinter.java| 28 --
.../dsl/jbang/core/kamelets/KameletConverter.java | 35 ---
.../core/kamelets/KameletDescriptionMatching.java | 34 ---
.../dsl/jbang/core/kamelets/KameletPrinter.java| 28 --
.../jbang/core/languages/LanguageConverter.java| 37 ---
.../languages/LanguageDescriptionMatching.java | 34 ---
.../dsl/jbang/core/languages/LanguagePrinter.java | 28 --
.../dsl/jbang/core/others/OtherConverter.java | 37 ---
.../core/others/OtherDescriptionMatching.java | 34 ---
.../camel/dsl/jbang/core/others/OtherPrinter.java | 28 --
.../camel/dsl/jbang/core/types/Component.java | 24 -
.../apache/camel/dsl/jbang/core/types/Kamelet.java | 23 -
.../camel/dsl/jbang/core/types/Language.java | 21
.../apache/camel/dsl/jbang/core/types/Other.java | 20
dsl/camel-jbang/camel-jbang-main/pom.xml | 2 +-
dsl/camel-kamelet-main/pom.xml | 2 +-
.../src/generated/resources/kamelet-main.json | 2 +-
.../src/main/docs/kamelet-main.adoc| 2 +-
33 files changed, 15 insertions(+), 776 deletions(-)
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/api/Converter.java
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/api/Extractor.java
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/api/Printer.java
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/api/TemplateParser.java
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/AbstractSearch.java
rename
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/{commands
=> common}/GistHelper.java (99%)
rename
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/{commands
=> common}/GitHubHelper.java (99%)
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/MatchExtractor.java
rename
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/{exceptions
=> }/ResourceDoesNotExist.java (94%)
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/exceptions/ResourceAlreadyExists.java
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/components/ComponentConverter.java
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/components/ComponentDescriptionMatching.java
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/components/ComponentPrinter.java
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/kamelets/KameletConverter.java
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/kamelets/KameletDescriptionMatching.java
delete mode 100644
dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/kamelets/KameletPrinter.java
delete mode 100644
[camel] 01/02: camel-jbang - Cleanup and removed unused code
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 907dceaf21082b7a8615e400a3895bb31d5d0335
Author: Claus Ibsen
AuthorDate: Wed Jun 15 06:35:56 2022 +0200
camel-jbang - Cleanup and removed unused code
---
.../apache/camel/dsl/jbang/core/api/Converter.java | 23 -
.../apache/camel/dsl/jbang/core/api/Extractor.java | 21
.../apache/camel/dsl/jbang/core/api/Printer.java | 21
.../camel/dsl/jbang/core/api/TemplateParser.java | 25 -
.../dsl/jbang/core/commands/AbstractSearch.java| 106 -
.../apache/camel/dsl/jbang/core/commands/Init.java | 8 +-
.../apache/camel/dsl/jbang/core/commands/Run.java | 6 +-
.../core/{commands => common}/GistHelper.java | 2 +-
.../core/{commands => common}/GitHubHelper.java| 2 +-
.../dsl/jbang/core/common/MatchExtractor.java | 46 -
.../{exceptions => }/ResourceDoesNotExist.java | 2 +-
.../common/exceptions/ResourceAlreadyExists.java | 28 --
.../jbang/core/components/ComponentConverter.java | 37 ---
.../components/ComponentDescriptionMatching.java | 34 ---
.../jbang/core/components/ComponentPrinter.java| 28 --
.../dsl/jbang/core/kamelets/KameletConverter.java | 35 ---
.../core/kamelets/KameletDescriptionMatching.java | 34 ---
.../dsl/jbang/core/kamelets/KameletPrinter.java| 28 --
.../jbang/core/languages/LanguageConverter.java| 37 ---
.../languages/LanguageDescriptionMatching.java | 34 ---
.../dsl/jbang/core/languages/LanguagePrinter.java | 28 --
.../dsl/jbang/core/others/OtherConverter.java | 37 ---
.../core/others/OtherDescriptionMatching.java | 34 ---
.../camel/dsl/jbang/core/others/OtherPrinter.java | 28 --
.../camel/dsl/jbang/core/types/Component.java | 24 -
.../apache/camel/dsl/jbang/core/types/Kamelet.java | 23 -
.../camel/dsl/jbang/core/types/Language.java | 21
.../apache/camel/dsl/jbang/core/types/Other.java | 20
28 files changed, 10 insertions(+), 762 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/api/Converter.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/api/Converter.java
deleted file mode 100644
index 7a66a2ba94d..000
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/api/Converter.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.dsl.jbang.core.api;
-
-import java.util.regex.Matcher;
-
-public interface Converter {
-T convert(Matcher matcher);
-}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/api/Extractor.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/api/Extractor.java
deleted file mode 100644
index be2ff86e5e7..000
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/api/Extractor.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.dsl.jbang.core.api;
-
-public interface Extractor {
-void extract(String line);
-}
diff --git
[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 877195b791a Polished 877195b791a is described below commit 877195b791a23ab137a5aa5e3259dfcb5d3c790b Author: Claus Ibsen AuthorDate: Wed Jun 15 06:31:32 2022 +0200 Polished --- docs/user-manual/modules/ROOT/pages/camel-jbang.adoc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index ee3cd5b57b7..5d10e16088f 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -31,7 +31,7 @@ You can specify which Camel version to run as shown: [source,bash] -jbang run -Dcamel.jbang.version=3.16.0 camel@apache/camel [command] +jbang run -Dcamel.jbang.version=3.17.0 camel@apache/camel [command] And you can also try bleeding edge development by using SNAPSHOT such as: @@ -500,7 +500,6 @@ running on port 8080. For example the following route in a file named `server.ya [source,yaml] -#!/usr/bin/env jbang camel@apache/camel run - from: uri: "platform-http:/hello" steps: @@ -519,7 +518,7 @@ And you can call the HTTP service with: [source,bash] -curl http://localhost:8080/hello +$ curl http://localhost:8080/hello Hello World%
[camel] branch main updated: Upgrade debezium 1.9.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 1bc4cad90dd Upgrade debezium 1.9.3 1bc4cad90dd is described below commit 1bc4cad90dd0c03004b18f504acbcbf3f5b8b654 Author: Claus Ibsen AuthorDate: Wed Jun 15 06:28:54 2022 +0200 Upgrade debezium 1.9.3 --- camel-dependencies/pom.xml |2 +- .../DebeziumOracleComponentConfigurer.java |6 + .../debezium/DebeziumOracleEndpointConfigurer.java |6 + .../debezium/DebeziumOracleEndpointUriFactory.java |3 +- ...acleConnectorEmbeddedDebeziumConfiguration.java | 1338 ++-- .../camel/component/debezium/debezium-oracle.json |2 + parent/pom.xml |2 +- 7 files changed, 695 insertions(+), 664 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 76e9acf3afc..2e87c1f8a2d 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -166,7 +166,7 @@ 2.1.4 8.0.28 -1.9.1.Final +1.9.3.Final 1.9.5 1.4.0 10.14.2.0 diff --git a/components/camel-debezium/camel-debezium-oracle/src/generated/java/org/apache/camel/component/debezium/DebeziumOracleComponentConfigurer.java b/components/camel-debezium/camel-debezium-oracle/src/generated/java/org/apache/camel/component/debezium/DebeziumOracleComponentConfigurer.java index 65382dc4979..0a2e6cf23f9 100644 --- a/components/camel-debezium/camel-debezium-oracle/src/generated/java/org/apache/camel/component/debezium/DebeziumOracleComponentConfigurer.java +++ b/components/camel-debezium/camel-debezium-oracle/src/generated/java/org/apache/camel/component/debezium/DebeziumOracleComponentConfigurer.java @@ -142,6 +142,8 @@ public class DebeziumOracleComponentConfigurer extends PropertyConfigurerSupport case "logMiningScnGapDetectionGapSizeMin": getOrCreateConfiguration(target).setLogMiningScnGapDetectionGapSizeMin(property(camelContext, long.class, value)); return true; case "logminingscngapdetectiontimeintervalmaxms": case "logMiningScnGapDetectionTimeIntervalMaxMs": getOrCreateConfiguration(target).setLogMiningScnGapDetectionTimeIntervalMaxMs(property(camelContext, java.time.Duration.class, value).toMillis()); return true; +case "logminingsessionmaxms": +case "logMiningSessionMaxMs": getOrCreateConfiguration(target).setLogMiningSessionMaxMs(property(camelContext, java.time.Duration.class, value).toMillis()); return true; case "logminingsleeptimedefaultms": case "logMiningSleepTimeDefaultMs": getOrCreateConfiguration(target).setLogMiningSleepTimeDefaultMs(property(camelContext, java.time.Duration.class, value).toMillis()); return true; case "logminingsleeptimeincrementms": @@ -355,6 +357,8 @@ public class DebeziumOracleComponentConfigurer extends PropertyConfigurerSupport case "logMiningScnGapDetectionGapSizeMin": return long.class; case "logminingscngapdetectiontimeintervalmaxms": case "logMiningScnGapDetectionTimeIntervalMaxMs": return long.class; +case "logminingsessionmaxms": +case "logMiningSessionMaxMs": return long.class; case "logminingsleeptimedefaultms": case "logMiningSleepTimeDefaultMs": return long.class; case "logminingsleeptimeincrementms": @@ -569,6 +573,8 @@ public class DebeziumOracleComponentConfigurer extends PropertyConfigurerSupport case "logMiningScnGapDetectionGapSizeMin": return getOrCreateConfiguration(target).getLogMiningScnGapDetectionGapSizeMin(); case "logminingscngapdetectiontimeintervalmaxms": case "logMiningScnGapDetectionTimeIntervalMaxMs": return getOrCreateConfiguration(target).getLogMiningScnGapDetectionTimeIntervalMaxMs(); +case "logminingsessionmaxms": +case "logMiningSessionMaxMs": return getOrCreateConfiguration(target).getLogMiningSessionMaxMs(); case "logminingsleeptimedefaultms": case "logMiningSleepTimeDefaultMs": return getOrCreateConfiguration(target).getLogMiningSleepTimeDefaultMs(); case "logminingsleeptimeincrementms": diff --git a/components/camel-debezium/camel-debezium-oracle/src/generated/java/org/apache/camel/component/debezium/DebeziumOracleEndpointConfigurer.java b/components/camel-debezium/camel-debezium-oracle/src/generated/java/org/apache/camel/component/debezium/DebeziumOracleEndpointConfigurer.java index 2b0cc7d25b7..9036eda6314 100644 --- a/components/camel-debezium/camel-debezium-oracle/src/generated/java/org/apache/camel/component/debezium/DebeziumOracleEndpointConfigurer.java +++ b/components/camel-debezium/camel-debezium-oracle/src/generated/java/org/apache/camel/component/debezium/DebeziumOracleEndpointConfigurer.java @@ -136,6 +136,8 @@ public class
[camel] branch main updated: Cleanup deprecated (#7783)
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 30283bba874 Cleanup deprecated (#7783)
30283bba874 is described below
commit 30283bba87437f7a9966e917dc4f573b9e8abb1c
Author: Marat Gubaidullin
AuthorDate: Wed Jun 15 00:22:22 2022 -0400
Cleanup deprecated (#7783)
---
dsl/camel-jbang/camel-jbang-core/pom.xml | 18 -
.../camel/dsl/jbang/core/commands/Build.java | 35 --
.../dsl/jbang/core/commands/CamelJBangMain.java| 16 -
.../camel/dsl/jbang/core/commands/Deploy.java | 121 --
.../camel/dsl/jbang/core/commands/Image.java | 237
.../dsl/jbang/core/commands/KubernetesHelper.java | 242
.../camel/dsl/jbang/core/commands/Manifest.java| 113 --
.../camel/dsl/jbang/core/commands/Package.java | 35 --
.../camel/dsl/jbang/core/commands/Profile.java | 38 --
.../dsl/jbang/core/commands/ProfileHelper.java | 89 -
.../camel/dsl/jbang/core/commands/Search.java | 47 ---
.../dsl/jbang/core/commands/SearchComponents.java | 89 -
.../dsl/jbang/core/commands/SearchKamelets.java| 82 -
.../dsl/jbang/core/commands/SearchLanguages.java | 87 -
.../dsl/jbang/core/commands/SearchOthers.java | 88 -
.../camel/dsl/jbang/core/commands/UberJar.java | 410 -
.../camel/dsl/jbang/core/commands/Undeploy.java| 84 -
17 files changed, 1831 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/pom.xml
b/dsl/camel-jbang/camel-jbang-core/pom.xml
index 4a304f38230..a72cf1a9db4 100644
--- a/dsl/camel-jbang/camel-jbang-core/pom.xml
+++ b/dsl/camel-jbang/camel-jbang-core/pom.xml
@@ -94,24 +94,6 @@
jansi
${jansi-version}
-
-
-io.fabric8
-kubernetes-client
-${kubernetes-client-version}
-
-
-
-io.fabric8
-openshift-client
-${kubernetes-client-version}
-
-
-
-com.google.cloud.tools
-jib-core
-${jib-version}
-
org.apache.camel
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Build.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Build.java
deleted file mode 100644
index 44974cfea34..000
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Build.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.dsl.jbang.core.commands;
-
-import picocli.CommandLine;
-import picocli.CommandLine.Command;
-
-@Command(name = "build", description = "Build Camel container image and
resources (use --help to see sub commands)")
-@Deprecated
-class Build extends CamelCommand {
-
-public Build(CamelJBangMain main) {
-super(main);
-}
-
-@Override
-public Integer call() throws Exception {
-new CommandLine(this).execute("--help");
-return 0;
-}
-}
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
index cbd58a2562d..69a880c009a 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
@@ -44,20 +44,6 @@ public class CamelJBangMain implements Callable {
.addSubcommand("camel-main", new CommandLine(new
ExportCamelMain(main)))
.addSubcommand("spring-boot", new CommandLine(new
ExportSpringBoot(main)))
.addSubcommand("quarkus", new CommandLine(new
ExportQuarkus(main;
-/* // TODO: do not show commands that are
[GitHub] [camel] davsclaus merged pull request #7783: Cleanup deprecated
davsclaus merged PR #7783: URL: https://github.com/apache/camel/pull/7783 -- 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 ee69030ab79 [create-pull-request] automated change
ee69030ab79 is described below
commit ee69030ab795127cd96aff92929121a5b94cc524
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jun 15 01:28:24 2022 +
[create-pull-request] automated change
---
.../resources/org/apache/camel/springboot/catalog/components/file.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/file.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/file.json
index 87990f7e34d..d2683f32362 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/file.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/file.json
@@ -41,7 +41,8 @@
"CamelFileRelativePath": { "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The relative path.", "constantName":
"org.apache.camel.component.file.FileConstants#FILE_RELATIVE_PATH" },
"CamelFileParent": { "kind": "header", "displayName": "", "group":
"common", "label": "", "required": false, "javaType": "String", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The parent path.", "constantName":
"org.apache.camel.component.file.FileConstants#FILE_PARENT" },
"CamelFileNameProduced": { "kind": "header", "displayName": "", "group":
"producer", "label": "producer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The actual absolute filepath (path name) for the output
file that was written. This header is set by Camel and its purpose is providing
end-users with the name of the file that was written.", "constantName":
"org.apache.camel.component.file.Fil [...]
-"CamelOverruleFileName": { "kind": "header", "displayName": "", "group":
"producer", "label": "producer", "required": false, "javaType": "Object",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Is used for overruling CamelFileName header and use the
value instead (but only once, as the producer will remove this header after
writing the file). The value can be only be a String. Notice that if the option
fileName has been configured, th [...]
+"CamelOverruleFileName": { "kind": "header", "displayName": "", "group":
"producer", "label": "producer", "required": false, "javaType": "Object",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Is used for overruling CamelFileName header and use the
value instead (but only once, as the producer will remove this header after
writing the file). The value can be only be a String. Notice that if the option
fileName has been configured, th [...]
+"CamelFileInitialOffset": { "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "long",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "A long value containing the initial offset.",
"constantName": "org.apache.camel.component.file.FileConstants#INITIAL_OFFSET" }
},
"properties": {
"directoryName": { "kind": "path", "displayName": "Directory Name",
"group": "common", "label": "", "required": true, "type": "string", "javaType":
"java.io.File", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The starting directory" },
[GitHub] [camel-spring-boot] oscerd merged pull request #568: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
oscerd merged PR #568: URL: https://github.com/apache/camel-spring-boot/pull/568 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karaf] branch main updated: [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-karaf.git
The following commit(s) were added to refs/heads/main by this push:
new e9337df5 [create-pull-request] automated change
e9337df5 is described below
commit e9337df520bea30a224c43b1c48bd266a7474dfe
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Jun 15 01:07:22 2022 +
[create-pull-request] automated change
---
.../main/resources/org/apache/camel/catalog/karaf/components/file.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/file.json
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/file.json
index 550829da..7173bf35 100644
---
a/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/file.json
+++
b/catalog/camel-catalog-provider-karaf/src/main/resources/org/apache/camel/catalog/karaf/components/file.json
@@ -41,7 +41,8 @@
"CamelFileRelativePath": { "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The relative path.", "constantName":
"org.apache.camel.component.file.FileConstants#FILE_RELATIVE_PATH" },
"CamelFileParent": { "kind": "header", "displayName": "", "group":
"common", "label": "", "required": false, "javaType": "String", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"description": "The parent path.", "constantName":
"org.apache.camel.component.file.FileConstants#FILE_PARENT" },
"CamelFileNameProduced": { "kind": "header", "displayName": "", "group":
"producer", "label": "producer", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The actual absolute filepath (path name) for the output
file that was written. This header is set by Camel and its purpose is providing
end-users with the name of the file that was written.", "constantName":
"org.apache.camel.component.file.Fil [...]
-"CamelOverruleFileName": { "kind": "header", "displayName": "", "group":
"producer", "label": "producer", "required": false, "javaType": "Object",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Is used for overruling CamelFileName header and use the
value instead (but only once, as the producer will remove this header after
writing the file). The value can be only be a String. Notice that if the option
fileName has been configured, th [...]
+"CamelOverruleFileName": { "kind": "header", "displayName": "", "group":
"producer", "label": "producer", "required": false, "javaType": "Object",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "Is used for overruling CamelFileName header and use the
value instead (but only once, as the producer will remove this header after
writing the file). The value can be only be a String. Notice that if the option
fileName has been configured, th [...]
+"CamelFileInitialOffset": { "kind": "header", "displayName": "", "group":
"consumer", "label": "consumer", "required": false, "javaType": "long",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "A long value containing the initial offset.",
"constantName": "org.apache.camel.component.file.FileConstants#INITIAL_OFFSET" }
},
"properties": {
"directoryName": { "kind": "path", "displayName": "Directory Name",
"group": "common", "label": "", "required": true, "type": "string", "javaType":
"java.io.File", "deprecated": false, "deprecationNote": "", "autowired": false,
"secret": false, "description": "The starting directory" },
[GitHub] [camel-karaf] oscerd merged pull request #163: [Github Actions] Periodic Sync Camel Karaf Main Branch
oscerd merged PR #163: URL: https://github.com/apache/camel-karaf/pull/163 -- 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 created (now 59c2de3854b)
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 at 59c2de3854b [create-pull-request] automated change No new revisions were added by this update.
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request, #568: [Github Actions] Periodic Sync Camel Spring Boot Main Branch
github-actions[bot] opened a new pull request, #568: URL: https://github.com/apache/camel-spring-boot/pull/568 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
[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-1155868400 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 2498942321-679-edfcaa21-11bc-467b-84c0-d0aceab640f1 * Camel Quarkus Commit: 6adb1cd70d0b733c13c6f81959a7e80eee89083e * Camel Main Commit: 476fb78fe7b3be25213854b24d2021384b84c35a * Link to build: https://github.com/apache/camel-quarkus/actions/runs/2498942321 -- 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-karaf] github-actions[bot] opened a new pull request, #163: [Github Actions] Periodic Sync Camel Karaf Main Branch
github-actions[bot] opened a new pull request, #163: URL: https://github.com/apache/camel-karaf/pull/163 Periodic Sync of Camel Karaf Main Branch with main Camel Main. see https://github.com/apache/camel-karaf/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-karaf] branch automatic-periodic-sync updated (787f2739 -> 9e86f83c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch automatic-periodic-sync in repository https://gitbox.apache.org/repos/asf/camel-karaf.git from 787f2739 [create-pull-request] automated change add 51b684a0 CAMEL-18183: Wrong bundle in the camel-azure-storage-datalake feature (#161) add 9e86f83c [create-pull-request] automated change No new revisions were added by this update. Summary of changes: .../main/resources/org/apache/camel/catalog/karaf/components/file.json | 3 ++- platforms/karaf/features/src/main/resources/features.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
[GitHub] [camel-k] github-actions[bot] closed pull request #3036: Update installation.adoc
github-actions[bot] closed pull request #3036: Update installation.adoc URL: https://github.com/apache/camel-k/pull/3036 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #7783: Cleanup deprecated
github-actions[bot] commented on PR #7783: URL: https://github.com/apache/camel/pull/7783#issuecomment-1155819905 :no_entry_sign: There are (likely) no components to be tested in this PR -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] ammachado commented on issue #3341: How to deal with `SNAPSHOT` dependencies?
ammachado commented on issue #3341:
URL: https://github.com/apache/camel-k/issues/3341#issuecomment-1155800890
By the way, I'm testing here with `kamel rebuild` and I'm getting the
following error:
> Error: could not rebuild integration my-route-k in namespace dev:
integrations.camel.apache.org "my-route-k" is forbidden: User "ammachado"
cannot update resource "integrations/status" in API group "camel.apache.org" in
the namespace "dev"
I'm fiddling with cluster permissions here, it is an Openshift cluster. My
user has `cluster-reader` rights and I am admin of the namespace.
Running `oc auth can-i * integrations` I receive a `yes` answer and running
`oc auth can-i * integrations/status` I also receive `yes` as the answer, so I
figure I have all the rights needed.
Which permissions are needed to run `kamel rebuild`?
Also, looking at the source code, it seems that `kamel rebuild` only delete
the `status` field. I may be wrong, but I think that I can do the same with a
`oc edit` command and setting `status: {}` and let the operator reconcile it.
Doing the latter, the `status` is recreated with the original kit, since from
what I could find, the operator tries to reuse an existing kit based on the
traits and the dependencies.
--
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] mgubaidullin opened a new pull request, #7783: Cleanup deprecated
mgubaidullin opened a new pull request, #7783: URL: https://github.com/apache/camel/pull/7783 1. Deprecated commands removed 2. Deprecated custom profile augmentation removed 3. Unused dependencies removed -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-karavan] branch main updated: Fix #367 (#369)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new d828ba2 Fix #367 (#369)
d828ba2 is described below
commit d828ba218e57f63f76f95e800605ba85bba46c36
Author: Marat Gubaidullin
AuthorDate: Tue Jun 14 18:33:10 2022 -0400
Fix #367 (#369)
---
karavan-vscode/src/designerView.ts | 144 +++-
karavan-vscode/src/extension.ts| 139 +++
karavan-vscode/src/helpView.ts | 24 ++--
karavan-vscode/src/integrationView.ts | 50 ---
karavan-vscode/src/{commands.ts => jbang.ts} | 48 +++
karavan-vscode/src/openapiView.ts | 56
karavan-vscode/src/utils.ts| 147 +
karavan-vscode/webview/builder/PropertiesTable.tsx | 26 ++--
8 files changed, 368 insertions(+), 266 deletions(-)
diff --git a/karavan-vscode/src/designerView.ts
b/karavan-vscode/src/designerView.ts
index af8059e..aa89553 100644
--- a/karavan-vscode/src/designerView.ts
+++ b/karavan-vscode/src/designerView.ts
@@ -14,42 +14,43 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import * as vscode from "vscode";
-import * as fs from "fs";
+import { workspace, Uri, window, commands, WebviewPanel, ExtensionContext,
ViewColumn, WebviewPanelOnDidChangeViewStateEvent } from "vscode";
import * as path from "path";
import * as utils from "./utils";
-import * as commands from "./commands";
+import * as jbang from "./jbang";
import { CamelDefinitionYaml } from "karavan-core/lib/api/CamelDefinitionYaml";
import { Integration } from "karavan-core/lib/model/IntegrationDefinition";
const KARAVAN_LOADED = "karavan:loaded";
-const KARAVAN_PANELS: Map = new Map();
+const KARAVAN_PANELS: Map = new Map();
const extension = '.properties';
export class DesignerView {
-constructor(private context: vscode.ExtensionContext, private
webviewContent: string, private rootPath?: string) {
+constructor(private context: ExtensionContext, private webviewContent:
string, private rootPath?: string) {
}
karavanOpen(fullPath: string, tab?: string) {
-const yaml = fs.readFileSync(path.resolve(fullPath)).toString('utf8');
-const filename = path.basename(fullPath);
-const relativePath = utils.getRalativePath(fullPath);
-const integration = utils.parceYaml(filename, yaml);
+utils.readFile(path.resolve(fullPath)).then(readData => {
+const yaml = Buffer.from(readData).toString('utf8');
+const filename = path.basename(fullPath);
+const relativePath = utils.getRalativePath(fullPath);
+const integration = utils.parceYaml(filename, yaml);
-if (integration[0]) {
-this.openKaravanWebView(filename, relativePath, fullPath,
integration[1], tab);
-} else {
-vscode.window.showErrorMessage("File is not Camel Integration!")
-}
+if (integration[0]) {
+this.openKaravanWebView(filename, relativePath, fullPath,
integration[1], tab);
+} else {
+window.showErrorMessage("File is not Camel Integration!")
+}
+})
}
jbangRun(fullPath: string) {
const filename = this.getFilename(fullPath);
-if (filename && this.rootPath){
+if (filename && this.rootPath) {
this.selectProfile(this.rootPath, filename);
-}
+}
}
getFilename(fullPath: string) {
@@ -59,37 +60,40 @@ export class DesignerView {
return filename;
}
} else {
-const yaml =
fs.readFileSync(path.resolve(fullPath)).toString('utf8');
-const relativePath = utils.getRalativePath(fullPath);
-const filename = path.basename(fullPath);
-const integration = utils.parceYaml(filename, yaml);
-if (integration[0] && this.rootPath) {
-return relativePath;
-} else {
-vscode.window.showErrorMessage("File is not Camel
Integration!")
-}
+utils.readFile(path.resolve(fullPath)).then(readData => {
+const yaml = Buffer.from(readData).toString('utf8');
+const relativePath = utils.getRalativePath(fullPath);
+const filename = path.basename(fullPath);
+const integration = utils.parceYaml(filename, yaml);
+if (integration[0] && this.rootPath) {
+return relativePath;
+} else {
+window.showErrorMessage("File is not Camel Integration!")
+}
+});
}
}
selectProfile(rootPath:
[GitHub] [camel-karavan] mgubaidullin closed issue #367: Use VS Code fs API instead of Node fs API
mgubaidullin closed issue #367: Use VS Code fs API instead of Node fs API URL: https://github.com/apache/camel-karavan/issues/367 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin merged pull request #369: Fix #367
mgubaidullin merged PR #369: URL: https://github.com/apache/camel-karavan/pull/369 -- 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 (5b6978338e1 -> a4bbf2e1795)
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 5b6978338e1 CAMEL-18818: camel-jbang - Downloading from maven repos should setup for release vs snapshot repo. add 55fb520d846 Regen for commit f8873dcab291b71b59c753fecda5223fb45b3a2c (#7781) add a4bbf2e1795 CAMEL-18193: camel-language - Language component should load resource from classpath by default No new revisions were added by this update. Summary of changes: .../camel/component/language/LanguageComponent.java | 8 +--- .../language/ConstantLanguageBinaryResourceTest.java | 19 --- .../LanguageLoadScriptFromFileCachedTest.java | 2 +- 3 files changed, 22 insertions(+), 7 deletions(-)
[camel] branch main updated: CAMEL-18193: camel-language - Language component should load resource from classpath by default
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 a4bbf2e1795 CAMEL-18193: camel-language - Language component should
load resource from classpath by default
a4bbf2e1795 is described below
commit a4bbf2e17950dbd83db97e8163d421441b865712
Author: Claus Ibsen
AuthorDate: Tue Jun 14 20:34:08 2022 +0200
CAMEL-18193: camel-language - Language component should load resource from
classpath by default
---
.../camel/component/language/LanguageComponent.java | 8 +---
.../language/ConstantLanguageBinaryResourceTest.java | 19 ---
.../LanguageLoadScriptFromFileCachedTest.java | 2 +-
3 files changed, 22 insertions(+), 7 deletions(-)
diff --git
a/components/camel-language/src/main/java/org/apache/camel/component/language/LanguageComponent.java
b/components/camel-language/src/main/java/org/apache/camel/component/language/LanguageComponent.java
index 3137878536f..a8258df04bc 100644
---
a/components/camel-language/src/main/java/org/apache/camel/component/language/LanguageComponent.java
+++
b/components/camel-language/src/main/java/org/apache/camel/component/language/LanguageComponent.java
@@ -17,12 +17,12 @@
package org.apache.camel.component.language;
import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
import java.util.Map;
import org.apache.camel.Endpoint;
import org.apache.camel.spi.Language;
import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.support.ResourceHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
@@ -55,17 +55,19 @@ public class LanguageComponent extends DefaultComponent {
String resourceUri = null;
String resource = script;
if (resource != null) {
+boolean resourcePrefix = false;
if (resource.startsWith(RESOURCE)) {
+resourcePrefix = true;
resource = resource.substring(RESOURCE.length());
}
-if (ResourceHelper.hasScheme(resource)) {
+if (resourcePrefix) {
// the script is a uri for a resource
resourceUri = resource;
// then the script should be null
script = null;
} else {
// the script is provided as text in the uri, so decode to
utf-8
-script = URLDecoder.decode(script, "UTF-8");
+script = URLDecoder.decode(script, StandardCharsets.UTF_8);
// then the resource should be null
resourceUri = null;
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/language/ConstantLanguageBinaryResourceTest.java
b/core/camel-core/src/test/java/org/apache/camel/language/ConstantLanguageBinaryResourceTest.java
index 10b919e99d4..ae3b17d8d56 100644
---
a/core/camel-core/src/test/java/org/apache/camel/language/ConstantLanguageBinaryResourceTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/language/ConstantLanguageBinaryResourceTest.java
@@ -27,8 +27,19 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
public class ConstantLanguageBinaryResourceTest extends ContextTestSupport {
@Test
-public void testConstantBinary() throws Exception {
-byte[] data = template.requestBody("direct:start", "", byte[].class);
+public void testConstantBinaryDefault() throws Exception {
+byte[] data = template.requestBody("direct:default", "", byte[].class);
+// should have X number of bytes
+assertNotNull(data);
+assertEquals(10249, data.length);
+
+// store the logo
+template.sendBodyAndHeader(fileUri(), data, Exchange.FILE_NAME,
"savedlogo.jpeg");
+}
+
+@Test
+public void testConstantBinaryClasspath() throws Exception {
+byte[] data = template.requestBody("direct:classpath", "",
byte[].class);
// should have X number of bytes
assertNotNull(data);
assertEquals(10249, data.length);
@@ -42,7 +53,9 @@ public class ConstantLanguageBinaryResourceTest extends
ContextTestSupport {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("direct:start").to("language:constant:resource:classpath:org/apache/camel/logo.jpeg?binary=true");
+
from("direct:default").to("language:constant:resource:org/apache/camel/logo.jpeg?binary=true");
+
+
from("direct:classpath").to("language:constant:resource:classpath:org/apache/camel/logo.jpeg?binary=true");
}
};
}
diff --git
a/core/camel-management/src/test/java/org/apache/camel/component/language/LanguageLoadScriptFromFileCachedTest.java
[GitHub] [camel-k] robertonav20 commented on pull request #3309: MultiArchitecture support
robertonav20 commented on PR #3309:
URL: https://github.com/apache/camel-k/pull/3309#issuecomment-111774
@squakez i tested again with your instructions but i get the same result
```
{"level":"info","ts":1655230597.095445,"logger":"camel-k.controller.integrationkit","msg":"Invoking
action
build","request-namespace":"default","request-name":"kit-cakd11275mqc73ao1qm0","api-version":"camel.apache.org/v1","kind":"IntegrationKit","ns":"default","name":"kit-cakd11275mqc73ao1qm0"}
{"level":"info","ts":1655230597.0983949,"logger":"camel-k.traits","msg":"User
defined linux/arm/v8 platform, will be used from buildah!","trait":"builder"}
buildah bud --storage-driver=vfs --pull-always -f Dockerfile -t
ghcr.io/robertonav20/default/camel-k-kit-cakd11275mqc73ao1qm0:524604 . &&
buildah push --storage-driver=vfs --digestfile=/dev/termination-log
ghcr.io/robertonav20/default/camel-k-kit-cakd11275mqc73ao1qm0:524604
docker://ghcr.io/robertonav20/default/camel-k-kit-cakd11275mqc73ao1qm0:524604
```
I don't know how to help :(
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[camel-karavan] branch main updated: Saas fix4 (#368)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 99a8616 Saas fix4 (#368)
99a8616 is described below
commit 99a8616db947c70e5f23565ea73e37e5357efd57
Author: Marat Gubaidullin
AuthorDate: Tue Jun 14 13:27:29 2022 -0400
Saas fix4 (#368)
* Readonly properties
* Improvements
---
.../org/apache/camel/karavan/model/Project.java| 4 ++--
.../camel/karavan/service/InfinispanService.java | 3 +++
karavan-app/src/main/webapp/src/Main.tsx | 2 +-
.../main/webapp/src/builder/PropertiesTable.tsx| 18 +++
karavan-app/src/main/webapp/src/index.css | 8 +++
.../src/main/webapp/src/projects/ProjectsPage.tsx | 4 +---
karavan-designer/src/builder/PropertiesTable.tsx | 26 --
karavan-docker/Dockerfile | 1 -
8 files changed, 38 insertions(+), 28 deletions(-)
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/model/Project.java
b/karavan-app/src/main/java/org/apache/camel/karavan/model/Project.java
index 97d77fd..6a13009 100644
--- a/karavan-app/src/main/java/org/apache/camel/karavan/model/Project.java
+++ b/karavan-app/src/main/java/org/apache/camel/karavan/model/Project.java
@@ -46,12 +46,12 @@ public class Project {
this.runtime = runtime;
}
-private String toFolder(String artifactId, String version){
+public static String toFolder(String artifactId, String version){
String folder = (artifactId+version).replaceAll("[^A-Za-z0-9 ]", "_");
return CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, folder);
}
-private String toKey(String groupId, String artifactId, String version){
+public static String toKey(String groupId, String artifactId, String
version){
return groupId + ":" + artifactId + ":" + version;
}
diff --git
a/karavan-app/src/main/java/org/apache/camel/karavan/service/InfinispanService.java
b/karavan-app/src/main/java/org/apache/camel/karavan/service/InfinispanService.java
index b90fbca..a6f5e1c 100644
---
a/karavan-app/src/main/java/org/apache/camel/karavan/service/InfinispanService.java
+++
b/karavan-app/src/main/java/org/apache/camel/karavan/service/InfinispanService.java
@@ -107,6 +107,9 @@ public class InfinispanService {
public void saveProject(Project project) {
GroupedKey key = GroupedKey.create(project.getKey(), project.getKey());
boolean isNew = !projects.containsKey(key);
+if (project.getFolder() == null || project.getFolder().trim().length()
== 0) {
+project.setFolder(Project.toFolder(project.getArtifactId(),
project.getVersion()));
+}
projects.put(key, project);
if (isNew){
String filename = "application.properties";
diff --git a/karavan-app/src/main/webapp/src/Main.tsx
b/karavan-app/src/main/webapp/src/Main.tsx
index 3e306e2..edc2b16 100644
--- a/karavan-app/src/main/webapp/src/Main.tsx
+++ b/karavan-app/src/main/webapp/src/Main.tsx
@@ -136,7 +136,7 @@ export class Main extends React.Component {
]
return (
-
+
{Icon()}
diff --git a/karavan-app/src/main/webapp/src/builder/PropertiesTable.tsx
b/karavan-app/src/main/webapp/src/builder/PropertiesTable.tsx
index ab05991..27d5a88 100644
--- a/karavan-app/src/main/webapp/src/builder/PropertiesTable.tsx
+++ b/karavan-app/src/main/webapp/src/builder/PropertiesTable.tsx
@@ -102,15 +102,15 @@ export class PropertiesTable extends
React.Component {
{properties.map((property, idx: number) => {
const readOnly = ["camel.jbang.gav",
"camel.jbang.runtime"].includes(property.key);
return (
-
-{this.getTextInputField(property, "key", readOnly)}
-{this.getTextInputField(property, "value", readOnly)}
-
-{!readOnly && } className={"delete-button"}
- onClick={event =>
this.startDelete(property.id)}/>}
-
-
-)})}
+
+{this.getTextInputField(property, "key", readOnly)}
+{this.getTextInputField(property, "value", readOnly)}
+
+{!readOnly && } className={"delete-button"}
+
[GitHub] [camel-karavan] mgubaidullin merged pull request #368: Saas fix4
mgubaidullin merged PR #368: URL: https://github.com/apache/camel-karavan/pull/368 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin commented on issue #365: Local setup
mgubaidullin commented on issue #365: URL: https://github.com/apache/camel-karavan/issues/365#issuecomment-1155488006 I usually open karavan-vscode in vscode and use `npm run package` or `npm run watch` it copies required karavan-designer files -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] Viswaprya commented on issue #365: Local setup
Viswaprya commented on issue #365: URL: https://github.com/apache/camel-karavan/issues/365#issuecomment-1155465004 After npm install inside karavan-core folder, lib folder is generated but still the error exists. Not sure what I am missing.  -- 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 (10eec7fcd69 -> 5b6978338e1)
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 10eec7fcd69 Regen for commit f8873dcab291b71b59c753fecda5223fb45b3a2c add d3905e21da4 (chores) ci: fixed typo add ff99e3c62bd Polished add 5b6978338e1 CAMEL-18818: camel-jbang - Downloading from maven repos should setup for release vs snapshot repo. 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 (10eec7fcd69) \ N -- N -- N refs/heads/regen_bot (5b6978338e1) 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: Jenkinsfile.s390x | 2 +- .../java/org/apache/camel/main/DependencyUtil.java | 54 -- .../org/apache/camel/main/DownloaderHelper.java| 19 +--- 3 files changed, 53 insertions(+), 22 deletions(-)
[camel] branch main updated: Regen for commit f8873dcab291b71b59c753fecda5223fb45b3a2c (#7781)
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 55fb520d846 Regen for commit f8873dcab291b71b59c753fecda5223fb45b3a2c (#7781) 55fb520d846 is described below commit 55fb520d84625a98bf8093a1ef3822d634ef17ca Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Jun 14 18:04:51 2022 +0200 Regen for commit f8873dcab291b71b59c753fecda5223fb45b3a2c (#7781) Signed-off-by: GitHub Co-authored-by: orpiske
[GitHub] [camel] davsclaus merged pull request #7781: Generated sources regen
davsclaus merged PR #7781: URL: https://github.com/apache/camel/pull/7781 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/02: 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
commit ff99e3c62bd298f7232a7772e0f56a6eee75b4eb
Author: Claus Ibsen
AuthorDate: Tue Jun 14 14:49:34 2022 +0200
Polished
---
.../src/main/java/org/apache/camel/main/DependencyUtil.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyUtil.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyUtil.java
index 68bb27d5c42..cdc962b5cfb 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyUtil.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyUtil.java
@@ -49,7 +49,7 @@ final class DependencyUtil {
for (int i = 0; i < customRepos.size(); i++) {
String repo = customRepos.get(i);
MavenRemoteRepository repository
-=
MavenRemoteRepositories.createRemoteRepository("custom" + i + 1, repo,
"default");
+=
MavenRemoteRepositories.createRemoteRepository("custom" + (i + 1), repo,
"default");
if (fresh) {
repository.setUpdatePolicy(MavenUpdatePolicy.UPDATE_POLICY_ALWAYS);
} else {
[camel] branch main updated (d3905e21da4 -> 5b6978338e1)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from d3905e21da4 (chores) ci: fixed typo new ff99e3c62bd Polished new 5b6978338e1 CAMEL-18818: camel-jbang - Downloading from maven repos should setup for release vs snapshot repo. 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: .../main/CommandLineDependencyDownloader.java | 3 +- .../java/org/apache/camel/main/DependencyUtil.java | 54 -- .../org/apache/camel/main/DownloaderHelper.java| 19 +--- 3 files changed, 54 insertions(+), 22 deletions(-)
[camel] 02/02: CAMEL-18818: camel-jbang - Downloading from maven repos should setup for release vs snapshot repo.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5b6978338e1cc3ab0b3c70545f1e074a5157809a
Author: Claus Ibsen
AuthorDate: Tue Jun 14 17:16:14 2022 +0200
CAMEL-18818: camel-jbang - Downloading from maven repos should setup for
release vs snapshot repo.
---
.../main/CommandLineDependencyDownloader.java | 3 +-
.../java/org/apache/camel/main/DependencyUtil.java | 54 --
.../org/apache/camel/main/DownloaderHelper.java| 19 +---
3 files changed, 54 insertions(+), 22 deletions(-)
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/CommandLineDependencyDownloader.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/CommandLineDependencyDownloader.java
index 54370b30ee1..b712d46af34 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/CommandLineDependencyDownloader.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/CommandLineDependencyDownloader.java
@@ -67,7 +67,8 @@ public class CommandLineDependencyDownloader extends
ServiceSupport implements C
if (!gavs.isEmpty()) {
for (String gav : gavs) {
MavenGav mg = MavenGav.parseGav(camelContext, gav);
-DownloaderHelper.downloadDependency(camelContext, repos,
fresh, mg.getGroupId(), mg.getArtifactId(), mg.getVersion());
+DownloaderHelper.downloadDependency(camelContext, repos,
fresh, mg.getGroupId(), mg.getArtifactId(),
+mg.getVersion());
}
}
}
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyUtil.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyUtil.java
index cdc962b5cfb..1608859de11 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyUtil.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyUtil.java
@@ -17,20 +17,22 @@
package org.apache.camel.main;
import java.io.File;
+import java.lang.reflect.Field;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import java.util.stream.Collectors;
+import org.apache.camel.util.ReflectionHelper;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.repository.RepositoryPolicy;
import org.jboss.shrinkwrap.resolver.api.ResolutionException;
-import org.jboss.shrinkwrap.resolver.api.maven.ConfigurableMavenResolverSystem;
import org.jboss.shrinkwrap.resolver.api.maven.Maven;
import org.jboss.shrinkwrap.resolver.api.maven.MavenFormatStage;
import org.jboss.shrinkwrap.resolver.api.maven.MavenResolvedArtifact;
import org.jboss.shrinkwrap.resolver.api.maven.MavenStrategyStage;
-import
org.jboss.shrinkwrap.resolver.api.maven.repository.MavenRemoteRepositories;
-import
org.jboss.shrinkwrap.resolver.api.maven.repository.MavenRemoteRepository;
-import org.jboss.shrinkwrap.resolver.api.maven.repository.MavenUpdatePolicy;
+import org.jboss.shrinkwrap.resolver.api.maven.MavenWorkingSession;
+import
org.jboss.shrinkwrap.resolver.impl.maven.ConfigurableMavenResolverSystemImpl;
final class DependencyUtil {
@@ -41,21 +43,45 @@ final class DependencyUtil {
List depIds, List customRepos,
boolean offline, boolean fresh, boolean transitively) {
-ConfigurableMavenResolverSystem resolver = Maven.configureResolver()
-.withMavenCentralRepo(true)
+ConfigurableMavenResolverSystemImpl resolver =
(ConfigurableMavenResolverSystemImpl) Maven.configureResolver()
+.withMavenCentralRepo(false) // do not use central
.workOffline(offline);
if (customRepos != null) {
-for (int i = 0; i < customRepos.size(); i++) {
-String repo = customRepos.get(i);
-MavenRemoteRepository repository
-=
MavenRemoteRepositories.createRemoteRepository("custom" + (i + 1), repo,
"default");
-if (fresh) {
-
repository.setUpdatePolicy(MavenUpdatePolicy.UPDATE_POLICY_ALWAYS);
+int custom = 1;
+for (String repo : customRepos) {
+// shrikwrap does not have public API for adding release vs
snapshot repos
+// we need workaround using lower-level APIs and reflection
+boolean snapshot =
repo.equals(DownloaderHelper.APACHE_SNAPSHOT_REPO);
+boolean central =
repo.equals(DownloaderHelper.MAVEN_CENTRAL_REPO);
+String update = fresh ? RepositoryPolicy.UPDATE_POLICY_ALWAYS
: RepositoryPolicy.UPDATE_POLICY_NEVER;
+RepositoryPolicy releasePolicy = new
RepositoryPolicy(!snapshot, update, null);
+RepositoryPolicy snapshotPolicy = new
RepositoryPolicy(snapshot, update, null);
+
+
[camel] branch regen_bot updated (8059227189a -> 10eec7fcd69)
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 8059227189a Regen for commit 407c95e3283411390eae00495d378931b3a1beb4 add 6e9076a95d4 Update Jenkinsfile.s390x add 4e9e01746b3 Update Jenkinsfile.s390x add cfd43bb9065 Update Jenkinsfile.s390x add f8873dcab29 (chores) camel-cassandra: remove unecessary calls to String.format add 10eec7fcd69 Regen for commit f8873dcab291b71b59c753fecda5223fb45b3a2c 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 (8059227189a) \ N -- N -- N refs/heads/regen_bot (10eec7fcd69) 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: Jenkinsfile.s390x | 14 .../integration/CassandraComponentConsumerIT.java | 6 ++--- .../integration/CassandraComponentProducerIT.java | 26 +++--- .../CassandraComponentProducerUnpreparedIT.java| 12 +- .../CassandraAggregationRepositoryIT.java | 2 +- .../NamedCassandraAggregationRepositoryIT.java | 4 +--- .../cassandra/CassandraIdempotentRepositoryIT.java | 2 +- .../NamedCassandraIdempotentRepositoryIT.java | 4 +--- 8 files changed, 36 insertions(+), 34 deletions(-)
[GitHub] [camel-karavan] mgubaidullin commented on issue #364: Custom Bean creation
mgubaidullin commented on issue #364: URL: https://github.com/apache/camel-karavan/issues/364#issuecomment-1155310884 alternatively add your custom code into the project and annotate your bean as is this demo https://github.com/apache/camel-karavan/blob/main/karavan-demo/postman/project/CustomProcessor.java -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin commented on issue #364: Custom Bean creation
mgubaidullin commented on issue #364: URL: https://github.com/apache/camel-karavan/issues/364#issuecomment-1155309502 you bean should be in mvn repository and then add it to your integration https://user-images.githubusercontent.com/1379213/173609392-fb9ac6f0-1de7-48bf-8114-f8811c99acf2.png;> -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin commented on issue #366: Docker
mgubaidullin commented on issue #366: URL: https://github.com/apache/camel-karavan/issues/366#issuecomment-1155305902 1. as VS Code extension 2. as standalone java application 3. in Podman instead of Docker -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin commented on issue #365: Local setup
mgubaidullin commented on issue #365: URL: https://github.com/apache/camel-karavan/issues/365#issuecomment-1155303999 you neen to install karavan-core first by doing `npm install` in karavan-core folder -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] apupier opened a new issue, #367: Use VS Code fs API instead of Node fs API
apupier opened a new issue, #367: URL: https://github.com/apache/camel-karavan/issues/367 it will allow to have the VS Code extension working with VS Code Server. For instance, fs api is used here https://github.com/apache/camel-karavan/blob/575d72b532841f5a39e83239e66f64aae36feb59/karavan-vscode/src/commands.ts#L18 The VS Code FileSystem API: https://code.visualstudio.com/api/references/vscode-api#FileSystem -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: (chores) ci: fixed typo
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new d3905e21da4 (chores) ci: fixed typo
d3905e21da4 is described below
commit d3905e21da4f1964b8844cdff2b36155fdb35d27
Author: Otavio Rodolfo Piske
AuthorDate: Tue Jun 14 16:27:07 2022 +0200
(chores) ci: fixed typo
---
Jenkinsfile.s390x | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile.s390x b/Jenkinsfile.s390x
index 7c74e97ef13..a366cab6d1b 100644
--- a/Jenkinsfile.s390x
+++ b/Jenkinsfile.s390x
@@ -83,7 +83,7 @@ pipeline {
stage('Test') {
steps {
-// Skip the test case execution of modules which are either
not supported on s390x or vendor images are not not available for s390x.
+// Skip the test case execution of modules which are either
not supported on s390x or vendor images are not available for s390x.
sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS
$MAVEN_TEST_LIMIT_PARAMS -Dmaven.test.failure.ignore=true
-Dcheckstyle.skip=true verify -pl
'!docs,!components/camel-kudu,!components/camel-djl,!components/camel-consul,!components/camel-pulsar,!components/camel-xmpp,!components/camel-google/camel-google-pubsub,!components/camel-hdfs,!components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component,!components/camel-zookeeper,!components/camel-zookeeper-master'"
}
post {
[camel] branch main updated: (chores) camel-cassandra: remove unecessary calls to String.format
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new f8873dcab29 (chores) camel-cassandra: remove unecessary calls to
String.format
f8873dcab29 is described below
commit f8873dcab291b71b59c753fecda5223fb45b3a2c
Author: Otavio Rodolfo Piske
AuthorDate: Tue Jun 14 15:17:35 2022 +0200
(chores) camel-cassandra: remove unecessary calls to String.format
---
.../integration/CassandraComponentConsumerIT.java | 6 ++---
.../integration/CassandraComponentProducerIT.java | 26 +++---
.../CassandraComponentProducerUnpreparedIT.java| 12 +-
.../CassandraAggregationRepositoryIT.java | 2 +-
.../NamedCassandraAggregationRepositoryIT.java | 4 +---
.../cassandra/CassandraIdempotentRepositoryIT.java | 2 +-
.../NamedCassandraIdempotentRepositoryIT.java | 4 +---
7 files changed, 26 insertions(+), 30 deletions(-)
diff --git
a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentConsumerIT.java
b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentConsumerIT.java
index 28cad34ea8a..720089d8d0d 100644
---
a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentConsumerIT.java
+++
b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentConsumerIT.java
@@ -82,10 +82,10 @@ public class CassandraComponentConsumerIT extends
BaseCassandra {
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
-from(String.format("cql://%s/%s?cql=%s", getUrl(),
KEYSPACE_NAME, CQL)).to("mock:resultAll");
-
from(String.format("cql://%s/%s?cql=%s=false", getUrl(),
KEYSPACE_NAME, CQL))
+fromF("cql://%s/%s?cql=%s", getUrl(), KEYSPACE_NAME,
CQL).to("mock:resultAll");
+fromF("cql://%s/%s?cql=%s=false", getUrl(),
KEYSPACE_NAME, CQL)
.to("mock:resultUnprepared");
-
from(String.format("cql://%s/%s?cql=%s=ONE",
getUrl(), KEYSPACE_NAME, CQL))
+fromF("cql://%s/%s?cql=%s=ONE",
getUrl(), KEYSPACE_NAME, CQL)
.to("mock:resultOne");
}
};
diff --git
a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerIT.java
b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerIT.java
index 9e1a3573290..8bccd5bccf0 100644
---
a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerIT.java
+++
b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/integration/CassandraComponentProducerIT.java
@@ -64,15 +64,15 @@ public class CassandraComponentProducerIT extends
BaseCassandra {
return new RouteBuilder() {
public void configure() {
-from("direct:input").to(String.format("cql://%s/%s?cql=%s",
getUrl(), KEYSPACE_NAME, CQL));
+from("direct:input").toF("cql://%s/%s?cql=%s", getUrl(),
KEYSPACE_NAME, CQL);
from("direct:inputNoParameter")
-.to(String.format("cql://%s/%s?cql=%s", getUrl(),
KEYSPACE_NAME, NO_PARAMETER_CQL));
-from("direct:loadBalancingPolicy").to(String.format(
-
"cql://%s/%s?cql=%s=org.apache.camel.component.cassandra.MockLoadBalancingPolicy",
-getUrl(), KEYSPACE_NAME, NO_PARAMETER_CQL));
+.toF("cql://%s/%s?cql=%s", getUrl(), KEYSPACE_NAME,
NO_PARAMETER_CQL);
+from("direct:loadBalancingPolicy")
+
.toF("cql://%s/%s?cql=%s=org.apache.camel.component.cassandra.MockLoadBalancingPolicy",
+getUrl(), KEYSPACE_NAME, NO_PARAMETER_CQL);
from("direct:inputNotConsistent")
-
.to(String.format("cql://%s/%s?cql=%s=ANY", getUrl(),
KEYSPACE_NAME, CQL));
-
from("direct:inputNoEndpointCql").to(String.format("cql://%s/%s", getUrl(),
KEYSPACE_NAME));
+.toF("cql://%s/%s?cql=%s=ANY",
getUrl(), KEYSPACE_NAME, CQL);
+from("direct:inputNoEndpointCql").toF("cql://%s/%s", getUrl(),
KEYSPACE_NAME);
}
};
}
@@ -82,7 +82,7 @@ public class CassandraComponentProducerIT extends
BaseCassandra {
producerTemplate.requestBody(Arrays.asList("w_jiang", "Willem",
"Jiang"));
ResultSet resultSet = getSession()
-.execute(String.format("select login,
[GitHub] [camel] orpiske merged pull request #7780: (chores) camel-cassandra: remove unecessary calls to String.format
orpiske merged PR #7780: URL: https://github.com/apache/camel/pull/7780 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #7780: (chores) camel-cassandra: remove unecessary calls to String.format
github-actions[bot] commented on PR #7780: URL: https://github.com/apache/camel/pull/7780#issuecomment-1155261436 :heavy_check_mark: Finished component verification: 0 component(s) test failed out of **1 component(s) tested** -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/03: Update Jenkinsfile.s390x
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6e9076a95d4f90382c0f262a6a2373caacad3d3f
Author: Nayana Thorat
AuthorDate: Tue Jun 14 17:31:08 2022 +0530
Update Jenkinsfile.s390x
---
Jenkinsfile.s390x | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile.s390x b/Jenkinsfile.s390x
index 2eecc506f05..e643dbf6fc6 100644
--- a/Jenkinsfile.s390x
+++ b/Jenkinsfile.s390x
@@ -22,6 +22,8 @@ def JDK_NAME = env.JDK_NAME ?: 'jdk_11_latest'
def MAVEN_PARAMS = "-B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true
-Dsurefire.rerunFailingTestsCount=2"
def MAVEN_TEST_PARAMS = "-Dkafka.instance.type=local-strimzi-container"
+// Below paramteres needed for core/camel-core module
+def MAVEN_TEST_LIMIT_PARAMS = "-Djdk.xml.xpathExprGrpLimit=100
-Djdk.xml.xpathExprOpLimit=2000"
pipeline {
@@ -64,7 +66,7 @@ pipeline {
branch 'main'
}
steps {
-// Remove camel-kudu and docs as these are not supported on
s390x.
+// Skip modules camel-kudu and docs as these are not supported
on s390x.
sh "./mvnw -U $MAVEN_PARAMS -Dmaven.test.skip.exec=true clean
install -pl '!docs,!components/camel-kudu,!components/camel-djl'"
}
}
@@ -77,8 +79,8 @@ pipeline {
stage('Test') {
steps {
-// Remove camel-kudu and docs as these are not supported on
s390x.
-sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS
-Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify -pl
'!docs,!components/camel-kudu,!components/camel-djl'"
+// Skip the test case execution of modules which are either
not supported on s390x or vendor images are not not available for s390x.
+sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS
$MAVEN_TEST_LIMIT_PARAMS -Dmaven.test.failure.ignore=true
-Dcheckstyle.skip=true verify -pl
'!docs,!components/camel-kudu,!components/camel-djl,!components/camel-consul,!components/camel-pulsar,!components/camel-xmpp,!components/camel-google/camel-google-pubsub,!components/camel-hdfs,!components/camel-vertx/camel-vertx-kafka/camel-vertx-kafka-component,!components/camel-zookeeper,!components/camel-zookeeper-master'"
}
post {
always {
[camel] branch main updated (407c95e3283 -> cfd43bb9065)
This is an automated email from the ASF dual-hosted git repository. orpiske pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 407c95e3283 camel-jbang - Add --fresh option to run command new 6e9076a95d4 Update Jenkinsfile.s390x new 4e9e01746b3 Update Jenkinsfile.s390x new cfd43bb9065 Update Jenkinsfile.s390x The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: Jenkinsfile.s390x | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-)
[camel] 03/03: Update Jenkinsfile.s390x
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cfd43bb9065032dca9581c85d44e8b1ca7d356a7
Author: Nayana Thorat
AuthorDate: Tue Jun 14 19:46:10 2022 +0530
Update Jenkinsfile.s390x
---
Jenkinsfile.s390x | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile.s390x b/Jenkinsfile.s390x
index d0e709bc40a..7c74e97ef13 100644
--- a/Jenkinsfile.s390x
+++ b/Jenkinsfile.s390x
@@ -23,7 +23,7 @@ def JDK_NAME = env.JDK_NAME ?: 'jdk_11_latest'
def MAVEN_PARAMS = "-B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true
-Dsurefire.rerunFailingTestsCount=2"
def MAVEN_TEST_PARAMS = "-Dkafka.instance.type=local-strimzi-container"
/*
-Below parameters required for camel/core/camel-core module's test cases to pass
+Below parameters are required for camel/core/camel-core module's test cases to
pass
- xpathExprGrpLimit: limits the number of groups an Xpath expression can
contain
- xpathExprOpLimit: limits the number of operators an Xpath expression can
contain
*/
@@ -71,7 +71,7 @@ pipeline {
}
steps {
// Skip modules camel-kudu and docs as these are not supported
on s390x.
-sh "./mvnw -U $MAVEN_PARAMS -Dmaven.test.skip.exec=true clean
install -pl '!docs,!components/camel-kudu,!components/camel-djl'"
+sh "./mvnw -U $MAVEN_PARAMS -Dmaven.test.skip.exec=true clean
install -pl '!docs,!components/camel-kudu'"
}
}
[camel] 02/03: Update Jenkinsfile.s390x
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4e9e01746b375e014f4f3c517ff21da5bbd3949f
Author: Nayana Thorat
AuthorDate: Tue Jun 14 19:43:27 2022 +0530
Update Jenkinsfile.s390x
---
Jenkinsfile.s390x | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile.s390x b/Jenkinsfile.s390x
index e643dbf6fc6..d0e709bc40a 100644
--- a/Jenkinsfile.s390x
+++ b/Jenkinsfile.s390x
@@ -22,8 +22,12 @@ def JDK_NAME = env.JDK_NAME ?: 'jdk_11_latest'
def MAVEN_PARAMS = "-B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true
-Dsurefire.rerunFailingTestsCount=2"
def MAVEN_TEST_PARAMS = "-Dkafka.instance.type=local-strimzi-container"
-// Below paramteres needed for core/camel-core module
-def MAVEN_TEST_LIMIT_PARAMS = "-Djdk.xml.xpathExprGrpLimit=100
-Djdk.xml.xpathExprOpLimit=2000"
+/*
+Below parameters required for camel/core/camel-core module's test cases to pass
+- xpathExprGrpLimit: limits the number of groups an Xpath expression can
contain
+- xpathExprOpLimit: limits the number of operators an Xpath expression can
contain
+*/
+def MAVEN_TEST_LIMIT_PARAMS = "-Djdk.xml.xpathExprGrpLimit=100
-Djdk.xml.xpathExprOpLimit=2000"
pipeline {
[GitHub] [camel] orpiske merged pull request #7782: s390x jenkinsfile update
orpiske merged PR #7782: URL: https://github.com/apache/camel/pull/7782 -- 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] Nayana-ibm opened a new pull request, #7782: s390x jenkinsfile update
Nayana-ibm opened a new pull request, #7782: URL: https://github.com/apache/camel/pull/7782 Skip the test case execution of modules which are either not supported on s390x or vendor images are not not available for s390x. Also added - xpathExprGrpLimit and - xpathExprOpLimit parameters -- 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] christophd commented on pull request #3357: [TEST] Add autoscaling test
christophd commented on PR #3357: URL: https://github.com/apache/camel-k/pull/3357#issuecomment-1155191132 @squakez ah yes, just did a stupid copy & paste. thx -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] Viswaprya opened a new issue, #366: Docker
Viswaprya opened a new issue, #366: URL: https://github.com/apache/camel-karavan/issues/366 Is there any alternative for docker to build and run the karavan? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (616e8bcce13 -> 8059227189a)
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 616e8bcce13 Regen for commit 05595854aadb81ccb408c1ca8c3c28c4dc835ec3 add 407c95e3283 camel-jbang - Add --fresh option to run command add 8059227189a Regen for commit 407c95e3283411390eae00495d378931b3a1beb4 No new revisions were added by this update. Summary of changes: .../apache/camel/dsl/jbang/core/commands/Run.java | 4 +++ .../main/CommandLineDependencyDownloader.java | 7 +++-- .../main/DependencyDownloaderClassResolver.java| 6 ++-- .../DependencyDownloaderComponentResolver.java | 6 ++-- .../DependencyDownloaderDataFormatResolver.java| 6 ++-- .../camel/main/DependencyDownloaderKamelet.java| 10 --- .../main/DependencyDownloaderLanguageResolver.java | 6 ++-- ...ependencyDownloaderPropertyBindingListener.java | 6 ++-- .../main/DependencyDownloaderResourceLoader.java | 6 ++-- .../main/DependencyDownloaderRoutesLoader.java | 6 ++-- .../camel/main/DependencyDownloaderStrategy.java | 6 ++-- .../java/org/apache/camel/main/DependencyUtil.java | 8 -- .../org/apache/camel/main/DownloaderHelper.java| 4 +-- .../java/org/apache/camel/main/KameletMain.java| 32 +++--- .../org/apache/camel/main/DependencyUtilTest.java | 2 +- 15 files changed, 78 insertions(+), 37 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request, #7781: Generated sources regen
github-actions[bot] opened a new pull request, #7781: URL: https://github.com/apache/camel/pull/7781 Regen bot :robot: found some uncommitted changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #7780: (chores) camel-cassandra: remove unecessary calls to String.format
github-actions[bot] commented on PR #7780: URL: https://github.com/apache/camel/pull/7780#issuecomment-1155180142 :warning: This PR changes Camel components and will be tested automatically. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske opened a new pull request, #7780: (chores) camel-cassandra: remove unecessary calls to String.format
orpiske opened a new pull request, #7780: URL: https://github.com/apache/camel/pull/7780 -- 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-examples] KuthumiPepple commented on pull request #53: add cron example
KuthumiPepple commented on PR #53: URL: https://github.com/apache/camel-k-examples/pull/53#issuecomment-1155148538 I removed the didact tutorial and provided some context in the readme.md -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] Viswaprya opened a new issue, #365: Local setup
Viswaprya opened a new issue, #365: URL: https://github.com/apache/camel-karavan/issues/365 Hi I am trying to do the local setup of the camel-karavan code in my laptop by following the readme cd karavan-vscode/yarn run compile getting failed with below error ERROR in ./src/builderView.ts 22:0-88 Module not found: Error: Can't resolve 'karavan-core/lib/model/ProjectModel' in 'D:\camel-karavan-main\karavan-vscode\src' @ ./src/extension.ts 24:0-44 51:26-37 ERROR in ./src/builderView.ts 23:0-71 Module not found: Error: Can't resolve 'karavan-core/lib/api/ProjectModelApi' in 'D:\camel-karavan-main\karavan-vscode\src' @ ./src/extension.ts 24:0-44 51:26-37 ERROR in ./src/commands.ts 21:0-79 Module not found: Error: Can't resolve 'karavan-core/lib/api/CamelDefinitionYaml' in 'D:\camel-karavan-main\karavan-vscode\src' @ ./src/designerView.ts 21:0-39 86:24-46 91:16-38 @ ./src/extension.ts 20:0-46 39:23-35 ERROR in ./src/designerView.ts 22:0-79 Module not found: Error: Can't resolve 'karavan-core/lib/api/CamelDefinitionYaml' in 'D:\camel-karavan-main\karavan-vscode\src' @ ./src/extension.ts 20:0-46 39:23-35 ERROR in ./src/designerView.ts 23:0-75 Module not found: Error: Can't resolve 'karavan-core/lib/model/IntegrationDefinition' in 'D:\camel-karavan-main\karavan-vscode\src' @ ./src/extension.ts 20:0-46 39:23-35 ERROR in ./src/integrationView.ts 22:0-79 Module not found: Error: Can't resolve 'karavan-core/lib/api/CamelDefinitionYaml' in 'D:\camel-karavan-main\karavan-vscode\src' @ ./src/extension.ts 21:0-52 40:30-45 .. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] jamesnetherton commented on a diff in pull request #3815: Test aws-secrets-manager extension with Localstack #3741
jamesnetherton commented on code in PR #3815:
URL: https://github.com/apache/camel-quarkus/pull/3815#discussion_r896764048
##
integration-tests-jvm/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTestEnvCustomizer.java:
##
@@ -0,0 +1,48 @@
+/*
+ * 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.quarkus.component.aws.secrets.manager.it;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext;
+import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer;
+import org.testcontainers.containers.localstack.LocalStackContainer.Service;
+
+public class AwsSecretsManagerTestEnvCustomizer implements
Aws2TestEnvCustomizer {
+
+@Override
+public Service[] localstackServices() {
+return new Service[] { Service.SECRETSMANAGER };
+}
+
+@Override
+public void customize(Aws2TestEnvContext envContext) {
+
+//get all properties from the context
+Map props = envContext.getProperies();
Review Comment:
Yes, exactly.
--
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-jbang - Add --fresh option to run command
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 407c95e3283 camel-jbang - Add --fresh option to run command
407c95e3283 is described below
commit 407c95e3283411390eae00495d378931b3a1beb4
Author: Claus Ibsen
AuthorDate: Tue Jun 14 13:04:09 2022 +0200
camel-jbang - Add --fresh option to run command
---
.../apache/camel/dsl/jbang/core/commands/Run.java | 4 +++
.../main/CommandLineDependencyDownloader.java | 6 ++--
.../main/DependencyDownloaderClassResolver.java| 6 ++--
.../DependencyDownloaderComponentResolver.java | 6 ++--
.../DependencyDownloaderDataFormatResolver.java| 6 ++--
.../camel/main/DependencyDownloaderKamelet.java| 10 ---
.../main/DependencyDownloaderLanguageResolver.java | 6 ++--
...ependencyDownloaderPropertyBindingListener.java | 6 ++--
.../main/DependencyDownloaderResourceLoader.java | 6 ++--
.../main/DependencyDownloaderRoutesLoader.java | 6 ++--
.../camel/main/DependencyDownloaderStrategy.java | 6 ++--
.../java/org/apache/camel/main/DependencyUtil.java | 8 --
.../org/apache/camel/main/DownloaderHelper.java| 4 +--
.../java/org/apache/camel/main/KameletMain.java| 32 +++---
.../org/apache/camel/main/DependencyUtilTest.java | 2 +-
15 files changed, 77 insertions(+), 37 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 4f5e953bc85..568768edf0c 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -105,6 +105,9 @@ class Run extends CamelCommand {
@Option(names = {"--repos"}, description = "Additional maven repositories
for download on-demand (Use commas to separate multiple repositories).")
String repos;
+@Option(names = { "--fresh" }, description = "Make sure we use fresh (i.e.
non-cached) resources")
+private boolean fresh;
+
@Option(names = {"--download"}, defaultValue = "true", description =
"Whether to allow automatic downloaded JAR dependencies, over the internet,
that Camel requires.")
boolean download = true;
@@ -318,6 +321,7 @@ class Run extends CamelCommand {
final Set downloaded = new HashSet<>();
main.setRepos(repos);
main.setDownload(download);
+main.setFresh(fresh);
main.setDownloadListener(new DownloadListener() {
@Override
public void onDownloadDependency(String groupId, String
artifactId, String version) {
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/CommandLineDependencyDownloader.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/CommandLineDependencyDownloader.java
index b30540b1acc..54370b30ee1 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/CommandLineDependencyDownloader.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/CommandLineDependencyDownloader.java
@@ -28,10 +28,12 @@ public class CommandLineDependencyDownloader extends
ServiceSupport implements C
private CamelContext camelContext;
private final String dependencies;
private final String repos;
+private final boolean fresh;
-public CommandLineDependencyDownloader(String dependencies, String repos) {
+public CommandLineDependencyDownloader(String dependencies, String repos,
boolean fresh) {
this.dependencies = dependencies;
this.repos = repos;
+this.fresh = fresh;
}
@Override
@@ -65,7 +67,7 @@ public class CommandLineDependencyDownloader extends
ServiceSupport implements C
if (!gavs.isEmpty()) {
for (String gav : gavs) {
MavenGav mg = MavenGav.parseGav(camelContext, gav);
-DownloaderHelper.downloadDependency(camelContext, repos,
mg.getGroupId(), mg.getArtifactId(), mg.getVersion());
+DownloaderHelper.downloadDependency(camelContext, repos,
fresh, mg.getGroupId(), mg.getArtifactId(), mg.getVersion());
}
}
}
diff --git
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyDownloaderClassResolver.java
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyDownloaderClassResolver.java
index cdec350fb63..cd3b2f22e0a 100644
---
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyDownloaderClassResolver.java
+++
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/DependencyDownloaderClassResolver.java
@@ -24,13 +24,15 @@ final class DependencyDownloaderClassResolver
[camel] branch regen_bot updated (744e5415610 -> 616e8bcce13)
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 744e5415610 Regen for commit 05595854aadb81ccb408c1ca8c3c28c4dc835ec3 add 616e8bcce13 Regen for commit 05595854aadb81ccb408c1ca8c3c28c4dc835ec3 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 (744e5415610) \ N -- N -- N refs/heads/regen_bot (616e8bcce13) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[GitHub] [camel-k] robertonav20 commented on pull request #3309: MultiArchitecture support
robertonav20 commented on PR #3309: URL: https://github.com/apache/camel-k/pull/3309#issuecomment-1155119948 Ok thanks... i will do these steps in some few days, anyway the tests are failed so how you proceed? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] JiriOndrusek commented on pull request #3815: Test aws-secrets-manager extension with Localstack #3741
JiriOndrusek commented on PR #3815: URL: https://github.com/apache/camel-quarkus/pull/3815#issuecomment-1155112365 The follow-up ticket is https://github.com/apache/camel-quarkus/issues/3848 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] JiriOndrusek opened a new issue, #3848: Extend test coverage for aws-secrets-manager
JiriOndrusek opened a new issue, #3848: URL: https://github.com/apache/camel-quarkus/issues/3848 Follows https://github.com/apache/camel-quarkus/issues/3741. Refactor (to use LocalStack) does not cover all usecases from the [documentation](https://camel.apache.org/components/3.16.x/aws-secrets-manager-component.html). There are 2 items, which are not covered: - [SING AWS SECRETS MANAGER PROPERTY FUNCTION](https://camel.apache.org/components/3.16.x/aws-secrets-manager-component.html#_using_aws_secrets_manager_property_function) - operation `replicateSecretToRegions` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] JiriOndrusek commented on a diff in pull request #3815: Test aws-secrets-manager extension with Localstack #3741
JiriOndrusek commented on code in PR #3815:
URL: https://github.com/apache/camel-quarkus/pull/3815#discussion_r896736883
##
integration-tests-jvm/aws-secrets-manager/src/test/java/org/apache/camel/quarkus/component/aws/secrets/manager/it/AwsSecretsManagerTestEnvCustomizer.java:
##
@@ -0,0 +1,48 @@
+/*
+ * 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.quarkus.component.aws.secrets.manager.it;
+
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvContext;
+import org.apache.camel.quarkus.test.support.aws2.Aws2TestEnvCustomizer;
+import org.testcontainers.containers.localstack.LocalStackContainer.Service;
+
+public class AwsSecretsManagerTestEnvCustomizer implements
Aws2TestEnvCustomizer {
+
+@Override
+public Service[] localstackServices() {
+return new Service[] { Service.SECRETSMANAGER };
+}
+
+@Override
+public void customize(Aws2TestEnvContext envContext) {
+
+//get all properties from the context
+Map props = envContext.getProperies();
Review Comment:
@jamesnetherton I put the logic into the test customizer. Is this the place
you are suggesting?
--
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 05595854aadb81ccb408c1ca8c3c28c4dc835ec3
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 616e8bcce13 Regen for commit 05595854aadb81ccb408c1ca8c3c28c4dc835ec3 616e8bcce13 is described below commit 616e8bcce133f9c0063883f966f5deee9c6e664c Author: orpiske AuthorDate: Tue Jun 14 11:43:37 2022 + Regen for commit 05595854aadb81ccb408c1ca8c3c28c4dc835ec3 Signed-off-by: GitHub --- .../main/java/org/apache/camel/model/CircuitBreakerDefinition.java| 4 ++-- .../src/main/java/org/apache/camel/model/ProcessorDefinition.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java index d92f2c840d6..c63ac5b29ed 100644 --- a/core/camel-core-model/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java +++ b/core/camel-core-model/src/main/java/org/apache/camel/model/CircuitBreakerDefinition.java @@ -134,8 +134,8 @@ public class CircuitBreakerDefinition extends OutputDefinition /** * Creates a Circuit Breaker EIP. * - * This requires having an implementation on the classpath such as - * camel-microprofile-fault-tolerance. + * This requires having an implementation on the classpath such as camel-microprofile-fault-tolerance. * * @return the builder */
[GitHub] [camel] oscerd merged pull request #7779: Generated sources regen
oscerd merged PR #7779: URL: https://github.com/apache/camel/pull/7779 -- 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 (db7aaace51d -> 744e5415610)
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 db7aaace51d (chores) camel-rabbitmq: removed some usages of Thread.sleep add 05595854aad CAMEL-17879: remove left-overs from camel-hystrix add 744e5415610 Regen for commit 05595854aadb81ccb408c1ca8c3c28c4dc835ec3 No new revisions were added by this update. Summary of changes: .../main/camel-main-configuration-metadata.json| 32 - .../camel/catalog/models/circuitBreaker.json | 2 +- .../apache/camel/catalog/models/onFallback.json| 2 +- .../apache/camel/catalog/schemas/camel-spring.xsd | 11 +- .../org/apache/camel/catalog/CamelCatalogTest.java | 1 - .../parser/helper/CamelJavaTreeParserHelper.java | 4 +- .../ResilienceInheritErrorHandlerTest.java | 4 +- .../spring/xml/handler/CamelNamespaceHandler.java | 2 +- .../camel/catalog/impl/AbstractCamelCatalog.java | 2 - .../org/apache/camel/model/circuitBreaker.json | 2 +- .../org/apache/camel/model/onFallback.json | 2 +- .../camel/model/CircuitBreakerDefinition.java | 4 +- .../apache/camel/model/OnFallbackDefinition.java | 7 +- .../apache/camel/model/ProcessorDefinition.java| 3 +- .../camel/processor/DefaultProcessorFactory.java | 2 - .../camel/reifier/CircuitBreakerReifier.java | 2 +- .../HystrixConfigurationPropertiesConfigurer.java | 276 --- .../camel-main-configuration-metadata.json | 32 - core/camel-main/src/main/docs/main.adoc| 39 - .../camel/main/HystrixConfigurationProperties.java | 809 - .../camel/main/MainConfigurationProperties.java| 23 - .../maven/packaging/PrepareCamelMainMojo.java | 7 +- 22 files changed, 22 insertions(+), 1246 deletions(-) delete mode 100644 core/camel-main/src/generated/java/org/apache/camel/main/HystrixConfigurationPropertiesConfigurer.java delete mode 100644 core/camel-main/src/main/java/org/apache/camel/main/HystrixConfigurationProperties.java
[GitHub] [camel] github-actions[bot] opened a new pull request, #7779: Generated sources regen
github-actions[bot] opened a new pull request, #7779: URL: https://github.com/apache/camel/pull/7779 Regen bot :robot: found some uncommitted changes after running build on :camel: main. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (6a0781bec7c -> db7aaace51d)
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 6a0781bec7c Regen for commit 45994e41d2d5c9a4425161ed50f5740adc1a61a4
(#7776)
add b3a46764b99 (chores) Rename manual tests
add 16f4b346747 (chores) camel-mybatis: removed usages of Thread.sleep
add 0588e153ec0 (chores) camel-netty-http: removed usages of Thread.sleep
add 0451c189756 (chores) camel-netty: removed some usages of Thread.sleep
add db7aaace51d (chores) camel-rabbitmq: removed some usages of
Thread.sleep
No new revisions were added by this update.
Summary of changes:
...SocketTests.java => JavaSocketManualTests.java} | 2 +-
components/camel-mybatis/pom.xml | 5
.../mybatis/MyBatisConsumerIdleMessageTest.java| 9 --
.../camel/component/mybatis/MyBatisQueueTest.java | 10 +--
.../mybatis/MyBatisShutdownAllTasksTest.java | 10 ---
.../NettyHttpBasicAuthConstraintMapperTest.java| 20 -
...tpBasicAuthCustomSecurityAuthenticatorTest.java | 19 +++-
.../netty/http/NettyHttpSuspendResume503Test.java | 14 +
.../netty/http/NettyHttpSuspendResumeTest.java | 14 +
components/camel-netty/pom.xml | 5
.../netty/ErrorDuringGracefullShutdownTest.java| 12 ++--
.../RabbitMQDeadLetterRoutingKeyIT.java| 5 ++--
.../rabbitmq/integration/RabbitMQProducerIT.java | 35 +++---
.../integration/spring/RabbitMQSpringIntTest.java | 12
14 files changed, 108 insertions(+), 64 deletions(-)
rename
components/camel-mllp/src/test/java/org/apache/camel/test/tcp/{JavaSocketTests.java
=> JavaSocketManualTests.java} (99%)
[GitHub] [camel-examples] orpiske merged pull request #96: CAMEL-18126: improved split support for the file component
orpiske merged PR #96: URL: https://github.com/apache/camel-examples/pull/96 -- 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: CAMEL-18126: improved split support for the file component
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-examples.git
The following commit(s) were added to refs/heads/main by this push:
new d1e5022b CAMEL-18126: improved split support for the file component
d1e5022b is described below
commit d1e5022bb1b43565903359aefaf91bcf23fc9c78
Author: Otavio Rodolfo Piske
AuthorDate: Mon Jun 13 14:39:51 2022 +0200
CAMEL-18126: improved split support for the file component
---
.../kafka/file/LargeFileRouteBuilder.java | 77 --
.../example/resume/file/offset/main/MainApp.java | 17 -
2 files changed, 42 insertions(+), 52 deletions(-)
diff --git
a/examples/resume-api/resume-api-common/src/main/java/org/apache/camel/example/resume/strategies/kafka/file/LargeFileRouteBuilder.java
b/examples/resume-api/resume-api-common/src/main/java/org/apache/camel/example/resume/strategies/kafka/file/LargeFileRouteBuilder.java
index 63b20fc1..fbb886b6 100644
---
a/examples/resume-api/resume-api-common/src/main/java/org/apache/camel/example/resume/strategies/kafka/file/LargeFileRouteBuilder.java
+++
b/examples/resume-api/resume-api-common/src/main/java/org/apache/camel/example/resume/strategies/kafka/file/LargeFileRouteBuilder.java
@@ -17,19 +17,16 @@
package org.apache.camel.example.resume.strategies.kafka.file;
-import java.io.BufferedReader;
import java.io.File;
-import java.io.Reader;
import java.util.concurrent.CountDownLatch;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.file.consumer.adapters.FileOffset;
+import org.apache.camel.component.file.FileConstants;
import org.apache.camel.processor.resume.kafka.KafkaResumeStrategy;
import org.apache.camel.resume.Resumable;
import org.apache.camel.resume.cache.ResumeCache;
import org.apache.camel.support.resume.Resumables;
-import org.apache.camel.util.IOHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,64 +40,41 @@ public class LargeFileRouteBuilder extends RouteBuilder {
private final ResumeCache cache;
private long lastOffset;
-private int batchSize;
+private long lineCount = 0;
+
private final CountDownLatch latch;
public LargeFileRouteBuilder(KafkaResumeStrategy resumeStrategy,
ResumeCache cache, CountDownLatch latch) {
this.testResumeStrategy = resumeStrategy;
this.cache = cache;
-String tmp = System.getProperty("resume.batch.size", "30");
-this.batchSize = Integer.valueOf(tmp);
-
this.latch = latch;
}
-private void process(Exchange exchange) throws Exception {
-Reader reader = exchange.getIn().getBody(Reader.class);
-BufferedReader br = IOHelper.buffered(reader);
-
-File path = exchange.getMessage().getHeader("CamelFilePath",
File.class);
-LOG.debug("Path: {} ", path);
+private void process(Exchange exchange) {
+final String body = exchange.getMessage().getBody(String.class);
+final String filePath =
exchange.getMessage().getHeader(Exchange.FILE_PATH, String.class);
+final File file = new File(filePath);
-FileOffset offsetContainer = cache.get(path, FileOffset.class);
+// Get the initial offset and use it to update the last offset when
reading the first line
+final Resumable resumable =
exchange.getMessage().getHeader(FileConstants.INITIAL_OFFSET, Resumable.class);
+final Long value = resumable.getLastOffset().getValue(Long.class);
-if (offsetContainer != null) {
-lastOffset = offsetContainer.getValue();
-} else {
-lastOffset = 0;
+if (lineCount == 0) {
+lastOffset += value;
}
-LOG.debug("Starting to read at offset {}", lastOffset);
-
-String line = br.readLine();
-int count = 0;
-while (count < batchSize) {
-if (line == null || line.isEmpty()) {
-LOG.debug("End of file");
-// EOF, therefore reset the offset
-final Resumable resumable = Resumables.of(path, 0L);
-exchange.getMessage().setHeader(Exchange.OFFSET, resumable);
-
-break;
-}
+// It sums w/ 1 in order to account for the newline that is removed by
readLine
+lastOffset += body.length() + 1;
+lineCount++;
-LOG.debug("Read line at offset {} from the file: {}", lastOffset,
line);
-testResumeStrategy.updateLastOffset(Resumables.of(path,
lastOffset));
+exchange.getMessage().setHeader(Exchange.OFFSET, Resumables.of(file,
lastOffset));
-// It sums w/ 1 in order to account for the newline that is
removed by readLine
-lastOffset += line.length() + 1;
-// Simulate slow processing
-Thread.sleep(50);
-
[camel] branch main updated: CAMEL-17879: remove left-overs from camel-hystrix
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 05595854aad CAMEL-17879: remove left-overs from camel-hystrix
05595854aad is described below
commit 05595854aadb81ccb408c1ca8c3c28c4dc835ec3
Author: Otavio Rodolfo Piske
AuthorDate: Tue Jun 14 11:31:29 2022 +0200
CAMEL-17879: remove left-overs from camel-hystrix
---
.../main/camel-main-configuration-metadata.json| 32 -
.../camel/catalog/models/circuitBreaker.json | 2 +-
.../apache/camel/catalog/models/onFallback.json| 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 11 +-
.../org/apache/camel/catalog/CamelCatalogTest.java | 1 -
.../parser/helper/CamelJavaTreeParserHelper.java | 4 +-
.../ResilienceInheritErrorHandlerTest.java | 4 +-
.../spring/xml/handler/CamelNamespaceHandler.java | 2 +-
.../camel/catalog/impl/AbstractCamelCatalog.java | 2 -
.../org/apache/camel/model/circuitBreaker.json | 2 +-
.../org/apache/camel/model/onFallback.json | 2 +-
.../camel/model/CircuitBreakerDefinition.java | 2 +-
.../apache/camel/model/OnFallbackDefinition.java | 7 +-
.../apache/camel/model/ProcessorDefinition.java| 2 +-
.../camel/processor/DefaultProcessorFactory.java | 2 -
.../camel/reifier/CircuitBreakerReifier.java | 2 +-
.../HystrixConfigurationPropertiesConfigurer.java | 276 ---
.../camel-main-configuration-metadata.json | 32 -
core/camel-main/src/main/docs/main.adoc| 39 -
.../camel/main/HystrixConfigurationProperties.java | 809 -
.../camel/main/MainConfigurationProperties.java| 23 -
.../maven/packaging/PrepareCamelMainMojo.java | 7 +-
22 files changed, 21 insertions(+), 1244 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 26c9225dcaf..2376528636f 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -9,7 +9,6 @@
{ "name": "camel.vault.azure", "description": "Camel Azure Key Vault
configurations", "sourceType": "org.apache.camel.vault.AzureVaultConfiguration"
},
{ "name": "camel.faulttolerance", "description": "Fault Tolerance EIP
Circuit Breaker configurations", "sourceType":
"org.apache.camel.main.FaultToleranceConfigurationProperties" },
{ "name": "camel.resilience4j", "description": "Resilience4j EIP Circuit
Breaker configurations", "sourceType":
"org.apache.camel.main.Resilience4jConfigurationProperties" },
-{ "name": "camel.hystrix", "description": "Hystrix (deprecated) EIP
Circuit Breaker configurations", "sourceType":
"org.apache.camel.main.HystrixConfigurationProperties" },
{ "name": "camel.lra", "description": "Camel Saga EIP (Long Running
Actions) configurations", "sourceType":
"org.apache.camel.main.LraConfigurationProperties" }
],
"properties": [
@@ -147,37 +146,6 @@
{ "name": "camel.health.initialState", "description": "The initial state
of health-checks (readiness). There are the following states: UP, DOWN,
UNKNOWN. By default, the state is DOWN, is regarded as being
pessimistic\/careful. This means that the overall health checks may report as
DOWN during startup and then only if everything is up and running flip to being
UP. Setting the initial state to UP, is regarded as being optimistic. This
means that the overall health checks may report a [...]
{ "name": "camel.health.registryEnabled", "description": "Whether registry
health check is enabled", "sourceType":
"org.apache.camel.main.HealthConfigurationProperties", "type": "boolean",
"javaType": "java.lang.Boolean", "defaultValue": true },
{ "name": "camel.health.routesEnabled", "description": "Whether routes
health check is enabled", "sourceType":
"org.apache.camel.main.HealthConfigurationProperties", "type": "boolean",
"javaType": "java.lang.Boolean", "defaultValue": true },
-{ "name": "camel.hystrix.allowMaximumSizeToDivergeFromCoreSize",
"description": "Allows the configuration for maximumSize to take effect. That
value can then be equal to, or higher, than coreSize", "sourceType":
"org.apache.camel.main.HystrixConfigurationProperties", "type": "boolean",
"javaType": "java.lang.Boolean", "defaultValue": "false", "deprecated": true },
-{ "name": "camel.hystrix.circuitBreakerEnabled", "description": "Whether
to use a HystrixCircuitBreaker or not. If false no circuit-breaker logic will
be used and all requests permitted. This is
[GitHub] [camel] orpiske merged pull request #7777: CAMEL-17879: remove left-overs from camel-hystrix
orpiske merged PR #: URL: https://github.com/apache/camel/pull/ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] orpiske commented on pull request #7777: CAMEL-17879: remove left-overs from camel-hystrix
orpiske commented on PR #: URL: https://github.com/apache/camel/pull/#issuecomment-1155031256 The failure is unrelated to this change, so it should be good to merge. -- 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] barius commented on issue #3356: kamel local run support --build-property ?
barius commented on issue #3356: URL: https://github.com/apache/camel-k/issues/3356#issuecomment-1155020576 > Probably it's because the different layers of virtualization. However, a fine tuned cluster should behave as any local machine. I guess you need to investigate how to improve network performances in your cluster. Sure, I'll work on that. Thanks! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #7777: CAMEL-17879: remove left-overs from camel-hystrix
github-actions[bot] commented on PR #: URL: https://github.com/apache/camel/pull/#issuecomment-1155015914 :x: Finished component verification: **1 component(s) test failed** out of 2 component(s) tested -- 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] squakez commented on pull request #3357: [TEST] Add autoscaling test
squakez commented on PR #3357: URL: https://github.com/apache/camel-k/pull/3357#issuecomment-1155011804 Thanks @christophd - as this is a backport on a release branch, it should not be necessary -- 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 (54640e425f1 -> 6a0781bec7c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git discard 54640e425f1 Regen for commit ea0a50a72b31be1012d23dcb1959e568cfd99d39 add 6a0781bec7c Regen for commit 45994e41d2d5c9a4425161ed50f5740adc1a61a4 (#7776) 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 (54640e425f1) \ N -- N -- N refs/heads/regen_bot (6a0781bec7c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes:
[GitHub] [camel] github-actions[bot] closed pull request #7778: Generated sources regen
github-actions[bot] closed pull request #7778: Generated sources regen URL: https://github.com/apache/camel/pull/7778 -- 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] 03/05: (chores) camel-netty-http: removed usages of Thread.sleep
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0588e153ec0d346383c5bd1b8d2657ba892705d0
Author: Otavio Rodolfo Piske
AuthorDate: Tue Jun 14 10:37:49 2022 +0200
(chores) camel-netty-http: removed usages of Thread.sleep
---
.../http/NettyHttpBasicAuthConstraintMapperTest.java | 20 +---
...HttpBasicAuthCustomSecurityAuthenticatorTest.java | 19 +++
.../netty/http/NettyHttpSuspendResume503Test.java| 14 --
.../netty/http/NettyHttpSuspendResumeTest.java | 14 +-
4 files changed, 41 insertions(+), 26 deletions(-)
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthConstraintMapperTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthConstraintMapperTest.java
index ff67314a4c0..c797b074dad 100644
---
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthConstraintMapperTest.java
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthConstraintMapperTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.netty.http;
+import java.util.concurrent.TimeUnit;
+
import org.apache.camel.BindToRegistry;
import org.apache.camel.CamelExecutionException;
import org.apache.camel.builder.RouteBuilder;
@@ -24,6 +26,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -74,14 +77,17 @@ public class NettyHttpBasicAuthConstraintMapperTest extends
BaseNettyTest {
NettyHttpOperationFailedException cause =
assertIsInstanceOf(NettyHttpOperationFailedException.class, e.getCause());
assertEquals(401, cause.getStatusCode());
-// wait a little bit before next as the connection was closed when
denied
-Thread.sleep(500);
-
// username:password is scott:secret
-String auth = "Basic c2NvdHQ6c2VjcmV0";
-out =
template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo;,
"Hello World", "Authorization", auth,
-String.class);
-assertEquals("Bye World", out);
+final String auth = "Basic c2NvdHQ6c2VjcmV0";
+
+// wait a little bit before next as the connection was closed when
denied
+await().atMost(500, TimeUnit.MILLISECONDS)
+.untilAsserted(() -> {
+String nextOut =
template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo;,
"Hello World",
+"Authorization", auth,
+String.class);
+assertEquals("Bye World", nextOut);
+});
assertMockEndpointsSatisfied();
}
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthCustomSecurityAuthenticatorTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthCustomSecurityAuthenticatorTest.java
index 8930c0d63b2..cb347582e7d 100644
---
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthCustomSecurityAuthenticatorTest.java
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpBasicAuthCustomSecurityAuthenticatorTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.netty.http;
+import java.util.concurrent.TimeUnit;
+
import javax.security.auth.Subject;
import javax.security.auth.login.LoginException;
@@ -25,6 +27,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
@@ -45,16 +48,16 @@ public class
NettyHttpBasicAuthCustomSecurityAuthenticatorTest extends BaseNetty
// wait a little bit before next as the connection was closed when
// denied
-Thread.sleep(500);
-
-getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
-
-// username:password is scott:secret
String auth = "Basic c2NvdHQ6c2VjcmV0";
-String out =
template.requestBodyAndHeader("netty-http:http://localhost:{{port}}/foo;,
"Hello World", "Authorization",
-auth, String.class);
-assertEquals("Bye World", out);
+getMockEndpoint("mock:input").expectedBodiesReceived("Hello
[camel] 01/05: (chores) Rename manual tests
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b3a46764b99af81a2c90e160fe342e49fe6384cd
Author: Otavio Rodolfo Piske
AuthorDate: Tue Jun 14 10:11:14 2022 +0200
(chores) Rename manual tests
Manual tests commmonly use practices that deviate from the standard
good practices - with reason - but that causes them to be flagged in
SonarQube analysis. Renaming them should help us reduce the incidence of
false alarms in the code analysis.
See: 31e0a33ed4f232b7d4616d0764b5be59d8a89df0
---
.../camel/test/tcp/{JavaSocketTests.java => JavaSocketManualTests.java} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/components/camel-mllp/src/test/java/org/apache/camel/test/tcp/JavaSocketTests.java
b/components/camel-mllp/src/test/java/org/apache/camel/test/tcp/JavaSocketManualTests.java
similarity index 99%
rename from
components/camel-mllp/src/test/java/org/apache/camel/test/tcp/JavaSocketTests.java
rename to
components/camel-mllp/src/test/java/org/apache/camel/test/tcp/JavaSocketManualTests.java
index 15432a7663d..16a8c0c0175 100644
---
a/components/camel-mllp/src/test/java/org/apache/camel/test/tcp/JavaSocketTests.java
+++
b/components/camel-mllp/src/test/java/org/apache/camel/test/tcp/JavaSocketManualTests.java
@@ -44,7 +44,7 @@ import static org.junit.jupiter.api.Assertions.fail;
* NOTE: This class may be deleted in the future
*/
@Disabled(value = "Tests validating Java Socket behaviours")
-public class JavaSocketTests {
+public class JavaSocketManualTests {
Logger log = LoggerFactory.getLogger(this.getClass());
Socket clientSocket;
[camel] 04/05: (chores) camel-netty: removed some usages of Thread.sleep
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0451c1897561d083b51f3bc9b650c4bc8c7256f6
Author: Otavio Rodolfo Piske
AuthorDate: Tue Jun 14 10:52:17 2022 +0200
(chores) camel-netty: removed some usages of Thread.sleep
---
components/camel-netty/pom.xml | 5 +
.../component/netty/ErrorDuringGracefullShutdownTest.java| 12 +---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/components/camel-netty/pom.xml b/components/camel-netty/pom.xml
index 2a64bb37bf7..e11d9828b15 100644
--- a/components/camel-netty/pom.xml
+++ b/components/camel-netty/pom.xml
@@ -113,6 +113,11 @@
log4j-slf4j-impl
test
+
+org.awaitility
+awaitility
+test
+
diff --git
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/ErrorDuringGracefullShutdownTest.java
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/ErrorDuringGracefullShutdownTest.java
index cf3dba589fd..ffede513ed0 100644
---
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/ErrorDuringGracefullShutdownTest.java
+++
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/ErrorDuringGracefullShutdownTest.java
@@ -16,11 +16,16 @@
*/
package org.apache.camel.component.netty;
+import java.util.concurrent.TimeUnit;
+
import org.apache.camel.RoutesBuilder;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.processor.errorhandler.DefaultErrorHandler;
+import org.awaitility.Awaitility;
+import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import org.junit.jupiter.api.parallel.Isolated;
import static org.assertj.core.api.Assertions.assertThat;
@@ -48,6 +53,7 @@ class ErrorDuringGracefullShutdownTest extends BaseNettyTest {
};
}
+@Timeout(value = 1, unit = TimeUnit.MINUTES)
@Test
void shouldNotTriggerErrorDuringGracefullShutdown() throws Exception {
// given: successful request
@@ -55,9 +61,9 @@ class ErrorDuringGracefullShutdownTest extends BaseNettyTest {
// when: context is closed
context().close();
-while (context.getStatus() != ServiceStatus.Stopped) {
-Thread.sleep(1);
-}
+
+Awaitility.await().atMost(10, TimeUnit.SECONDS)
+.until(() -> context.getStatus(),
Matchers.equalTo(ServiceStatus.Stopped));
// then: there should be no entries in log indicating that the
callback was called twice
assertThat(LogCaptureAppender.hasEventsFor(DefaultErrorHandler.class)).isFalse();
[camel] branch main updated (6a0781bec7c -> db7aaace51d)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 6a0781bec7c Regen for commit 45994e41d2d5c9a4425161ed50f5740adc1a61a4
(#7776)
new b3a46764b99 (chores) Rename manual tests
new 16f4b346747 (chores) camel-mybatis: removed usages of Thread.sleep
new 0588e153ec0 (chores) camel-netty-http: removed usages of Thread.sleep
new 0451c189756 (chores) camel-netty: removed some usages of Thread.sleep
new db7aaace51d (chores) camel-rabbitmq: removed some usages of
Thread.sleep
The 5 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:
...SocketTests.java => JavaSocketManualTests.java} | 2 +-
components/camel-mybatis/pom.xml | 5
.../mybatis/MyBatisConsumerIdleMessageTest.java| 9 --
.../camel/component/mybatis/MyBatisQueueTest.java | 10 +--
.../mybatis/MyBatisShutdownAllTasksTest.java | 10 ---
.../NettyHttpBasicAuthConstraintMapperTest.java| 20 -
...tpBasicAuthCustomSecurityAuthenticatorTest.java | 19 +++-
.../netty/http/NettyHttpSuspendResume503Test.java | 14 +
.../netty/http/NettyHttpSuspendResumeTest.java | 14 +
components/camel-netty/pom.xml | 5
.../netty/ErrorDuringGracefullShutdownTest.java| 12 ++--
.../RabbitMQDeadLetterRoutingKeyIT.java| 5 ++--
.../rabbitmq/integration/RabbitMQProducerIT.java | 35 +++---
.../integration/spring/RabbitMQSpringIntTest.java | 12
14 files changed, 108 insertions(+), 64 deletions(-)
rename
components/camel-mllp/src/test/java/org/apache/camel/test/tcp/{JavaSocketTests.java
=> JavaSocketManualTests.java} (99%)
[camel] 02/05: (chores) camel-mybatis: removed usages of Thread.sleep
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 16f4b346747014717c95cc943d63ed23f684b1bf
Author: Otavio Rodolfo Piske
AuthorDate: Tue Jun 14 10:25:41 2022 +0200
(chores) camel-mybatis: removed usages of Thread.sleep
---
components/camel-mybatis/pom.xml | 5 +
.../component/mybatis/MyBatisConsumerIdleMessageTest.java | 9 +++--
.../org/apache/camel/component/mybatis/MyBatisQueueTest.java | 10 +++---
.../camel/component/mybatis/MyBatisShutdownAllTasksTest.java | 10 ++
4 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/components/camel-mybatis/pom.xml b/components/camel-mybatis/pom.xml
index c17fbd960ff..587f2ee81e1 100644
--- a/components/camel-mybatis/pom.xml
+++ b/components/camel-mybatis/pom.xml
@@ -75,5 +75,10 @@
mockito-junit-jupiter
test
+
+org.awaitility
+awaitility
+test
+
diff --git
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisConsumerIdleMessageTest.java
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisConsumerIdleMessageTest.java
index cbbd22b3c66..804eda4c8f9 100644
---
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisConsumerIdleMessageTest.java
+++
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisConsumerIdleMessageTest.java
@@ -16,10 +16,13 @@
*/
package org.apache.camel.component.mybatis;
+import java.util.concurrent.TimeUnit;
+
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
+import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertNull;
/**
@@ -35,10 +38,12 @@ public class MyBatisConsumerIdleMessageTest extends
MyBatisTestSupport {
@Test
public void testConsumeIdleMessages() throws Exception {
-Thread.sleep(110);
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMinimumMessageCount(2);
-assertMockEndpointsSatisfied();
+
+await()
+.atLeast(110, TimeUnit.MILLISECONDS)
+.untilAsserted(() -> assertMockEndpointsSatisfied());
assertNull(mock.getExchanges().get(0).getIn().getBody());
assertNull(mock.getExchanges().get(1).getIn().getBody());
}
diff --git
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java
index 5baa582c3cc..57386321b1e 100644
---
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java
+++
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisQueueTest.java
@@ -17,12 +17,15 @@
package org.apache.camel.component.mybatis;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
import static org.apache.camel.test.junit5.TestSupport.assertIsInstanceOf;
+import static org.awaitility.Awaitility.await;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class MyBatisQueueTest extends MyBatisTestSupport {
@@ -59,11 +62,12 @@ public class MyBatisQueueTest extends MyBatisTestSupport {
assertMockEndpointsSatisfied();
// need a delay here on slower machines
-Thread.sleep(1000);
+List body = await()
+.atMost(1, TimeUnit.SECONDS)
+.until(() ->
template.requestBody("mybatis:selectProcessedAccounts?statementType=SelectList",
null, List.class),
+Matchers.notNullValue());
// now lets poll that the account has been inserted
-List body =
template.requestBody("mybatis:selectProcessedAccounts?statementType=SelectList",
null, List.class);
-
assertEquals(2, body.size(), "Wrong size: " + body);
Account actual = assertIsInstanceOf(Account.class, body.get(0));
diff --git
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisShutdownAllTasksTest.java
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisShutdownAllTasksTest.java
index e565546d68a..bcd9e5b6f91 100644
---
a/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisShutdownAllTasksTest.java
+++
b/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisShutdownAllTasksTest.java
@@ -16,12 +16,15 @@
*/
package org.apache.camel.component.mybatis;
+import
