[GitHub] [camel-k] squakez commented on pull request #3953: fix(test): temporary remove env var
squakez commented on PR #3953: URL: https://github.com/apache/camel-k/pull/3953#issuecomment-1363704408 This is getting weird... now it fails with rate limit when the var is unset: ``` Error: cannot read sources: failed to resolve sources: GET https://api.github.com/gists/e2c3f9a5fd0d9e79b21b04809786f17a: 403 API rate limit exceeded for 40.84.169.240. (But here's the good news: Authenticated requests get a higher rate limit. Check out the documentation for more details.) [rate reset in 19m17s] testing.go:1169: test executed panic(nil) or runtime.Goexit: subtest may have called FailNow on a parent test ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus opened a new pull request, #8943: CAMEL-18839: Upgrade to Kafka 3.3.1
davsclaus opened a new pull request, #8943: URL: https://github.com/apache/camel/pull/8943 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: CAMEL-18839: Upgrade to Kafka 3.3.1
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch kafka331 in repository https://gitbox.apache.org/repos/asf/camel.git commit 055bb6c388efb40cf99b24411e2670230d5b93d5 Author: Claus Ibsen AuthorDate: Fri Dec 23 08:26:07 2022 +0100 CAMEL-18839: Upgrade to Kafka 3.3.1 --- camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 9b8ad310c0d..f34daa43746 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -363,7 +363,7 @@ 2.7.3 2.7.3 1.1.3 -3.2.3 +3.3.1 2.8.2 1.7.20 6.3.1 diff --git a/parent/pom.xml b/parent/pom.xml index 4c6e06c3c6b..0633bf5e589 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -346,7 +346,7 @@ 2.7.3 2.7.3 1.1.3 -3.2.3 +3.3.1 2.8.2 1.7.20 6.3.1
[camel] branch kafka331 created (now 055bb6c388e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch kafka331 in repository https://gitbox.apache.org/repos/asf/camel.git at 055bb6c388e CAMEL-18839: Upgrade to Kafka 3.3.1 This branch includes the following new commits: new 055bb6c388e CAMEL-18839: Upgrade to Kafka 3.3.1 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] branch regen_bot updated (5b73eba46d3 -> fb609ed80f7)
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 5b73eba46d3 CAMEL-18665: Document default resource type change. add fb609ed80f7 Fix spelling mistake (#8942) No new revisions were added by this update. Summary of changes: core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch camel-3.20.x updated: Fix spelling mistake (#8942)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.20.x by this push:
new 1a92418970f Fix spelling mistake (#8942)
1a92418970f is described below
commit 1a92418970f6216520746a41cd9d102912191ada
Author: Chandramouli
AuthorDate: Fri Dec 23 10:58:34 2022 +0530
Fix spelling mistake (#8942)
Fix spelling mistake of `LogLevel`
---
core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
index 53bb9404fbd..f30003f74d5 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
@@ -79,7 +79,7 @@ The logger instance may be used as well:
[source,java]
from("direct:start")
-.log(LoggingLeven.DEBUG,
org.slf4j.LoggerFactory.getLogger("com.mycompany.mylogger"), "Processing ${id}")
+.log(LoggingLevel.DEBUG,
org.slf4j.LoggerFactory.getLogger("com.mycompany.mylogger"), "Processing ${id}")
.to("bean:foo");
[camel] branch main updated: Fix spelling mistake (#8942)
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 fb609ed80f7 Fix spelling mistake (#8942)
fb609ed80f7 is described below
commit fb609ed80f776efe71ecb5d2f116f772bdf1c95f
Author: Chandramouli
AuthorDate: Fri Dec 23 10:58:34 2022 +0530
Fix spelling mistake (#8942)
Fix spelling mistake of `LogLevel`
---
core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
index 53bb9404fbd..f30003f74d5 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
@@ -79,7 +79,7 @@ The logger instance may be used as well:
[source,java]
from("direct:start")
-.log(LoggingLeven.DEBUG,
org.slf4j.LoggerFactory.getLogger("com.mycompany.mylogger"), "Processing ${id}")
+.log(LoggingLevel.DEBUG,
org.slf4j.LoggerFactory.getLogger("com.mycompany.mylogger"), "Processing ${id}")
.to("bean:foo");
[camel] branch camel-3.19.x updated: Fix spelling mistake (#8942)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.19.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.19.x by this push:
new 03b7893d131 Fix spelling mistake (#8942)
03b7893d131 is described below
commit 03b7893d131b15b221047b04488b210db3c41dd9
Author: Chandramouli
AuthorDate: Fri Dec 23 10:58:34 2022 +0530
Fix spelling mistake (#8942)
Fix spelling mistake of `LogLevel`
---
core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
b/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
index 53bb9404fbd..f30003f74d5 100644
--- a/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
+++ b/core/camel-core-engine/src/main/docs/modules/eips/pages/log-eip.adoc
@@ -79,7 +79,7 @@ The logger instance may be used as well:
[source,java]
from("direct:start")
-.log(LoggingLeven.DEBUG,
org.slf4j.LoggerFactory.getLogger("com.mycompany.mylogger"), "Processing ${id}")
+.log(LoggingLevel.DEBUG,
org.slf4j.LoggerFactory.getLogger("com.mycompany.mylogger"), "Processing ${id}")
.to("bean:foo");
[GitHub] [camel] davsclaus merged pull request #8942: Fix spelling mistake
davsclaus merged PR #8942: URL: https://github.com/apache/camel/pull/8942 -- 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] pchandramouli opened a new pull request, #8942: Fix spelling mistake
pchandramouli opened a new pull request, #8942: URL: https://github.com/apache/camel/pull/8942 Fix spelling mistake of `LoggingLevel` -- 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-kafka-connector] branch automatic-periodic-sync updated (205a8d465 -> fa42416df)
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-kafka-connector.git discard 205a8d465 [create-pull-request] automated change add fa42416df [create-pull-request] automated change This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (205a8d465) \ N -- N -- N refs/heads/automatic-periodic-sync (fa42416df) 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: .../awscloudtrailsource/CamelAwscloudtrailsourceSourceConnector.java | 3 +-- .../CamelAwscloudtrailsourceSourceConnectorConfig.java | 3 +-- .../awscloudtrailsource/CamelAwscloudtrailsourceSourceTask.java| 3 +-- .../awscloudwatchsink/CamelAwscloudwatchsinkSinkConnector.java | 3 +-- .../awscloudwatchsink/CamelAwscloudwatchsinkSinkConnectorConfig.java | 3 +-- .../awscloudwatchsink/CamelAwscloudwatchsinkSinkTask.java | 3 +-- .../CamelAwsddbexperimentalsinkSinkConnector.java | 3 +-- .../CamelAwsddbexperimentalsinkSinkConnectorConfig.java| 3 +-- .../awsddbexperimentalsink/CamelAwsddbexperimentalsinkSinkTask.java| 3 +-- .../camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnector.java | 3 +-- .../kafkaconnector/awsddbsink/CamelAwsddbsinkSinkConnectorConfig.java | 3 +-- .../camel/kafkaconnector/awsddbsink/CamelAwsddbsinkSinkTask.java | 3 +-- .../awsddbstreamssource/CamelAwsddbstreamssourceSourceConnector.java | 3 +-- .../CamelAwsddbstreamssourceSourceConnectorConfig.java | 3 +-- .../awsddbstreamssource/CamelAwsddbstreamssourceSourceTask.java| 3 +-- .../camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkConnector.java | 3 +-- .../kafkaconnector/awsec2sink/CamelAwsec2sinkSinkConnectorConfig.java | 3 +-- .../camel/kafkaconnector/awsec2sink/CamelAwsec2sinkSinkTask.java | 3 +-- .../awseventbridgesink/CamelAwseventbridgesinkSinkConnector.java | 3 +-- .../awseventbridgesink/CamelAwseventbridgesinkSinkConnectorConfig.java | 3 +-- .../awseventbridgesink/CamelAwseventbridgesinkSinkTask.java| 3 +-- .../CamelAwskinesisfirehosesinkSinkConnector.java | 3 +-- .../CamelAwskinesisfirehosesinkSinkConnectorConfig.java| 3 +-- .../awskinesisfirehosesink/CamelAwskinesisfirehosesinkSinkTask.java| 3 +-- .../awskinesissink/CamelAwskinesissinkSinkConnector.java | 3 +-- .../awskinesissink/CamelAwskinesissinkSinkConnectorConfig.java | 3 +-- .../kafkaconnector/awskinesissink/CamelAwskinesissinkSinkTask.java | 3 +-- .../awskinesissource/CamelAwskinesissourceSourceConnector.java | 3 +-- .../awskinesissource/CamelAwskinesissourceSourceConnectorConfig.java | 3 +-- .../awskinesissource/CamelAwskinesissourceSourceTask.java | 3 +-- .../kafkaconnector/awslambdasink/CamelAwslambdasinkSinkConnector.java | 3 +-- .../awslambdasink/CamelAwslambdasinkSinkConnectorConfig.java | 3 +-- .../camel/kafkaconnector/awslambdasink/CamelAwslambdasinkSinkTask.java | 3 +-- .../awsredshiftsink/CamelAwsredshiftsinkSinkConnector.java | 3 +-- .../awsredshiftsink/CamelAwsredshiftsinkSinkConnectorConfig.java | 3 +-- .../kafkaconnector/awsredshiftsink/CamelAwsredshiftsinkSinkTask.java | 3 +-- .../awsredshiftsource/CamelAwsredshiftsourceSourceConnector.java | 3 +-- .../awsredshiftsource/CamelAwsredshiftsourceSourceConnectorConfig.java | 3 +-- .../awsredshiftsource/CamelAwsredshiftsourceSourceTask.java| 3 +-- .../awss3cdcsource/CamelAwss3cdcsourceSourceConnector.java | 3 +-- .../awss3cdcsource/CamelAwss3cdcsourceSourceConnectorConfig.java | 3 +-- .../kafkaconnector/awss3cdcsource/CamelAwss3cdcsourceSourceTask.java | 3 +-- .../CamelAwss3experimentalsourceSourceConnector.java | 3 +-- .../CamelAwss3experimentalsourceSourceConnectorConfig.java | 3 +-- .../CamelAwss3experimentalsourceSourceTask.java| 3 +-- .../camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkConnector.java| 3 +-- .../kafkaconnector/awss3sink/CamelAwss3sinkSinkConnectorConfig.java| 3 +-- .../apache/camel/kafkaconnector/awss3sink/CamelAwss3sinkSinkTask.java | 3 +--
[camel-quarkus] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 491c0440a4 Updated CHANGELOG.md 491c0440a4 is described below commit 491c0440a45efdaf7a8e8a1f4652801a65d199be Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Dec 23 03:14:59 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdfc608123..9d0db642c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ **Merged pull requests:** +- Added extra content to the Control Bus extension for supported languages. [\#4354](https://github.com/apache/camel-quarkus/pull/4354) ([Gerry-Forde](https://github.com/Gerry-Forde)) - Check extension pages with strict option [\#4351](https://github.com/apache/camel-quarkus/pull/4351) ([ppalaga](https://github.com/ppalaga)) - Exclude io.fabric8:zjsonpatch from test artifacts to avoid version misconvergence [\#4348](https://github.com/apache/camel-quarkus/pull/4348) ([ppalaga](https://github.com/ppalaga)) - Workaround Datasonnet integration tests fail in native mode on … [\#4343](https://github.com/apache/camel-quarkus/pull/4343) ([ppalaga](https://github.com/ppalaga))
[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-1363569648 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 3762646660-974-f7027eee-1ff1-4450-be0e-217feb23ceae * Camel Quarkus Commit: 0a07dba534ed864221d5dc9194aa7737cbb94bc4 * Quarkus Main Commit: aa499ab8fd1f73523fff2964363c77f256a85556 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/3762646660 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] tag 1.11.1-nightly created (now bed3e8479)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to tag 1.11.1-nightly in repository https://gitbox.apache.org/repos/asf/camel-k.git at bed3e8479 (commit) No new revisions were added by this update.
[camel-k-runtime] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/main by this push: new 7a6c73de Updated CHANGELOG.md 7a6c73de is described below commit 7a6c73de1f5f0a476db7123a4d6cd2722f66f4bf Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Dec 23 03:04:47 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 5 + 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bcf7536f..1736a7e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,12 @@ **Merged pull requests:** +- feat\(deps\): split quarkus-camel-bom [\#937](https://github.com/apache/camel-k-runtime/pull/937) ([squakez](https://github.com/squakez)) - Remove duplicate maven-assembly-plugin-version property from pom.xml [\#936](https://github.com/apache/camel-k-runtime/pull/936) ([claudio4j](https://github.com/claudio4j)) +- build\(deps\): bump decode-uri-component from 0.2.0 to 0.2.2 in /docs [\#934](https://github.com/apache/camel-k-runtime/pull/934) ([dependabot[bot]](https://github.com/apps/dependabot)) +- build\(deps\): bump jackson-version from 2.13.4 to 2.14.1 [\#932](https://github.com/apache/camel-k-runtime/pull/932) ([dependabot[bot]](https://github.com/apps/dependabot)) +- build\(deps\): bump gmavenplus-plugin from 1.13.1 to 2.1.0 [\#912](https://github.com/apache/camel-k-runtime/pull/912) ([dependabot[bot]](https://github.com/apps/dependabot)) +- build\(deps\): bump asm from 9.3 to 9.4 [\#899](https://github.com/apache/camel-k-runtime/pull/899) ([dependabot[bot]](https://github.com/apps/dependabot)) ## [camel-k-runtime-project-1.16.0](https://github.com/apache/camel-k-runtime/tree/camel-k-runtime-project-1.16.0) (2022-11-28)
[GitHub] [camel-k] tadayosi opened a new pull request, #3954: fix(e2e): stabilise kustomize uninstall tests
tadayosi opened a new pull request, #3954: URL: https://github.com/apache/camel-k/pull/3954 Small e2e improvements in case they occasionally fail. **Release Note** ```release-note NONE ``` -- 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-1363490977 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 3762063311-870-9fe7721d-424d-470b-be1b-4bc1161a3e97 * Camel Quarkus Commit: 91ff094c9713a41ec308b956df77f9a199c85acf * Camel Main Commit: aa499ab8fd1f73523fff2964363c77f256a85556 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/3762063311 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 01/02: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 94c8efdb8d9e6f96867782123e934c26f5a582b3 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Dec 23 00:52:55 2022 + chore: changelog automatic update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18f3b9d3b..fbc6e1521 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,13 @@ **Closed issues:** +- Container trait : setting `container.name` result in wrong integration condition type `Ready` [\#3941](https://github.com/apache/camel-k/issues/3941) - V 1.11.0 nightly wrong image name [\#3930](https://github.com/apache/camel-k/issues/3930) - GraalVM removal from doc [\#3929](https://github.com/apache/camel-k/issues/3929) - Use flag/config namespace for existing CLI completion kubectl commands [\#3922](https://github.com/apache/camel-k/issues/3922) - Bundle Kamelets from a released version [\#3919](https://github.com/apache/camel-k/issues/3919) - Automate the dependencies in doc setting [\#3867](https://github.com/apache/camel-k/issues/3867) +- Kustomize-based installation method doesn't provide uninstall [\#3866](https://github.com/apache/camel-k/issues/3866) - Helm - missing parameters [\#3763](https://github.com/apache/camel-k/issues/3763) - Kamelet API test rate limit [\#3760](https://github.com/apache/camel-k/issues/3760) - Side services compatibility matrix [\#3306](https://github.com/apache/camel-k/issues/3306)
[camel-k] 02/02: chore: nightly resource refresh
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit bed3e8479cee4fe21e48b265a3d8047307320cd1
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Dec 23 00:57:44 2022 +
chore: nightly resource refresh
---
pkg/resources/resources.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 3529e33be..d49766312 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -512,9 +512,9 @@ var assets = func() http.FileSystem {
"/samples/patch-integration-platform.yaml":
۰CompressedFileInfo{
name: "patch-integration-platform.yaml",
modTime: time.Time{},
- uncompressedSize: 3711,
+ uncompressedSize: 3825,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x57\x5f\x8f\xdb\xb8\x11\x7f\xd7\xa7\x18\xc4\x2f\x09\x20\xcb\xd9\xb4\x45\x51\xf5\xc9\xd9\xec\xf6\xdc\x4d\xec\x60\xb5\xd7\xeb\xa1\xe8\xc3\x98\x1a\x4b\x84\x29\x52\x25\xa9\x75\xdc\x6e\xbf\x7b\x31\x24\x65\xcb\x1b\xdf\xa1\x0f\x67\x60\xbd\x36\x35\x7f\x7e\x33\xf3\x9b\xe1\x78\x06\xf3\xdf\xee\x95\xcd\xe0\xb3\x14\xa4\x1d\xd5\xe0\x0d\xf8\x96\x60\xd9\xa3\x68\x09\x2a\xb3\xf3\x07\xb4\x04\xf7\x66\xd0\x35\x7a\x69\x34\xbc\x5d\x56\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x57\x4f\x8f\xdb\xba\x11\xbf\xeb\x53\x0c\xe2\x4b\x02\x48\x72\x36\x6d\x51\x54\x3d\x39\x9b\xa4\xcf\xdd\x64\x1d\xac\xf6\xf5\xf5\xa1\xe8\x61\x4c\x8d\x25\xc2\x14\xa9\x92\xd4\x3a\x6e\xb7\xdf\xbd\x18\x92\xb2\xe5\x8d\x5b\xf4\x10\x03\x71\xbc\xd4\xfc\xf9\xcd\xcc\x6f\x86\xa3\x05\x14\x3f\xee\x93\x2d\xe0\xb3\x14\xa4\x1d\x35\xe0\x0d\xf8\x8e\x60\x35\xa0\xe8\x08\x6a\xb3\xf3\x07\xb4\x04\x9f\xcc\xa8\x1b\xf4\xd2\x68\x78\xbd\xaa\x3f\x
[...]
},
"/templates": ۰DirInfo{
name:"templates",
[camel-k] branch main updated (f83b7979f -> bed3e8479)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from f83b7979f test(e2e): add E2E tests for kustomize uninstall new 94c8efdb8 chore: changelog automatic update new bed3e8479 chore: nightly resource refresh 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: CHANGELOG.md | 2 ++ pkg/resources/resources.go | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-)
[camel-k] branch release-1.10.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-1.10.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-1.10.x by this push: new 64c9a38bf chore: changelog automatic update 64c9a38bf is described below commit 64c9a38bf4b3e544482baa74d89eaa97a76206d6 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Dec 23 00:52:56 2022 + chore: changelog automatic update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18f3b9d3b..fbc6e1521 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,13 @@ **Closed issues:** +- Container trait : setting `container.name` result in wrong integration condition type `Ready` [\#3941](https://github.com/apache/camel-k/issues/3941) - V 1.11.0 nightly wrong image name [\#3930](https://github.com/apache/camel-k/issues/3930) - GraalVM removal from doc [\#3929](https://github.com/apache/camel-k/issues/3929) - Use flag/config namespace for existing CLI completion kubectl commands [\#3922](https://github.com/apache/camel-k/issues/3922) - Bundle Kamelets from a released version [\#3919](https://github.com/apache/camel-k/issues/3919) - Automate the dependencies in doc setting [\#3867](https://github.com/apache/camel-k/issues/3867) +- Kustomize-based installation method doesn't provide uninstall [\#3866](https://github.com/apache/camel-k/issues/3866) - Helm - missing parameters [\#3763](https://github.com/apache/camel-k/issues/3763) - Kamelet API test rate limit [\#3760](https://github.com/apache/camel-k/issues/3760) - Side services compatibility matrix [\#3306](https://github.com/apache/camel-k/issues/3306)
[camel-k] branch release-1.11.x updated: chore: changelog automatic update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-1.11.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-1.11.x by this push: new 9a84ea241 chore: changelog automatic update 9a84ea241 is described below commit 9a84ea241eda1195d39902e9e5a5be9d5a195688 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Fri Dec 23 00:52:55 2022 + chore: changelog automatic update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18f3b9d3b..fbc6e1521 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,11 +6,13 @@ **Closed issues:** +- Container trait : setting `container.name` result in wrong integration condition type `Ready` [\#3941](https://github.com/apache/camel-k/issues/3941) - V 1.11.0 nightly wrong image name [\#3930](https://github.com/apache/camel-k/issues/3930) - GraalVM removal from doc [\#3929](https://github.com/apache/camel-k/issues/3929) - Use flag/config namespace for existing CLI completion kubectl commands [\#3922](https://github.com/apache/camel-k/issues/3922) - Bundle Kamelets from a released version [\#3919](https://github.com/apache/camel-k/issues/3919) - Automate the dependencies in doc setting [\#3867](https://github.com/apache/camel-k/issues/3867) +- Kustomize-based installation method doesn't provide uninstall [\#3866](https://github.com/apache/camel-k/issues/3866) - Helm - missing parameters [\#3763](https://github.com/apache/camel-k/issues/3763) - Kamelet API test rate limit [\#3760](https://github.com/apache/camel-k/issues/3760) - Side services compatibility matrix [\#3306](https://github.com/apache/camel-k/issues/3306)
[camel] branch regen_bot updated (569149dd77e -> 5b73eba46d3)
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 569149dd77e Polished add 5b73eba46d3 CAMEL-18665: Document default resource type change. No new revisions were added by this update. Summary of changes: docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
[camel] branch main updated: CAMEL-18665: Document default resource type change.
This is an automated email from the ASF dual-hosted git repository. jeremyross pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 5b73eba46d3 CAMEL-18665: Document default resource type change. 5b73eba46d3 is described below commit 5b73eba46d3e4017a9fc29271814ce18732c5a6c Author: Jeremy Ross AuthorDate: Thu Dec 22 16:56:24 2022 -0600 CAMEL-18665: Document default resource type change. --- docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc index 649a717ea86..f0b3b649ac7 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-3x-upgrade-guide-3_20.adoc @@ -10,7 +10,9 @@ from both 3.0 to 3.1 and 3.1 to 3.2. The `org.apache.camel.support.jsse.SSLContextParameters` is now using `ResourceLoader` from `CamelContext` to load keystore and other resources in a standard way. Therefore, the `SSLContextParameters` now must have been pre-configured -with a `CamelContext` otherwise an exception is thrown. +with a `CamelContext` otherwise an exception is thrown. This also changes the default resource type from file to classpath. +If using a file resource for a keystore and the keystore is not found, or entries/aliases aren't found, try explicitly +specifying the file resource type, .e.g `file:myKeystore.jks`. The model class `org.apache.camel.model.errorhandler.ErrorHandlerRefDefinition` has been renamed to `org.apache.camel.model.errorhandler.RefErrorHandlerDefinition`.
[camel-k-runtime] branch dependabot/maven/org.apache-apache-29 created (now 5a963b54)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache-apache-29 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git at 5a963b54 build(deps): bump apache from 27 to 29 No new revisions were added by this update.
[GitHub] [camel-k-runtime] dependabot[bot] opened a new pull request, #942: build(deps): bump apache from 27 to 29
dependabot[bot] opened a new pull request, #942: URL: https://github.com/apache/camel-k-runtime/pull/942 Bumps [apache](https://github.com/apache/maven-apache-parent) from 27 to 29. Release notes Sourced from https://github.com/apache/maven-apache-parent/releases;>apache's releases. Apache Parent POM version 29 Improvement [https://issues.apache.org/jira/browse/MPOM-378;>MPOM-378] - Using an SPDX identifier as the license name is recommended by Maven Dependency upgrade [https://issues.apache.org/jira/browse/MPOM-380;>MPOM-380] - Bump maven-ear-plugin from 3.2.0 to 3.3.0 [https://issues.apache.org/jira/browse/MPOM-381;>MPOM-381] - Bump maven-release-plugin from 3.0.0-M6 to 3.0.0-M7 [https://issues.apache.org/jira/browse/MPOM-382;>MPOM-382] - Bump maven-install-plugin from 3.0.1 to 3.1.0 [https://issues.apache.org/jira/browse/MPOM-383;>MPOM-383] - Bump maven-dependency-plugin from 3.3.0 to 3.4.0 Apache Parent POM version 28 Bug [https://issues.apache.org/jira/browse/MPOM-345;>MPOM-345] - Respect property assembly.tarLongFileMode Improvement [https://issues.apache.org/jira/browse/MPOM-347;>MPOM-347] - Allow custom Release Distribution Repository Dependency upgrade [https://issues.apache.org/jira/browse/MPOM-354;>MPOM-354] - Upgrade maven plugin tools to 3.7.0 [https://issues.apache.org/jira/browse/MPOM-360;>MPOM-360] - Bump apache-rat-plugin from 0.14 to 0.15 [https://issues.apache.org/jira/browse/MPOM-361;>MPOM-361] - Bump maven-jar-plugin from 3.2.2 to 3.3.0 [https://issues.apache.org/jira/browse/MPOM-362;>MPOM-362] - Bump maven-help-plugin from 3.2.0 to 3.3.0 [https://issues.apache.org/jira/browse/MPOM-363;>MPOM-363] - Bump maven-project-info-reports-plugin from 3.3.0 to 3.4.1 [https://issues.apache.org/jira/browse/MPOM-364;>MPOM-364] - Bump maven-javadoc-plugin from 3.4.0 to 3.4.1 [https://issues.apache.org/jira/browse/MPOM-365;>MPOM-365] - Bump maven-site-plugin from 3.12.0 to 3.12.1 [https://issues.apache.org/jira/browse/MPOM-366;>MPOM-366] - Bump maven-resources-plugin from 3.2.0 to 3.3.0 [https://issues.apache.org/jira/browse/MPOM-367;>MPOM-367] - Bump maven-assembly-plugin from 3.4.1 to 3.4.2 [https://issues.apache.org/jira/browse/MPOM-368;>MPOM-368] - Bump maven-install-plugin from 2.5.2 to 3.0.1 [https://issues.apache.org/jira/browse/MPOM-369;>MPOM-369] - Bump maven-shade-plugin from 3.3.0 to 3.4.1 Commits See full diff in https://github.com/apache/maven-apache-parent/commits;>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k-runtime] branch dependabot/maven/org.apache.maven.plugins-maven-dependency-plugin-3.4.0 created (now 8dbd6664)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-dependency-plugin-3.4.0 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git at 8dbd6664 build(deps): bump maven-dependency-plugin from 3.3.0 to 3.4.0 No new revisions were added by this update.
[GitHub] [camel-k-runtime] dependabot[bot] opened a new pull request, #941: build(deps): bump maven-dependency-plugin from 3.3.0 to 3.4.0
dependabot[bot] opened a new pull request, #941: URL: https://github.com/apache/camel-k-runtime/pull/941 Bumps [maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.3.0 to 3.4.0. Commits https://github.com/apache/maven-dependency-plugin/commit/8fecf8a54af68c7b9cb97f90ac6b9c726e33e5ce;>8fecf8a [maven-release-plugin] prepare release maven-dependency-plugin-3.4.0 https://github.com/apache/maven-dependency-plugin/commit/f2e192ae263531e50948082d4fb544cac43f9fa9;>f2e192a [MDEP-809] Fix JavaDoc for verbose parameter of tree mojo https://github.com/apache/maven-dependency-plugin/commit/f9b3ab7a064ce2752b199a1d426aa479649d28ad;>f9b3ab7 Bump plexus-utils from 3.4.2 to 3.5.0 https://github.com/apache/maven-dependency-plugin/commit/e741282d23bf0411057874c5194578ec720abf91;>e741282 Refresh setup-custom-ear-lifecycle test https://github.com/apache/maven-dependency-plugin/commit/a3c64deeb954664615acc3a75dcf959b3ba1337d;>a3c64de Fix tests for new plexus-archiver https://github.com/apache/maven-dependency-plugin/commit/d78f6e1b20281b005f87c570cfc81eda1e4c0461;>d78f6e1 Bump plexus-archiver from 4.2.2 to 4.6.0 https://github.com/apache/maven-dependency-plugin/commit/50a4b7017f1e66e92d8b66d0985ffdff05e93fcc;>50a4b70 [MDEP-674] Add IDE build support (https://github-redirect.dependabot.com/apache/maven-dependency-plugin/issues/257;>#257) https://github.com/apache/maven-dependency-plugin/commit/0eabeef83b4ced3b7d1e72b3da69adfa348a3e6a;>0eabeef Bump project version to 3.4.0-SNAPSHOT https://github.com/apache/maven-dependency-plugin/commit/b8af16ff6c930834c59ef494e373d6b02c526b4e;>b8af16f Bump mockito-core from 4.8.1 to 4.9.0 https://github.com/apache/maven-dependency-plugin/commit/23bfa032f24bad060262058cfa6fca509f119668;>23bfa03 Bump maven-dependency-tree from 3.2.0 to 3.2.1 Additional commits viewable in https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.3.0...maven-dependency-plugin-3.4.0;>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k-runtime] branch dependabot/maven/io.quarkus.platform-quarkus-camel-bom-2.15.1.Final created (now 2cc84f85)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.quarkus.platform-quarkus-camel-bom-2.15.1.Final in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git at 2cc84f85 build(deps): bump quarkus-camel-bom from 2.14.0.Final to 2.15.1.Final No new revisions were added by this update.
[GitHub] [camel-k-runtime] dependabot[bot] opened a new pull request, #940: build(deps): bump quarkus-camel-bom from 2.14.0.Final to 2.15.1.Final
dependabot[bot] opened a new pull request, #940: URL: https://github.com/apache/camel-k-runtime/pull/940 Bumps [quarkus-camel-bom](https://github.com/quarkusio/quarkus-platform) from 2.14.0.Final to 2.15.1.Final. Commits https://github.com/quarkusio/quarkus-platform/commit/5a96ce0de3d9a312d3e85ec14b6a4fe09cefe6f3;>5a96ce0 [maven-release-plugin] prepare release 2.15.1.Final https://github.com/quarkusio/quarkus-platform/commit/b5b8c36e01dea19ffb56aaad81840d097c75c032;>b5b8c36 Merge pull request https://github-redirect.dependabot.com/quarkusio/quarkus-platform/issues/738;>#738 from gsmet/quarkus-2.15.1 https://github.com/quarkusio/quarkus-platform/commit/42165b0d27b6b5d8549d649e08a5a794988c2505;>42165b0 Upgrade to Quarkus 2.15.1.Final https://github.com/quarkusio/quarkus-platform/commit/33b6706928d6a138e2f4661039e4ae42186d9113;>33b6706 Bump up kogito to 1.32.0.Final https://github.com/quarkusio/quarkus-platform/commit/732679c78f0f26ae26dcf3f6f98dd82a31e4da06;>732679c Merge pull request https://github-redirect.dependabot.com/quarkusio/quarkus-platform/issues/735;>#735 from gsmet/amazon-services-1.4.0-2.15 https://github.com/quarkusio/quarkus-platform/commit/c77846591fd52a47e453263cb66b98e0c797711c;>c778465 Upgrade Amazon Services to 1.4.0 https://github.com/quarkusio/quarkus-platform/commit/f781da9ffbad4d80c760bea99bf22450bd23004f;>f781da9 [maven-release-plugin] prepare for next development iteration https://github.com/quarkusio/quarkus-platform/commit/1ea6466991c6afca7fb7ae979390abb66991458e;>1ea6466 [maven-release-plugin] prepare release 2.15.0.Final https://github.com/quarkusio/quarkus-platform/commit/f2d4ae77df83defbe39e680b2479b69d9d20e1e2;>f2d4ae7 Merge pull request https://github-redirect.dependabot.com/quarkusio/quarkus-platform/issues/724;>#724 from loicmathieu/google-cloud-services-1-3-0 https://github.com/quarkusio/quarkus-platform/commit/2185364d78fcb6b55c9f91225094f2c55bb6c1bd;>2185364 Google Cloud Services 1.3.0 Additional commits viewable in https://github.com/quarkusio/quarkus-platform/compare/2.14.0.Final...2.15.1.Final;>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- 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 (e26a94c3e35 -> 569149dd77e)
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 e26a94c3e35 CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for … (#8941) add 569149dd77e Polished No new revisions were added by this update. Summary of changes: .../main/java/org/apache/camel/component/docker/DockerOperation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[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 569149dd77e Polished
569149dd77e is described below
commit 569149dd77e542572914fb87353bc3ea8b1890ac
Author: Claus Ibsen
AuthorDate: Thu Dec 22 19:23:21 2022 +0100
Polished
---
.../main/java/org/apache/camel/component/docker/DockerOperation.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
index 971bdb3ccc4..e274ea358d0 100644
---
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
+++
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerOperation.java
@@ -27,13 +27,13 @@ public enum DockerOperation {
/**
* Events *
*/
-EVENTS("events", false, true, false,
+EVENTS("events", true, false, false,
DockerConstants.DOCKER_INITIAL_RANGE, Long.class),
/**
* Stats *
*/
-STATS("stats", false, true, false,
+STATS("stats", true, false, false,
DockerConstants.DOCKER_CONTAINER_ID, Long.class),
/**
[camel] branch regen_bot updated (6cd2a9c25d6 -> e26a94c3e35)
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 6cd2a9c25d6 Sync deps add e26a94c3e35 CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for … (#8941) No new revisions were added by this update. Summary of changes: .../apache/camel/util/StingQuoteHelperTest.java| 34 ++ .../camel/support/PropertyBindingSupport.java | 4 +-- .../org/apache/camel/util/StringQuoteHelper.java | 9 ++ 3 files changed, 45 insertions(+), 2 deletions(-)
[camel-karavan] 05/07: Generate IDs for DSL that have ID property. #577
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
commit cfbb6828d32659fb6d89731c8687329232678fc0
Author: Marat Gubaidullin
AuthorDate: Thu Dec 22 11:37:48 2022 -0500
Generate IDs for DSL that have ID property. #577
---
karavan-core/src/core/model/CamelDefinition.ts | 1505 ++--
.../generator/CamelDefinitionApiGenerator.java | 13 +-
.../generator/CamelDefinitionGenerator.java| 19 +-
.../src/main/resources/CamelDefinition.ts |4 +-
.../src/main/resources/CamelDefinitionApi.ts |2 +-
5 files changed, 1057 insertions(+), 486 deletions(-)
diff --git a/karavan-core/src/core/model/CamelDefinition.ts
b/karavan-core/src/core/model/CamelDefinition.ts
index 8d1544f..0e16e97 100644
--- a/karavan-core/src/core/model/CamelDefinition.ts
+++ b/karavan-core/src/core/model/CamelDefinition.ts
@@ -72,16 +72,16 @@ export class ProcessorDefinition extends CamelElement {
wireTap?: WireTapDefinition;
serviceCall?: ServiceCallDefinition | string
public constructor(init?: Partial) {
-super('ProcessorDefinition')
-Object.assign(this, init)
+super('ProcessorDefinition');
+Object.assign(this, init);
}
}
export class BeansDeserializer extends CamelElement {
public constructor(init?: Partial) {
-super('BeansDeserializer')
-Object.assign(this, init)
+super('BeansDeserializer');
+Object.assign(this, init);
}
}
@@ -93,8 +93,8 @@ export class ErrorHandlerBuilderDeserializer extends
CamelElement {
refErrorHandler?: RefErrorHandlerDefinition | string;
springTransactionErrorHandler?: SpringTransactionErrorHandlerDefinition
public constructor(init?: Partial) {
-super('ErrorHandlerBuilderDeserializer')
-Object.assign(this, init)
+super('ErrorHandlerBuilderDeserializer');
+Object.assign(this, init);
}
}
@@ -103,8 +103,8 @@ export class NamedBeanDefinition extends CamelElement {
properties?: any = {};
type: string = ''
public constructor(init?: Partial) {
-super('NamedBeanDefinition')
-Object.assign(this, init)
+super('NamedBeanDefinition');
+Object.assign(this, init);
}
}
@@ -115,8 +115,11 @@ export class OutputAwareFromDefinition extends
CamelElement {
steps: CamelElement[] = [];
uri: string = ''
public constructor(init?: Partial) {
-super('OutputAwareFromDefinition')
-Object.assign(this, init)
+super('OutputAwareFromDefinition');
+Object.assign(this, init);
+if (this.id === undefined) {
+this.id = 'null-' + uuidv4().substring(0,4);
+}
}
}
@@ -155,8 +158,11 @@ export class AggregateDefinition extends CamelElement {
inheritErrorHandler?: boolean;
steps?: CamelElement[] = []
public constructor(init?: Partial) {
-super('AggregateDefinition')
-Object.assign(this, init)
+super('AggregateDefinition');
+Object.assign(this, init);
+if (this.id === undefined) {
+this.id = 'aggregate-' + uuidv4().substring(0,4);
+}
}
}
@@ -171,8 +177,11 @@ export class BeanDefinition extends CamelElement {
description?: string;
inheritErrorHandler?: boolean
public constructor(init?: Partial) {
-super('BeanDefinition')
-Object.assign(this, init)
+super('BeanDefinition');
+Object.assign(this, init);
+if (this.id === undefined) {
+this.id = 'bean-' + uuidv4().substring(0,4);
+}
}
}
@@ -186,8 +195,11 @@ export class CatchDefinition extends CamelElement {
inheritErrorHandler?: boolean;
steps?: CamelElement[] = []
public constructor(init?: Partial) {
-super('CatchDefinition')
-Object.assign(this, init)
+super('CatchDefinition');
+Object.assign(this, init);
+if (this.id === undefined) {
+this.id = 'doCatch-' + uuidv4().substring(0,4);
+}
}
}
@@ -201,8 +213,11 @@ export class ChoiceDefinition extends CamelElement {
description?: string;
inheritErrorHandler?: boolean
public constructor(init?: Partial) {
-super('ChoiceDefinition')
-Object.assign(this, init)
+super('ChoiceDefinition');
+Object.assign(this, init);
+if (this.id === undefined) {
+this.id = 'choice-' + uuidv4().substring(0,4);
+}
}
}
@@ -218,8 +233,11 @@ export class CircuitBreakerDefinition extends CamelElement
{
onFallback?: OnFallbackDefinition;
steps?: CamelElement[] = []
public constructor(init?: Partial) {
-super('CircuitBreakerDefinition')
-Object.assign(this, init)
+super('CircuitBreakerDefinition');
+Object.assign(this, init);
+if
[camel-karavan] 06/07: Tests with generated node IDs. #577
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
commit 6a026c674b6e3dc3c67ff24c4108f50a90e1a07b
Author: Marat Gubaidullin
AuthorDate: Thu Dec 22 12:35:23 2022 -0500
Tests with generated node IDs. #577
---
karavan-core/src/core/model/CamelDefinition.ts | 1405 ++--
.../src/core/model/IntegrationDefinition.ts|2 +-
karavan-core/test/checkRequired.spec.ts|2 -
karavan-core/test/circuitBreaker.spec.ts | 10 +-
karavan-core/test/circuitBreaker.yaml | 11 +-
karavan-core/test/errorHandler1.yaml |8 +
karavan-core/test/multiObjectProperties.spec.ts|6 +-
karavan-core/test/multiObjectProperties1.yaml | 40 +-
karavan-core/test/plain-try-catch.yaml |9 +
karavan-core/test/restConfigDsl.yaml | 32 +-
karavan-core/test/restDsl.spec.ts | 13 +-
karavan-core/test/routes1.yaml | 13 +-
.../generator/CamelDefinitionGenerator.java| 21 +-
.../src/main/resources/CamelDefinition.ts |2 +-
14 files changed, 517 insertions(+), 1057 deletions(-)
diff --git a/karavan-core/src/core/model/CamelDefinition.ts
b/karavan-core/src/core/model/CamelDefinition.ts
index 0e16e97..240fa97 100644
--- a/karavan-core/src/core/model/CamelDefinition.ts
+++ b/karavan-core/src/core/model/CamelDefinition.ts
@@ -73,7 +73,7 @@ export class ProcessorDefinition extends CamelElement {
serviceCall?: ServiceCallDefinition | string
public constructor(init?: Partial) {
super('ProcessorDefinition');
-Object.assign(this, init);
+Object.assign(this, init);
}
}
@@ -81,7 +81,7 @@ export class BeansDeserializer extends CamelElement {
public constructor(init?: Partial) {
super('BeansDeserializer');
-Object.assign(this, init);
+Object.assign(this, init);
}
}
@@ -94,7 +94,7 @@ export class ErrorHandlerBuilderDeserializer extends
CamelElement {
springTransactionErrorHandler?: SpringTransactionErrorHandlerDefinition
public constructor(init?: Partial) {
super('ErrorHandlerBuilderDeserializer');
-Object.assign(this, init);
+Object.assign(this, init);
}
}
@@ -104,7 +104,7 @@ export class NamedBeanDefinition extends CamelElement {
type: string = ''
public constructor(init?: Partial) {
super('NamedBeanDefinition');
-Object.assign(this, init);
+Object.assign(this, init);
}
}
@@ -116,10 +116,7 @@ export class OutputAwareFromDefinition extends
CamelElement {
uri: string = ''
public constructor(init?: Partial) {
super('OutputAwareFromDefinition');
-Object.assign(this, init);
-if (this.id === undefined) {
-this.id = 'null-' + uuidv4().substring(0,4);
-}
+Object.assign(this, init);
}
}
@@ -153,16 +150,13 @@ export class AggregateDefinition extends CamelElement {
forceCompletionOnStop?: boolean;
completeAllOnStop?: boolean;
disabled?: boolean;
-id?: string;
+id?: string = 'aggregate-' + uuidv4().substring(0,4);
description?: string;
inheritErrorHandler?: boolean;
steps?: CamelElement[] = []
public constructor(init?: Partial) {
super('AggregateDefinition');
-Object.assign(this, init);
-if (this.id === undefined) {
-this.id = 'aggregate-' + uuidv4().substring(0,4);
-}
+Object.assign(this, init);
}
}
@@ -173,15 +167,12 @@ export class BeanDefinition extends CamelElement {
beanType?: string;
scope?: string;
disabled?: boolean;
-id?: string;
+id?: string = 'bean-' + uuidv4().substring(0,4);
description?: string;
inheritErrorHandler?: boolean
public constructor(init?: Partial) {
super('BeanDefinition');
-Object.assign(this, init);
-if (this.id === undefined) {
-this.id = 'bean-' + uuidv4().substring(0,4);
-}
+Object.assign(this, init);
}
}
@@ -190,16 +181,13 @@ export class CatchDefinition extends CamelElement {
exception?: string[] = [];
onWhen?: WhenDefinition;
disabled?: boolean;
-id?: string;
+id?: string = 'doCatch-' + uuidv4().substring(0,4);
description?: string;
inheritErrorHandler?: boolean;
steps?: CamelElement[] = []
public constructor(init?: Partial) {
super('CatchDefinition');
-Object.assign(this, init);
-if (this.id === undefined) {
-this.id = 'doCatch-' + uuidv4().substring(0,4);
-}
+Object.assign(this, init);
}
}
@@ -209,15 +197,12 @@ export class ChoiceDefinition extends CamelElement {
otherwise?: OtherwiseDefinition;
precondition?: boolean;
disabled?: boolean;
-id?:
[camel-karavan] 07/07: routeConfiguration nodeId should be ampty be default. #577
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
commit e96e70f1e0428adef00e0e0e772f121bc8f2a2dd
Author: Marat Gubaidullin
AuthorDate: Thu Dec 22 12:42:48 2022 -0500
routeConfiguration nodeId should be ampty be default. #577
---
karavan-core/src/core/model/CamelDefinition.ts | 470 ++---
.../generator/CamelDefinitionGenerator.java| 5 +-
2 files changed, 238 insertions(+), 237 deletions(-)
diff --git a/karavan-core/src/core/model/CamelDefinition.ts
b/karavan-core/src/core/model/CamelDefinition.ts
index 240fa97..abf7877 100644
--- a/karavan-core/src/core/model/CamelDefinition.ts
+++ b/karavan-core/src/core/model/CamelDefinition.ts
@@ -70,7 +70,7 @@ export class ProcessorDefinition extends CamelElement {
when?: WhenDefinition;
whenSkipSendToEndpoint?: WhenSkipSendToEndpointDefinition;
wireTap?: WireTapDefinition;
-serviceCall?: ServiceCallDefinition | string
+serviceCall?: ServiceCallDefinition | string;
public constructor(init?: Partial) {
super('ProcessorDefinition');
Object.assign(this, init);
@@ -91,7 +91,7 @@ export class ErrorHandlerBuilderDeserializer extends
CamelElement {
jtaTransactionErrorHandler?: JtaTransactionErrorHandlerDefinition;
noErrorHandler?: NoErrorHandlerDefinition;
refErrorHandler?: RefErrorHandlerDefinition | string;
-springTransactionErrorHandler?: SpringTransactionErrorHandlerDefinition
+springTransactionErrorHandler?: SpringTransactionErrorHandlerDefinition;
public constructor(init?: Partial) {
super('ErrorHandlerBuilderDeserializer');
Object.assign(this, init);
@@ -101,7 +101,7 @@ export class ErrorHandlerBuilderDeserializer extends
CamelElement {
export class NamedBeanDefinition extends CamelElement {
name: string = '';
properties?: any = {};
-type: string = ''
+type: string = '';
public constructor(init?: Partial) {
super('NamedBeanDefinition');
Object.assign(this, init);
@@ -113,7 +113,7 @@ export class OutputAwareFromDefinition extends CamelElement
{
id?: string;
parameters?: any = {};
steps: CamelElement[] = [];
-uri: string = ''
+uri: string = '';
public constructor(init?: Partial) {
super('OutputAwareFromDefinition');
Object.assign(this, init);
@@ -153,7 +153,7 @@ export class AggregateDefinition extends CamelElement {
id?: string = 'aggregate-' + uuidv4().substring(0,4);
description?: string;
inheritErrorHandler?: boolean;
-steps?: CamelElement[] = []
+steps?: CamelElement[] = [];
public constructor(init?: Partial) {
super('AggregateDefinition');
Object.assign(this, init);
@@ -169,7 +169,7 @@ export class BeanDefinition extends CamelElement {
disabled?: boolean;
id?: string = 'bean-' + uuidv4().substring(0,4);
description?: string;
-inheritErrorHandler?: boolean
+inheritErrorHandler?: boolean;
public constructor(init?: Partial) {
super('BeanDefinition');
Object.assign(this, init);
@@ -184,7 +184,7 @@ export class CatchDefinition extends CamelElement {
id?: string = 'doCatch-' + uuidv4().substring(0,4);
description?: string;
inheritErrorHandler?: boolean;
-steps?: CamelElement[] = []
+steps?: CamelElement[] = [];
public constructor(init?: Partial) {
super('CatchDefinition');
Object.assign(this, init);
@@ -199,7 +199,7 @@ export class ChoiceDefinition extends CamelElement {
disabled?: boolean;
id?: string = 'choice-' + uuidv4().substring(0,4);
description?: string;
-inheritErrorHandler?: boolean
+inheritErrorHandler?: boolean;
public constructor(init?: Partial) {
super('ChoiceDefinition');
Object.assign(this, init);
@@ -216,7 +216,7 @@ export class CircuitBreakerDefinition extends CamelElement {
description?: string;
inheritErrorHandler?: boolean;
onFallback?: OnFallbackDefinition;
-steps?: CamelElement[] = []
+steps?: CamelElement[] = [];
public constructor(init?: Partial) {
super('CircuitBreakerDefinition');
Object.assign(this, init);
@@ -233,7 +233,7 @@ export class ClaimCheckDefinition extends CamelElement {
disabled?: boolean;
id?: string = 'claimCheck-' + uuidv4().substring(0,4);
description?: string;
-inheritErrorHandler?: boolean
+inheritErrorHandler?: boolean;
public constructor(init?: Partial) {
super('ClaimCheckDefinition');
Object.assign(this, init);
@@ -244,7 +244,7 @@ export class ContextScanDefinition extends CamelElement {
stepName?: string = 'contextScan';
includeNonSingletons?: boolean;
excludes?: string[] = [];
-includes?: string[] = []
+includes?: string[] = [];
public constructor(init?: Partial) {
[camel-karavan] 02/07: Generator creates code without empty lines
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
commit 22fd6886e3a2efbe6607643dcde0fe0e64ff1efd
Author: Marat Gubaidullin
AuthorDate: Thu Dec 22 10:56:59 2022 -0500
Generator creates code without empty lines
---
karavan-core/src/core/api/CamelDefinitionApi.ts| 272 ++---
.../generator/CamelDefinitionApiGenerator.java | 4 +-
2 files changed, 83 insertions(+), 193 deletions(-)
diff --git a/karavan-core/src/core/api/CamelDefinitionApi.ts
b/karavan-core/src/core/api/CamelDefinitionApi.ts
index 7ffb525..57ea1db 100644
--- a/karavan-core/src/core/api/CamelDefinitionApi.ts
+++ b/karavan-core/src/core/api/CamelDefinitionApi.ts
@@ -482,7 +482,6 @@ export class CamelDefinitionApi {
const def = element ? new OutputAwareFromDefinition({...element}) :
new OutputAwareFromDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
return def;
}
@@ -505,7 +504,6 @@ export class CamelDefinitionApi {
def.optimisticLockRetryPolicy =
CamelDefinitionApi.createOptimisticLockRetryPolicyDefinition(element.optimisticLockRetryPolicy);
}
def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
return def;
}
@@ -522,7 +520,6 @@ export class CamelDefinitionApi {
def.onWhen =
CamelDefinitionApi.createWhenDefinition(element.onWhen);
}
def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
return def;
}
@@ -532,8 +529,7 @@ export class CamelDefinitionApi {
if (element?.otherwise !== undefined) {
def.otherwise =
CamelDefinitionApi.createOtherwiseDefinition(element.otherwise);
}
-def.when = element && element?.when ? element?.when.map((x:any) =>
CamelDefinitionApi.createWhenDefinition(x)) :[];
-
+def.when = element && element?.when ? element?.when.map((x:any) =>
CamelDefinitionApi.createWhenDefinition(x)) :[];
return def;
}
@@ -550,7 +546,6 @@ export class CamelDefinitionApi {
def.resilience4jConfiguration =
CamelDefinitionApi.createResilience4jConfigurationDefinition(element.resilience4jConfiguration);
}
def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
return def;
}
@@ -717,7 +712,6 @@ if (element && typeof element === 'string') element =
{type: element};
def.expression =
CamelDefinitionApi.createExpressionDefinition(element.expression);
def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
return def;
}
@@ -725,7 +719,6 @@ if (element && typeof element === 'string') element =
{type: element};
const def = element ? new FinallyDefinition({...element}) : new
FinallyDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
return def;
}
@@ -734,7 +727,6 @@ if (element && typeof element === 'string') element = {
uri: element};
const def = element ? new FromDefinition({...element}) : new
FromDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
return def;
}
@@ -747,8 +739,7 @@ if (element && typeof element === 'string') element = {
uri: element};
static createGlobalOptionsDefinition = (element: any):
GlobalOptionsDefinition => {
const def = element ? new GlobalOptionsDefinition({...element}) : new
GlobalOptionsDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
-def.globalOption = element && element?.globalOption ?
element?.globalOption.map((x:any) =>
CamelDefinitionApi.createGlobalOptionDefinition(x)) :[];
-
+def.globalOption = element && element?.globalOption ?
element?.globalOption.map((x:any) =>
CamelDefinitionApi.createGlobalOptionDefinition(x)) :[];
return def;
}
@@ -758,7 +749,6 @@ if (element && typeof element === 'string') element = {
uri: element};
def.expression =
CamelDefinitionApi.createExpressionDefinition(element.expression);
def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
return def;
}
@@ -786,7 +776,6 @@ if (element && typeof element === 'string') element = {uri:
element};
const def = element ? new InterceptDefinition({...element}) : new
InterceptDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
def.steps = CamelDefinitionApi.createSteps(element?.steps);
-
return def;
}
@@ -794,7 +783,6 @@ if (element && typeof element === 'string') element = {uri:
element};
const def = element ? new InterceptFromDefinition({...element}) : new
[camel-karavan] branch main updated (e800146 -> e96e70f)
This is an automated email from the ASF dual-hosted git repository. marat pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git from e800146 Fix #576 new 1e109c3 Generator creates code without empty lines new 22fd688 Generator creates code without empty lines new 39d48f6 Generator creates code better formatted new 0224565 Generator creates code better formatted new cfbb682 Generate IDs for DSL that have ID property. #577 new 6a026c6 Tests with generated node IDs. #577 new e96e70f routeConfiguration nodeId should be ampty be default. #577 The 7 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: karavan-core/src/core/api/CamelDefinitionApi.ts| 3442 +--- karavan-core/src/core/model/CamelDefinition.ts | 1866 +-- .../src/core/model/IntegrationDefinition.ts|2 +- karavan-core/test/checkRequired.spec.ts|2 - karavan-core/test/circuitBreaker.spec.ts | 10 +- karavan-core/test/circuitBreaker.yaml | 11 +- karavan-core/test/errorHandler1.yaml |8 + karavan-core/test/multiObjectProperties.spec.ts|6 +- karavan-core/test/multiObjectProperties1.yaml | 40 +- karavan-core/test/plain-try-catch.yaml |9 + karavan-core/test/restConfigDsl.yaml | 32 +- karavan-core/test/restDsl.spec.ts | 13 +- karavan-core/test/routes1.yaml | 13 +- .../generator/CamelDefinitionApiGenerator.java | 32 +- .../generator/CamelDefinitionGenerator.java| 18 +- .../src/main/resources/CamelDefinition.ts |5 +- .../src/main/resources/CamelDefinitionApi.ts |6 +- 17 files changed, 2500 insertions(+), 3015 deletions(-)
[camel-karavan] 03/07: Generator creates code better formatted
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
commit 39d48f6ec56d7ff9119584f05522035786bcd675
Author: Marat Gubaidullin
AuthorDate: Thu Dec 22 11:04:00 2022 -0500
Generator creates code better formatted
---
karavan-core/src/core/api/CamelDefinitionApi.ts| 176 +++--
.../generator/CamelDefinitionApiGenerator.java | 8 +-
2 files changed, 138 insertions(+), 46 deletions(-)
diff --git a/karavan-core/src/core/api/CamelDefinitionApi.ts
b/karavan-core/src/core/api/CamelDefinitionApi.ts
index 57ea1db..86c67b9 100644
--- a/karavan-core/src/core/api/CamelDefinitionApi.ts
+++ b/karavan-core/src/core/api/CamelDefinitionApi.ts
@@ -562,7 +562,9 @@ export class CamelDefinitionApi {
}
static createConvertBodyDefinition = (element: any): ConvertBodyDefinition
=> {
-if (element && typeof element === 'string') element = {type: element};
+if (element && typeof element === 'string') {
+element = {type: element};
+}
const def = element ? new ConvertBodyDefinition({...element}) : new
ConvertBodyDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
return def;
@@ -723,7 +725,9 @@ if (element && typeof element === 'string') element =
{type: element};
}
static createFromDefinition = (element: any): FromDefinition => {
-if (element && typeof element === 'string') element = { uri: element};
+if (element && typeof element === 'string') {
+element = { uri: element};
+}
const def = element ? new FromDefinition({...element}) : new
FromDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
def.steps = CamelDefinitionApi.createSteps(element?.steps);
@@ -753,14 +757,18 @@ if (element && typeof element === 'string') element = {
uri: element};
}
static createInOnlyDefinition = (element: any): InOnlyDefinition => {
-if (element && typeof element === 'string') element = {uri: element};
+if (element && typeof element === 'string') {
+element = {uri: element};
+}
const def = element ? new InOnlyDefinition({...element}) : new
InOnlyDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
return def;
}
static createInOutDefinition = (element: any): InOutDefinition => {
-if (element && typeof element === 'string') element = {uri: element};
+if (element && typeof element === 'string') {
+element = {uri: element};
+}
const def = element ? new InOutDefinition({...element}) : new
InOutDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
return def;
@@ -787,7 +795,9 @@ if (element && typeof element === 'string') element = {uri:
element};
}
static createInterceptSendToEndpointDefinition = (element: any):
InterceptSendToEndpointDefinition => {
-if (element && typeof element === 'string') element = {uri: element};
+if (element && typeof element === 'string') {
+element = {uri: element};
+}
const def = element ? new
InterceptSendToEndpointDefinition({...element}) : new
InterceptSendToEndpointDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
def.steps = CamelDefinitionApi.createSteps(element?.steps);
@@ -795,7 +805,9 @@ if (element && typeof element === 'string') element = {uri:
element};
}
static createKameletDefinition = (element: any): KameletDefinition => {
-if (element && typeof element === 'string') element = {name: element};
+if (element && typeof element === 'string') {
+element = {name: element};
+}
const def = element ? new KameletDefinition({...element}) : new
KameletDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
return def;
@@ -830,7 +842,9 @@ if (element && typeof element === 'string') element =
{name: element};
}
static createLogDefinition = (element: any): LogDefinition => {
-if (element && typeof element === 'string') element = {message: element};
+if (element && typeof element === 'string') {
+element = {message: element};
+}
const def = element ? new LogDefinition({...element}) : new
LogDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
return def;
@@ -1115,28 +1129,36 @@ if (element && typeof element === 'string') element =
{message: element};
}
static createRemoveHeaderDefinition = (element: any):
RemoveHeaderDefinition => {
-if (element && typeof element === 'string') element = {name: element};
+if (element && typeof element === 'string') {
+element = {name: element};
+}
const def = element ? new RemoveHeaderDefinition({...element}) : new
[camel-karavan] 04/07: Generator creates code better formatted
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
commit 02245657ff181ae21947388f2cb378da74a57908
Author: Marat Gubaidullin
AuthorDate: Thu Dec 22 11:06:16 2022 -0500
Generator creates code better formatted
---
.../apache/camel/karavan/generator/CamelDefinitionApiGenerator.java | 6 +-
karavan-generator/src/main/resources/CamelDefinitionApi.ts | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git
a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionApiGenerator.java
b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionApiGenerator.java
index 43f23b0..93d7b2d 100644
---
a/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionApiGenerator.java
+++
b/karavan-generator/src/main/java/org/apache/camel/karavan/generator/CamelDefinitionApiGenerator.java
@@ -168,7 +168,11 @@ public final class CamelDefinitionApiGenerator extends
AbstractGenerator {
String stringToRequired = getStringToRequired(obj, className);
String s2 = stringToRequired.isEmpty() ? "" : "\n" +
getStringToRequired(obj, className);
String s3 = attrs.size() > 0 ? "\n" +
attrs.stream().collect(Collectors.joining("\n")) : "";
-return String.format(readFileText(modelTemplate), className, s2, s3);
+
+System.out.println(className);
+System.out.println(properties.getMap().keySet());
+String s4 = "";
+return String.format(readFileText(modelTemplate), className, s2, s3,
s4);
}
private String getStringToRequired(JsonObject obj, String className) {
diff --git a/karavan-generator/src/main/resources/CamelDefinitionApi.ts
b/karavan-generator/src/main/resources/CamelDefinitionApi.ts
index edcd3d4..c0d2d59 100644
--- a/karavan-generator/src/main/resources/CamelDefinitionApi.ts
+++ b/karavan-generator/src/main/resources/CamelDefinitionApi.ts
@@ -1,5 +1,5 @@
static create%1$s = (element: any): %1$s => { %2$s
const def = element ? new %1$s({...element}) : new %1$s();
-def.uuid = element?.uuid ? element.uuid : def.uuid; %3$s
+def.uuid = element?.uuid ? element.uuid : def.uuid; %3$s %3$s
return def;
}
[camel] branch camel-3.20.x updated: CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for … (#8941)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.20.x by this push:
new 0722c4b1845 CAMEL-18834: camel-core - StringQuoteHelper should remove
quotes for … (#8941)
0722c4b1845 is described below
commit 0722c4b184555e1e66f055d8c1e20e2ebc969483
Author: Claus Ibsen
AuthorDate: Thu Dec 22 18:23:01 2022 +0100
CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for …
(#8941)
CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for single
element
---
.../apache/camel/util/StingQuoteHelperTest.java| 34 ++
.../camel/support/PropertyBindingSupport.java | 4 +--
.../org/apache/camel/util/StringQuoteHelper.java | 9 ++
3 files changed, 45 insertions(+), 2 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
b/core/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
index 0dd066b7f03..1f5126a292a 100644
---
a/core/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
@@ -124,6 +124,40 @@ public class StingQuoteHelperTest {
assertEquals("*", out[0]);
assertEquals("", out[1]);
assertEquals("arg3", out[2]);
+
+out = StringQuoteHelper.splitSafeQuote("'Hello'", ',', true);
+assertEquals(1, out.length);
+assertEquals("Hello", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("' Hello '", ',', true);
+assertEquals(1, out.length);
+assertEquals("Hello", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("' Hello '", ',', false);
+assertEquals(1, out.length);
+assertEquals(" Hello ", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("'Hello', 'World'", ',', true);
+assertEquals(2, out.length);
+assertEquals("Hello", out[0]);
+assertEquals("World", out[1]);
+
+out = StringQuoteHelper.splitSafeQuote("\"Hello\"", ',', true);
+assertEquals(1, out.length);
+assertEquals("Hello", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("\" Hello \"", ',', true);
+assertEquals(1, out.length);
+assertEquals("Hello", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("\" Hello \"", ',', false);
+assertEquals(1, out.length);
+assertEquals(" Hello ", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("\"Hello\", \"World\"", ',',
true);
+assertEquals(2, out.length);
+assertEquals("Hello", out[0]);
+assertEquals("World", out[1]);
}
@Test
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
index a868dc68587..6ce1abb5b92 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
@@ -1232,7 +1232,7 @@ public final class PropertyBindingSupport {
*/
public static Object newInstanceConstructorParameters(CamelContext
camelContext, Class type, String parameters)
throws Exception {
-String[] params = StringQuoteHelper.splitSafeQuote(parameters, ',');
+String[] params = StringQuoteHelper.splitSafeQuote(parameters, ',',
false);
Constructor found = findMatchingConstructor(type.getConstructors(),
params);
if (found != null) {
Object[] arr = new Object[found.getParameterCount()];
@@ -1330,7 +1330,7 @@ public final class PropertyBindingSupport {
public static Object newInstanceFactoryParameters(
CamelContext camelContext, Class type, String factoryMethod,
String parameters)
throws Exception {
-String[] params = StringQuoteHelper.splitSafeQuote(parameters, ',');
+String[] params = StringQuoteHelper.splitSafeQuote(parameters, ',',
false);
Method found = findMatchingFactoryMethod(type.getMethods(),
factoryMethod, params);
if (found != null) {
Object[] arr = new Object[found.getParameterCount()];
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/StringQuoteHelper.java
b/core/camel-util/src/main/java/org/apache/camel/util/StringQuoteHelper.java
index 414cb95c691..9b6b6feec19 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/StringQuoteHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/StringQuoteHelper.java
@@ -86,6 +86,15 @@ public final class StringQuoteHelper {
}
if (input.indexOf(separator) == -1) {
+if (input.length() > 1) {
+char ch = input.charAt(0);
[camel] branch main updated: CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for … (#8941)
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 e26a94c3e35 CAMEL-18834: camel-core - StringQuoteHelper should remove
quotes for … (#8941)
e26a94c3e35 is described below
commit e26a94c3e35fd4716b8e4104f908cac27c8c75e8
Author: Claus Ibsen
AuthorDate: Thu Dec 22 18:23:01 2022 +0100
CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for …
(#8941)
CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for single
element
---
.../apache/camel/util/StingQuoteHelperTest.java| 34 ++
.../camel/support/PropertyBindingSupport.java | 4 +--
.../org/apache/camel/util/StringQuoteHelper.java | 9 ++
3 files changed, 45 insertions(+), 2 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
b/core/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
index 0dd066b7f03..1f5126a292a 100644
---
a/core/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
@@ -124,6 +124,40 @@ public class StingQuoteHelperTest {
assertEquals("*", out[0]);
assertEquals("", out[1]);
assertEquals("arg3", out[2]);
+
+out = StringQuoteHelper.splitSafeQuote("'Hello'", ',', true);
+assertEquals(1, out.length);
+assertEquals("Hello", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("' Hello '", ',', true);
+assertEquals(1, out.length);
+assertEquals("Hello", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("' Hello '", ',', false);
+assertEquals(1, out.length);
+assertEquals(" Hello ", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("'Hello', 'World'", ',', true);
+assertEquals(2, out.length);
+assertEquals("Hello", out[0]);
+assertEquals("World", out[1]);
+
+out = StringQuoteHelper.splitSafeQuote("\"Hello\"", ',', true);
+assertEquals(1, out.length);
+assertEquals("Hello", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("\" Hello \"", ',', true);
+assertEquals(1, out.length);
+assertEquals("Hello", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("\" Hello \"", ',', false);
+assertEquals(1, out.length);
+assertEquals(" Hello ", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("\"Hello\", \"World\"", ',',
true);
+assertEquals(2, out.length);
+assertEquals("Hello", out[0]);
+assertEquals("World", out[1]);
}
@Test
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
index a868dc68587..6ce1abb5b92 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
@@ -1232,7 +1232,7 @@ public final class PropertyBindingSupport {
*/
public static Object newInstanceConstructorParameters(CamelContext
camelContext, Class type, String parameters)
throws Exception {
-String[] params = StringQuoteHelper.splitSafeQuote(parameters, ',');
+String[] params = StringQuoteHelper.splitSafeQuote(parameters, ',',
false);
Constructor found = findMatchingConstructor(type.getConstructors(),
params);
if (found != null) {
Object[] arr = new Object[found.getParameterCount()];
@@ -1330,7 +1330,7 @@ public final class PropertyBindingSupport {
public static Object newInstanceFactoryParameters(
CamelContext camelContext, Class type, String factoryMethod,
String parameters)
throws Exception {
-String[] params = StringQuoteHelper.splitSafeQuote(parameters, ',');
+String[] params = StringQuoteHelper.splitSafeQuote(parameters, ',',
false);
Method found = findMatchingFactoryMethod(type.getMethods(),
factoryMethod, params);
if (found != null) {
Object[] arr = new Object[found.getParameterCount()];
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/StringQuoteHelper.java
b/core/camel-util/src/main/java/org/apache/camel/util/StringQuoteHelper.java
index 414cb95c691..9b6b6feec19 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/StringQuoteHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/StringQuoteHelper.java
@@ -86,6 +86,15 @@ public final class StringQuoteHelper {
}
if (input.indexOf(separator) == -1) {
+if (input.length() > 1) {
+char ch = input.charAt(0);
+
[GitHub] [camel] davsclaus merged pull request #8941: CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for …
davsclaus merged PR #8941: URL: https://github.com/apache/camel/pull/8941 -- 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 a diff in pull request #574: Alert user that the Deployment is running. Deployment should be dele…
mgubaidullin commented on code in PR #574:
URL: https://github.com/apache/camel-karavan/pull/574#discussion_r1055632919
##
karavan-app/src/main/webui/src/projects/ProjectsPage.tsx:
##
@@ -80,7 +83,23 @@ export class ProjectsPage extends React.Component {
}
onProjectDelete = (project: Project) => {
-this.setState({isDeleteModalOpen: true, projectToDelete: project})
+KaravanApi.getProjectPipelineStatus(project.projectId,
this.props.config.environment, (status?: PipelineStatus) => {
+if(status === undefined){
+this.setState({isDeleteModalOpen: true, projectToDelete:
project})
+}else if(status?.result ==="Running"){
+this.setState({isPodRunningModalOpen: true, projectToDelete:
project})
+}else if(status?.result ==="Succeeded"){
+KaravanApi.getProjectPodStatuses(project.projectId,
this.props.config.environment, (statuses: PodStatus[]) => {
Review Comment:
If it is scaled to zero. No posd but deployment
--
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 a diff in pull request #574: Alert user that the Deployment is running. Deployment should be dele…
mgubaidullin commented on code in PR #574:
URL: https://github.com/apache/camel-karavan/pull/574#discussion_r1055632307
##
karavan-app/src/main/webui/src/projects/ProjectsPage.tsx:
##
@@ -80,7 +83,23 @@ export class ProjectsPage extends React.Component {
}
onProjectDelete = (project: Project) => {
-this.setState({isDeleteModalOpen: true, projectToDelete: project})
+KaravanApi.getProjectPipelineStatus(project.projectId,
this.props.config.environment, (status?: PipelineStatus) => {
+if(status === undefined){
+this.setState({isDeleteModalOpen: true, projectToDelete:
project})
+}else if(status?.result ==="Running"){
+this.setState({isPodRunningModalOpen: true, projectToDelete:
project})
+}else if(status?.result ==="Succeeded"){
Review Comment:
Pipeline replace existing deployment if this pipeline successfully finished
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-website] github-actions[bot] commented on pull request #951: A blog about 2022 in numbers. Numbers need to be updated next week to…
github-actions[bot] commented on PR #951: URL: https://github.com/apache/camel-website/pull/951#issuecomment-1363020047 Preview is available at https://pr-951--camel.netlify.app -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mrinalsharma commented on a diff in pull request #574: Alert user that the Deployment is running. Deployment should be dele…
mrinalsharma commented on code in PR #574:
URL: https://github.com/apache/camel-karavan/pull/574#discussion_r1055611858
##
karavan-app/src/main/webui/src/projects/ProjectsPage.tsx:
##
@@ -80,7 +83,23 @@ export class ProjectsPage extends React.Component {
}
onProjectDelete = (project: Project) => {
-this.setState({isDeleteModalOpen: true, projectToDelete: project})
+KaravanApi.getProjectPipelineStatus(project.projectId,
this.props.config.environment, (status?: PipelineStatus) => {
+if(status === undefined){
+this.setState({isDeleteModalOpen: true, projectToDelete:
project})
+}else if(status?.result ==="Running"){
+this.setState({isPodRunningModalOpen: true, projectToDelete:
project})
+}else if(status?.result ==="Succeeded"){
+KaravanApi.getProjectPodStatuses(project.projectId,
this.props.config.environment, (statuses: PodStatus[]) => {
Review Comment:
I thought about it when implementing but didn't do it because I thought
checking for Deployment will be a duplicate as I am already checking for all
the running pods. Are you thinking of a scenario where all the pods are
terminated but deployment is still there?
--
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] mrinalsharma commented on a diff in pull request #574: Alert user that the Deployment is running. Deployment should be dele…
mrinalsharma commented on code in PR #574:
URL: https://github.com/apache/camel-karavan/pull/574#discussion_r1055604958
##
karavan-app/src/main/webui/src/projects/ProjectsPage.tsx:
##
@@ -80,7 +83,23 @@ export class ProjectsPage extends React.Component {
}
onProjectDelete = (project: Project) => {
-this.setState({isDeleteModalOpen: true, projectToDelete: project})
+KaravanApi.getProjectPipelineStatus(project.projectId,
this.props.config.environment, (status?: PipelineStatus) => {
+if(status === undefined){
+this.setState({isDeleteModalOpen: true, projectToDelete:
project})
+}else if(status?.result ==="Running"){
+this.setState({isPodRunningModalOpen: true, projectToDelete:
project})
+}else if(status?.result ==="Succeeded"){
Review Comment:
Should the new pipeline run not delete the old Deployment first?
--
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 a diff in pull request #574: Alert user that the Deployment is running. Deployment should be dele…
mgubaidullin commented on code in PR #574:
URL: https://github.com/apache/camel-karavan/pull/574#discussion_r1055587234
##
karavan-app/src/main/webui/src/projects/ProjectsPage.tsx:
##
@@ -80,7 +83,23 @@ export class ProjectsPage extends React.Component {
}
onProjectDelete = (project: Project) => {
-this.setState({isDeleteModalOpen: true, projectToDelete: project})
+KaravanApi.getProjectPipelineStatus(project.projectId,
this.props.config.environment, (status?: PipelineStatus) => {
+if(status === undefined){
+this.setState({isDeleteModalOpen: true, projectToDelete:
project})
+}else if(status?.result ==="Running"){
+this.setState({isPodRunningModalOpen: true, projectToDelete:
project})
+}else if(status?.result ==="Succeeded"){
+KaravanApi.getProjectPodStatuses(project.projectId,
this.props.config.environment, (statuses: PodStatus[]) => {
Review Comment:
We should also check Deployments
--
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] mrinalsharma commented on pull request #574: Alert user that the Deployment is running. Deployment should be dele…
mrinalsharma commented on PR #574: URL: https://github.com/apache/camel-karavan/pull/574#issuecomment-1362981989 Camels has https://github.com/apache/camel/blob/main/etc/eclipse/CamelCodeFormatter.xml for Java. Are there any recommendations for Typescript? I will fix the issue around if() -- 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 a diff in pull request #574: Alert user that the Deployment is running. Deployment should be dele…
mgubaidullin commented on code in PR #574:
URL: https://github.com/apache/camel-karavan/pull/574#discussion_r1055586653
##
karavan-app/src/main/webui/src/projects/ProjectsPage.tsx:
##
@@ -80,7 +83,23 @@ export class ProjectsPage extends React.Component {
}
onProjectDelete = (project: Project) => {
-this.setState({isDeleteModalOpen: true, projectToDelete: project})
+KaravanApi.getProjectPipelineStatus(project.projectId,
this.props.config.environment, (status?: PipelineStatus) => {
+if(status === undefined){
+this.setState({isDeleteModalOpen: true, projectToDelete:
project})
+}else if(status?.result ==="Running"){
+this.setState({isPodRunningModalOpen: true, projectToDelete:
project})
+}else if(status?.result ==="Succeeded"){
Review Comment:
What if status.result is not "Succeeded"? Ex. latest pipeline run crashed,
but previous was succeeded and Deployment/Pod is Up and Running
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-website] squakez commented on pull request #951: A blog about 2022 in numbers. Numbers need to be updated next week to…
squakez commented on PR #951: URL: https://github.com/apache/camel-website/pull/951#issuecomment-1362946324 @davsclaus I've added something related to Camel K, do you think it's okey or should I do a separate blog post? I feel it makes sense if there is also some update from the other Camel subprojects. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-website] branch number2022 updated (b4041dcb -> 583d08b7)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch number2022 in repository https://gitbox.apache.org/repos/asf/camel-website.git from b4041dcb A blog about 2022 in numbers. Numbers need to be updated next week to catch up add 583d08b7 feat: Camel K update No new revisions were added by this update. Summary of changes: content/blog/2022/12/2022-Numbers/index.md | 22 -- 1 file changed, 20 insertions(+), 2 deletions(-)
[GitHub] [camel-k] squakez commented on pull request #3953: fix(test): temporary remove env var
squakez commented on PR #3953: URL: https://github.com/apache/camel-k/pull/3953#issuecomment-1362883545 It's failing with: ``` GITHUB_TOKEN env var detected, using it for GitHub APIs authentication Error: cannot read sources: failed to resolve sources: GET https://api.github.com/gists/e2c3f9a5fd0d9e79b21b04809786f17a: 401 Bad credentials [] ``` I'll check how to remove the env variable at all. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #8936: Problem when parameter type of bean method is String.
davsclaus commented on PR #8936: URL: https://github.com/apache/camel/pull/8936#issuecomment-1362843849 @Luke-hbk did you find out something else in item no 3 and what was that? -- 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 #8941: CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for …
github-actions[bot] commented on PR #8941: URL: https://github.com/apache/camel/pull/8941#issuecomment-1362779189 :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] github-actions[bot] commented on pull request #8941: CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for …
github-actions[bot] commented on PR #8941: URL: https://github.com/apache/camel/pull/8941#issuecomment-1362753555 :no_entry_sign: There are (likely) no components to be tested in this PR -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k-runtime] branch release-1.15.x updated: feat(deps): split quarkus-camel-bom
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.15.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/release-1.15.x by this push:
new 007d33b8 feat(deps): split quarkus-camel-bom
007d33b8 is described below
commit 007d33b829f06ed2d5eeacdb13a520b7a3f5b18e
Author: Pasquale Congiusti
AuthorDate: Thu Dec 22 10:47:21 2022 +0100
feat(deps): split quarkus-camel-bom
Have a separate property to control quarkus-camel-bom in case of CVE or any
other fix to apply
---
pom.xml | 14 --
scripts/bump.sh | 15 +--
support/camel-k-runtime-bom/pom.xml | 8 +---
3 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5abe8058..50dde6a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,8 @@
2.13.1
2.13.3.Final
2.13.4.Final
+
+2.13.4.Final
quay.io/quarkus/ubi-quarkus-native-image:22.3.0-java11
@@ -136,7 +138,7 @@
${maven-version}
-
+
@@ -314,7 +316,7 @@
camel-version
${project.parent.version}
Camel version must be equals to
camel-dependency parent pom version (${project.parent.version})!
-
+
true
@@ -393,7 +395,7 @@
-
+
org.apache.camel
camel-bom
@@ -403,14 +405,14 @@
io.quarkus.platform
-quarkus-bom
-${quarkus-platform-version}
+quarkus-camel-bom
+${quarkus-camel-bom-version}
pom
import
io.quarkus.platform
-quarkus-camel-bom
+quarkus-bom
${quarkus-platform-version}
pom
import
diff --git a/scripts/bump.sh b/scripts/bump.sh
index 30610c9b..6ad8e822 100755
--- a/scripts/bump.sh
+++ b/scripts/bump.sh
@@ -13,6 +13,7 @@ Usage: ./script/bump.sh [options]
--camel-quarkus Bump Camel-Quarkus version
--quarkus Bump Quarkus version
--quarkus-platformBump Quarkus platform version (could differ from
quarkus core)
+--quarkus-camel-bom Bump Quarkus Camel BOM version (could differ from
quarkus platform)
--helpThis help message
Example: ./script/bump.sh --version 1.14.0-SNAPSHOT --camel 3.16.0
@@ -25,6 +26,7 @@ CAMEL=""
CAMELQUARKUS=""
QUARKUS=""
QUARKUSPLATFORM=""
+QUARKUSCAMELBOM=""
main() {
parse_args $@
@@ -51,10 +53,15 @@ main() {
echo "Quarkus version set to $QUARKUS"
fi
-if [[ ! -z "$QUARKUSPLATFORM" ]]; then
+ if [[ ! -z "$QUARKUSPLATFORM" ]]; then
mvn versions:set-property -Dproperty="quarkus-platform-version"
-DnewVersion="$QUARKUSPLATFORM" -DgenerateBackupPoms=false
echo "Quarkus platform version set to $QUARKUSPLATFORM"
fi
+
+ if [[ ! -z "$QUARKUSCAMELBOM" ]]; then
+mvn versions:set-property -Dproperty="quarkus-camel-bom-version"
-DnewVersion="$QUARKUSCAMELBOM" -DgenerateBackupPoms=false
+echo "Quarkus Camel BOM version set to $QUARKUSCAMELBOM"
+ fi
}
parse_args(){
@@ -85,7 +92,11 @@ parse_args(){
--quarkus-platform)
shift
QUARKUSPLATFORM="$1"
- ;;
+ ;;
+--quarkus-camel-bom)
+ shift
+ QUARKUSCAMELBOM="$1"
+ ;;
*)
echo "❗ unknown argument: $1"
display_usage
diff --git a/support/camel-k-runtime-bom/pom.xml
b/support/camel-k-runtime-bom/pom.xml
index 65d94575..9ceb39b8 100644
--- a/support/camel-k-runtime-bom/pom.xml
+++ b/support/camel-k-runtime-bom/pom.xml
@@ -39,6 +39,8 @@
3.1.0
3.6.3
2.13.4.Final
+
+2.13.4.Final
@@ -97,14 +99,14 @@
io.quarkus.platform
-quarkus-bom
-${quarkus-platform-version}
+quarkus-camel-bom
+${quarkus-camel-bom-version}
pom
import
io.quarkus.platform
-quarkus-camel-bom
+quarkus-bom
${quarkus-platform-version}
pom
import
[GitHub] [camel-k-runtime] squakez merged pull request #939: [1.15.x] feat(deps): split quarkus-camel-bom
squakez merged PR #939: URL: https://github.com/apache/camel-k-runtime/pull/939 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k-runtime] branch release-1.16.x updated: feat(deps): split quarkus-camel-bom
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.16.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/release-1.16.x by this push:
new 3d748329 feat(deps): split quarkus-camel-bom
3d748329 is described below
commit 3d748329c7fcb3c53cb2a7d2cc8fb5550e42d19b
Author: Pasquale Congiusti
AuthorDate: Thu Dec 22 10:47:21 2022 +0100
feat(deps): split quarkus-camel-bom
Have a separate property to control quarkus-camel-bom in case of CVE or any
other fix to apply
---
pom.xml | 18 ++
scripts/bump.sh | 15 +--
support/camel-k-runtime-bom/pom.xml | 8 +---
3 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3e1e6d1b..cfb41727 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,8 @@
2.14.0
2.14.0.Final
2.14.0.Final
+
+2.14.0.Final
quay.io/quarkus/ubi-quarkus-native-image:22.3.0-java11
@@ -136,7 +138,7 @@
${maven-version}
-
+
@@ -314,7 +316,7 @@
camel-version
${project.parent.version}
Camel version must be equals to
camel-dependency parent pom version (${project.parent.version})!
-
+
true
@@ -393,7 +395,7 @@
-
+
org.apache.camel
camel-bom
@@ -403,14 +405,14 @@
io.quarkus.platform
-quarkus-bom
-${quarkus-platform-version}
+quarkus-camel-bom
+${quarkus-camel-bom-version}
pom
import
io.quarkus.platform
-quarkus-camel-bom
+quarkus-bom
${quarkus-platform-version}
pom
import
@@ -469,13 +471,13 @@
camel-k-master-deployment
${project.version}
-
+
org.apache.camel.k
camel-k-knative-impl
${project.version}
-
+
org.apache.camel.k
camel-k-cron-impl
diff --git a/scripts/bump.sh b/scripts/bump.sh
index 30610c9b..6ad8e822 100755
--- a/scripts/bump.sh
+++ b/scripts/bump.sh
@@ -13,6 +13,7 @@ Usage: ./script/bump.sh [options]
--camel-quarkus Bump Camel-Quarkus version
--quarkus Bump Quarkus version
--quarkus-platformBump Quarkus platform version (could differ from
quarkus core)
+--quarkus-camel-bom Bump Quarkus Camel BOM version (could differ from
quarkus platform)
--helpThis help message
Example: ./script/bump.sh --version 1.14.0-SNAPSHOT --camel 3.16.0
@@ -25,6 +26,7 @@ CAMEL=""
CAMELQUARKUS=""
QUARKUS=""
QUARKUSPLATFORM=""
+QUARKUSCAMELBOM=""
main() {
parse_args $@
@@ -51,10 +53,15 @@ main() {
echo "Quarkus version set to $QUARKUS"
fi
-if [[ ! -z "$QUARKUSPLATFORM" ]]; then
+ if [[ ! -z "$QUARKUSPLATFORM" ]]; then
mvn versions:set-property -Dproperty="quarkus-platform-version"
-DnewVersion="$QUARKUSPLATFORM" -DgenerateBackupPoms=false
echo "Quarkus platform version set to $QUARKUSPLATFORM"
fi
+
+ if [[ ! -z "$QUARKUSCAMELBOM" ]]; then
+mvn versions:set-property -Dproperty="quarkus-camel-bom-version"
-DnewVersion="$QUARKUSCAMELBOM" -DgenerateBackupPoms=false
+echo "Quarkus Camel BOM version set to $QUARKUSCAMELBOM"
+ fi
}
parse_args(){
@@ -85,7 +92,11 @@ parse_args(){
--quarkus-platform)
shift
QUARKUSPLATFORM="$1"
- ;;
+ ;;
+--quarkus-camel-bom)
+ shift
+ QUARKUSCAMELBOM="$1"
+ ;;
*)
echo "❗ unknown argument: $1"
display_usage
diff --git a/support/camel-k-runtime-bom/pom.xml
b/support/camel-k-runtime-bom/pom.xml
index 4941edd0..b82f1938 100644
--- a/support/camel-k-runtime-bom/pom.xml
+++ b/support/camel-k-runtime-bom/pom.xml
@@ -39,6 +39,8 @@
3.1.0
3.6.3
2.14.0.Final
+
+2.14.0.Final
@@ -97,14 +99,14 @@
io.quarkus.platform
-quarkus-bom
-${quarkus-platform-version}
+
[GitHub] [camel-k-runtime] squakez merged pull request #938: [1.16.x] feat(deps): split quarkus-camel-bom
squakez merged PR #938: URL: https://github.com/apache/camel-k-runtime/pull/938 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] squakez commented on pull request #951: A blog about 2022 in numbers. Numbers need to be updated next week to…
squakez commented on PR #951: URL: https://github.com/apache/camel-website/pull/951#issuecomment-1362735241 > I grabbed our last 2019 blog and updated. Anyone is welcome to add more details to this if we have more information for 2022 that would be good to include. I will add something about Camel K, I was thinking to do a blog on its own but it makes sense to have one unique overview! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] davsclaus commented on pull request #951: A blog about 2022 in numbers. Numbers need to be updated next week to…
davsclaus commented on PR #951: URL: https://github.com/apache/camel-website/pull/951#issuecomment-1362732002 I grabbed our last 2019 blog and updated. Anyone is welcome to add more details to this if we have more information for 2022 that would be good to include. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-website] davsclaus opened a new pull request, #951: A blog about 2022 in numbers. Numbers need to be updated next week to…
davsclaus opened a new pull request, #951: URL: https://github.com/apache/camel-website/pull/951 … catch up -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-website] 01/01: A blog about 2022 in numbers. Numbers need to be updated next week to catch up
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch number2022
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit b4041dcbb3a9823d58d4b967ae66e64c13b120b4
Author: Claus Ibsen
AuthorDate: Thu Dec 22 12:29:10 2022 +0100
A blog about 2022 in numbers. Numbers need to be updated next week to catch
up
---
content/blog/2022/12/2022-Numbers/index.md | 48 +
.../blog/2022/12/2022-Numbers/numbers-featured.jpg | Bin 0 -> 40301 bytes
2 files changed, 48 insertions(+)
diff --git a/content/blog/2022/12/2022-Numbers/index.md
b/content/blog/2022/12/2022-Numbers/index.md
new file mode 100644
index ..ca07f087
--- /dev/null
+++ b/content/blog/2022/12/2022-Numbers/index.md
@@ -0,0 +1,48 @@
+---
+title: "Camel 2022 in Numbers"
+date: 2022-12-31
+authors: [davsclaus]
+categories: ["Roadmap"]
+preview: Summary of the Apache Camel project in 2022
+---
+
+It's the time of the year when we take a look back at 2022, and compile a
brief summary of the Apache Camel project.
+
+## Camel 2022 in Numbers
+
+Number of Camel Core releases in 2022: **19**
+
+Number of Camel Quarkus releases in 2022: **15**
+
+Number of Camel K releases in 2022: **11**
+
+Number of Camel Kafka Connector releases in 2022: **4**
+
+Number of commits in 2022: **6088** [1]
+
+Total number of JIRA tickets created at end of 2022: **18825**
+
+Number of JIRA tickets created in 2022: **1400**
+
+Number of JIRA tickets resolved in 2022: **1700**
+
+Number of stars on GitHub at end of 2022: **4649**
+
+Total number of commits at end of 2022: **61875**
+
+Total number of contributors on GitHub at end of 2022: **921**
+
+Number of individual committers doing commits in 2022: **210** [2]
+
+Number of closed pull requests at end of 2022: **8912**
+
+Number of closed pull requests in 2022: **2323**
+
+Number of Twitter followers at end of 2022: **2759**
+
+Happy New Year and 2023 is going to be a great year for Apache Camel with
Camel 4 on the way.
+
+```
+#1 git shortlog -ns --since 2022-01-01 --until 2023-01-01 | cut -c1-7 | awk '{
SUM += $1} END { print SUM }'
+#2 git shortlog --since 2022-01-01 --until 2023-01-01 -ns | wc -l
+```
diff --git a/content/blog/2022/12/2022-Numbers/numbers-featured.jpg
b/content/blog/2022/12/2022-Numbers/numbers-featured.jpg
new file mode 100644
index ..29cb690b
Binary files /dev/null and
b/content/blog/2022/12/2022-Numbers/numbers-featured.jpg differ
[camel-website] branch number2022 created (now b4041dcb)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch number2022 in repository https://gitbox.apache.org/repos/asf/camel-website.git at b4041dcb A blog about 2022 in numbers. Numbers need to be updated next week to catch up This branch includes the following new commits: new b4041dcb A blog about 2022 in numbers. Numbers need to be updated next week to catch up The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[GitHub] [camel-karavan] davsclaus commented on pull request #574: Alert user that the Deployment is running. Deployment should be dele…
davsclaus commented on PR #574: URL: https://github.com/apache/camel-karavan/pull/574#issuecomment-1362727504 It would be good to use same coding style as existing code, eg spaces around if ( ) ... etc We have a coding style in camel core, and when projects become bigger then we need to have a consistent style so its easier to maintain the code for more people. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch CAMEL-18834 updated (9b5248c0a5d -> 93a83acbd67)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-18834 in repository https://gitbox.apache.org/repos/asf/camel.git from 9b5248c0a5d CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for single element add 93a83acbd67 CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for single element No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/util/StringQuoteHelper.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
[GitHub] [camel-k] squakez opened a new pull request, #3953: fix(test): temporary remove env var
squakez opened a new pull request, #3953: URL: https://github.com/apache/camel-k/pull/3953 I cannot come up with a better solution. If the execution is sequential, temporary removing the environment variable should be fine. Close #3952 **Release Note** ```release-note fix(test): temporary remove env var ``` -- 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-runtime] squakez opened a new pull request, #939: [1.15.x] feat(deps): split quarkus-camel-bom
squakez opened a new pull request, #939: URL: https://github.com/apache/camel-k-runtime/pull/939 Have a separate property to control quarkus-camel-bom in case of CVE or any other fix to apply **Release Note** ```release-note NONE ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #8936: Problem when parameter type of bean method is String.
davsclaus commented on PR #8936: URL: https://github.com/apache/camel/pull/8936#issuecomment-1362715322 > > Yeah the 1st example is a little bug. For 2nd, then you MUST start with double quotes > > ``` > > "John's" > > ``` > > We still need to be able to escape the quotes otherwise what can we do with an expression with both type of quotes like `"John's \"big\" house"` That is NOT intended to be supported, - its for normal use-cases -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus commented on pull request #8936: Problem when parameter type of bean method is String.
davsclaus commented on PR #8936: URL: https://github.com/apache/camel/pull/8936#issuecomment-1362714869 I took a look the string quote helper, and created a PR with a fix for the little bug when there is only 1 element. This change affected kamelets and route templates / property binding via contrustor arguments that shouldn't be trimmed Here is a PR https://github.com/apache/camel/pull/8941 -- 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] essobedo commented on pull request #8936: Problem when parameter type of bean method is String.
essobedo commented on PR #8936: URL: https://github.com/apache/camel/pull/8936#issuecomment-1362714665 > Yeah the 1st example is a little bug. For 2nd, then you MUST start with double quotes > > ``` > "John's" > ``` We still need to be able to escape the quotes otherwise what can we do with an expression with both type of quotes like `"John's \"big\" house"` -- 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-runtime] squakez opened a new pull request, #938: [1.16.x] feat(deps): split quarkus-camel-bom
squakez opened a new pull request, #938: URL: https://github.com/apache/camel-k-runtime/pull/938 Have a separate property to control quarkus-camel-bom in case of CVE or any other fix to apply **Release Note** ```release-note NONE ``` -- 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 #8941: CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for …
github-actions[bot] commented on PR #8941: URL: https://github.com/apache/camel/pull/8941#issuecomment-1362713875 :star2: Thank you for your contribution to the Apache Camel project! :star2: :warning: Please note that the changes on this PR may be **tested automatically**. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] davsclaus opened a new pull request, #8941: CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for …
davsclaus opened a new pull request, #8941: URL: https://github.com/apache/camel/pull/8941 …single element -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for single element
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-18834
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9b5248c0a5d7610e35298e24c7799ab6f8e97ce4
Author: Claus Ibsen
AuthorDate: Thu Dec 22 12:12:38 2022 +0100
CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for single
element
---
.../apache/camel/util/StingQuoteHelperTest.java| 34 ++
.../camel/support/PropertyBindingSupport.java | 4 +--
.../org/apache/camel/util/StringQuoteHelper.java | 12 +++-
3 files changed, 47 insertions(+), 3 deletions(-)
diff --git
a/core/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
b/core/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
index 0dd066b7f03..1f5126a292a 100644
---
a/core/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
@@ -124,6 +124,40 @@ public class StingQuoteHelperTest {
assertEquals("*", out[0]);
assertEquals("", out[1]);
assertEquals("arg3", out[2]);
+
+out = StringQuoteHelper.splitSafeQuote("'Hello'", ',', true);
+assertEquals(1, out.length);
+assertEquals("Hello", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("' Hello '", ',', true);
+assertEquals(1, out.length);
+assertEquals("Hello", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("' Hello '", ',', false);
+assertEquals(1, out.length);
+assertEquals(" Hello ", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("'Hello', 'World'", ',', true);
+assertEquals(2, out.length);
+assertEquals("Hello", out[0]);
+assertEquals("World", out[1]);
+
+out = StringQuoteHelper.splitSafeQuote("\"Hello\"", ',', true);
+assertEquals(1, out.length);
+assertEquals("Hello", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("\" Hello \"", ',', true);
+assertEquals(1, out.length);
+assertEquals("Hello", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("\" Hello \"", ',', false);
+assertEquals(1, out.length);
+assertEquals(" Hello ", out[0]);
+
+out = StringQuoteHelper.splitSafeQuote("\"Hello\", \"World\"", ',',
true);
+assertEquals(2, out.length);
+assertEquals("Hello", out[0]);
+assertEquals("World", out[1]);
}
@Test
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
index a868dc68587..6ce1abb5b92 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
@@ -1232,7 +1232,7 @@ public final class PropertyBindingSupport {
*/
public static Object newInstanceConstructorParameters(CamelContext
camelContext, Class type, String parameters)
throws Exception {
-String[] params = StringQuoteHelper.splitSafeQuote(parameters, ',');
+String[] params = StringQuoteHelper.splitSafeQuote(parameters, ',',
false);
Constructor found = findMatchingConstructor(type.getConstructors(),
params);
if (found != null) {
Object[] arr = new Object[found.getParameterCount()];
@@ -1330,7 +1330,7 @@ public final class PropertyBindingSupport {
public static Object newInstanceFactoryParameters(
CamelContext camelContext, Class type, String factoryMethod,
String parameters)
throws Exception {
-String[] params = StringQuoteHelper.splitSafeQuote(parameters, ',');
+String[] params = StringQuoteHelper.splitSafeQuote(parameters, ',',
false);
Method found = findMatchingFactoryMethod(type.getMethods(),
factoryMethod, params);
if (found != null) {
Object[] arr = new Object[found.getParameterCount()];
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/StringQuoteHelper.java
b/core/camel-util/src/main/java/org/apache/camel/util/StringQuoteHelper.java
index 414cb95c691..8d6c4d15a0c 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/StringQuoteHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/StringQuoteHelper.java
@@ -37,7 +37,8 @@ public final class StringQuoteHelper {
/**
* Returns the text wrapped single quotes
*/
-public static String singleQuote(String text) {
+public static String
+singleQuote(String text) {
return quote(text, "'");
}
@@ -86,6 +87,15 @@ public final class StringQuoteHelper {
}
if (input.indexOf(separator) == -1) {
+if (input.length() > 1) {
+char ch = input.charAt(0);
+char
[camel] branch CAMEL-18834 created (now 9b5248c0a5d)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-18834 in repository https://gitbox.apache.org/repos/asf/camel.git at 9b5248c0a5d CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for single element This branch includes the following new commits: new 9b5248c0a5d CAMEL-18834: camel-core - StringQuoteHelper should remove quotes for single element The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel-k-runtime] branch main updated: feat(deps): split quarkus-camel-bom
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/main by this push:
new c0ca1fb1 feat(deps): split quarkus-camel-bom
c0ca1fb1 is described below
commit c0ca1fb1e8f077d6464d87d72396e1d95e680a57
Author: Pasquale Congiusti
AuthorDate: Thu Dec 22 10:47:21 2022 +0100
feat(deps): split quarkus-camel-bom
Have a separate property to control quarkus-camel-bom in case of CVE or any
other fix to apply
---
pom.xml | 18 ++
scripts/bump.sh | 15 +--
support/camel-k-runtime-bom/pom.xml | 8 +---
3 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1a76e724..b17ba4d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,8 @@
2.14.0
2.14.0.Final
2.14.0.Final
+
+2.14.0.Final
quay.io/quarkus/ubi-quarkus-native-image:22.3.0-java11
@@ -135,7 +137,7 @@
${maven-version}
-
+
@@ -313,7 +315,7 @@
camel-version
${project.parent.version}
Camel version must be equals to
camel-dependency parent pom version (${project.parent.version})!
-
+
true
@@ -392,7 +394,7 @@
-
+
org.apache.camel
camel-bom
@@ -402,14 +404,14 @@
io.quarkus.platform
-quarkus-bom
-${quarkus-platform-version}
+quarkus-camel-bom
+${quarkus-camel-bom-version}
pom
import
io.quarkus.platform
-quarkus-camel-bom
+quarkus-bom
${quarkus-platform-version}
pom
import
@@ -468,13 +470,13 @@
camel-k-master-deployment
${project.version}
-
+
org.apache.camel.k
camel-k-knative-impl
${project.version}
-
+
org.apache.camel.k
camel-k-cron-impl
diff --git a/scripts/bump.sh b/scripts/bump.sh
index 30610c9b..6ad8e822 100755
--- a/scripts/bump.sh
+++ b/scripts/bump.sh
@@ -13,6 +13,7 @@ Usage: ./script/bump.sh [options]
--camel-quarkus Bump Camel-Quarkus version
--quarkus Bump Quarkus version
--quarkus-platformBump Quarkus platform version (could differ from
quarkus core)
+--quarkus-camel-bom Bump Quarkus Camel BOM version (could differ from
quarkus platform)
--helpThis help message
Example: ./script/bump.sh --version 1.14.0-SNAPSHOT --camel 3.16.0
@@ -25,6 +26,7 @@ CAMEL=""
CAMELQUARKUS=""
QUARKUS=""
QUARKUSPLATFORM=""
+QUARKUSCAMELBOM=""
main() {
parse_args $@
@@ -51,10 +53,15 @@ main() {
echo "Quarkus version set to $QUARKUS"
fi
-if [[ ! -z "$QUARKUSPLATFORM" ]]; then
+ if [[ ! -z "$QUARKUSPLATFORM" ]]; then
mvn versions:set-property -Dproperty="quarkus-platform-version"
-DnewVersion="$QUARKUSPLATFORM" -DgenerateBackupPoms=false
echo "Quarkus platform version set to $QUARKUSPLATFORM"
fi
+
+ if [[ ! -z "$QUARKUSCAMELBOM" ]]; then
+mvn versions:set-property -Dproperty="quarkus-camel-bom-version"
-DnewVersion="$QUARKUSCAMELBOM" -DgenerateBackupPoms=false
+echo "Quarkus Camel BOM version set to $QUARKUSCAMELBOM"
+ fi
}
parse_args(){
@@ -85,7 +92,11 @@ parse_args(){
--quarkus-platform)
shift
QUARKUSPLATFORM="$1"
- ;;
+ ;;
+--quarkus-camel-bom)
+ shift
+ QUARKUSCAMELBOM="$1"
+ ;;
*)
echo "❗ unknown argument: $1"
display_usage
diff --git a/support/camel-k-runtime-bom/pom.xml
b/support/camel-k-runtime-bom/pom.xml
index 61e847a2..3a411cb5 100644
--- a/support/camel-k-runtime-bom/pom.xml
+++ b/support/camel-k-runtime-bom/pom.xml
@@ -39,6 +39,8 @@
3.1.0
3.6.3
2.14.0.Final
+
+2.14.0.Final
@@ -97,14 +99,14 @@
io.quarkus.platform
-quarkus-bom
-${quarkus-platform-version}
+quarkus-camel-bom
+
[GitHub] [camel-k-runtime] squakez merged pull request #937: feat(deps): split quarkus-camel-bom
squakez merged PR #937: URL: https://github.com/apache/camel-k-runtime/pull/937 -- 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 (d9851ad09c1 -> 6cd2a9c25d6)
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 d9851ad09c1 Sync deps add 41406645820 Upgrade Http Core to version 4.4.16 add a3b6e8aaf1e Upgrade Http Client to version 4.5.16 add 6cd2a9c25d6 Sync deps No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 4 ++-- parent/pom.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
[GitHub] [camel] davsclaus commented on pull request #8936: Problem when parameter type of bean method is String.
davsclaus commented on PR #8936: URL: https://github.com/apache/camel/pull/8936#issuecomment-1362688998 Yeah the 1st example is a little bug. For 2nd, then you MUST start with double quotes "John's" -- 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 (40321de6d29 -> d9851ad09c1)
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 40321de6d29 Sync deps add f52be8cf411 Upgrade Optaplanner to version 8.32.0.Final add d9851ad09c1 Sync deps No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[GitHub] [camel-quarkus] JiriOndrusek commented on pull request #4350: Upgrade to 3.20
JiriOndrusek commented on PR #4350: URL: https://github.com/apache/camel-quarkus/pull/4350#issuecomment-1362664217 @ppalaga @jamesnetherton @zbendhiba pointed out that we need to have kubernetes native support for Quarkus 2.x and Camel 3.20 Therefore it would be better to solve https://github.com/apache/camel-quarkus/issues/4357 before merging 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-quarkus] zbendhiba commented on issue #4357: [Camel 3.20] Camel-kubernetes does not work in native (needs quarkus update)
zbendhiba commented on issue #4357: URL: https://github.com/apache/camel-quarkus/issues/4357#issuecomment-1362662865 FYi @ppalaga @jamesnetherton @aldettinger @JiriOndrusek Thanks for all the work around Camel 3.20. Let's check this one beginning of January. -- 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] zbendhiba commented on issue #4357: [Camel 3.20] Camel-kubernetes does not work in native (needs quarkus update)
zbendhiba commented on issue #4357: URL: https://github.com/apache/camel-quarkus/issues/4357#issuecomment-1362660155 We need to watch out for this one, and see how we can solve it for next version -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 03/03: test(e2e): add E2E tests for kustomize uninstall
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit f83b7979ffc999a162b6d1de53a6b8b5080eee8c
Author: Tadayoshi Sato
AuthorDate: Thu Dec 22 15:54:27 2022 +0900
test(e2e): add E2E tests for kustomize uninstall
---
e2e/namespace/install/kustomize/common.go | 10 +-
e2e/namespace/install/kustomize/operator_test.go | 52 ++
e2e/namespace/install/kustomize/setup_test.go | 14 +--
e2e/namespace/install/kustomize/uninstall_test.go | 112 ++
e2e/support/test_support.go | 32 +++
install/Makefile | 14 ++-
6 files changed, 184 insertions(+), 50 deletions(-)
diff --git a/e2e/namespace/install/kustomize/common.go
b/e2e/namespace/install/kustomize/common.go
index 15cc9bec4..856aa6233 100644
--- a/e2e/namespace/install/kustomize/common.go
+++ b/e2e/namespace/install/kustomize/common.go
@@ -58,7 +58,7 @@ const (
ExpectedOSClusterRoles = 1
)
-func ExecMake(t *testing.T, command *exec.Cmd) {
+func ExpectExecSucceed(t *testing.T, command *exec.Cmd) {
t.Helper()
var cmdOut strings.Builder
@@ -74,14 +74,14 @@ func ExecMake(t *testing.T, command *exec.Cmd) {
session, err := gexec.Start(command, , )
session.Wait()
Eventually(session).Should(gexec.Exit(0))
- assert.Nil(t, err)
+ assert.NoError(t, err)
assert.NotContains(t, strings.ToUpper(cmdErr.String()), "ERROR")
}
//
-// Expect a make error with an exit code of 1
+// Expect a command error with an exit code of 1
//
-func ExecMakeError(t *testing.T, command *exec.Cmd) {
+func ExpectExecError(t *testing.T, command *exec.Cmd) {
t.Helper()
var cmdOut strings.Builder
@@ -97,7 +97,7 @@ func ExecMakeError(t *testing.T, command *exec.Cmd) {
session, err := gexec.Start(command, , )
session.Wait()
Eventually(session).ShouldNot(gexec.Exit(0))
- assert.Nil(t, err)
+ assert.NoError(t, err)
assert.Contains(t, strings.ToUpper(cmdErr.String()), "ERROR")
}
diff --git a/e2e/namespace/install/kustomize/operator_test.go
b/e2e/namespace/install/kustomize/operator_test.go
index 63ee49ddf..06c52f4cd 100644
--- a/e2e/namespace/install/kustomize/operator_test.go
+++ b/e2e/namespace/install/kustomize/operator_test.go
@@ -27,12 +27,14 @@ import (
"os"
"testing"
+ corev1 "k8s.io/api/core/v1"
+
. "github.com/apache/camel-k/e2e/support"
testutil "github.com/apache/camel-k/e2e/support/util"
. "github.com/onsi/gomega"
)
-func TestBasicOperator(t *testing.T) {
+func TestOperatorBasic(t *testing.T) {
makeDir := testutil.MakeTempCopyDir(t, "../../../../install")
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
@@ -43,18 +45,24 @@ func TestBasicOperator(t *testing.T) {
defer Cleanup()
WithNewTestNamespace(t, func(ns string) {
- ExecMake(t, Make("setup-cluster", fmt.Sprintf("NAMESPACE=%s",
ns)))
- ExecMake(t, Make("setup", fmt.Sprintf("NAMESPACE=%s", ns)))
+ namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
+ ExpectExecSucceed(t, Make("setup-cluster", namespaceArg))
+ ExpectExecSucceed(t, Make("setup", namespaceArg))
// Skip default kamelets installation for faster test runs
- ExecMake(t, Make("operator",
- fmt.Sprintf("NAMESPACE=%s", ns),
+ ExpectExecSucceed(t, Make("operator",
+ namespaceArg,
"INSTALL_DEFAULT_KAMELETS=false"))
+ // Refresh the test client to account for the newly installed
CRDs
+ SyncClient()
+
Eventually(OperatorPod(ns)).ShouldNot(BeNil())
+ Eventually(OperatorPodPhase(ns),
TestTimeoutMedium).Should(Equal(corev1.PodRunning))
+ Eventually(Platform(ns)).ShouldNot(BeNil())
})
}
-func TestAlternativeImageOperator(t *testing.T) {
+func TestOperatorAlternativeImage(t *testing.T) {
makeDir := testutil.MakeTempCopyDir(t, "../../../../install")
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
@@ -65,24 +73,27 @@ func TestAlternativeImageOperator(t *testing.T) {
defer Cleanup()
WithNewTestNamespace(t, func(ns string) {
-
- ExecMake(t, Make("setup-cluster", fmt.Sprintf("NAMESPACE=%s",
ns)))
- ExecMake(t, Make("setup", fmt.Sprintf("NAMESPACE=%s", ns)))
+ namespaceArg := fmt.Sprintf("NAMESPACE=%s", ns)
+ ExpectExecSucceed(t, Make("setup-cluster", namespaceArg))
+ ExpectExecSucceed(t, Make("setup", namespaceArg))
// Skip default kamelets installation for faster test runs
newImage := "quay.io/kameltest/kamel-operator"
newTag := "1.1.1"
-
[camel-k] 01/03: feat(kustomize): add uninstall target to Makefile
This is an automated email from the ASF dual-hosted git repository.
tsato pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit e7fa22cbada5608c83d4c127ed847c8d51e2e453
Author: Tadayoshi Sato
AuthorDate: Fri Dec 16 23:08:18 2022 +0900
feat(kustomize): add uninstall target to Makefile
---
config/samples/patch-integration-platform.yaml | 2 --
install/Makefile | 42 --
2 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/config/samples/patch-integration-platform.yaml
b/config/samples/patch-integration-platform.yaml
index 4af3fedc8..75ab2dfdd 100644
--- a/config/samples/patch-integration-platform.yaml
+++ b/config/samples/patch-integration-platform.yaml
@@ -123,11 +123,9 @@ spec:
#
# insecure: true | false
kamelet: {}
- resources: {}
status:
build:
maven:
settings: {}
registry: {}
kamelet: {}
- resources: {}
diff --git a/install/Makefile b/install/Makefile
index 7c998bbb7..945e64b60 100644
--- a/install/Makefile
+++ b/install/Makefile
@@ -19,6 +19,8 @@
#
SHELL := /bin/bash
+MAKE := make --no-print-directory
+
#
# Allows for resources to be loaded from outside the root location of
# the kustomize config file. Ensures that resource don't need to be
@@ -58,6 +60,8 @@ HEALTH_PORT ?= 8081
LOGGING_LEVEL ?= info
# Install default kamelets: [true|false]
INSTALL_DEFAULT_KAMELETS ?= true
+# Uninstall all Camel K resources: [true|false]
+UNINSTALL_ALL ?=false
CONFIG := config
MANAGER := $(CONFIG)/manager
@@ -288,7 +292,7 @@ endif
#
#@ operator
#
-#== Install the operator deployment and related resources
+#== Install the operator deployment and related resources.
#
#=== Cluster-admin privileges are required.
#
@@ -374,7 +378,7 @@ endif
#
#@ platform
#
-#== Install the integration platform
+#== Install the integration platform.
#
#=== Cluster-admin privileges are required.
#
@@ -401,7 +405,7 @@ endif
#
#@ example
#
-#== Installs the example integration
+#== Install the example integration.
#
#* PARAMETERS:
#** NAMESPACE: Set the namespace to install the example into
@@ -418,6 +422,38 @@ else
@$(KUSTOMIZE) build $(KOPTIONS) $@
endif
+.PHONY: uninstall
+
+#---
+#
+#@ uninstall
+#
+#== Uninstall the resources previously installed by the platform, operator,
setup, and setup-cluster targets.
+#
+#=== Cluster-admin privileges are required.
+#
+#* PARAMETERS:
+#** UNINSTALL_ALL: Uninstall all Camel K resources including crds and cluster
roles installed by setup-cluster [true|false]
+#** DRY_RUN: Print the resources to be applied instead of applying them
[true|false]
+#
+#---
+uninstall: kubectl
+ifeq ($(DRY_RUN), false)
+ @$(KUSTOMIZE) build $(KOPTIONS) platform | kubectl delete
--ignore-not-found=true -f -
+ @$(KUSTOMIZE) build $(KOPTIONS) operator | kubectl delete
--ignore-not-found=true -f -
+ @$(KUSTOMIZE) build $(KOPTIONS) setup| kubectl delete
--ignore-not-found=true -f -
+ifeq ($(UNINSTALL_ALL), true)
+ @$(KUSTOMIZE) build $(KOPTIONS) setup-cluster | kubectl delete
--ignore-not-found=true -f -
+endif
+else
+ @$(KUSTOMIZE) build $(KOPTIONS) platform | kubectl delete
--dry-run=client -f -
+ @$(KUSTOMIZE) build $(KOPTIONS) operator | kubectl delete
--dry-run=client -f -
+ @$(KUSTOMIZE) build $(KOPTIONS) setup| kubectl delete
--dry-run=client -f -
+ifeq ($(UNINSTALL_ALL), true)
+ @$(KUSTOMIZE) build $(KOPTIONS) setup-cluster | kubectl delete
--dry-run=client -f -
+endif
+endif
+
.DEFAULT_GOAL := help
.PHONY: help
help: ## Show this help screen.
[camel-k] branch main updated (d5eaf94c1 -> f83b7979f)
This is an automated email from the ASF dual-hosted git repository. tsato pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from d5eaf94c1 fix(controller): Ready condition status using container trait value new e7fa22cba feat(kustomize): add uninstall target to Makefile new 18e023465 chore(kustomize): add commented cli options to IntegrationPlatform example patch new f83b7979f test(e2e): add E2E tests for kustomize uninstall 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: config/samples/patch-integration-platform.yaml| 9 +- e2e/namespace/install/kustomize/common.go | 10 +- e2e/namespace/install/kustomize/operator_test.go | 52 ++ e2e/namespace/install/kustomize/setup_test.go | 14 +-- e2e/namespace/install/kustomize/uninstall_test.go | 112 ++ e2e/support/test_support.go | 32 +++ install/Makefile | 56 +-- 7 files changed, 230 insertions(+), 55 deletions(-) create mode 100644 e2e/namespace/install/kustomize/uninstall_test.go
[camel-k] 02/03: chore(kustomize): add commented cli options to IntegrationPlatform example patch
This is an automated email from the ASF dual-hosted git repository. tsato pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 18e023465bd6ecaacdacb5b92e032a39d3a7a3c1 Author: Tadayoshi Sato AuthorDate: Mon Dec 19 15:37:07 2022 +0900 chore(kustomize): add commented cli options to IntegrationPlatform example patch --- config/samples/patch-integration-platform.yaml | 7 +++ 1 file changed, 7 insertions(+) diff --git a/config/samples/patch-integration-platform.yaml b/config/samples/patch-integration-platform.yaml index 75ab2dfdd..f53bd4783 100644 --- a/config/samples/patch-integration-platform.yaml +++ b/config/samples/patch-integration-platform.yaml @@ -73,6 +73,13 @@ spec: # maven: # +# CLI options passed to the Maven commands to be executed +# +# cliOptions: +# - --show-version +# - --batch-mode +# +# # Location of the local Maven repository # # localRepository: my.repository.url
[GitHub] [camel-k] tadayosi closed issue #3866: Kustomize-based installation method doesn't provide uninstall
tadayosi closed issue #3866: Kustomize-based installation method doesn't provide uninstall URL: https://github.com/apache/camel-k/issues/3866 -- 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] tadayosi merged pull request #3928: feat(kustomize): add uninstall target to Makefile
tadayosi merged PR #3928: URL: https://github.com/apache/camel-k/pull/3928 -- 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, #4357: [Camel 3.20] Camel-kubernetes does not work in native (needs quarkus update)
JiriOndrusek opened a new issue, #4357: URL: https://github.com/apache/camel-quarkus/issues/4357 Camel-kubernetes requires kubernetes-client of version `6.3.1` Quarkus from `main` branch contains version `6.2.0`, but upgrade to 6.3.1is already part of the quarkus (see commit - [commit](https://github.com/quarkusio/quarkus/commit/f85e79dae01bc330d8d012aa8fb0af3abf8682e8) ) I'm disabling native builds of ` camel-quarkus-integration-test-master-openshift`, `camel-quarkus-examples-cluster-leader-election` and `camel-quarkus-examples-cluster-leader-election`. Please enable native builds once problem is solved. -- 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 (67acbd90411 -> 40321de6d29)
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 67acbd90411 camel-jbang - Upgrade to latest quarkus for export add 6a107fe1b66 Upgrade AWS SDK v2 to version 2.19.2 add 40321de6d29 Sync deps No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] 03/03: Sync deps
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git commit 6cd2a9c25d6100e6125f2ff55fad52a3844e678a Author: Andrea Cosentino AuthorDate: Thu Dec 22 10:56:38 2022 +0100 Sync deps Signed-off-by: Andrea Cosentino --- camel-dependencies/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 0700ebfb9ad..9b8ad310c0d 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -256,8 +256,8 @@ 2.6.1 2.7.1 4.1.5 -4.5.13 -4.4.15 +4.5.14 +4.4.16 1.7 3.21.4.1 3.0.76
[camel] 02/03: Upgrade Http Client to version 4.5.16
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 a3b6e8aaf1ef734ef1c7d82052d4177e7b344ff8 Author: Andrea Cosentino AuthorDate: Thu Dec 22 10:46:24 2022 +0100 Upgrade Http Client to version 4.5.16 Signed-off-by: Andrea Cosentino --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0db28a7fc91..4c6e06c3c6b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -237,7 +237,7 @@ 2.7.1 1.7 4.4.16 -4.5.13 +4.5.14 4.1.5 3.21.4.1 3.0.76
[camel] branch main updated (d9851ad09c1 -> 6cd2a9c25d6)
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 d9851ad09c1 Sync deps new 41406645820 Upgrade Http Core to version 4.4.16 new a3b6e8aaf1e Upgrade Http Client to version 4.5.16 new 6cd2a9c25d6 Sync deps 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: camel-dependencies/pom.xml | 4 ++-- parent/pom.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
[camel] 01/03: Upgrade Http Core to version 4.4.16
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 41406645820069db14e373d6b7a94bb9cc0bbc3c Author: Andrea Cosentino AuthorDate: Thu Dec 22 10:46:04 2022 +0100 Upgrade Http Core to version 4.4.16 Signed-off-by: Andrea Cosentino --- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index bea6befb6cc..0db28a7fc91 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -8,7 +8,7 @@ (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 + ttp://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, @@ -236,7 +236,7 @@ 2.6.1 2.7.1 1.7 -4.4.15 +4.4.16 4.5.13 4.1.5 3.21.4.1
[camel-k-runtime] branch main updated (8eba1313 -> 3d45c6e9)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git from 8eba1313 build(deps): bump gmavenplus-plugin from 1.13.1 to 2.1.0 add 3d45c6e9 build(deps): bump asm from 9.3 to 9.4 No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[GitHub] [camel-k-runtime] squakez merged pull request #899: build(deps): bump asm from 9.3 to 9.4
squakez merged PR #899: URL: https://github.com/apache/camel-k-runtime/pull/899 -- 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
