svn commit: r65645 - in /dev/camel/camel-quarkus/3.2.3: ./ apache-camel-quarkus-3.2.3-src.zip apache-camel-quarkus-3.2.3-src.zip.asc apache-camel-quarkus-3.2.3-src.zip.sha512
Author: zhfeng Date: Wed Nov 29 07:52:36 2023 New Revision: 65645 Log: Apache Camel Quarkus 3.2.3 staging artifacts Added: dev/camel/camel-quarkus/3.2.3/ dev/camel/camel-quarkus/3.2.3/apache-camel-quarkus-3.2.3-src.zip (with props) dev/camel/camel-quarkus/3.2.3/apache-camel-quarkus-3.2.3-src.zip.asc (with props) dev/camel/camel-quarkus/3.2.3/apache-camel-quarkus-3.2.3-src.zip.sha512 Added: dev/camel/camel-quarkus/3.2.3/apache-camel-quarkus-3.2.3-src.zip == Binary file - no diff available. Propchange: dev/camel/camel-quarkus/3.2.3/apache-camel-quarkus-3.2.3-src.zip -- svn:mime-type = application/zip Added: dev/camel/camel-quarkus/3.2.3/apache-camel-quarkus-3.2.3-src.zip.asc == Binary file - no diff available. Propchange: dev/camel/camel-quarkus/3.2.3/apache-camel-quarkus-3.2.3-src.zip.asc -- svn:mime-type = application/pgp-signature Added: dev/camel/camel-quarkus/3.2.3/apache-camel-quarkus-3.2.3-src.zip.sha512 == --- dev/camel/camel-quarkus/3.2.3/apache-camel-quarkus-3.2.3-src.zip.sha512 (added) +++ dev/camel/camel-quarkus/3.2.3/apache-camel-quarkus-3.2.3-src.zip.sha512 Wed Nov 29 07:52:36 2023 @@ -0,0 +1 @@ +05a9cf90053ac4f0fc0579a1255e596b0330677edcb8322f43175ad13cbe0349c477b52d0a438cac6753b82f184bd7f597af01e46c5a0ed2868e6f86476a398c apache-camel-quarkus-3.2.3-src.zip
Re: [I] Some openapi-java array types cannot be configured [camel-quarkus]
zhfeng commented on issue #5559: URL: https://github.com/apache/camel-quarkus/issues/5559#issuecomment-1831358092 OK, I will check them when I find a fix in camel. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Some openapi-java array types cannot be configured [camel-quarkus]
jamesnetherton commented on issue #5559: URL: https://github.com/apache/camel-quarkus/issues/5559#issuecomment-1831349543 > @jamesnetherton is there any reproducer? https://github.com/apache/camel-quarkus/blob/main/integration-tests/openapi-java/src/main/java/org/apache/camel/quarkus/component/openapijava/it/OpenApiRoutes.java#L200-L230 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch 3.2.x updated (017734332e -> 0d5b8c5478)
This is an automated email from the ASF dual-hosted git repository. zhfeng pushed a change to branch 3.2.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git omit 017734332e Update generated files after 3.2.3 release new 0d5b8c5478 Update generated files after 3.2.3 release 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 (017734332e) \ N -- N -- N refs/heads/3.2.x (0d5b8c5478) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 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. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [PR] Bump com.google.apis:google-api-services-gmail from v1-rev20230612-2.0.0 to v1-rev20231106-2.0.0 [camel]
github-actions[bot] commented on PR #12247: URL: https://github.com/apache/camel/pull/12247#issuecomment-1831329962 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Bump com.google.apis:google-api-services-gmail from v1-rev20230612-2.0.0 to v1-rev20231106-2.0.0 [camel]
dependabot[bot] opened a new pull request, #12247: URL: https://github.com/apache/camel/pull/12247 Bumps com.google.apis:google-api-services-gmail from v1-rev20230612-2.0.0 to v1-rev20231106-2.0.0. [](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 show ignore conditions` will show all of the ignore conditions of the specified dependency - `@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 dependabot/maven/com.google.apis-google-api-services-gmail-v1-rev20231106-2.0.0 created (now 669251c225e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.google.apis-google-api-services-gmail-v1-rev20231106-2.0.0 in repository https://gitbox.apache.org/repos/asf/camel.git at 669251c225e Bump com.google.apis:google-api-services-gmail No new revisions were added by this update.
Re: [PR] Bump ch.qos.logback:logback-classic from 1.4.11 to 1.4.13 [camel]
github-actions[bot] commented on PR #12246: URL: https://github.com/apache/camel/pull/12246#issuecomment-1831328324 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Bump ch.qos.logback:logback-classic from 1.4.11 to 1.4.13 [camel]
dependabot[bot] opened a new pull request, #12246: URL: https://github.com/apache/camel/pull/12246 Bumps [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) from 1.4.11 to 1.4.13. Commits https://github.com/qos-ch/logback/commit/7ee000a0a359d239c60bb93a2f4f4ea467c38395;>7ee000a prepare release 1.4.13 https://github.com/qos-ch/logback/commit/867bf581b678a2eed60d56f257f328284e14ad45;>867bf58 remove superflus system.out call https://github.com/qos-ch/logback/commit/88abf59a18720854f4f55feb8d8f6951cfaf6037;>88abf59 prepare release 1.4.12 https://github.com/qos-ch/logback/commit/2cd8cabc5b1289d8efab7cb0f728010c8f381e71;>2cd8cab cater for array size marked with -1 https://github.com/qos-ch/logback/commit/9c782b45be4abdafb7e17481e24e7354c2acd1eb;>9c782b4 prevent DOS attacks using on malicious serialized input https://github.com/qos-ch/logback/commit/f6d690dfe85c96cfc00e23321c381122f266b5de;>f6d690d further support for Virtual threads, issues 737 https://github.com/qos-ch/logback/commit/9a1fc44f84befa8f05eaeea3f236014a556872e2;>9a1fc44 add support for Virtual threads https://github.com/qos-ch/logback/commit/410ad18a79695ac7a26a1006188a29ba729b8842;>410ad18 parameterizable invocation gate delay https://github.com/qos-ch/logback/commit/2946e3b0b34c2a22fd20b97058944aeb67d4361f;>2946e3b minor refactoring https://github.com/qos-ch/logback/commit/bf59a63059841e14dff80cf6b5f473b71eee26cd;>bf59a63 fix guthub issue 715 Additional commits viewable in https://github.com/qos-ch/logback/compare/v_1.4.11...v_1.4.13;>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 show ignore conditions` will show all of the ignore conditions of the specified dependency - `@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 dependabot/maven/ch.qos.logback-logback-classic-1.4.13 created (now 6b01caf2ac6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/ch.qos.logback-logback-classic-1.4.13 in repository https://gitbox.apache.org/repos/asf/camel.git at 6b01caf2ac6 Bump ch.qos.logback:logback-classic from 1.4.11 to 1.4.13 No new revisions were added by this update.
Re: [PR] Bump aws-java-sdk2-version from 2.21.32 to 2.21.33 [camel]
github-actions[bot] commented on PR #12245: URL: https://github.com/apache/camel/pull/12245#issuecomment-1831327652 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch dependabot/maven/aws-java-sdk2-version-2.21.33 created (now eb60a44cd9c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/aws-java-sdk2-version-2.21.33 in repository https://gitbox.apache.org/repos/asf/camel.git at eb60a44cd9c Bump aws-java-sdk2-version from 2.21.32 to 2.21.33 No new revisions were added by this update.
[PR] Bump aws-java-sdk2-version from 2.21.32 to 2.21.33 [camel]
dependabot[bot] opened a new pull request, #12245: URL: https://github.com/apache/camel/pull/12245 Bumps `aws-java-sdk2-version` from 2.21.32 to 2.21.33. Updates `software.amazon.awssdk:sqs` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:kinesis` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:s3` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:sns` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:cloudwatch` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:ec2` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:eventbridge` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:iam` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:kms` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:lambda` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:secretsmanager` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:sts` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:dynamodb` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:apache-client` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:athena` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:cloudtrail` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:config` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:ecs` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:eks` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:netty-nio-client` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:firehose` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:kafka` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:mq` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:redshiftdata` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:ses` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:sfn` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:timestreamquery` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:timestreamwrite` from 2.21.32 to 2.21.33 Updates `software.amazon.awssdk:translate` from 2.21.32 to 2.21.33 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 show ignore conditions` will show all of the ignore conditions of the specified dependency - `@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
Re: [PR] chore(deps): bump knative.dev/serving from 0.38.2 to 0.39.2 [camel-k]
dependabot[bot] commented on PR #4939: URL: https://github.com/apache/camel-k/pull/4939#issuecomment-1831321196 OK, I won't notify you again about this release, but will get in touch when a new version is available. If you'd rather skip all updates until the next major or minor version, let me know by commenting `@dependabot ignore this major version` or `@dependabot ignore this minor version`. You can also ignore all major, minor, or patch releases for a dependency by adding an [`ignore` condition](https://docs.github.com/en/code-security/supply-chain-security/configuration-options-for-dependency-updates#ignore) with the desired `update_types` to your config file. If you change your mind, just re-open this PR and I'll resolve any conflicts on it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] chore(deps): bump knative.dev/serving from 0.38.2 to 0.39.2 [camel-k]
squakez closed pull request #4939: chore(deps): bump knative.dev/serving from 0.38.2 to 0.39.2 URL: https://github.com/apache/camel-k/pull/4939 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] chore(deps): bump knative.dev/serving from 0.38.2 to 0.39.2 [camel-k]
squakez commented on PR #4939: URL: https://github.com/apache/camel-k/pull/4939#issuecomment-1831321160 Depends on #4612 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch dependabot/go_modules/knative.dev/serving-0.39.2 deleted (was ad0163afe)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/knative.dev/serving-0.39.2 in repository https://gitbox.apache.org/repos/asf/camel-k.git was ad0163afe chore(deps): bump knative.dev/serving from 0.38.2 to 0.39.2 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] chore(deps): bump knative.dev/eventing from 0.38.5 to 0.39.1 [camel-k]
dependabot[bot] commented on PR #4938: URL: https://github.com/apache/camel-k/pull/4938#issuecomment-1831320846 OK, I won't notify you again about this release, but will get in touch when a new version is available. If you'd rather skip all updates until the next major or minor version, let me know by commenting `@dependabot ignore this major version` or `@dependabot ignore this minor version`. You can also ignore all major, minor, or patch releases for a dependency by adding an [`ignore` condition](https://docs.github.com/en/code-security/supply-chain-security/configuration-options-for-dependency-updates#ignore) with the desired `update_types` to your config file. If you change your mind, just re-open this PR and I'll resolve any conflicts on it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) branch dependabot/go_modules/knative.dev/eventing-0.39.1 deleted (was 42b4a9466)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch dependabot/go_modules/knative.dev/eventing-0.39.1 in repository https://gitbox.apache.org/repos/asf/camel-k.git was 42b4a9466 chore(deps): bump knative.dev/eventing from 0.38.5 to 0.39.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] chore(deps): bump knative.dev/eventing from 0.38.5 to 0.39.1 [camel-k]
squakez commented on PR #4938: URL: https://github.com/apache/camel-k/pull/4938#issuecomment-1831320812 Depends on #4612 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] chore(deps): bump knative.dev/eventing from 0.38.5 to 0.39.1 [camel-k]
squakez closed pull request #4938: chore(deps): bump knative.dev/eventing from 0.38.5 to 0.39.1 URL: https://github.com/apache/camel-k/pull/4938 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] [3.2.x] Add Generated SBOM to release as artifacts [camel-quarkus]
zhfeng opened a new pull request, #5568: URL: https://github.com/apache/camel-quarkus/pull/5568 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Bump org.apache.commons:commons-dbcp2 from 2.10.0 to 2.11.0 [camel]
github-actions[bot] commented on PR #12244: URL: https://github.com/apache/camel/pull/12244#issuecomment-1831312379 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch dependabot/maven/org.apache.commons-commons-dbcp2-2.11.0 created (now 4c9799fe4ab)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.commons-commons-dbcp2-2.11.0 in repository https://gitbox.apache.org/repos/asf/camel.git at 4c9799fe4ab Bump org.apache.commons:commons-dbcp2 from 2.10.0 to 2.11.0 No new revisions were added by this update.
[PR] Bump org.apache.commons:commons-dbcp2 from 2.10.0 to 2.11.0 [camel]
dependabot[bot] opened a new pull request, #12244: URL: https://github.com/apache/camel/pull/12244 Bumps org.apache.commons:commons-dbcp2 from 2.10.0 to 2.11.0. [](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 show ignore conditions` will show all of the ignore conditions of the specified dependency - `@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 (ffcb160b426 -> e1212b9e749)
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 ffcb160b426 CAMEL-20163: consolidate duplicated charset extract/set code (#12242) add e1212b9e749 Regen No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/support/http/HttpUtil.java | 10 ++ .../src/main/java/org/apache/camel/util/CollectionHelper.java | 9 + 2 files changed, 11 insertions(+), 8 deletions(-)
(camel) branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new e1212b9e749 Regen
e1212b9e749 is described below
commit e1212b9e749497802f650e9f343812bd519e8f6e
Author: Claus Ibsen
AuthorDate: Wed Nov 29 07:15:09 2023 +0100
Regen
---
.../src/main/java/org/apache/camel/support/http/HttpUtil.java | 10 ++
.../src/main/java/org/apache/camel/util/CollectionHelper.java | 9 +
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java
b/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java
index f055473cd09..6ba015fe164 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/http/HttpUtil.java
@@ -58,9 +58,10 @@ public final class HttpUtil {
/**
* Deprecated way to extract the charset value from the content type string
- * @deprecated use {@link IOHelper#getCharsetNameFromContentType(String)}
- * @param contentType the content type string
- * @return the charset value or null if there is nothing to extract
+ *
+ * @deprecated use {@link
IOHelper#getCharsetNameFromContentType(String)}
+ * @param contentType the content type string
+ * @return the charset value or null if there is nothing
to extract
*/
@Deprecated
public static String getCharsetFromContentType(String contentType) {
@@ -81,8 +82,9 @@ public final class HttpUtil {
/**
* Extracts the charset value from the content type string and sets it on
the given exchange
+ *
* @param contentType the content type string
- * @param exchange the exchange to set the charset value
+ * @param exchangethe exchange to set the charset value
*/
public static void setCharsetFromContentType(String contentType, Exchange
exchange) {
String charset = HttpUtil.getCharsetFromContentType(contentType);
diff --git
a/core/camel-util/src/main/java/org/apache/camel/util/CollectionHelper.java
b/core/camel-util/src/main/java/org/apache/camel/util/CollectionHelper.java
index be2eefd5702..bfc1fa50379 100644
--- a/core/camel-util/src/main/java/org/apache/camel/util/CollectionHelper.java
+++ b/core/camel-util/src/main/java/org/apache/camel/util/CollectionHelper.java
@@ -246,11 +246,12 @@ public final class CollectionHelper {
}
/**
- * When trying to set the value for a map, if the value already exists,
appends it to a list. Otherwise, sets the entry to
- * the given value.
+ * When trying to set the value for a map, if the value already exists,
appends it to a list. Otherwise, sets the
+ * entry to the given value.
+ *
* @param headers the map that whose entry will be set or appended
- * @param key the key on the map
- * @param value the value to set or append within the map
+ * @param key the key on the map
+ * @param value the value to set or append within the map
*/
public static void appendEntry(Map headers,
String key, T value) {
if (headers.containsKey(key)) {
(camel-spring-boot) branch main updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 5c0289fd2cf Regen
5c0289fd2cf is described below
commit 5c0289fd2cf8be0ae6d4543b1b4d5a29b0271d33
Author: Claus Ibsen
AuthorDate: Wed Nov 29 06:45:08 2023 +0100
Regen
---
.../springboot/catalog/components/aws-config.json | 4 +-
.../camel/springboot/catalog/components/jetty.json | 68 --
.../camel-jetty-starter/src/main/docs/jetty.json | 27 +
.../JettyHttpComponentConfiguration11.java | 52 +
4 files changed, 119 insertions(+), 32 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-config.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-config.json
index 973dee6dad1..99dc9fe947a 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-config.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-config.json
@@ -24,7 +24,7 @@
"componentProperties": {
"configuration": { "index": 0, "kind": "property", "displayName":
"Configuration", "group": "producer", "label": "", "required": false, "type":
"object", "javaType":
"org.apache.camel.component.aws.config.AWSConfigConfiguration", "deprecated":
false, "autowired": false, "secret": false, "description": "Component
configuration" },
"lazyStartProducer": { "index": 1, "kind": "property", "displayName":
"Lazy Start Producer", "group": "producer", "label": "producer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether the producer should be started lazy (on the first message). By
starting lazy you can use this to allow CamelContext and routes to startup in
situations where a producer may otherwise fail [...]
-"operation": { "index": 2, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType": "org.apache.camel.component.aws.config.AWSConfigOperations",
"enum": [ "putConfigRule", "removeConfigRule" ], "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws.config.AWSConfigConfiguration",
"configurationField": "configuration", "description": [...]
+"operation": { "index": 2, "kind": "property", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType": "org.apache.camel.component.aws.config.AWSConfigOperations",
"enum": [ "putConfigRule", "removeConfigRule", "describeRuleCompliance" ],
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.aws.config.AWSConfigConfiguration",
"configurationField": "confi [...]
"overrideEndpoint": { "index": 3, "kind": "property", "displayName":
"Override Endpoint", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws.config.AWSConfigConfiguration",
"configurationField": "configuration", "description": "Set the need for
overidding the endpoint. This option needs to be used in combina [...]
"pojoRequest": { "index": 4, "kind": "property", "displayName": "Pojo
Request", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws.config.AWSConfigConfiguration",
"configurationField": "configuration", "description": "If we want to use a POJO
request as body or not" },
"region": { "index": 5, "kind": "property", "displayName": "Region",
"group": "producer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "ap-south-2", "ap-south-1",
"eu-south-1", "eu-south-2", "us-gov-east-1", "me-central-1", "il-central-1",
"ca-central-1", "eu-central-1", "us-iso-west-1", "eu-central-2", "us-west-1",
"us-west-2", "af-south-1", "eu-north-1", "eu-west-3", "eu-west-2", "eu-west-1",
"ap-northeast-3", "ap-northeast-2", "ap-nor [...]
@@ -51,7 +51,7 @@
},
"properties": {
"label": { "index": 0, "kind": "path", "displayName": "Label", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "autowired":
Re: [PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
davsclaus closed pull request #1025: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) URL: https://github.com/apache/camel-spring-boot/pull/1025 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20163: consolidate duplicated logging code [camel]
github-actions[bot] commented on PR #12243: URL: https://github.com/apache/camel/pull/12243#issuecomment-1831244929 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] CAMEL-20163: consolidate duplicated logging code [camel]
orpiske opened a new pull request, #12243: URL: https://github.com/apache/camel/pull/12243 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Some openapi-java array types cannot be configured [camel-quarkus]
zhfeng commented on issue #5559: URL: https://github.com/apache/camel-quarkus/issues/5559#issuecomment-1831229647 @jamesnetherton is there any reproducer? It looks like that we can use `Schema::cast` method https://github.com/swagger-api/swagger-core/blob/master/modules/swagger-models/src/main/java/io/swagger/v3/oas/models/media/Schema.java#L854-L856 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karavan) branch main updated: UI prototype for #956
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 6290498a UI prototype for #956
6290498a is described below
commit 6290498a9b871b586b87bb1ff2e3757e8feaa71e
Author: Marat Gubaidullin
AuthorDate: Tue Nov 28 23:45:12 2023 -0500
UI prototype for #956
---
karavan-space/src/designer/editor/CodeEditor.tsx | 9 +++--
karavan-space/src/designer/route/DslElement.css| 17 +-
karavan-space/src/designer/route/DslElement.tsx| 39 +++---
.../main/webui/src/designer/editor/CodeEditor.tsx | 9 +++--
.../main/webui/src/designer/route/DslElement.css | 17 +-
.../main/webui/src/designer/route/DslElement.tsx | 39 +++---
6 files changed, 114 insertions(+), 16 deletions(-)
diff --git a/karavan-space/src/designer/editor/CodeEditor.tsx
b/karavan-space/src/designer/editor/CodeEditor.tsx
index cd6a4f36..d421ecaa 100644
--- a/karavan-space/src/designer/editor/CodeEditor.tsx
+++ b/karavan-space/src/designer/editor/CodeEditor.tsx
@@ -29,8 +29,13 @@ export function CodeEditor () {
const [code, setCode] = useState('');
useEffect(() => {
-const c = CamelDefinitionYaml.integrationToYaml(integration);
-setCode(c);
+try {
+const c = CamelDefinitionYaml.integrationToYaml(integration);
+setCode(c);
+} catch (e: any) {
+const message: string = e?.message ? e.message : e.reason;
+setNotification(true, ['Error in YAML, Integration can not be
saved!', message]);
+}
return () => {
setNotification(false, ['', '']);
}
diff --git a/karavan-space/src/designer/route/DslElement.css
b/karavan-space/src/designer/route/DslElement.css
index 71621b45..d3ed7177 100644
--- a/karavan-space/src/designer/route/DslElement.css
+++ b/karavan-space/src/designer/route/DslElement.css
@@ -1,3 +1,18 @@
.disabled {
opacity: 0.5;
-}
\ No newline at end of file
+}
+.menu-button {
+position: absolute;
+top: 26px;
+line-height: 1;
+border: 0;
+padding: 0;
+margin: 0 0 0 10px;
+background: transparent;
+color: var(--pf-v5-global--primary-color--100);
+visibility: hidden;
+}
+
+.dsl-element:hover .menu-button {
+visibility: visible;
+}
diff --git a/karavan-space/src/designer/route/DslElement.tsx
b/karavan-space/src/designer/route/DslElement.tsx
index efeaeff8..e3dfdbfc 100644
--- a/karavan-space/src/designer/route/DslElement.tsx
+++ b/karavan-space/src/designer/route/DslElement.tsx
@@ -15,13 +15,13 @@
* limitations under the License.
*/
import React, {CSSProperties, useMemo, useState} from 'react';
-import {
-Text, Tooltip,
-} from '@patternfly/react-core';
+import {Menu, MenuContent, MenuItem, MenuList, Popover, Text, Tooltip,} from
'@patternfly/react-core';
import '../karavan.css';
import './DslElement.css';
import AddIcon from "@patternfly/react-icons/dist/js/icons/plus-circle-icon";
import DeleteIcon from
"@patternfly/react-icons/dist/js/icons/times-circle-icon";
+import SyncIcon from "@patternfly/react-icons/dist/js/icons/sync-icon";
+import TurnIcon from
"@patternfly/react-icons/dist/js/icons/chevron-circle-right-icon";
import InsertIcon from
"@patternfly/react-icons/dist/js/icons/arrow-alt-circle-right-icon";
import {CamelElement} from "karavan-core/lib/model/IntegrationDefinition";
import {CamelUi} from "../utils/CamelUi";
@@ -222,7 +222,7 @@ export function DslElement(props: Props) {
const headerClass = ['RouteConfigurationDefinition',
'RouteDefinition'].includes(step.dslName) ? "header-route" : "header"
const headerClasses = isElementSelected() ? headerClass + " selected"
: headerClass;
return (
-
+
{!['RouteConfigurationDefinition',
'RouteDefinition'].includes(props.step.dslName) &&
sendPosition(el)}
@@ -237,6 +237,7 @@ export function DslElement(props: Props) {
{showInsertButton && getInsertElementButton()}
{getDeleteButton()}
+{/*{getMenuButton()}*/}
{showAddButton && getAddElementButton()}
)
@@ -408,11 +409,39 @@ export function DslElement(props: Props) {
return (
{"Delete
element"}}>
onDeleteElement(e)} className="delete-button">
-
+
+
)
}
+function getMenuButton() {
+return (
+ {}} isPlain>
+
+
+}>Convert to SetHeader
+{/*Action*/}
+{/*Action*/}
+
+
(camel-karavan) branch main updated (143a9208 -> a51f59cb)
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 143a9208 Fix #908 new 0f300da1 Set default expression as Simple new a51f59cb UI prototype for #956 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: karavan-core/src/core/api/CamelDefinitionApi.ts| 1 + karavan-designer/src/App.tsx | 4 +-- .../src/designer/editor/CodeEditor.tsx | 9 +++-- karavan-designer/src/designer/route/DslElement.css | 17 +- karavan-designer/src/designer/route/DslElement.tsx | 39 +++--- .../generator/CamelDefinitionApiGenerator.java | 7 ++-- 6 files changed, 64 insertions(+), 13 deletions(-)
(camel-karavan) 01/02: Set default expression as Simple
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 0f300da1db239875adeb5f91cb71ccac7223c464
Author: Marat Gubaidullin
AuthorDate: Tue Nov 28 23:43:02 2023 -0500
Set default expression as Simple
---
karavan-core/src/core/api/CamelDefinitionApi.ts| 1 +
.../camel/karavan/generator/CamelDefinitionApiGenerator.java | 7 ---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/karavan-core/src/core/api/CamelDefinitionApi.ts
b/karavan-core/src/core/api/CamelDefinitionApi.ts
index aea9a15c..ea782fb0 100644
--- a/karavan-core/src/core/api/CamelDefinitionApi.ts
+++ b/karavan-core/src/core/api/CamelDefinitionApi.ts
@@ -2374,6 +2374,7 @@ export class CamelDefinitionApi {
static createExpressionDefinition = (element: any): ExpressionDefinition
=> {
const def = element ? new ExpressionDefinition({...element}) : new
ExpressionDefinition();
def.uuid = element?.uuid ? element.uuid : def.uuid;
+element = element !== undefined ? element : {simple:
CamelDefinitionApi.createSimpleExpression({expression: ""})}
if (element?.constant !== undefined) {
def.constant =
CamelDefinitionApi.createConstantExpression(element.constant);
}
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 5e4ad388..eba2bb46 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
@@ -137,6 +137,9 @@ public final class CamelDefinitionApiGenerator extends
AbstractGenerator {
List attrs = new ArrayList<>();
AtomicBoolean hasId = new AtomicBoolean(false);
+if (className.equals("ExpressionDefinition")) {
+attrs.add("element = element !== undefined ? element :
{simple: CamelDefinitionApi.createSimpleExpression({expression: \"\"})}");
+}
properties.keySet().stream().sorted(getComparator(stepName)).forEach(name -> {
JsonObject aValue = properties.get(name);
if ("id".equals(name)) {
@@ -164,13 +167,11 @@ public final class CamelDefinitionApiGenerator extends
AbstractGenerator {
"}";
String code = String.format(template, name,
getAttributeClass(aValue));
attrs.add(code);
-} else {
-
}
});
String stringToRequired = getStringToRequired(obj, className);
String s2 = stringToRequired.isEmpty() ? "" : "\n" + stringToRequired;
-String s3 = attrs.size() > 0 ? "\n" +
attrs.stream().collect(Collectors.joining("\n")) : "";
+String s3 = !attrs.isEmpty() ? "\n" + String.join("\n", attrs) : "";
return String.format(readFileText(modelTemplate), className, s2, s3);
}
(camel-karavan) 02/02: UI prototype for #956
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 a51f59cb12b205bc3a4c0306cee5b949493bbf54
Author: Marat Gubaidullin
AuthorDate: Tue Nov 28 23:43:37 2023 -0500
UI prototype for #956
---
karavan-designer/src/App.tsx | 4 +--
.../src/designer/editor/CodeEditor.tsx | 9 +++--
karavan-designer/src/designer/route/DslElement.css | 17 +-
karavan-designer/src/designer/route/DslElement.tsx | 39 +++---
4 files changed, 59 insertions(+), 10 deletions(-)
diff --git a/karavan-designer/src/App.tsx b/karavan-designer/src/App.tsx
index 649fd775..d4a2b788 100644
--- a/karavan-designer/src/App.tsx
+++ b/karavan-designer/src/App.tsx
@@ -102,8 +102,8 @@ class App extends React.Component {
TemplateApi.saveTemplate("org.apache.camel.Processor", data[3]);
if (data[4]) {
-// this.setState({yaml: data[4], name: "demo.camel.yaml"})
-this.setState({yaml: data[4], name:
"aws-s3-cdc-source.kamelet.yaml"})
+this.setState({yaml: data[4], name: "demo.camel.yaml"})
+// this.setState({yaml: data[4], name:
"aws-s3-cdc-source.kamelet.yaml"})
}
if (data[5]) {
diff --git a/karavan-designer/src/designer/editor/CodeEditor.tsx
b/karavan-designer/src/designer/editor/CodeEditor.tsx
index cd6a4f36..d421ecaa 100644
--- a/karavan-designer/src/designer/editor/CodeEditor.tsx
+++ b/karavan-designer/src/designer/editor/CodeEditor.tsx
@@ -29,8 +29,13 @@ export function CodeEditor () {
const [code, setCode] = useState('');
useEffect(() => {
-const c = CamelDefinitionYaml.integrationToYaml(integration);
-setCode(c);
+try {
+const c = CamelDefinitionYaml.integrationToYaml(integration);
+setCode(c);
+} catch (e: any) {
+const message: string = e?.message ? e.message : e.reason;
+setNotification(true, ['Error in YAML, Integration can not be
saved!', message]);
+}
return () => {
setNotification(false, ['', '']);
}
diff --git a/karavan-designer/src/designer/route/DslElement.css
b/karavan-designer/src/designer/route/DslElement.css
index 71621b45..d3ed7177 100644
--- a/karavan-designer/src/designer/route/DslElement.css
+++ b/karavan-designer/src/designer/route/DslElement.css
@@ -1,3 +1,18 @@
.disabled {
opacity: 0.5;
-}
\ No newline at end of file
+}
+.menu-button {
+position: absolute;
+top: 26px;
+line-height: 1;
+border: 0;
+padding: 0;
+margin: 0 0 0 10px;
+background: transparent;
+color: var(--pf-v5-global--primary-color--100);
+visibility: hidden;
+}
+
+.dsl-element:hover .menu-button {
+visibility: visible;
+}
diff --git a/karavan-designer/src/designer/route/DslElement.tsx
b/karavan-designer/src/designer/route/DslElement.tsx
index efeaeff8..e3dfdbfc 100644
--- a/karavan-designer/src/designer/route/DslElement.tsx
+++ b/karavan-designer/src/designer/route/DslElement.tsx
@@ -15,13 +15,13 @@
* limitations under the License.
*/
import React, {CSSProperties, useMemo, useState} from 'react';
-import {
-Text, Tooltip,
-} from '@patternfly/react-core';
+import {Menu, MenuContent, MenuItem, MenuList, Popover, Text, Tooltip,} from
'@patternfly/react-core';
import '../karavan.css';
import './DslElement.css';
import AddIcon from "@patternfly/react-icons/dist/js/icons/plus-circle-icon";
import DeleteIcon from
"@patternfly/react-icons/dist/js/icons/times-circle-icon";
+import SyncIcon from "@patternfly/react-icons/dist/js/icons/sync-icon";
+import TurnIcon from
"@patternfly/react-icons/dist/js/icons/chevron-circle-right-icon";
import InsertIcon from
"@patternfly/react-icons/dist/js/icons/arrow-alt-circle-right-icon";
import {CamelElement} from "karavan-core/lib/model/IntegrationDefinition";
import {CamelUi} from "../utils/CamelUi";
@@ -222,7 +222,7 @@ export function DslElement(props: Props) {
const headerClass = ['RouteConfigurationDefinition',
'RouteDefinition'].includes(step.dslName) ? "header-route" : "header"
const headerClasses = isElementSelected() ? headerClass + " selected"
: headerClass;
return (
-
+
{!['RouteConfigurationDefinition',
'RouteDefinition'].includes(props.step.dslName) &&
sendPosition(el)}
@@ -237,6 +237,7 @@ export function DslElement(props: Props) {
{showInsertButton && getInsertElementButton()}
{getDeleteButton()}
+{/*{getMenuButton()}*/}
{showAddButton && getAddElementButton()}
)
@@ -408,11 +409,39 @@ export function DslElement(props: Props) {
return (
{"Delete
element"}}>
(camel) branch regen_bot updated (41733b2fc5b -> ffcb160b426)
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 41733b2fc5b CAMEL-20152: camel-jetty - Allow to configure the multipart (#12240) add ffcb160b426 CAMEL-20163: consolidate duplicated charset extract/set code (#12242) No new revisions were added by this update. Summary of changes: .../org/apache/camel/http/base/HttpHelper.java | 20 .../org/apache/camel/http/common/HttpHelper.java | 5 +-- .../component/netty/http/NettyHttpConverter.java | 3 +- .../component/netty/http/NettyHttpHelper.java | 24 -- .../http/handlers/HttpServerChannelHandler.java| 2 +- .../org/apache/camel/support/http/HttpUtil.java| 38 ++ 6 files changed, 44 insertions(+), 48 deletions(-)
(camel) branch main updated: CAMEL-20163: consolidate duplicated charset extract/set code (#12242)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new ffcb160b426 CAMEL-20163: consolidate duplicated charset extract/set
code (#12242)
ffcb160b426 is described below
commit ffcb160b4269dcfe7fa061862a8020cfccbb4370
Author: Otavio Rodolfo Piske
AuthorDate: Wed Nov 29 05:27:47 2023 +0100
CAMEL-20163: consolidate duplicated charset extract/set code (#12242)
---
.../org/apache/camel/http/base/HttpHelper.java | 20
.../org/apache/camel/http/common/HttpHelper.java | 5 +--
.../component/netty/http/NettyHttpConverter.java | 3 +-
.../component/netty/http/NettyHttpHelper.java | 24 --
.../http/handlers/HttpServerChannelHandler.java| 2 +-
.../org/apache/camel/support/http/HttpUtil.java| 38 ++
6 files changed, 44 insertions(+), 48 deletions(-)
diff --git
a/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpHelper.java
b/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpHelper.java
index b53cef30a58..e13b4059774 100644
---
a/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpHelper.java
+++
b/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpHelper.java
@@ -77,26 +77,6 @@ public final class HttpHelper {
}
}
-/**
- * @deprecated use {@link IOHelper#getCharsetNameFromContentType(String)}
- */
-@Deprecated
-public static String getCharsetFromContentType(String contentType) {
-if (contentType != null) {
-// find the charset and set it to the Exchange
-int index = contentType.indexOf("charset=");
-if (index > 0) {
-String charset = contentType.substring(index + 8);
-// there may be another parameter after a semi colon, so skip
that
-if (charset.contains(";")) {
-charset = StringHelper.before(charset, ";");
-}
-return IOHelper.normalizeCharset(charset);
-}
-}
-return null;
-}
-
/**
* Appends the key/value to the headers.
*
diff --git
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
index 0035908bc0c..2c90b767921 100644
---
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
+++
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
@@ -35,6 +35,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.RuntimeExchangeException;
import org.apache.camel.converter.stream.CachedOutputStream;
import org.apache.camel.support.CamelObjectInputStream;
+import org.apache.camel.support.http.HttpUtil;
import org.apache.camel.util.CollectionHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.URISupport;
@@ -55,11 +56,11 @@ public final class HttpHelper {
}
public static void setCharsetFromContentType(String contentType, Exchange
exchange) {
-
org.apache.camel.http.base.HttpHelper.setCharsetFromContentType(contentType,
exchange);
+HttpUtil.setCharsetFromContentType(contentType, exchange);
}
public static String getCharsetFromContentType(String contentType) {
-return
org.apache.camel.http.base.HttpHelper.getCharsetFromContentType(contentType);
+return HttpUtil.getCharsetFromContentType(contentType);
}
/**
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConverter.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConverter.java
index f7afabf4bbd..7ccd8cc8c27 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConverter.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConverter.java
@@ -30,6 +30,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePropertyKey;
import org.apache.camel.component.netty.NettyConverter;
import org.apache.camel.spi.TypeConverterRegistry;
+import org.apache.camel.support.http.HttpUtil;
@Converter(generateLoader = true)
public final class NettyHttpConverter {
@@ -87,7 +88,7 @@ public final class NettyHttpConverter {
@Converter
public static String toString(FullHttpResponse response, Exchange
exchange) {
String contentType =
response.headers().get(NettyHttpConstants.CONTENT_TYPE);
-String charset =
NettyHttpHelper.getCharsetFromContentType(contentType);
+String charset = HttpUtil.getCharsetFromContentType(contentType);
if (charset == null && exchange
Re: [PR] CAMEL-20163: consolidate duplicated charset extract/set code [camel]
orpiske merged PR #12242: URL: https://github.com/apache/camel/pull/12242 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] [CI] - Quarkus Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1831122287 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 7027139092-1315-a662a7ca-ac01-4529-9d81-e2efef7fb2d5 * Camel Quarkus Commit: 5394393506bdbec75076cde54ad4436cabf109d1 * Quarkus Main Commit: 5bebe187681834fdc5d407cf8bc37880bcc89e98 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/7027139092 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) annotated tag 3.2.3 created (now 4d24e68d2b)
This is an automated email from the ASF dual-hosted git repository. zhfeng pushed a change to annotated tag 3.2.3 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 4d24e68d2b (tag) tagging 67d454472967f464e484aa12140dd359d6da9af8 (commit) replaces 3.2.2 by Zheng Feng on Wed Nov 29 10:42:11 2023 +0800 - Log - [maven-release-plugin] copy for tag 3.2.3 --- No new revisions were added by this update.
(camel-quarkus) branch dependabot/maven/quarkiverse-pooled-jms.version-2.3.0 deleted (was 353371bc83)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-pooled-jms.version-2.3.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was 353371bc83 Auto generated changes for dependabot commit 75cc41294faba9e800f310c73d74907d46e7ab6a The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(camel-quarkus) branch main updated: Bump quarkiverse-pooled-jms.version from 2.2.0 to 2.3.0 (#5567)
This is an automated email from the ASF dual-hosted git repository. zhfeng 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 8f6895ad7c Bump quarkiverse-pooled-jms.version from 2.2.0 to 2.3.0 (#5567) 8f6895ad7c is described below commit 8f6895ad7c3b42730ed0582bc8e89781d68c3d86 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Nov 29 10:33:38 2023 +0800 Bump quarkiverse-pooled-jms.version from 2.2.0 to 2.3.0 (#5567) * Bump quarkiverse-pooled-jms.version from 2.2.0 to 2.3.0 Bumps `quarkiverse-pooled-jms.version` from 2.2.0 to 2.3.0. Updates `io.quarkiverse.messaginghub:quarkus-pooled-jms` from 2.2.0 to 2.3.0 - [Release notes](https://github.com/quarkiverse/quarkus-pooled-jms/releases) - [Commits](https://github.com/quarkiverse/quarkus-pooled-jms/compare/2.2.0...2.3.0) Updates `io.quarkiverse.messaginghub:quarkus-pooled-jms-deployment` from 2.2.0 to 2.3.0 - [Release notes](https://github.com/quarkiverse/quarkus-pooled-jms/releases) - [Commits](https://github.com/quarkiverse/quarkus-pooled-jms/compare/2.2.0...2.3.0) --- updated-dependencies: - dependency-name: io.quarkiverse.messaginghub:quarkus-pooled-jms dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.quarkiverse.messaginghub:quarkus-pooled-jms-deployment dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Auto generated changes for dependabot commit 75cc41294faba9e800f310c73d74907d46e7ab6a - Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- poms/bom/src/main/generated/flattened-full-pom.xml| 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 580141602e..d33f556e78 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 3.2.4 3.3.1 2.2.0 - 2.2.0 + 2.3.0 2.0.2 3.6.0 4.0.0 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 040679345c..afede8247d 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6303,12 +6303,12 @@ io.quarkiverse.messaginghub quarkus-pooled-jms -2.2.0 +2.3.0 io.quarkiverse.messaginghub quarkus-pooled-jms-deployment -2.2.0 +2.3.0 io.quarkiverse.minio diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 5a07ee3853..d9be89afe4 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6293,12 +6293,12 @@ io.quarkiverse.messaginghub quarkus-pooled-jms -2.2.0 +2.3.0 io.quarkiverse.messaginghub quarkus-pooled-jms-deployment -2.2.0 +2.3.0 io.quarkiverse.minio diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 5b8a6ed95a..5b2ab1de10 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6293,12 +6293,12 @@ io.quarkiverse.messaginghub quarkus-pooled-jms -2.2.0 +2.3.0 io.quarkiverse.messaginghub quarkus-pooled-jms-deployment -2.2.0 +2.3.0 io.quarkiverse.minio
Re: [PR] Bump quarkiverse-pooled-jms.version from 2.2.0 to 2.3.0 [camel-quarkus]
zhfeng merged PR #5567: URL: https://github.com/apache/camel-quarkus/pull/5567 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch 3.2.x updated: Remove redundant Apache Arrow io.netty classes from google-biqquery extension (#5564)
This is an automated email from the ASF dual-hosted git repository.
zhfeng pushed a commit to branch 3.2.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/3.2.x by this push:
new 77b715289a Remove redundant Apache Arrow io.netty classes from
google-biqquery extension (#5564)
77b715289a is described below
commit 77b715289aa438cd186fd200192f753d35291bc6
Author: Zheng Feng
AuthorDate: Wed Nov 29 10:33:23 2023 +0800
Remove redundant Apache Arrow io.netty classes from google-biqquery
extension (#5564)
Co-authored-by: James Netherton
---
.../src/main/java/io/netty/buffer/LargeBuffer.java | 34 --
.../io/netty/buffer/MutableWrappedByteBuf.java | 447 -
.../io/netty/buffer/PooledByteBufAllocatorL.java | 277 -
.../io/netty/buffer/UnsafeDirectLittleEndian.java | 261
4 files changed, 1019 deletions(-)
diff --git
a/extensions/google-bigquery/runtime/src/main/java/io/netty/buffer/LargeBuffer.java
b/extensions/google-bigquery/runtime/src/main/java/io/netty/buffer/LargeBuffer.java
deleted file mode 100644
index 306ce49433..00
---
a/extensions/google-bigquery/runtime/src/main/java/io/netty/buffer/LargeBuffer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.netty.buffer;
-
-/**
- * A MutableWrappedByteBuf that also maintains a metric of the number of huge
buffer bytes and
- * counts.
- */
-public class LargeBuffer extends MutableWrappedByteBuf {
-
-public LargeBuffer(ByteBuf buffer) {
-super(buffer);
-}
-
-@Override
-public ByteBuf copy(int index, int length) {
-return new LargeBuffer(buffer.copy(index, length));
-}
-}
diff --git
a/extensions/google-bigquery/runtime/src/main/java/io/netty/buffer/MutableWrappedByteBuf.java
b/extensions/google-bigquery/runtime/src/main/java/io/netty/buffer/MutableWrappedByteBuf.java
deleted file mode 100644
index 005a049f86..00
---
a/extensions/google-bigquery/runtime/src/main/java/io/netty/buffer/MutableWrappedByteBuf.java
+++ /dev/null
@@ -1,447 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.netty.buffer;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.channels.FileChannel;
-import java.nio.channels.GatheringByteChannel;
-import java.nio.channels.ScatteringByteChannel;
-
-import io.netty.util.ByteProcessor;
-
-/**
- * This is basically a complete copy of netty's DuplicatedByteBuf. We copy
because we want to override
- * some behaviors and make buffer mutable.
- */
-abstract class MutableWrappedByteBuf extends AbstractByteBuf {
-
-ByteBuf buffer;
-
-public MutableWrappedByteBuf(ByteBuf buffer) {
-super(buffer.maxCapacity());
-
-if (buffer instanceof MutableWrappedByteBuf) {
-this.buffer = ((MutableWrappedByteBuf) buffer).buffer;
-} else {
-this.buffer = buffer;
-}
-
-setIndex(buffer.readerIndex(), buffer.writerIndex());
-}
-
-@Override
-public ByteBuffer nioBuffer(int index, int length) {
-return unwrap().nioBuffer(index, length);
-}
-
-@Override
-public ByteBuf unwrap() {
-return buffer;
-}
-
-@Override
-public ByteBufAllocator alloc() {
-return
Re: [PR] [3.2.x] Remove redundant Apache Arrow io.netty classes from google-biqquery e… [camel-quarkus]
zhfeng merged PR #5564: URL: https://github.com/apache/camel-quarkus/pull/5564 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [I] Upgrade jib-maven-plugin [camel-karavan]
mgubaidullin closed issue #908: Upgrade jib-maven-plugin URL: https://github.com/apache/camel-karavan/issues/908 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karavan) branch main updated: Fix #908
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 143a9208 Fix #908
143a9208 is described below
commit 143a92089ec497949c6a19755e82815aadc08808
Author: Marat Gubaidullin
AuthorDate: Tue Nov 28 21:08:00 2023 -0500
Fix #908
---
.../src/main/resources/snippets/docker-application.properties| 1 +
.../src/main/resources/snippets/kubernetes-application.properties| 1 +
.../src/main/resources/snippets/openshift-application.properties | 1 +
3 files changed, 3 insertions(+)
diff --git
a/karavan-web/karavan-app/src/main/resources/snippets/docker-application.properties
b/karavan-web/karavan-app/src/main/resources/snippets/docker-application.properties
index 3eb16295..f9bd3743 100644
---
a/karavan-web/karavan-app/src/main/resources/snippets/docker-application.properties
+++
b/karavan-web/karavan-app/src/main/resources/snippets/docker-application.properties
@@ -5,6 +5,7 @@ camel.jbang.gav=org.camel.karavan.demo:{projectId}:1
camel.jbang.runtime=camel-main
camel.jbang.version=4.1.0
camel.jbang.dependencies=camel-console,camel-platform-http-main
+camel.jbang.jib-maven-plugin-version=3.4.0
camel.server.enabled=true
camel.server.healthCheckEnabled=true
camel.server.devConsoleEnabled=true
diff --git
a/karavan-web/karavan-app/src/main/resources/snippets/kubernetes-application.properties
b/karavan-web/karavan-app/src/main/resources/snippets/kubernetes-application.properties
index a85eb609..8ccc29ab 100644
---
a/karavan-web/karavan-app/src/main/resources/snippets/kubernetes-application.properties
+++
b/karavan-web/karavan-app/src/main/resources/snippets/kubernetes-application.properties
@@ -5,6 +5,7 @@ camel.jbang.gav=org.camel.karavan.demo:{projectId}:1
camel.jbang.runtime=camel-main
camel.jbang.version=4.1.0
camel.jbang.dependencies=camel-console,camel-platform-http-main
+camel.jbang.jib-maven-plugin-version=3.4.0
camel.health.enabled=true
camel.health.exposure-level=full
camel.server.enabled=true
diff --git
a/karavan-web/karavan-app/src/main/resources/snippets/openshift-application.properties
b/karavan-web/karavan-app/src/main/resources/snippets/openshift-application.properties
index 701cb413..96281b7a 100644
---
a/karavan-web/karavan-app/src/main/resources/snippets/openshift-application.properties
+++
b/karavan-web/karavan-app/src/main/resources/snippets/openshift-application.properties
@@ -5,6 +5,7 @@ camel.jbang.gav=org.camel.karavan.demo:{projectId}:1
camel.jbang.runtime=camel-main
camel.jbang.version=4.1.0
camel.jbang.dependencies=camel-console,camel-platform-http-main
+camel.jbang.jib-maven-plugin-version=3.4.0
camel.health.enabled=true
camel.health.exposure-level=full
camel.server.enabled=true
(camel-karavan) branch dependabot/npm_and_yarn/karavan-designer/axios-1.6.0 deleted (was 11b167c4)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/karavan-designer/axios-1.6.0 in repository https://gitbox.apache.org/repos/asf/camel-karavan.git was 11b167c4 Bump axios from 1.5.1 to 1.6.0 in /karavan-designer The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] Bump axios from 1.5.1 to 1.6.0 in /karavan-designer [camel-karavan]
dependabot[bot] commented on PR #988: URL: https://github.com/apache/camel-karavan/pull/988#issuecomment-1831073663 OK, I won't notify you again about this release, but will get in touch when a new version is available. If you'd rather skip all updates until the next major or minor version, let me know by commenting `@dependabot ignore this major version` or `@dependabot ignore this minor version`. If you change your mind, just re-open this PR and I'll resolve any conflicts on it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Bump axios from 1.5.1 to 1.6.0 in /karavan-designer [camel-karavan]
mgubaidullin closed pull request #988: Bump axios from 1.5.1 to 1.6.0 in /karavan-designer URL: https://github.com/apache/camel-karavan/pull/988 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karavan) branch dependabot/npm_and_yarn/karavan-space/axios-1.6.0 deleted (was 831eac91)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/karavan-space/axios-1.6.0 in repository https://gitbox.apache.org/repos/asf/camel-karavan.git was 831eac91 Bump axios from 1.5.1 to 1.6.0 in /karavan-space The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] Bump axios from 1.5.1 to 1.6.0 in /karavan-designer [camel-karavan]
dependabot[bot] commented on PR #988: URL: https://github.com/apache/camel-karavan/pull/988#issuecomment-1831073634 Looks like axios is up-to-date now, so this is no longer needed. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Bump axios from 1.5.1 to 1.6.0 in /karavan-space [camel-karavan]
dependabot[bot] commented on PR #987: URL: https://github.com/apache/camel-karavan/pull/987#issuecomment-1831073556 OK, I won't notify you again about this release, but will get in touch when a new version is available. If you'd rather skip all updates until the next major or minor version, let me know by commenting `@dependabot ignore this major version` or `@dependabot ignore this minor version`. If you change your mind, just re-open this PR and I'll resolve any conflicts on it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Bump axios from 1.5.1 to 1.6.0 in /karavan-space [camel-karavan]
mgubaidullin closed pull request #987: Bump axios from 1.5.1 to 1.6.0 in /karavan-space URL: https://github.com/apache/camel-karavan/pull/987 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-karavan) branch main updated: Bump axios version
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new bf902d22 Bump axios version
bf902d22 is described below
commit bf902d22d30f97b31a49d717764304439a1dbe27
Author: Marat Gubaidullin
AuthorDate: Tue Nov 28 21:02:17 2023 -0500
Bump axios version
---
karavan-designer/package-lock.json | 16
karavan-designer/package.json| 2 +-
karavan-space/package-lock.json | 16
karavan-space/package.json | 2 +-
karavan-web/karavan-app/src/main/webui/package-lock.json | 8
karavan-web/karavan-app/src/main/webui/package.json | 2 +-
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/karavan-designer/package-lock.json
b/karavan-designer/package-lock.json
index 8e72064c..fa7b65be 100644
--- a/karavan-designer/package-lock.json
+++ b/karavan-designer/package-lock.json
@@ -17,7 +17,7 @@
"@types/js-yaml": "4.0.7",
"@types/node": "18.16.3",
"@types/uuid": "9.0.5",
-"axios": "1.5.1",
+"axios": "1.6.2",
"dagre": "0.8.5",
"html-to-image": "1.11.11",
"karavan-core": "file:../karavan-core",
@@ -42,14 +42,14 @@
}
},
"../karavan-core": {
- "version": "4.0.1",
+ "version": "4.1.1",
"license": "Apache-2.0",
"dependencies": {
-"@types/js-yaml": "^4.0.5",
-"@types/uuid": "^8.3.4",
+"@types/js-yaml": "^4.0.7",
+"@types/uuid": "^9.0.5",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.1",
-"uuid": "8.3.2"
+"uuid": "9.0.1"
},
"devDependencies": {
"@types/chai": "^4.3.0",
@@ -5545,9 +5545,9 @@
}
},
"node_modules/axios": {
- "version": "1.5.1",
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz;,
- "integrity":
"sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz;,
+ "integrity":
"sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
"dependencies": {
"follow-redirects": "^1.15.0",
"form-data": "^4.0.0",
diff --git a/karavan-designer/package.json b/karavan-designer/package.json
index 5d8c0460..9a673f87 100644
--- a/karavan-designer/package.json
+++ b/karavan-designer/package.json
@@ -34,7 +34,7 @@
"@types/js-yaml": "4.0.7",
"@types/node": "18.16.3",
"@types/uuid": "9.0.5",
-"axios": "1.5.1",
+"axios": "1.6.2",
"dagre": "0.8.5",
"html-to-image": "1.11.11",
"karavan-core": "file:../karavan-core",
diff --git a/karavan-space/package-lock.json b/karavan-space/package-lock.json
index f944e36c..baf26558 100644
--- a/karavan-space/package-lock.json
+++ b/karavan-space/package-lock.json
@@ -17,7 +17,7 @@
"@types/js-yaml": "4.0.5",
"@types/node": "18.15.3",
"@types/uuid": "9.0.5",
-"axios": "1.5.1",
+"axios": "1.6.2",
"dagre": "0.8.5",
"html-to-image": "1.11.11",
"karavan-core": "file:../karavan-core",
@@ -45,14 +45,14 @@
}
},
"../karavan-core": {
- "version": "4.0.1",
+ "version": "4.1.1",
"license": "Apache-2.0",
"dependencies": {
-"@types/js-yaml": "^4.0.5",
-"@types/uuid": "^8.3.4",
+"@types/js-yaml": "^4.0.7",
+"@types/uuid": "^9.0.5",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.1",
-"uuid": "8.3.2"
+"uuid": "9.0.1"
},
"devDependencies": {
"@types/chai": "^4.3.0",
@@ -5563,9 +5563,9 @@
}
},
"node_modules/axios": {
- "version": "1.5.1",
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz;,
- "integrity":
"sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz;,
+ "integrity":
"sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
"dependencies": {
"follow-redirects": "^1.15.0",
"form-data": "^4.0.0",
diff --git a/karavan-space/package.json b/karavan-space/package.json
index 113c0646..fa7b9e33 100644
--- a/karavan-space/package.json
+++ b/karavan-space/package.json
@@ -40,7 +40,7 @@
"@types/js-yaml": "4.0.5",
"@types/node": "18.15.3",
"@types/uuid": "9.0.5",
-"axios": "1.5.1",
+"axios": "1.6.2",
"dagre": "0.8.5",
"html-to-image": "1.11.11",
"karavan-core": "file:../karavan-core",
diff --git
(camel-karavan) branch main updated: Fix #998
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new da7aee75 Fix #998
da7aee75 is described below
commit da7aee754f1a4d0338a924e17a33b3591b6342ee
Author: Marat Gubaidullin
AuthorDate: Tue Nov 28 20:59:18 2023 -0500
Fix #998
---
karavan-designer/src/designer/route/DslElement.css| 3 +++
karavan-designer/src/designer/route/DslElement.tsx| 5 -
karavan-space/src/designer/route/DslElement.css | 3 +++
karavan-space/src/designer/route/DslElement.tsx | 5 -
.../src/designer/route/property/InfrastructureSelector.tsx| 11 ++-
.../src/main/webui/src/designer/route/DslElement.css | 3 +++
.../src/main/webui/src/designer/route/DslElement.tsx | 5 -
7 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/karavan-designer/src/designer/route/DslElement.css
b/karavan-designer/src/designer/route/DslElement.css
new file mode 100644
index ..71621b45
--- /dev/null
+++ b/karavan-designer/src/designer/route/DslElement.css
@@ -0,0 +1,3 @@
+.disabled {
+opacity: 0.5;
+}
\ No newline at end of file
diff --git a/karavan-designer/src/designer/route/DslElement.tsx
b/karavan-designer/src/designer/route/DslElement.tsx
index 9e4a8c70..efeaeff8 100644
--- a/karavan-designer/src/designer/route/DslElement.tsx
+++ b/karavan-designer/src/designer/route/DslElement.tsx
@@ -19,6 +19,7 @@ import {
Text, Tooltip,
} from '@patternfly/react-core';
import '../karavan.css';
+import './DslElement.css';
import AddIcon from "@patternfly/react-icons/dist/js/icons/plus-circle-icon";
import DeleteIcon from
"@patternfly/react-icons/dist/js/icons/times-circle-icon";
import InsertIcon from
"@patternfly/react-icons/dist/js/icons/arrow-alt-circle-right-icon";
@@ -413,7 +414,9 @@ export function DslElement(props: Props) {
}
const element: CamelElement = props.step;
-const className = "step-element" + (isElementSelected() ? "
step-element-selected" : "") + (!props.step.showChildren ? " hidden-step" : "");
+const className = "step-element"
++ (isElementSelected() ? " step-element-selected" : "") +
(!props.step.showChildren ? " hidden-step" : "")
++ ((element as any).disabled ? " disabled " : "");
return (
("configMap");
+const tabs = InfrastructureAPI.infrastructure === 'kubernetes' ?
['configMap', 'secret', 'services'] : ['services'];
+const [tabIndex, setTabIndex] = useState(tabs[0]);
const [filter, setFilter] = useState();
function checkFilter (name: string): boolean {
@@ -49,9 +50,9 @@ export function InfrastructureSelector(props: Props) {
return (
- setFilter(value)}/>
+ setFilter(value)}/>
)
@@ -190,7 +191,7 @@ export function InfrastructureSelector(props: Props) {
)
}
-const tabs = InfrastructureAPI.infrastructure === 'kubernetes' ?
['configMap', 'secret', 'services'] : ['services'];
+
return (
Re: [I] Disabled DSL element should be different visually (ex. semitransparent, gray, etc) [camel-karavan]
mgubaidullin closed issue #998: Disabled DSL element should be different visually (ex. semitransparent, gray, etc) URL: https://github.com/apache/camel-karavan/issues/998 -- 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) 02/02: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-2.0.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 9dfd060e6969a0b9faa7c98d94e013a41e121ea9
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Nov 29 01:23:08 2023 +
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 71d871468..d40bb3030 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json;,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:814f844e-b103-4e6f-ac9f-4f6d34ea00b7",
+ "serialNumber": "urn:uuid:66cc7347-5123-4956-aef5-801ba9c0721b",
"version": 1,
"metadata": {
-"timestamp": "2023-11-28T00:50:13Z",
+"timestamp": "2023-11-29T01:23:08Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231126003828-3643d3958a94?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231129011941-fbf190abeae9?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20231126003828-3643d3958a94",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231126003828-3643d3958a94?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231129011941-fbf190abeae9",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231129011941-fbf190abeae9?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k;,
@@ -4021,7 +4021,7 @@
],
"dependencies": [
{
- "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231126003828-3643d3958a94?type=module",
+ "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231129011941-fbf190abeae9?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.29?type=module",
(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 release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit fbf190abeae931076443300e0ea139f9533ea12b Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Nov 29 01:19:41 2023 + chore: changelog automatic update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index edffbafe8..3c1a5b09a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Kustomize installation test failing [\#4929](https://github.com/apache/camel-k/issues/4929) - Install non-olm test failing [\#4928](https://github.com/apache/camel-k/issues/4928) - Component resolvable variables regression [\#4916](https://github.com/apache/camel-k/issues/4916) - TestSecretHotReload failure [\#4902](https://github.com/apache/camel-k/issues/4902)
(camel-k) branch release-2.0.x updated (8d627bab3 -> 9dfd060e6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from 8d627bab3 chore: nightly SBOM update new fbf190abe chore: changelog automatic update new 9dfd060e6 chore: nightly SBOM update 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 | 1 + camel-k-sbom/camel-k-sbom.json | 12 ++-- 2 files changed, 7 insertions(+), 6 deletions(-)
(camel-k) branch release-2.1.x updated (934099f99 -> aee3858b8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release-2.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from 934099f99 chore: nightly SBOM update new 7363ed287 chore: changelog automatic update new aee3858b8 chore: nightly SBOM update 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 | 1 + camel-k-sbom/camel-k-sbom.json | 12 ++-- 2 files changed, 7 insertions(+), 6 deletions(-)
(camel-k) 02/02: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-2.1.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit aee3858b88efe4898fc7bc0217ad6e4c55ca4e0b
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Nov 29 00:36:16 2023 +
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 948235bfa..e443ea628 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json;,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:551029e0-3088-4c12-a6f8-cfbc63a5929b",
+ "serialNumber": "urn:uuid:7f3d2f34-7673-4ba1-9bde-f2cc1b06027d",
"version": 1,
"metadata": {
-"timestamp": "2023-11-27T00:29:42Z",
+"timestamp": "2023-11-29T00:36:16Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231125235659-37719f92bb2a?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231129003304-7363ed287103?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20231125235659-37719f92bb2a",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231125235659-37719f92bb2a?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231129003304-7363ed287103",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231129003304-7363ed287103?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k;,
@@ -3853,7 +3853,7 @@
],
"dependencies": [
{
- "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231125235659-37719f92bb2a?type=module",
+ "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231129003304-7363ed287103?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.38?type=module",
(camel-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 release-2.1.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 7363ed2871037e9cd33146dc2961c2478e7565d6 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Nov 29 00:33:04 2023 + chore: changelog automatic update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index edffbafe8..3c1a5b09a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Kustomize installation test failing [\#4929](https://github.com/apache/camel-k/issues/4929) - Install non-olm test failing [\#4928](https://github.com/apache/camel-k/issues/4928) - Component resolvable variables regression [\#4916](https://github.com/apache/camel-k/issues/4916) - TestSecretHotReload failure [\#4902](https://github.com/apache/camel-k/issues/4902)
(camel-k) branch dependabot/go_modules/knative.dev/serving-0.39.2 created (now ad0163afe)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/knative.dev/serving-0.39.2 in repository https://gitbox.apache.org/repos/asf/camel-k.git at ad0163afe chore(deps): bump knative.dev/serving from 0.38.2 to 0.39.2 No new revisions were added by this update.
[PR] chore(deps): bump knative.dev/serving from 0.38.2 to 0.39.2 [camel-k]
dependabot[bot] opened a new pull request, #4939: URL: https://github.com/apache/camel-k/pull/4939 Bumps [knative.dev/serving](https://github.com/knative/serving) from 0.38.2 to 0.39.2. Commits https://github.com/knative/serving/commit/239b73efe5002162ec30becbd9be6b4a48cd198a;>239b73e remove duplicate 'additionalPrinterColumns' (https://redirect.github.com/knative/serving/issues/14653;>#14653) https://github.com/knative/serving/commit/d638f4979e0cec2a1a85083b4adaf38c0ac70069;>d638f49 [release-1.12] Surface cpu and mem requests forbidden errors (and other ones ... https://github.com/knative/serving/commit/2659cc3aed8ecc7b89335c2729dc33667d2dbe51;>2659cc3 upgrade to latest dependencies (https://redirect.github.com/knative/serving/issues/14555;>#14555) https://github.com/knative/serving/commit/2a46d0dd494e190fd31a14275540ab61724e1312;>2a46d0d upgrade to latest dependencies (https://redirect.github.com/knative/serving/issues/14546;>#14546) https://github.com/knative/serving/commit/268701d1e785f7d2c659a2366f7b9baea2147e67;>268701d Update net-kourier nightly (https://redirect.github.com/knative/serving/issues/14549;>#14549) https://github.com/knative/serving/commit/cfd806f994cef7925f036960d6839ef06184a099;>cfd806f Update net-certmanager nightly (https://redirect.github.com/knative/serving/issues/14550;>#14550) https://github.com/knative/serving/commit/6b844deb81fca2b10e2c44223bc82781877c9996;>6b844de Update net-contour nightly (https://redirect.github.com/knative/serving/issues/14545;>#14545) https://github.com/knative/serving/commit/f69766c10adc53c59f9a83b8bfcf14f860e481a0;>f69766c Bubble up KCertificate Status Message when its not ready (https://redirect.github.com/knative/serving/issues/14496;>#14496) https://github.com/knative/serving/commit/2c0b8dcb386f7fbf1877236abae4792de4031e0c;>2c0b8dc Rename auto-tls to external-domain-tls (https://redirect.github.com/knative/serving/issues/14482;>#14482) https://github.com/knative/serving/commit/425abcb95f5a85dbfecfa37c60c09d968f0157ce;>425abcb Update net-gateway-api nightly (https://redirect.github.com/knative/serving/issues/14531;>#14531) Additional commits viewable in https://github.com/knative/serving/compare/v0.38.2...v0.39.2;>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 show ignore conditions` will show all of the ignore conditions of the specified dependency - `@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) branch dependabot/go_modules/knative.dev/eventing-0.39.1 created (now 42b4a9466)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/knative.dev/eventing-0.39.1 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 42b4a9466 chore(deps): bump knative.dev/eventing from 0.38.5 to 0.39.1 No new revisions were added by this update.
[PR] chore(deps): bump knative.dev/eventing from 0.38.5 to 0.39.1 [camel-k]
dependabot[bot] opened a new pull request, #4938: URL: https://github.com/apache/camel-k/pull/4938 Bumps [knative.dev/eventing](https://github.com/knative/eventing) from 0.38.5 to 0.39.1. Commits https://github.com/knative/eventing/commit/747a9f54a6caa7c345f0b605520aecf85908bf49;>747a9f5 [release-1.12] Increase Ready timeout for TestChannelConformance to 4 minutes... https://github.com/knative/eventing/commit/360ec60b1bcef66467e0a88ba0a82d485b664a6b;>360ec60 [main] Upgrade to latest dependencies (https://redirect.github.com/knative/eventing/issues/7391;>#7391) https://github.com/knative/eventing/commit/b5fd264775b0fb2a0398c7727f2055f4a09d879d;>b5fd264 Shell executor logs through testing.T in upgrade tests (https://redirect.github.com/knative/eventing/issues/7367;>#7367) https://github.com/knative/eventing/commit/5848584eb6aa0cafc95e29d128b5694262a7df5b;>5848584 [main] Upgrade to latest dependencies (https://redirect.github.com/knative/eventing/issues/7388;>#7388) https://github.com/knative/eventing/commit/16a398695622c8470869472b2fd2f5e373d83cb8;>16a3986 Don't override default values when applying partial features.yaml configmap ... https://github.com/knative/eventing/commit/4d14c2126a20b55b733e5244b29f131600662510;>4d14c21 Added test for multiple sinks, multiple triggers (https://redirect.github.com/knative/eventing/issues/7350;>#7350) https://github.com/knative/eventing/commit/a261e0683f2d88ff0d2e8f545404ec5131841c88;>a261e06 OIDC - Support auto generation of PingSource identity service account and exp... https://github.com/knative/eventing/commit/16d75a9807031432828cba975fe77b9f9cb7a45f;>16d75a9 mt-broker-ingress check audience of received token (https://redirect.github.com/knative/eventing/issues/7336;>#7336) https://github.com/knative/eventing/commit/3ef831c9b7e4f620d3dd574ee9c559780bfdb322;>3ef831c Increase expiration buffer time of OIDCTokenProviders cache to 5 minutes (https://redirect.github.com/knative/eventing/issues/7355;>#7355) https://github.com/knative/eventing/commit/5168dc3b476536b5e78534490ec6cc1d540475ae;>5168dc3 Update dependencies (https://redirect.github.com/knative/eventing/issues/7378;>#7378) Additional commits viewable in https://github.com/knative/eventing/compare/v0.38.5...v0.39.1;>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 show ignore conditions` will show all of the ignore conditions of the specified dependency - `@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
[PR] [Github Actions] Periodic Sync Camel Spring Boot (Camel 4) [camel-spring-boot]
github-actions[bot] opened a new pull request, #1025: URL: https://github.com/apache/camel-spring-boot/pull/1025 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-k) 02/02: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit a50113335f51fe4b16172752ebb454b8447408e7
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Nov 28 23:46:43 2023 +
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 350 -
1 file changed, 175 insertions(+), 175 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 0f75cb6fe..993d7049e 100644
--- a/camel-k-sbom/camel-k-sbom.json
+++ b/camel-k-sbom/camel-k-sbom.json
@@ -2,10 +2,10 @@
"$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json;,
"bomFormat": "CycloneDX",
"specVersion": "1.4",
- "serialNumber": "urn:uuid:28acd041-d075-4464-a271-22e15470d2b7",
+ "serialNumber": "urn:uuid:c95b7002-871b-4d8f-b8c5-b25728a419ec",
"version": 1,
"metadata": {
-"timestamp": "2023-11-27T23:42:47Z",
+"timestamp": "2023-11-28T23:46:43Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231126234258-af94a7cf88fb?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231128234355-aaa3162125f6?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20231126234258-af94a7cf88fb",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231126234258-af94a7cf88fb?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20231128234355-aaa3162125f6",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231128234355-aaa3162125f6?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k;,
@@ -2870,18 +2870,18 @@
}
},
{
- "bom-ref": "pkg:golang/golang.org/x/crypto@v0.15.0?type=module",
+ "bom-ref": "pkg:golang/golang.org/x/crypto@v0.16.0?type=module",
"type": "library",
"name": "golang.org/x/crypto",
- "version": "v0.15.0",
+ "version": "v0.16.0",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"7eb567d5311a084699727dd399ded8d9be4a28f699f88df6436380de4629e530"
+ "content":
"98c32b173452085d06bc1ecd7b6ed756d5406972eb3e680f0bbfefd2d9301da6"
}
],
- "purl":
"pkg:golang/golang.org/x/crypto@v0.15.0?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/golang.org/x/crypto@v0.16.0?type=module\u0026goos=linux\u0026goarch=amd64",
"evidence": {
"licenses": [
{
@@ -2939,18 +2939,18 @@
}
},
{
- "bom-ref": "pkg:golang/golang.org/x/net@v0.18.0?type=module",
+ "bom-ref": "pkg:golang/golang.org/x/net@v0.19.0?type=module",
"type": "library",
"name": "golang.org/x/net",
- "version": "v0.18.0",
+ "version": "v0.19.0",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"9886257ae02449b1e1d2d0afed1be32f717a6556cb8eae3e47bcdb3a7dcaa248"
+ "content":
"cd3c0aa537765ee0aa7fc86e73b168da24b2fb84473ddd74b382b37939d5af57"
}
],
- "purl":
"pkg:golang/golang.org/x/net@v0.18.0?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/golang.org/x/net@v0.19.0?type=module\u0026goos=linux\u0026goarch=amd64",
"evidence": {
"licenses": [
{
@@ -2962,18 +2962,18 @@
}
},
{
- "bom-ref": "pkg:golang/golang.org/x/oauth2@v0.14.0?type=module",
+ "bom-ref": "pkg:golang/golang.org/x/oauth2@v0.15.0?type=module",
"type": "library",
"name": "golang.org/x/oauth2",
- "version": "v0.14.0",
+ "version": "v0.15.0",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"3f456b7ffdb9dfc9e60b41fea4443730d151467551ed196ac95c3e6ef9b6eb3d"
+ "content":
"b3ca679f1355ce35b2aef61d15442ae65952d4f5f6ce13d799c719bfdf61eee4"
}
],
- "purl":
"pkg:golang/golang.org/x/oauth2@v0.14.0?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/golang.org/x/oauth2@v0.15.0?type=module\u0026goos=linux\u0026goarch=amd64",
"evidence": {
"licenses": [
{
@@ -3008,18 +3008,18 @@
}
},
{
- "bom-ref": "pkg:golang/golang.org/x/sys@v0.14.0?type=module",
+ "bom-ref": "pkg:golang/golang.org/x/sys@v0.15.0?type=module",
"type": "library",
"name": "golang.org/x/sys",
- "version": "v0.14.0",
+ "version": "v0.15.0",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
(camel-k) branch main updated (caba342b3 -> a50113335)
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 caba342b3 fix(trait): Add test on openshift security context for container trait new aaa316212 chore: changelog automatic update new a50113335 chore: nightly SBOM update 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 | 6 + camel-k-sbom/camel-k-sbom.json | 350 - 2 files changed, 181 insertions(+), 175 deletions(-)
(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 aaa3162125f6b041cf32d7c8eaccfdcc4f72e701 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Tue Nov 28 23:43:55 2023 + chore: changelog automatic update --- CHANGELOG.md | 6 ++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79681c8c0..5b1d864a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Kustomize installation test failing [\#4929](https://github.com/apache/camel-k/issues/4929) - Install non-olm test failing [\#4928](https://github.com/apache/camel-k/issues/4928) - Component resolvable variables regression [\#4916](https://github.com/apache/camel-k/issues/4916) - TestSecretHotReload failure [\#4902](https://github.com/apache/camel-k/issues/4902) @@ -26,6 +27,11 @@ **Merged pull requests:** +- chore\(deps\): bump golang.org/x/time from 0.4.0 to 0.5.0 [\#4935](https://github.com/apache/camel-k/pull/4935) ([dependabot[bot]](https://github.com/apps/dependabot)) +- chore\(deps\): bump golang.org/x/oauth2 from 0.14.0 to 0.15.0 [\#4933](https://github.com/apache/camel-k/pull/4933) ([dependabot[bot]](https://github.com/apps/dependabot)) +- Fix\(core\): Openshift securityContext on global operator [\#4932](https://github.com/apache/camel-k/pull/4932) ([gansheer](https://github.com/gansheer)) +- \[java\] Add sundrio to generate builders [\#4931](https://github.com/apache/camel-k/pull/4931) ([andreaTP](https://github.com/andreaTP)) +- fix\(e2e\): Error in check crd support script [\#4930](https://github.com/apache/camel-k/pull/4930) ([gansheer](https://github.com/gansheer)) - chore\(trait\): run mount only when necessary [\#4926](https://github.com/apache/camel-k/pull/4926) ([squakez](https://github.com/squakez)) - chore\(e2e\): Dev mode flaky test randomize name [\#4921](https://github.com/apache/camel-k/pull/4921) ([gansheer](https://github.com/gansheer)) - fix\(ci\): Remove golint warning for imports [\#4920](https://github.com/apache/camel-k/pull/4920) ([gansheer](https://github.com/gansheer))
(camel-karavan) 02/02: Cleanup
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 e5f5495b54830ed64745125c157b5c70afa41da3
Author: Marat Gubaidullin
AuthorDate: Tue Nov 28 17:54:26 2023 -0500
Cleanup
---
.../java/org/apache/camel/karavan/docker/DockerService.java| 10 --
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java
index 20c7fb4c..38a554aa 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/docker/DockerService.java
@@ -138,7 +138,7 @@ public class DockerService extends DockerServiceUtils {
public Container getContainerByName(String name) {
List containers = findContainer(name);
-return containers.size() > 0 ? containers.get(0) : null;
+return !containers.isEmpty() ? containers.get(0) : null;
}
public Statistics getContainerStats(String containerId) {
@@ -163,12 +163,10 @@ public class DockerService extends DockerServiceUtils {
public Container createContainerFromCompose(DockerComposeService compose,
Map labels) throws InterruptedException {
List containers =
findContainer(compose.getContainer_name());
if (containers.isEmpty()) {
-LOGGER.infof("Compose Service starting for %s",
compose.getContainer_name());
-
HealthCheck healthCheck = getHealthCheck(compose.getHealthcheck());
List env = compose.getEnvironment() != null ?
compose.getEnvironmentList() : List.of();
-LOGGER.infof("Compose Service started for %s",
compose.getContainer_name());
+LOGGER.infof("Compose Service started for %s in network:%s",
compose.getContainer_name(), networkName);
RestartPolicy restartPolicy = RestartPolicy.noRestart();
if (Objects.equals(compose.getRestart(),
RestartPolicy.onFailureRestart(10).getName())) {
@@ -196,7 +194,7 @@ public class DockerService extends DockerServiceUtils {
Map volumes, String
network, RestartPolicy restartPolicy,
String... command) throws
InterruptedException {
List containers = findContainer(name);
-if (containers.size() == 0) {
+if (containers.isEmpty()) {
pullImage(image);
CreateContainerCmd createContainerCmd =
getDockerClient().createContainerCmd(image)
@@ -217,7 +215,7 @@ public class DockerService extends DockerServiceUtils {
mounts.add(new
Mount().withType(MountType.BIND).withSource("/var/run/docker.sock").withTarget("/var/run/docker.sock"));
}
createContainerCmd.withHostConfig(new HostConfig()
-.withRestartPolicy(restartPolicy)
+.withRestartPolicy(restartPolicy)
.withPortBindings(portBindings)
.withMounts(mounts)
.withNetworkMode(network != null ? network : networkName));
(camel-karavan) 01/02: Fix #1005
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 0d521f4518123ed842dcde32bb603e6f8c5f0c8b
Author: Marat Gubaidullin
AuthorDate: Tue Nov 28 17:54:07 2023 -0500
Fix #1005
---
.../src/designer/route/property/InfrastructureSelector.tsx | 11 ++-
.../apache/camel/karavan/api/InfrastructureResource.java| 9 +
.../src/designer/route/property/InfrastructureSelector.tsx | 11 ++-
.../src/main/webui/src/project/DevModeToolbar.tsx | 13 -
4 files changed, 25 insertions(+), 19 deletions(-)
diff --git
a/karavan-designer/src/designer/route/property/InfrastructureSelector.tsx
b/karavan-designer/src/designer/route/property/InfrastructureSelector.tsx
index 38555892..e849b94d 100644
--- a/karavan-designer/src/designer/route/property/InfrastructureSelector.tsx
+++ b/karavan-designer/src/designer/route/property/InfrastructureSelector.tsx
@@ -34,7 +34,8 @@ interface Props {
export function InfrastructureSelector(props: Props) {
-const [tabIndex, setTabIndex] = useState("configMap");
+const tabs = InfrastructureAPI.infrastructure === 'kubernetes' ?
['configMap', 'secret', 'services'] : ['services'];
+const [tabIndex, setTabIndex] = useState(tabs[0]);
const [filter, setFilter] = useState();
function checkFilter (name: string): boolean {
@@ -49,9 +50,9 @@ export function InfrastructureSelector(props: Props) {
return (
- setFilter(value)}/>
+ setFilter(value)}/>
)
@@ -190,7 +191,7 @@ export function InfrastructureSelector(props: Props) {
)
}
-const tabs = InfrastructureAPI.infrastructure === 'kubernetes' ?
['configMap', 'secret', 'services'] : ['services'];
+
return (
getDeploymentStatusesByEnv(@PathParam("env")
String env) throws Exception {
if (infinispanService.isReady()) {
-return infinispanService.getDeploymentStatuses(env).stream()
-.sorted(Comparator.comparing(DeploymentStatus::getProjectId))
-.collect(Collectors.toList());
+return infinispanService.getDeploymentStatuses(env).stream()
+
.sorted(Comparator.comparing(DeploymentStatus::getProjectId))
+.collect(Collectors.toList());
} else {
return List.of();
}
@@ -140,7 +140,8 @@ public class InfrastructureResource {
return
Response.ok(kubernetesService.getServices(kubernetesService.getNamespace())).build();
} else {
List list =
infinispanService.getContainerStatuses(environment).stream()
-.map(ci -> ci.getPorts().stream().map(i ->
ci.getContainerName() + ":" + i).collect(Collectors.toList()))
+.filter(ci -> !ci.getPorts().isEmpty())
+.map(ci -> ci.getPorts().stream().map(i ->
ci.getContainerName() + "|" + ci.getContainerName() + ":" +
i.getPrivatePort()).collect(Collectors.toList()))
.flatMap(List::stream).collect(Collectors.toList());
return Response.ok(list).build();
}
diff --git
a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/InfrastructureSelector.tsx
b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/InfrastructureSelector.tsx
index 38555892..e849b94d 100644
---
a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/InfrastructureSelector.tsx
+++
b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/InfrastructureSelector.tsx
@@ -34,7 +34,8 @@ interface Props {
export function InfrastructureSelector(props: Props) {
-const [tabIndex, setTabIndex] = useState("configMap");
+const tabs = InfrastructureAPI.infrastructure === 'kubernetes' ?
['configMap', 'secret', 'services'] : ['services'];
+const [tabIndex, setTabIndex] = useState(tabs[0]);
const [filter, setFilter] = useState();
function checkFilter (name: string): boolean {
@@ -49,9 +50,9 @@ export function InfrastructureSelector(props: Props) {
return (
- setFilter(value)}/>
+ setFilter(value)}/>
)
@@ -190,7 +191,7 @@ export function InfrastructureSelector(props: Props) {
)
}
-const tabs = InfrastructureAPI.infrastructure === 'kubernetes' ?
['configMap', 'secret', 'services'] : ['services'];
+
return (
{poll && }
- : }
-variant={"link"}
-onClick={e => setPoll(!poll)}/>
+ : }
+variant={"link"}
+onClick={e => setPoll(!poll)}/>
(camel-karavan) branch main updated (152156b3 -> e5f5495b)
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 152156b3 Fix #959 new 0d521f45 Fix #1005 new e5f5495b Cleanup 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: .../src/designer/route/property/InfrastructureSelector.tsx | 11 ++- .../apache/camel/karavan/api/InfrastructureResource.java| 9 + .../java/org/apache/camel/karavan/docker/DockerService.java | 10 -- .../src/designer/route/property/InfrastructureSelector.tsx | 11 ++- .../src/main/webui/src/project/DevModeToolbar.tsx | 13 - 5 files changed, 29 insertions(+), 25 deletions(-)
Re: [I] Incorrect services in Selector when run in Docker [camel-karavan]
mgubaidullin closed issue #1005: Incorrect services in Selector when run in Docker URL: https://github.com/apache/camel-karavan/issues/1005 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch dependabot/maven/quarkiverse-pooled-jms.version-2.3.0 updated (75cc41294f -> 353371bc83)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-pooled-jms.version-2.3.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 75cc41294f Bump quarkiverse-pooled-jms.version from 2.2.0 to 2.3.0 add 353371bc83 Auto generated changes for dependabot commit 75cc41294faba9e800f310c73d74907d46e7ab6a No new revisions were added by this update. Summary of changes: poms/bom/src/main/generated/flattened-full-pom.xml| 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
Re: [PR] Bump quarkiverse-pooled-jms.version from 2.2.0 to 2.3.0 [camel-quarkus]
github-actions[bot] commented on PR #5567: URL: https://github.com/apache/camel-quarkus/pull/5567#issuecomment-1830852978 Branch auto synchronized due to changes in generated files. New workflow run triggered: https://github.com/apache/camel-quarkus/actions/runs/7025239701 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel-quarkus) branch dependabot/maven/quarkiverse-pooled-jms.version-2.3.0 created (now 75cc41294f)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-pooled-jms.version-2.3.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 75cc41294f Bump quarkiverse-pooled-jms.version from 2.2.0 to 2.3.0 No new revisions were added by this update.
[PR] Bump quarkiverse-pooled-jms.version from 2.2.0 to 2.3.0 [camel-quarkus]
dependabot[bot] opened a new pull request, #5567: URL: https://github.com/apache/camel-quarkus/pull/5567 Bumps `quarkiverse-pooled-jms.version` from 2.2.0 to 2.3.0. Updates `io.quarkiverse.messaginghub:quarkus-pooled-jms` from 2.2.0 to 2.3.0 Release notes Sourced from https://github.com/quarkiverse/quarkus-pooled-jms/releases;>io.quarkiverse.messaginghub:quarkus-pooled-jms's releases. v2.3.0 What's Changed Update docs by https://github.com/zhfeng;>@zhfeng in https://redirect.github.com/quarkiverse/quarkus-pooled-jms/pull/165;>quarkiverse/quarkus-pooled-jms#165 Bump quarkus.version from 3.4.0 to 3.4.1 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-pooled-jms/pull/166;>quarkiverse/quarkus-pooled-jms#166 Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.1.0 to 3.1.1 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-pooled-jms/pull/167;>quarkiverse/quarkus-pooled-jms#167 Bump quarkus.version from 3.4.1 to 3.4.2 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-pooled-jms/pull/168;>quarkiverse/quarkus-pooled-jms#168 Bump io.quarkiverse.artemis:quarkus-artemis-bom from 3.1.1 to 3.1.2 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-pooled-jms/pull/169;>quarkiverse/quarkus-pooled-jms#169 Bump quarkus.version from 3.4.2 to 3.4.3 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-pooled-jms/pull/171;>quarkiverse/quarkus-pooled-jms#171 Bump quarkus.version from 3.4.3 to 3.5.0 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-pooled-jms/pull/174;>quarkiverse/quarkus-pooled-jms#174 Bump quarkus.version from 3.5.0 to 3.5.1 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-pooled-jms/pull/175;>quarkiverse/quarkus-pooled-jms#175 Bump quarkus.version from 3.5.1 to 3.5.2 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-pooled-jms/pull/176;>quarkiverse/quarkus-pooled-jms#176 Change the extension to stable status by https://github.com/zhfeng;>@zhfeng in https://redirect.github.com/quarkiverse/quarkus-pooled-jms/pull/178;>quarkiverse/quarkus-pooled-jms#178 Fix https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/181;>#181 to move quarkus-artemis-bom to test module by https://github.com/zhfeng;>@zhfeng in https://redirect.github.com/quarkiverse/quarkus-pooled-jms/pull/182;>quarkiverse/quarkus-pooled-jms#182 Release 2.3.0 by https://github.com/zhfeng;>@zhfeng in https://redirect.github.com/quarkiverse/quarkus-pooled-jms/pull/180;>quarkiverse/quarkus-pooled-jms#180 Full Changelog: https://github.com/quarkiverse/quarkus-pooled-jms/compare/2.2.0...2.3.0;>https://github.com/quarkiverse/quarkus-pooled-jms/compare/2.2.0...2.3.0 Commits https://github.com/quarkiverse/quarkus-pooled-jms/commit/d826c5c87ea7a32f557860b88b092c9ca90a55a0;>d826c5c [maven-release-plugin] prepare release 2.3.0 https://github.com/quarkiverse/quarkus-pooled-jms/commit/fe20ee5f6f87fd0e9002761cb900d795d31c9df8;>fe20ee5 Release 2.3.0 (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/180;>#180) https://github.com/quarkiverse/quarkus-pooled-jms/commit/d6d442612a4a128ece1a135e0b85e0348ed6ec31;>d6d4426 Fix https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/181;>#181 to move quarkus-artemis-bom to test module (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/182;>#182) https://github.com/quarkiverse/quarkus-pooled-jms/commit/bdd4fc53ca5b1c85bd20d160d20bd56f48967d83;>bdd4fc5 Change the extension to stable status (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/178;>#178) https://github.com/quarkiverse/quarkus-pooled-jms/commit/4466affcd26f62aaffa5d3ae206329e97630b998;>4466aff Bump quarkus.version from 3.5.1 to 3.5.2 (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/176;>#176) https://github.com/quarkiverse/quarkus-pooled-jms/commit/92d20c4b7db119257b43b7da2fc502bae50747cf;>92d20c4 Bump quarkus.version from 3.5.0 to 3.5.1 (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/175;>#175) https://github.com/quarkiverse/quarkus-pooled-jms/commit/78b150b41727b55ee72b14c69a6529bdf2b82c8d;>78b150b Bump quarkus.version from 3.4.3 to 3.5.0 (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/174;>#174) https://github.com/quarkiverse/quarkus-pooled-jms/commit/3e56c57aefa0c436868bcc98d66423a05104a74d;>3e56c57 Bump quarkus.version from 3.4.2 to 3.4.3 (https://redirect.github.com/quarkiverse/quarkus-pooled-jms/issues/171;>#171) https://github.com/quarkiverse/quarkus-pooled-jms/commit/73a47ff2d21aa3376db24f6c13ab43434b052508;>73a47ff Bump
Re: [PR] CAMEL-20152: camel-jetty - Allow to configure the multipart [camel]
essobedo commented on PR #12240: URL: https://github.com/apache/camel/pull/12240#issuecomment-1830712691 And IMHO, it makes more sense to consider that a threshold set to 0 is immediately reached instead of never being reached like it was set to Integer.MAX_VALUE which is somehow the current behavior in any version of Jetty -- 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 (c8616d36ac6 -> 41733b2fc5b)
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 c8616d36ac6 CAMEL-20163: consolidate the code adding or appending entries on the header (#12236) add 41733b2fc5b CAMEL-20152: camel-jetty - Allow to configure the multipart (#12240) No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/components/jetty.json | 68 -- .../camel/component/jetty/JettyHttpComponent.java | 68 -- .../camel/component/jetty/JettyHttpEndpoint.java | 42 + .../jetty11/JettyHttp11EndpointUriFactory.java | 6 +- .../jetty11/JettyHttpComponent11Configurer.java| 24 + .../jetty11/JettyHttpEndpoint11Configurer.java | 24 + .../org/apache/camel/component/jetty11/jetty.json | 68 -- .../component/jetty/MultiPartFormBigFileTest.java | 102 + 8 files changed, 335 insertions(+), 67 deletions(-) create mode 100644 components/camel-jetty/src/test/java/org/apache/camel/component/jetty/MultiPartFormBigFileTest.java
(camel) branch CAMEL-20152/jetty-add-file-size-threshold deleted (was 139fec8206e)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch CAMEL-20152/jetty-add-file-size-threshold in repository https://gitbox.apache.org/repos/asf/camel.git was 139fec8206e CAMEL-20152: camel-jetty - Allow to configure the multipart The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] CAMEL-20152: camel-jetty - Allow to configure the multipart [camel]
essobedo merged PR #12240: URL: https://github.com/apache/camel/pull/12240 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: CAMEL-20152: camel-jetty - Allow to configure the multipart (#12240)
This is an automated email from the ASF dual-hosted git repository.
nfilotto pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 41733b2fc5b CAMEL-20152: camel-jetty - Allow to configure the
multipart (#12240)
41733b2fc5b is described below
commit 41733b2fc5b7935a96cb1e13ddf868f25ed79c9e
Author: Nicolas Filotto
AuthorDate: Tue Nov 28 21:33:33 2023 +0100
CAMEL-20152: camel-jetty - Allow to configure the multipart (#12240)
## Motivation
In the case of multipart, the content is kept in memory which can lead to
an OOME, it is due to the fact that the `fileSizeThreshold` is set to `0` by
default which should mean that the content is stored on disk according to the
Jetty Javadoc but it is not what the Jetty code expects.
## Modifications:
* Proposes new properties to be able to configure the multipart
* Add a unit test to ensure that the file content is stored on disk
---
.../org/apache/camel/catalog/components/jetty.json | 68 --
.../camel/component/jetty/JettyHttpComponent.java | 68 --
.../camel/component/jetty/JettyHttpEndpoint.java | 42 +
.../jetty11/JettyHttp11EndpointUriFactory.java | 6 +-
.../jetty11/JettyHttpComponent11Configurer.java| 24 +
.../jetty11/JettyHttpEndpoint11Configurer.java | 24 +
.../org/apache/camel/component/jetty11/jetty.json | 68 --
.../component/jetty/MultiPartFormBigFileTest.java | 102 +
8 files changed, 335 insertions(+), 67 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
index da8034a6399..e701cf7067b 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jetty.json
@@ -35,25 +35,29 @@
"sendServerVersion": { "index": 10, "kind": "property", "displayName":
"Send Server Version", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "defaultValue":
true, "description": "If the option is true, jetty will send the server header
with the jetty version information to the client which sends the request. NOTE
please make sure there is no any oth [...]
"useContinuation": { "index": 11, "kind": "property", "displayName": "Use
Continuation", "group": "consumer", "label": "consumer", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "defaultValue":
true, "description": "Whether or not to use Jetty continuations for the Jetty
Server." },
"useXForwardedForHeader": { "index": 12, "kind": "property",
"displayName": "Use XForwarded For Header", "group": "consumer", "label": "",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "deprecationNote": "", "autowired": false, "secret": false,
"defaultValue": false, "description": "To use the X-Forwarded-For header in
HttpServletRequest.getRemoteAddr." },
-"threadPool": { "index": 13, "kind": "property", "displayName": "Thread
Pool", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.eclipse.jetty.util.thread.ThreadPool", "deprecated": false,
"deprecationNote": "", "autowired": false, "secret": false, "description": "To
use a custom thread pool for the server. This option should only be used in
special circumstances." },
-"allowJavaSerializedObject": { "index": 14, "kind": "property",
"displayName": "Allow Java Serialized Object", "group": "advanced", "label":
"advanced", "required": false, "type": "boolean", "javaType": "boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
false, "description": "Whether to allow java serialization when a request uses
context-type=application\/x-java-serialized-object. This is by default turned
off. If you enable this then be aware that [...]
-"autowiredEnabled": { "index": 15, "kind": "property", "displayName":
"Autowired Enabled", "group": "advanced", "label": "advanced", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": true, "description":
"Whether autowiring is enabled. This is used for automatic autowiring options
(the option must be marked as autowired) by looking up in the registry to find
if there is a single instance of matching [...]
-"errorHandler": { "index": 16, "kind": "property", "displayName": "Error
Handler", "group": "advanced",
Re: [PR] CAMEL-20163: consolidate duplicated charset extract/set code [camel]
github-actions[bot] commented on PR #12242: URL: https://github.com/apache/camel/pull/12242#issuecomment-1830679416 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] CAMEL-20163: consolidate duplicated charset extract/set code [camel]
orpiske opened a new pull request, #12242: URL: https://github.com/apache/camel/pull/12242 (no comment) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20152: camel-jetty - Allow to configure the multipart [camel]
essobedo commented on PR #12240: URL: https://github.com/apache/camel/pull/12240#issuecomment-1830678866 Please note that even if it is mentioned only in EE 10, it is actually a clarification see https://github.com/jakartaee/servlet/issues/111, for example, in Glassfish, it is how it [has been implemented even in very old versions](https://github.com/eclipse-ee4j/glassfish/blob/5.1.0-RC1/appserver/web/web-core/src/main/java/org/apache/catalina/fileupload/ThresholdingOutputStream.java#L222-L226) that is why I proposed it in version 11 but I can understand your point of view. -- 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 (c9f03b35653 -> c8616d36ac6)
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 c9f03b35653 Bump com.github.eirslett:frontend-maven-plugin from 1.13.4 to 1.14.2 (#12239) add c8616d36ac6 CAMEL-20163: consolidate the code adding or appending entries on the header (#12236) No new revisions were added by this update. Summary of changes: .../org/apache/camel/http/base/HttpHelper.java | 16 ++-- .../org/apache/camel/http/common/HttpHelper.java | 4 +-- .../knative/http/KnativeHttpConsumer.java | 6 +++-- .../component/knative/http/KnativeHttpSupport.java | 19 -- .../component/netty/http/NettyHttpHelper.java | 18 ++ .../http/vertx/VertxPlatformHttpConsumer.java | 6 ++--- .../http/vertx/VertxPlatformHttpSupport.java | 29 +++--- .../camel/component/undertow/UndertowHelper.java | 18 ++ .../vertx/websocket/VertxWebsocketHelper.java | 17 ++--- .../org/apache/camel/support/http/HttpUtil.java| 1 + .../org/apache/camel/util/CollectionHelper.java| 29 ++ 11 files changed, 51 insertions(+), 112 deletions(-)
(camel) branch main updated: CAMEL-20163: consolidate the code adding or appending entries on the header (#12236)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new c8616d36ac6 CAMEL-20163: consolidate the code adding or appending
entries on the header (#12236)
c8616d36ac6 is described below
commit c8616d36ac6b3eacdf3a38230f8b0aa5b09b08bd
Author: Otavio Rodolfo Piske
AuthorDate: Tue Nov 28 20:56:59 2023 +0100
CAMEL-20163: consolidate the code adding or appending entries on the header
(#12236)
---
.../org/apache/camel/http/base/HttpHelper.java | 16 ++--
.../org/apache/camel/http/common/HttpHelper.java | 4 +--
.../knative/http/KnativeHttpConsumer.java | 6 +++--
.../component/knative/http/KnativeHttpSupport.java | 19 --
.../component/netty/http/NettyHttpHelper.java | 18 ++
.../http/vertx/VertxPlatformHttpConsumer.java | 6 ++---
.../http/vertx/VertxPlatformHttpSupport.java | 29 +++---
.../camel/component/undertow/UndertowHelper.java | 18 ++
.../vertx/websocket/VertxWebsocketHelper.java | 17 ++---
.../org/apache/camel/support/http/HttpUtil.java| 1 +
.../org/apache/camel/util/CollectionHelper.java| 29 ++
11 files changed, 51 insertions(+), 112 deletions(-)
diff --git
a/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpHelper.java
b/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpHelper.java
index 8a9cbe22ecd..b53cef30a58 100644
---
a/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpHelper.java
+++
b/components/camel-http-base/src/main/java/org/apache/camel/http/base/HttpHelper.java
@@ -24,6 +24,7 @@ import java.util.function.BiConsumer;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePropertyKey;
+import org.apache.camel.util.CollectionHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.StringHelper;
@@ -108,20 +109,7 @@ public final class HttpHelper {
*/
@SuppressWarnings("unchecked")
public static void appendHeader(Map headers, String key,
Object value) {
-if (headers.containsKey(key)) {
-Object existing = headers.get(key);
-List list;
-if (existing instanceof List) {
-list = (List) existing;
-} else {
-list = new ArrayList<>();
-list.add(existing);
-}
-list.add(value);
-value = list;
-}
-
-headers.put(key, value);
+CollectionHelper.appendEntry(headers, key, value);
}
/**
diff --git
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
index 38e88fbecb2..0035908bc0c 100644
---
a/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
+++
b/components/camel-http-common/src/main/java/org/apache/camel/http/common/HttpHelper.java
@@ -35,6 +35,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.RuntimeExchangeException;
import org.apache.camel.converter.stream.CachedOutputStream;
import org.apache.camel.support.CamelObjectInputStream;
+import org.apache.camel.util.CollectionHelper;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.URISupport;
import org.apache.camel.util.UnsafeUriCharactersEncoder;
@@ -278,8 +279,7 @@ public final class HttpHelper {
*/
@SuppressWarnings("unchecked")
public static void appendHeader(Map headers, String key,
Object value) {
-org.apache.camel.http.base.HttpHelper.appendHeader(headers, key,
value);
-
+CollectionHelper.appendEntry(headers, key, value);
}
/**
diff --git
a/components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpConsumer.java
b/components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpConsumer.java
index 626d47997d1..7ebf2569284 100644
---
a/components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpConsumer.java
+++
b/components/camel-knative/camel-knative-http/src/main/java/org/apache/camel/component/knative/http/KnativeHttpConsumer.java
@@ -49,6 +49,8 @@ import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.camel.util.CollectionHelper.appendEntry;
+
public class KnativeHttpConsumer extends DefaultConsumer {
private static final Logger LOGGER =
LoggerFactory.getLogger(KnativeHttpConsumer.class);
@@ -254,12 +256,12 @@ public class KnativeHttpConsumer extends DefaultConsumer {
for (Map.Entry
Re: [PR] CAMEL-20163: consolidate the code adding or appending entries on the header [camel]
orpiske merged PR #12236: URL: https://github.com/apache/camel/pull/12236 -- 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 (c8cb18d2feb -> c9f03b35653)
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 c8cb18d2feb Bump aws-java-sdk2-version from 2.21.31 to 2.21.32 (#12234) add c9f03b35653 Bump com.github.eirslett:frontend-maven-plugin from 1.13.4 to 1.14.2 (#12239) No new revisions were added by this update. Summary of changes: docs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(camel) branch regen_bot updated (f0d0fe0cf08 -> c8cb18d2feb)
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 f0d0fe0cf08 Bump redis.clients:jedis from 4.4.3 to 5.1.0 (#12237) add c5f60839e4f Bump jira-rest-client-api-version from 5.2.6 to 5.2.7 (#12235) add c8cb18d2feb Bump aws-java-sdk2-version from 2.21.31 to 2.21.32 (#12234) No new revisions were added by this update. Summary of changes: parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
(camel) branch dependabot/maven/com.github.eirslett-frontend-maven-plugin-1.14.2 deleted (was 5abbd279c6a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.github.eirslett-frontend-maven-plugin-1.14.2 in repository https://gitbox.apache.org/repos/asf/camel.git was 5abbd279c6a Bump com.github.eirslett:frontend-maven-plugin from 1.13.4 to 1.14.2 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
Re: [PR] CAMEL-20152: camel-jetty - Allow to configure the multipart [camel]
joakime commented on PR #12240: URL: https://github.com/apache/camel/pull/12240#issuecomment-1830539359 Note, Jetty 9 is now at End of Community Support. * https://github.com/jetty/jetty.project/issues/7958 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
(camel) branch main updated: Bump com.github.eirslett:frontend-maven-plugin from 1.13.4 to 1.14.2 (#12239)
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 c9f03b35653 Bump com.github.eirslett:frontend-maven-plugin from 1.13.4 to 1.14.2 (#12239) c9f03b35653 is described below commit c9f03b356535dd12b4653396dafccf13da25f833 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Tue Nov 28 20:30:39 2023 +0100 Bump com.github.eirslett:frontend-maven-plugin from 1.13.4 to 1.14.2 (#12239) Bumps [com.github.eirslett:frontend-maven-plugin](https://github.com/eirslett/frontend-maven-plugin) from 1.13.4 to 1.14.2. - [Changelog](https://github.com/eirslett/frontend-maven-plugin/blob/master/CHANGELOG.md) - [Commits](https://github.com/eirslett/frontend-maven-plugin/compare/frontend-plugins-1.13.4...frontend-plugins-1.14.2) --- updated-dependencies: - dependency-name: com.github.eirslett:frontend-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/pom.xml b/docs/pom.xml index a6af1cea3ea..ed00be79aae 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -129,7 +129,7 @@ com.github.eirslett frontend-maven-plugin -1.13.4 +1.14.2 install node and yarn
Re: [PR] Bump com.github.eirslett:frontend-maven-plugin from 1.13.4 to 1.14.2 [camel]
davsclaus merged PR #12239: URL: https://github.com/apache/camel/pull/12239 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Bump com.github.eirslett:frontend-maven-plugin from 1.13.4 to 1.14.2 [camel]
davsclaus commented on PR #12239: URL: https://github.com/apache/camel/pull/12239#issuecomment-1830538660 lets try this one -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20152: camel-jetty - Allow to configure the multipart [camel]
davsclaus commented on PR #12240: URL: https://github.com/apache/camel/pull/12240#issuecomment-1830538311 Yes its Jetty 11 in the source, however we are also working on upgrading to Jetty 12 for the upcoming Camel 4.3 release. But older Camel releases are using Jetty 11 and 9. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] CAMEL-20152: camel-jetty - Allow to configure the multipart [camel]
joakime commented on PR #12240: URL: https://github.com/apache/camel/pull/12240#issuecomment-1830536368 Is Camel using Jetty 12 with the ee10 environment? These changes seem to be for Jetty 11, which is for Servlet 5.0. This API spec behavior, where fileSizeThreshold value of 0 is documented, first shows up on Servlet 6.0. That language is _not_ present in the API spec on Servlet 5.0. - https://github.com/jakartaee/servlet/blob/5.0.0-RELEASE/api/src/main/java/jakarta/servlet/annotation/MultipartConfig.java#L65-L70 Jetty 12 on the ee10 environment already supports this spec behavior. -- 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
