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-1748037213 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 6413803630-1260-801be045-974f-44c8-8477-0735abaa3479 * Camel Quarkus Commit: 6a1c02cdf04adf8cb3ef65cd758de04b01db7de8 * Quarkus Main Commit: 676bb3ce2bde063481d4643b2ae5d256e0854465 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/6413803630 -- 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] Create a Salesforce Upsert Sink Kamelet [camel-kamelets]
oscerd closed issue #1527: Create a Salesforce Upsert Sink Kamelet URL: https://github.com/apache/camel-kamelets/issues/1527 -- 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] - Camel Main Branch Build Failure [camel-quarkus]
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1747923830 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 6412938675-1156-3d1e297d-ebd2-4dc5-818f-1eef67465508 * Camel Quarkus Commit: db8e9488c082beba6d2c80b08d09661e91c8908e * Camel Main Commit: 676bb3ce2bde063481d4643b2ae5d256e0854465 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/6412938675 -- 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 9b52b8150d1480f8861f1084b72025836eb1d89d Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Oct 5 00:57:03 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 dd528ad91..6e69914f3 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:d2c01e83-69f0-434b-9925-4c1db4e85069", + "serialNumber": "urn:uuid:65cf06b6-5105-4d42-96a6-7c5ab7b92869", "version": 1, "metadata": { -"timestamp": "2023-10-04T00:52:25Z", +"timestamp": "2023-10-05T00:57:03Z", "tools": [ { "vendor": "CycloneDX", @@ -46,11 +46,11 @@ } ], "component": { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231004004637-ac520fde6384?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231005005128-c1a602855a06?type=module", "type": "application", "name": "github.com/apache/camel-k/v2", - "version": "v0.0.0-20231004004637-ac520fde6384", - "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231004004637-ac520fde6384?type=module\u0026goos=linux\u0026goarch=amd64", + "version": "v0.0.0-20231005005128-c1a602855a06", + "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231005005128-c1a602855a06?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-20231004004637-ac520fde6384?type=module", + "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231005005128-c1a602855a06?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] branch release-2.0.x updated (2d6c00d69 -> 9b52b8150)
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 2d6c00d69 chore: nightly SBOM update new c1a602855 chore: changelog automatic update new 9b52b8150 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 | 5 + camel-k-sbom/camel-k-sbom.json | 12 ++-- 2 files changed, 11 insertions(+), 6 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 release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit c1a602855a06531399978d168cd7a16195d8b351 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Oct 5 00:51:28 2023 + chore: changelog automatic update --- CHANGELOG.md | 5 + 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80eaac568..9e7cb0a7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ **Closed issues:** +- Camel K doesn't install on a restricted namespace [\#4786](https://github.com/apache/camel-k/issues/4786) +- Remove deprecated linters [\#4785](https://github.com/apache/camel-k/issues/4785) - E2E failure on common TestRunExtraRepository test [\#4774](https://github.com/apache/camel-k/issues/4774) - Logger error in `--dev` mode [\#4770](https://github.com/apache/camel-k/issues/4770) - Prometheus checks failing in Camel 4 [\#4765](https://github.com/apache/camel-k/issues/4765) @@ -21,8 +23,11 @@ - Camel K 2.0 go package is broken [\#4683](https://github.com/apache/camel-k/issues/4683) - Camel K 1.12.1 : XSLT/XSLT-saxon: javax.xml.transform.TransformerConfigurationException: Could not compile stylesheet [\#4677](https://github.com/apache/camel-k/issues/4677) - Add GH issue template [\#4675](https://github.com/apache/camel-k/issues/4675) +- Separating Java and native image compilation [\#4648](https://github.com/apache/camel-k/issues/4648) +- IntegrationPlatform reconciliation should warn or fail when missing registry [\#4647](https://github.com/apache/camel-k/issues/4647) - Add plugin repository when `kamel run --maven-repository` [\#4608](https://github.com/apache/camel-k/issues/4608) - Security warning messages from the operator pod on Openshift [\#4424](https://github.com/apache/camel-k/issues/4424) +- Report error when any registry problem happen [\#4272](https://github.com/apache/camel-k/issues/4272) - unable to access the URL and unable to expose port after the integration build is successfully deployed. [\#4256](https://github.com/apache/camel-k/issues/4256) - Language page for documentation of camel-k 1.12.x missing [\#4176](https://github.com/apache/camel-k/issues/4176) - Redesign traits that have runtime dependencies [\#4166](https://github.com/apache/camel-k/issues/4166)
[camel-k] 02/02: Periodic Sync of Camel K Main Branch for SBOM Generation
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-1.12.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit a8514067747daddacd460dd413c70bb96524af41 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Oct 5 00:39:40 2023 + Periodic Sync of Camel K Main Branch for SBOM Generation --- camel-k-sbom/camel-k-sbom.json | 54 +- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json index e68b1dda1..d9468104a 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:33ab848f-d5eb-40be-976b-1ae59069844e", + "serialNumber": "urn:uuid:fd171691-989c-4805-932b-b872fe16c3c9", "version": 1, "metadata": { -"timestamp": "2023-10-04T00:37:28Z", +"timestamp": "2023-10-05T00:39:40Z", "tools": [ { "vendor": "CycloneDX", @@ -46,11 +46,11 @@ } ], "component": { - "bom-ref": "pkg:golang/github.com/apache/camel-k@v0.0.0-20231004003247-0937642f6c20?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k@v0.0.0-20231005003446-0e72465ec9fe?type=module", "type": "application", "name": "github.com/apache/camel-k", - "version": "v0.0.0-20231004003247-0937642f6c20", - "purl": "pkg:golang/github.com/apache/camel-k@v0.0.0-20231004003247-0937642f6c20?type=module\u0026goos=linux\u0026goarch=amd64", + "version": "v0.0.0-20231005003446-0e72465ec9fe", + "purl": "pkg:golang/github.com/apache/camel-k@v0.0.0-20231005003446-0e72465ec9fe?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k;, @@ -510,18 +510,18 @@ } }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20231004003247-0937642f6c20?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20231005003446-0e72465ec9fe?type=module", "type": "library", "name": "github.com/apache/camel-k/pkg/apis/camel", - "version": "v0.0.0-20231004003247-0937642f6c20", + "version": "v0.0.0-20231005003446-0e72465ec9fe", "scope": "required", "hashes": [ { "alg": "SHA-256", - "content": "7c32a5d700bf22595ae2e33718d068d076183b65371c446000626d65a6e66199" + "content": "9a2884a4b8dea4021ffa24bd0f961c0589131a44db421fe666452ca36ab16a2b" } ], - "purl": "pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20231004003247-0937642f6c20?type=module\u0026goos=linux\u0026goarch=amd64", + "purl": "pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20231005003446-0e72465ec9fe?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k/pkg/apis/camel;, @@ -530,18 +530,18 @@ ] }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20231004003247-0937642f6c20?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20231005003446-0e72465ec9fe?type=module", "type": "library", "name": "github.com/apache/camel-k/pkg/client/camel", - "version": "v0.0.0-20231004003247-0937642f6c20", + "version": "v0.0.0-20231005003446-0e72465ec9fe", "scope": "required", "hashes": [ { "alg": "SHA-256", - "content": "7124babf829d65e8bfb00f9078be3eb3a4b9a01ea27142e58053ba789b6ea610" + "content": "04a095c5b9bc3c66d837cdd415ee85fc083963ea6aa20bac62341dd618372124" } ], - "purl": "pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20231004003247-0937642f6c20?type=module\u0026goos=linux\u0026goarch=amd64", + "purl": "pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20231005003446-0e72465ec9fe?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k/pkg/client/camel;, @@ -550,18 +550,18 @@ ] }, { - "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20231004003247-0937642f6c20?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20231005003446-0e72465ec9fe?type=module", "type": "library", "name": "github.com/apache/camel-k/pkg/kamelet/repository", - "version": "v0.0.0-20231004003247-0937642f6c20", + "version": "v0.0.0-20231005003446-0e72465ec9fe", "scope": "required", "hashes": [ { "alg":
[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-1.12.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 0e72465ec9fe3a4e5e92a3813882dfb018f883e4 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Oct 5 00:34:46 2023 + chore: changelog automatic update --- CHANGELOG.md | 5 + 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80eaac568..9e7cb0a7f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ **Closed issues:** +- Camel K doesn't install on a restricted namespace [\#4786](https://github.com/apache/camel-k/issues/4786) +- Remove deprecated linters [\#4785](https://github.com/apache/camel-k/issues/4785) - E2E failure on common TestRunExtraRepository test [\#4774](https://github.com/apache/camel-k/issues/4774) - Logger error in `--dev` mode [\#4770](https://github.com/apache/camel-k/issues/4770) - Prometheus checks failing in Camel 4 [\#4765](https://github.com/apache/camel-k/issues/4765) @@ -21,8 +23,11 @@ - Camel K 2.0 go package is broken [\#4683](https://github.com/apache/camel-k/issues/4683) - Camel K 1.12.1 : XSLT/XSLT-saxon: javax.xml.transform.TransformerConfigurationException: Could not compile stylesheet [\#4677](https://github.com/apache/camel-k/issues/4677) - Add GH issue template [\#4675](https://github.com/apache/camel-k/issues/4675) +- Separating Java and native image compilation [\#4648](https://github.com/apache/camel-k/issues/4648) +- IntegrationPlatform reconciliation should warn or fail when missing registry [\#4647](https://github.com/apache/camel-k/issues/4647) - Add plugin repository when `kamel run --maven-repository` [\#4608](https://github.com/apache/camel-k/issues/4608) - Security warning messages from the operator pod on Openshift [\#4424](https://github.com/apache/camel-k/issues/4424) +- Report error when any registry problem happen [\#4272](https://github.com/apache/camel-k/issues/4272) - unable to access the URL and unable to expose port after the integration build is successfully deployed. [\#4256](https://github.com/apache/camel-k/issues/4256) - Language page for documentation of camel-k 1.12.x missing [\#4176](https://github.com/apache/camel-k/issues/4176) - Redesign traits that have runtime dependencies [\#4166](https://github.com/apache/camel-k/issues/4166)
[camel-k] branch release-1.12.x updated (16c9c6238 -> a85140677)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch release-1.12.x in repository https://gitbox.apache.org/repos/asf/camel-k.git from 16c9c6238 Periodic Sync of Camel K Main Branch for SBOM Generation new 0e72465ec chore: changelog automatic update new a85140677 Periodic Sync of Camel K Main Branch for SBOM Generation 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 | 5 camel-k-sbom/camel-k-sbom.json | 54 +- 2 files changed, 32 insertions(+), 27 deletions(-)
[camel-karavan] branch main updated: FIx #930
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 083466d2 FIx #930 083466d2 is described below commit 083466d2a46d34bd02ce5a14ab44251028124d8a Author: Marat Gubaidullin AuthorDate: Wed Oct 4 20:01:10 2023 -0400 FIx #930 --- .../designer/kamelet/KameletAnnotationsPanel.tsx | 3 +- karavan-designer/src/designer/karavan.css | 1 + .../route/property/ComponentParameterField.tsx | 4 +- .../designer/route/property/DslPropertyField.tsx | 12 +- .../designer/kamelet/KameletAnnotationsPanel.tsx | 3 +- .../kamelet/KameletDefinitionPropertyCard.tsx | 125 +++- .../designer/kamelet/KameletDefinitionsPanel.tsx | 59 +- .../designer/kamelet/KameletDependenciesCard.tsx | 113 +++ .../src/designer/kamelet/KameletProperties.tsx | 209 + .../src/designer/kamelet/KameletTypesOutCard.tsx | 113 +++ karavan-space/src/designer/kamelet/kamelet.css | 1 + karavan-space/src/designer/karavan.css | 1 + .../route/property/ComponentParameterField.tsx | 4 +- .../designer/route/property/DslPropertyField.tsx | 12 +- .../designer/kamelet/KameletAnnotationsPanel.tsx | 3 +- .../src/main/webui/src/designer/karavan.css| 1 + .../route/property/ComponentParameterField.tsx | 4 +- .../designer/route/property/DslPropertyField.tsx | 12 +- 18 files changed, 434 insertions(+), 246 deletions(-) diff --git a/karavan-designer/src/designer/kamelet/KameletAnnotationsPanel.tsx b/karavan-designer/src/designer/kamelet/KameletAnnotationsPanel.tsx index 076aec40..b1a6b324 100644 --- a/karavan-designer/src/designer/kamelet/KameletAnnotationsPanel.tsx +++ b/karavan-designer/src/designer/kamelet/KameletAnnotationsPanel.tsx @@ -75,8 +75,7 @@ export function KameletAnnotationsPanel() { return ( -{/* eslint-disable-next-line react/jsx-no-undef */} - + {values.map(value => [state.integration], shallow) const [dark] = useDesignerStore((s) => [s.dark], shallow) -const [isShowAdvanced, setIsShowAdvanced] = useState>(new Map()); +const [isShowAdvanced, setIsShowAdvanced] = useState([]); const [arrayValues, setArrayValues] = useState>(new Map()); const [selectStatus, setSelectStatus] = useState>(new Map()); const [showEditor, setShowEditor] = useState(false); @@ -654,19 +654,23 @@ export function DslPropertyField(props: Props) { ) } - function getExpandableComponentParameters(properties: ComponentProperty[], label: string) { const element = props.element; + return ( { setIsShowAdvanced(prevState => { -prevState.set(label, !prevState.get(label)); +if (isExpanded && !isShowAdvanced.includes(label)) { +prevState = [...prevState, label] +} else { +prevState = prevState.filter(s => s!== label); +} return prevState; }) }} -isExpanded={isShowAdvanced.has(label) && isShowAdvanced.get(label)}> +isExpanded={isShowAdvanced.includes(label)}> {properties.map(kp => -{/* eslint-disable-next-line react/jsx-no-undef */} - + {values.map(value => -{['string', 'number', 'boolean'].map((option, index) => ( - +{['string', 'number', 'integer', 'boolean'].map((option, index) => ( + ))} @@ -92,9 +103,106 @@ export function KameletDefinitionPropertyCard(props: Props) { ) } +function sortEnum(source: string, dest: string) { +const i = CamelUtil.cloneIntegration(integration); +if (i.spec.definition && integration.spec.definition?.properties[key]) { +const enums: string [] = i.spec.definition.properties[key].enum; +console.log(enums) +if (enums && Array.isArray(enums)) { +console.log("isArray") +const from = enums.findIndex(e => source); +const to = enums.findIndex(e => dest); +if (from > -1 && to > -1) { +console.log("exchange"); +[enums[from], enums[to]] = [enums[to], enums[from]]; +
Re: [I] ExpandableSection does not work for Advanced Components parameters [camel-karavan]
mgubaidullin closed issue #930: ExpandableSection does not work for Advanced Components parameters URL: https://github.com/apache/camel-karavan/issues/930 -- 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
[I] Dev-image parameter should be configured in installer [camel-karavan]
mgubaidullin opened a new issue, #929: URL: https://github.com/apache/camel-karavan/issues/929 As a workaround `KARAVAN_DEVMODE_IMAGE` env variable could be set in Deployment -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 01/04: 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 bab10502cd50bf39019be4db393f80faef04f34f Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Oct 4 23:44:06 2023 + chore: changelog automatic update --- CHANGELOG.md | 13 + 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index efdc9b6d1..d1a796b22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ **Closed issues:** +- Camel K doesn't install on a restricted namespace [\#4786](https://github.com/apache/camel-k/issues/4786) +- Remove deprecated linters [\#4785](https://github.com/apache/camel-k/issues/4785) - E2E failure on common TestRunExtraRepository test [\#4774](https://github.com/apache/camel-k/issues/4774) - Logger error in `--dev` mode [\#4770](https://github.com/apache/camel-k/issues/4770) - Prometheus checks failing in Camel 4 [\#4765](https://github.com/apache/camel-k/issues/4765) @@ -21,8 +23,12 @@ - Camel K 2.0 go package is broken [\#4683](https://github.com/apache/camel-k/issues/4683) - Camel K 1.12.1 : XSLT/XSLT-saxon: javax.xml.transform.TransformerConfigurationException: Could not compile stylesheet [\#4677](https://github.com/apache/camel-k/issues/4677) - Add GH issue template [\#4675](https://github.com/apache/camel-k/issues/4675) +- Separating Java and native image compilation [\#4648](https://github.com/apache/camel-k/issues/4648) +- IntegrationPlatform reconciliation should warn or fail when missing registry [\#4647](https://github.com/apache/camel-k/issues/4647) - Add plugin repository when `kamel run --maven-repository` [\#4608](https://github.com/apache/camel-k/issues/4608) - Security warning messages from the operator pod on Openshift [\#4424](https://github.com/apache/camel-k/issues/4424) +- Report error when any registry problem happen [\#4272](https://github.com/apache/camel-k/issues/4272) +- unable to access the URL and unable to expose port after the integration build is successfully deployed. [\#4256](https://github.com/apache/camel-k/issues/4256) - Language page for documentation of camel-k 1.12.x missing [\#4176](https://github.com/apache/camel-k/issues/4176) - Redesign traits that have runtime dependencies [\#4166](https://github.com/apache/camel-k/issues/4166) - Error creating Integration with Kaniko build strategy and Docker Desktop [\#4158](https://github.com/apache/camel-k/issues/4158) @@ -39,7 +45,13 @@ **Merged pull requests:** +- Added License headers to generated traits.yaml [\#4792](https://github.com/apache/camel-k/pull/4792) ([oscerd](https://github.com/oscerd)) +- Remove deprecated linters [\#4791](https://github.com/apache/camel-k/pull/4791) ([oscerd](https://github.com/oscerd)) +- Added Missing license headers and license headers to generation of tr… [\#4790](https://github.com/apache/camel-k/pull/4790) ([oscerd](https://github.com/oscerd)) +- chore\(deps\): bump github.com/prometheus/client\_model from 0.4.1-0.20230718164431-9a2bf3000d16 to 0.5.0 [\#4789](https://github.com/apache/camel-k/pull/4789) ([dependabot[bot]](https://github.com/apps/dependabot)) +- fix\(e2e\): Add installation with helm,kustomize,olm securityContext re… [\#4787](https://github.com/apache/camel-k/pull/4787) ([gansheer](https://github.com/gansheer)) - chore\(deps\): bump github.com/container-tools/spectrum from 0.6.36 to 0.6.37 [\#4784](https://github.com/apache/camel-k/pull/4784) ([dependabot[bot]](https://github.com/apps/dependabot)) +- feat\(ctrl\): verify existence of registry [\#4782](https://github.com/apache/camel-k/pull/4782) ([squakez](https://github.com/squakez)) - fix\(e2e\): existing dependency [\#4778](https://github.com/apache/camel-k/pull/4778) ([squakez](https://github.com/squakez)) - chore\(deps\): bump github.com/onsi/gomega from 1.27.10 to 1.28.0 [\#4775](https://github.com/apache/camel-k/pull/4775) ([dependabot[bot]](https://github.com/apps/dependabot)) - fix\(cli\): dev mode init controller-runtime log.SetLogger\(\) [\#4773](https://github.com/apache/camel-k/pull/4773) ([gansheer](https://github.com/gansheer)) @@ -48,6 +60,7 @@ - fix\(e2e\): Kamelets Default config as a labeled secret [\#4768](https://github.com/apache/camel-k/pull/4768) ([gansheer](https://github.com/gansheer)) - fix\(e2e\): Update prometheus e2e test to camel 4 metrics [\#4767](https://github.com/apache/camel-k/pull/4767) ([gansheer](https://github.com/gansheer)) - fix\(ci\): downgrade to Kind 0.19 [\#4766](https://github.com/apache/camel-k/pull/4766) ([squakez](https://github.com/squakez)) +- feat: Quarkus native source [\#4764](https://github.com/apache/camel-k/pull/4764) ([squakez](https://github.com/squakez)) - fix\(ci\): license check [\#4763](https://github.com/apache/camel-k/pull/4763) ([squakez](https://github.com/squakez))
[camel-k] 03/04: 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 f69f5bb606530f97f6ecff1acdc0324b4a707c87 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Oct 4 23:49:06 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 521d7d5d7..2324eba47 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:6082c284-26a0-4bfa-bb39-654f1aef44a8", + "serialNumber": "urn:uuid:f10754ed-8a2a-4ac7-8943-b7a59ae66ae2", "version": 1, "metadata": { -"timestamp": "2023-10-03T23:48:18Z", +"timestamp": "2023-10-04T23:49:06Z", "tools": [ { "vendor": "CycloneDX", @@ -46,11 +46,11 @@ } ], "component": { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231003234352-67135ab7776e?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231004234827-7649d299989d?type=module", "type": "application", "name": "github.com/apache/camel-k/v2", - "version": "v0.0.0-20231003234352-67135ab7776e", - "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231003234352-67135ab7776e?type=module\u0026goos=linux\u0026goarch=amd64", + "version": "v0.0.0-20231004234827-7649d299989d", + "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231004234827-7649d299989d?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k;, @@ -3772,7 +3772,7 @@ ], "dependencies": [ { - "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231003234352-67135ab7776e?type=module", + "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231004234827-7649d299989d?type=module", "dependsOn": [ "pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module", "pkg:golang/github.com/container-tools/spectrum@v0.6.37?type=module",
[camel-k] branch main updated (f1b700cba -> c924a32f3)
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 f1b700cba Added License headers to generated traits.yaml new bab10502c chore: changelog automatic update new 7649d2999 chore: autogenerated project resource update new f69f5bb60 chore: nightly SBOM update new c924a32f3 chore: nightly coverage badge update The 4 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 | 13 + README.adoc| 2 +- camel-k-sbom/camel-k-sbom.json | 12 ++-- pkg/resources/resources.go | 4 ++-- resources/traits.yaml | 16 5 files changed, 38 insertions(+), 9 deletions(-)
[camel-k] 02/04: chore: autogenerated project resource 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 7649d299989d981bd34fe8b73f575e4fbab8990a Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Oct 4 23:48:27 2023 + chore: autogenerated project resource update --- pkg/resources/resources.go | 4 ++-- resources/traits.yaml | 16 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index e0ed8c96a..3cc8b4665 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -625,9 +625,9 @@ var assets = func() http.FileSystem { "/traits.yaml": ۰CompressedFileInfo{ name: "traits.yaml", modTime: time.Time{}, - uncompressedSize: 69862, + uncompressedSize: 70800, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\xfd\x77\x1b\xb9\x91\xe0\xef\xfe\x2b\xf0\xb4\xb7\x4f\x92\x8f\x1f\xf2\x64\x93\x9d\xd5\xc6\xd9\xd3\x78\x3c\x89\x32\xfe\xd0\x59\x9a\xc9\xe6\xf9\xfc\x42\xb0\x1b\x24\x61\x35\x81\x0e\x80\xa6\xcc\xb9\xdc\xff\x7e\x0f\x55\x85\x8f\x6e\x36\x45\xca\x96\x66\xa3\xcd\x24\xef\x8d\x45\xb2\xbb\x50\x28\x14\x0a\x85\xfa\x74\x86\x4b\x67\x4f\x9f\x0c\x99\xe2\x4b\x71\xca\x7e\x65\x0b\x5e\x89\x27\x8c\xd5\x15\x77\x33\x6d\x96\xa7\x6c\xc6\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\xfb\x77\x1b\xb9\x91\x30\xfa\xbb\xff\x0a\x1c\xce\xdd\x23\xc9\x97\x0f\x79\xb2\xc9\xce\x6a\xe3\xec\xd5\xd8\x9e\x44\x19\x3f\x74\x2d\xcd\x64\x73\xfc\xf9\x84\x60\x37\x48\x62\xd4\x04\x3a\x00\x5a\x32\xe7\xcb\xf7\xbf\x7f\x07\x55\x85\x47\x37\x9b\x22\x65\x4b\xb3\xd1\x26\x93\x73\x62\x91\xec\x2e\x14\x0a\x85\x42\xa1\x9e\x5f\xb1\xd1\xfd\xfd\xf7\xe4\x2b\xf6\x5a\x16\x42\x59\x51\x32\xa7\x99\x5b\x0a\x76\x5a\xf3\x62\x29\xd8\x85\x [...] }, } fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ diff --git a/resources/traits.yaml b/resources/traits.yaml index 8a0e7c586..d2d95bed7 100755 --- a/resources/traits.yaml +++ b/resources/traits.yaml @@ -1,3 +1,19 @@ +# --- +# 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. +# --- traits: - name: 3scale platform: false
[camel-k] 04/04: chore: nightly coverage badge 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 c924a32f3ed245077506c4037569fa98d6b8e38d Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Oct 4 23:51:40 2023 + chore: nightly coverage badge update --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 95e97dc4b..9c34c8475 100644 --- a/README.adoc +++ b/README.adoc @@ -11,7 +11,7 @@ image:https://github.com/apache/camel-k/workflows/kubernetes/badge.svg["Kubernet image:https://github.com/apache/camel-k/workflows/knative/badge.svg["Knative;, link="https://github.com/apache/camel-k/actions/workflows/knative.yml;] image:https://github.com/apache/camel-k/actions/workflows/nightly-release.yml/badge.svg["Nightly releases", link="https://github.com/apache/camel-k/actions/workflows/nightly-release.yml;] image:https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml/badge.svg["Quarkus native", link="https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml;] -image:https://img.shields.io/badge/Coverage-33.3%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml;] +image:https://img.shields.io/badge/Coverage-33.4%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml;] image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg["Chat on Zulip", link="https://camel.zulipchat.com;] Apache Camel K is a lightweight integration framework built from **Apache Camel** that runs natively on Kubernetes and is specifically designed for serverless and microservice architectures. Users of `Camel K` can instantly run integration code written in Camel DSL on their preferred **Cloud** provider.
Re: [PR] Bump quarkiverse-groovy.version from 3.2.2 to 3.4.0 [camel-quarkus]
github-actions[bot] commented on PR #5401: URL: https://github.com/apache/camel-quarkus/pull/5401#issuecomment-1747697335 Branch auto synchronized due to changes in generated files. New workflow run triggered: https://github.com/apache/camel-quarkus/actions/runs/6411858164 -- 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-groovy.version-3.4.0 updated (f53ec98af5 -> ae13e39fb8)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-groovy.version-3.4.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from f53ec98af5 Bump quarkiverse-groovy.version from 3.2.2 to 3.4.0 add ae13e39fb8 Auto generated changes for dependabot commit f53ec98af50cc7dcb9d55fbaddedd016b29dc19b No new revisions were added by this update. Summary of changes: pom.xml| 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 164 ++--- .../src/main/generated/flattened-reduced-pom.xml | 6 +- .../generated/flattened-reduced-verbose-pom.xml| 6 +- 4 files changed, 89 insertions(+), 89 deletions(-)
[camel-quarkus] branch dependabot/maven/quarkiverse-groovy.version-3.4.0 created (now f53ec98af5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-groovy.version-3.4.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at f53ec98af5 Bump quarkiverse-groovy.version from 3.2.2 to 3.4.0 No new revisions were added by this update.
Re: [PR] Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom from 2.5.0 to 2.5.2 [camel-quarkus]
github-actions[bot] commented on PR #5400: URL: https://github.com/apache/camel-quarkus/pull/5400#issuecomment-1747690869 Branch auto synchronized due to changes in generated files. New workflow run triggered: https://github.com/apache/camel-quarkus/actions/runs/6411828982 -- 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 quarkiverse-groovy.version from 3.2.2 to 3.4.0 [camel-quarkus]
dependabot[bot] opened a new pull request, #5401: URL: https://github.com/apache/camel-quarkus/pull/5401 Bumps `quarkiverse-groovy.version` from 3.2.2 to 3.4.0. Updates `io.quarkiverse.groovy:quarkus-groovy` from 3.2.2 to 3.4.0 Updates `io.quarkiverse.groovy:quarkus-groovy-deployment` from 3.2.2 to 3.4.0 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-quarkus] branch dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.5.2 updated (47e85bc681 -> f688177c9b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.5.2 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git from 47e85bc681 Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom add f688177c9b Auto generated changes for dependabot commit 47e85bc681969b24b6618022dd43d3c7c4135fe8 No new revisions were added by this update. Summary of changes: pom.xml|4 +- poms/bom/src/main/generated/flattened-full-pom.xml | 2313 ++-- .../src/main/generated/flattened-reduced-pom.xml | 86 +- .../generated/flattened-reduced-verbose-pom.xml| 254 +-- 4 files changed, 1341 insertions(+), 1316 deletions(-)
[camel-quarkus] branch dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.5.1 deleted (was ca1e11bc22)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.5.1 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git was ca1e11bc22 Auto generated changes for dependabot commit cc81c4a7e304a4f1832608be06bd321987398351 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 io.quarkiverse.amazonservices:quarkus-amazon-services-bom from 2.5.0 to 2.5.1 [camel-quarkus]
dependabot[bot] closed pull request #5289: Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom from 2.5.0 to 2.5.1 URL: https://github.com/apache/camel-quarkus/pull/5289 -- 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 io.quarkiverse.amazonservices:quarkus-amazon-services-bom from 2.5.0 to 2.5.1 [camel-quarkus]
dependabot[bot] commented on PR #5289: URL: https://github.com/apache/camel-quarkus/pull/5289#issuecomment-1747687134 Superseded by #5400. -- 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/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.5.2 created (now 47e85bc681)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/io.quarkiverse.amazonservices-quarkus-amazon-services-bom-2.5.2 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 47e85bc681 Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom No new revisions were added by this update.
[PR] Bump io.quarkiverse.amazonservices:quarkus-amazon-services-bom from 2.5.0 to 2.5.2 [camel-quarkus]
dependabot[bot] opened a new pull request, #5400: URL: https://github.com/apache/camel-quarkus/pull/5400 Bumps [io.quarkiverse.amazonservices:quarkus-amazon-services-bom](https://github.com/quarkiverse/quarkus-amazon-services) from 2.5.0 to 2.5.2. Release notes Sourced from https://github.com/quarkiverse/quarkus-amazon-services/releases;>io.quarkiverse.amazonservices:quarkus-amazon-services-bom's releases. 2.5.2 Major changes Support the latest release of aws-crt, which, by introducing new JNI methods, has broken support for native compilation. What's Changed docs: Add guidance for handling Docker support in test mode by https://github.com/scrocquesel;>@scrocquesel in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/934;>quarkiverse/quarkus-amazon-services#934 ci: test the default and alternative client implementations separately by https://github.com/scrocquesel;>@scrocquesel in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/935;>quarkiverse/quarkus-amazon-services#935 build(deps): bump software.amazon.awssdk.crt:aws-crt from 0.26.0 to 0.27.3 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/943;>quarkiverse/quarkus-amazon-services#943 build(deps-dev): bump org.junit-pioneer:junit-pioneer from 2.0.1 to 2.1.0 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/926;>quarkiverse/quarkus-amazon-services#926 build(deps): bump quarkus.version from 3.3.0 to 3.4.1 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/941;>quarkiverse/quarkus-amazon-services#941 build(deps): bump software.amazon.awssdk:bom from 2.20.143 to 2.20.159 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/950;>quarkiverse/quarkus-amazon-services#950 chore: release 2.5.2 by https://github.com/scrocquesel;>@scrocquesel in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/951;>quarkiverse/quarkus-amazon-services#951 Full Changelog: https://github.com/quarkiverse/quarkus-amazon-services/compare/2.5.1...2.5.2;>https://github.com/quarkiverse/quarkus-amazon-services/compare/2.5.1...2.5.2 2.5.1 Major changes For those who encounter threading issues with JDK 19+, it is possible to disable the use of the Quarkus thread pool for AWS SDK async taskes by setting quarkus.extension.advanced.use-quarkus-scheduled-executor-service=false. This affects both synchronuous and asynchronuous clients. Asynchronous clients should also be configured with quarkus.extension.async-client.advanced.use-future-completion-thread-pool=false. This should be considered a temporary fix, as it will create additional thread pools that run in competition with the Quarkus thread pool. Refer to https://redirect.github.com/aws/aws-sdk-java-v2/issues/4395;>aws/aws-sdk-java-v2#4395 for ongoing follow-up. What's Changed docs: separate docs for for 2.4 branch by https://github.com/scrocquesel;>@scrocquesel in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/902;>quarkiverse/quarkus-amazon-services#902 feat: add config option to disable Quarkus thread pool usage by https://github.com/scrocquesel;>@scrocquesel in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/923;>quarkiverse/quarkus-amazon-services#923 build(deps): bump software.amazon.awssdk:bom from 2.20.128 to 2.20.143 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/921;>quarkiverse/quarkus-amazon-services#921 build(deps): bump software.amazon.awssdk.crt:aws-crt from 0.25.0 to 0.26.0 by https://github.com/dependabot;>@dependabot in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/922;>quarkiverse/quarkus-amazon-services#922 chore: release 2.5.1 by https://github.com/scrocquesel;>@scrocquesel in https://redirect.github.com/quarkiverse/quarkus-amazon-services/pull/924;>quarkiverse/quarkus-amazon-services#924 Full Changelog: https://github.com/quarkiverse/quarkus-amazon-services/compare/2.5.0...2.5.1;>https://github.com/quarkiverse/quarkus-amazon-services/compare/2.5.0...2.5.1 Commits https://github.com/quarkiverse/quarkus-amazon-services/commit/d180ffd304bdccde92e20b6833c94f7820d66708;>d180ffd [maven-release-plugin] prepare release 2.5.2 https://github.com/quarkiverse/quarkus-amazon-services/commit/2fb31ed79ac0222a3529d200dd1185783c826015;>2fb31ed Update the latest release version 2.5.2 in documentation https://github.com/quarkiverse/quarkus-amazon-services/commit/d86f6225fed1e9de2914c484bdf7ce86f3dc5b00;>d86f622 chore: release 2.5.2
[camel-karavan] branch main updated: fix build
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 7532d85b fix build 7532d85b is described below commit 7532d85b5c641101e4c348b6b807bcf5931864b3 Author: Marat Gubaidullin AuthorDate: Wed Oct 4 16:59:55 2023 -0400 fix build --- karavan-web/karavan-app/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/karavan-web/karavan-app/src/main/resources/application.properties b/karavan-web/karavan-app/src/main/resources/application.properties index 13a50355..67990ecb 100644 --- a/karavan-web/karavan-app/src/main/resources/application.properties +++ b/karavan-web/karavan-app/src/main/resources/application.properties @@ -121,7 +121,7 @@ quarkus.quinoa.enable-spa-routing=true quarkus.http.enable-compression=true quarkus.log.level=INFO quarkus.banner.enabled=false -quarkus.package.type=fast-jar +quarkus.package.type=uber-jar quarkus.docker.dockerfile-jvm-path=src/main/docker/Dockerfile.jdk #quarkus.docker.dockerfile-jvm-path=src/main/docker/Dockerfile.minimal quarkus.container-image.builder=docker
[camel-karavan] branch dependabot/npm_and_yarn/karavan-vscode/postcss-8.4.31 deleted (was 13346af3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/karavan-vscode/postcss-8.4.31 in repository https://gitbox.apache.org/repos/asf/camel-karavan.git was 13346af3 Bump postcss from 8.4.30 to 8.4.31 in /karavan-vscode 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 postcss from 8.4.30 to 8.4.31 in /karavan-vscode [camel-karavan]
oscerd merged PR #928: URL: https://github.com/apache/camel-karavan/pull/928 -- 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 postcss from 8.4.30 to 8.4.31 in /karavan-vscode (#928)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-karavan.git The following commit(s) were added to refs/heads/main by this push: new 39236a66 Bump postcss from 8.4.30 to 8.4.31 in /karavan-vscode (#928) 39236a66 is described below commit 39236a66069e02bf6afc93fb5c22e545ab906d9a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Oct 4 21:31:27 2023 +0200 Bump postcss from 8.4.30 to 8.4.31 in /karavan-vscode (#928) Bumps [postcss](https://github.com/postcss/postcss) from 8.4.30 to 8.4.31. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.30...8.4.31) --- updated-dependencies: - dependency-name: postcss dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- karavan-vscode/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/karavan-vscode/package-lock.json b/karavan-vscode/package-lock.json index d9a5695c..fce14e68 100644 --- a/karavan-vscode/package-lock.json +++ b/karavan-vscode/package-lock.json @@ -7038,9 +7038,9 @@ } }, "node_modules/postcss": { - "version": "8.4.30", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz;, - "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==", + "version": "8.4.31", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz;, + "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", "dev": true, "funding": [ {
[camel] branch regen_bot updated (d35d5a469e8 -> fff2a09c1c8)
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 d35d5a469e8 CAMEL-19949: camel-jbang - Allow to set a custom remote debugging port (#11645) add fff2a09c1c8 Polished No new revisions were added by this update. Summary of changes: .../org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java | 4 ++-- .../java/org/apache/camel/dsl/jbang/core/commands/Transform.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-)
[camel-karavan] branch dependabot/npm_and_yarn/karavan-vscode/postcss-8.4.31 created (now 13346af3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/karavan-vscode/postcss-8.4.31 in repository https://gitbox.apache.org/repos/asf/camel-karavan.git at 13346af3 Bump postcss from 8.4.30 to 8.4.31 in /karavan-vscode No new revisions were added by this update.
[PR] Bump postcss from 8.4.30 to 8.4.31 in /karavan-vscode [camel-karavan]
dependabot[bot] opened a new pull request, #928: URL: https://github.com/apache/camel-karavan/pull/928 Bumps [postcss](https://github.com/postcss/postcss) from 8.4.30 to 8.4.31. Release notes Sourced from https://github.com/postcss/postcss/releases;>postcss's releases. 8.4.31 Fixed \r parsing to fix CVE-2023-44270. Changelog Sourced from https://github.com/postcss/postcss/blob/main/CHANGELOG.md;>postcss's changelog. 8.4.31 Fixed \r parsing to fix CVE-2023-44270. Commits https://github.com/postcss/postcss/commit/90208de8805dd762596c0028b8637ffbed23e371;>90208de Release 8.4.31 version https://github.com/postcss/postcss/commit/58cc860b4c1707510c9cd1bc1fa30b423a9ad6c5;>58cc860 Fix carrier return parsing https://github.com/postcss/postcss/commit/4fff8e4cdc237619df1d73a444c0a8329701c1e2;>4fff8e4 Improve pnpm test output https://github.com/postcss/postcss/commit/cd43ed123274a92ebc13a1e8cccf1d65b8198f84;>cd43ed1 Update dependencies https://github.com/postcss/postcss/commit/caa916bdcbf66c51321574e2dde112ab13e8b306;>caa916b Update dependencies https://github.com/postcss/postcss/commit/8972f76923e921a3c9655822382039b31b1c8e1a;>8972f76 Typo https://github.com/postcss/postcss/commit/11a5286f781d2a637f2c545c5e9cd661055acaab;>11a5286 Typo See full diff in https://github.com/postcss/postcss/compare/8.4.30...8.4.31;>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=postcss=npm_and_yarn=8.4.30=8.4.31)](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) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/apache/camel-karavan/network/alerts). -- 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] 01/02: Kamelets Dependencies UI #315
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 cdde30d412b7aed8477f5902167cda3ef744da2e Author: Marat Gubaidullin AuthorDate: Tue Oct 3 20:06:52 2023 -0400 Kamelets Dependencies UI #315 --- .../src/core/model/IntegrationDefinition.ts| 21 ++- karavan-core/test/kamelet.spec.ts | 3 +- .../public/example/aws-s3-source.kamelet.yaml | 190 +++ .../src/designer/kamelet/KameletTypesOutCard.tsx | 113 +++ .../src/main/resources/application.properties | 2 +- .../kamelet/KameletDefinitionPropertyCard.tsx | 125 +++- .../designer/kamelet/KameletDefinitionsPanel.tsx | 59 +- .../designer/kamelet/KameletDependenciesCard.tsx | 113 +++ .../src/designer/kamelet/KameletProperties.tsx | 209 + .../src/designer/kamelet/KameletTypesOutCard.tsx | 113 +++ .../main/webui/src/designer/kamelet/kamelet.css| 1 + 11 files changed, 723 insertions(+), 226 deletions(-) diff --git a/karavan-core/src/core/model/IntegrationDefinition.ts b/karavan-core/src/core/model/IntegrationDefinition.ts index 974f8e5e..fb1c11f3 100644 --- a/karavan-core/src/core/model/IntegrationDefinition.ts +++ b/karavan-core/src/core/model/IntegrationDefinition.ts @@ -32,6 +32,23 @@ export class DefinitionProperty { } } +export class MediaType { +mediaType: string = ''; + +public constructor(init?: Partial) { +Object.assign(this, init); +} +} + +export class Types { +in?: MediaType = new MediaType(); +out?: MediaType = new MediaType(); + +public constructor(init?: Partial) { +Object.assign(this, init); +} +} + export class Definition { title: string = ''; description: string = ''; @@ -46,7 +63,7 @@ export class Definition { export class Spec { definition?: Definition; -types?: any; +types?: Types; flows?: any[] = []; template?: any; dependencies?: string[]; @@ -107,7 +124,7 @@ export class Integration { if (type === 'kamelet') { i.metadata.annotations = new MetadataAnnotations({}) i.spec.definition = new Definition({}) -i.spec.types = {} +i.spec.types = new Types(); } return i; diff --git a/karavan-core/test/kamelet.spec.ts b/karavan-core/test/kamelet.spec.ts index 65e94987..750d9295 100644 --- a/karavan-core/test/kamelet.spec.ts +++ b/karavan-core/test/kamelet.spec.ts @@ -28,7 +28,6 @@ describe('Kamelet <=> YAML', () => { it('Yaml to Kamelet', () => { const yaml = fs.readFileSync('test/postgresql-source.kamelet.yaml',{encoding:'utf8', flag:'r'}); const i = CamelDefinitionYaml.yamlToIntegration("postgresql-source.kamelet.yaml", yaml); -// console.log(i) }); it('Kamelet to YAML with beans', () => { @@ -44,6 +43,8 @@ describe('Kamelet <=> YAML', () => { i.spec.flows?.push(b); const a = new MetadataAnnotations({"camel.apache.org/kamelet.group" : "hello world"}) i.metadata.annotations = a + +// console.log(CamelDefinitionYaml.integrationToYaml(i)) }); it('Kamelet to YAML without beans', () => { diff --git a/karavan-designer/public/example/aws-s3-source.kamelet.yaml b/karavan-designer/public/example/aws-s3-source.kamelet.yaml new file mode 100644 index ..e20d11d7 --- /dev/null +++ b/karavan-designer/public/example/aws-s3-source.kamelet.yaml @@ -0,0 +1,190 @@ +apiVersion: camel.apache.org/v1 +kind: Kamelet +metadata: + name: aws-s3-source + annotations: +camel.apache.org/kamelet.support.level: "Stable" +camel.apache.org/catalog.version: "4.1.0-SNAPSHOT" +camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB2ZXJzaW9uPSIxLjEiIGlkPSJMYXllcl8xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHg9IjAiIHk9IjAiIHZpZXdCb3g9IjAgMCAyNDguMiAzMDAiIHhtbDpzcGFjZT0icHJlc2VydmUiPjxzdHlsZT4uc3QyOHtmaWxsOiM4YzMxMjN9LnN0Mjl7ZmlsbDojZTA1MjQzfTwvc3R5bGU+PHBhdGggY2xhc3M9InN0MjgiIGQ9Ik0yMCA1Mi4xTDAgNjJ2MTc1LjVsMjAgOS45LjEtLjFWNTIuMmwtLjEtLjEiLz48cGF0aCBjbGFzcz0ic3QyOSIgZD0iTTEyNyAyMjJMMjAgMjQ3LjVWNTIuMUwxMjcgNzd2MTQ1Ii8+PHBhdGggY2xhc3M9InN0MjgiIG [...] +camel.apache.org/provider: "Apache Software Foundation" +camel.apache.org/kamelet.group: "AWS S3" +camel.apache.org/kamelet.namespace: "AWS" + labels: +camel.apache.org/kamelet.type: "source" +spec: + definition: +title: "AWS S3 Source" +description: |- + Receive data from an Amazon S3 Bucket. + + The basic authentication method for the S3 service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider. + + If you use the default credentials provider, the S3 client loads the credentials through this provider and doesn't use the basic
[camel-karavan] branch main updated (76a18789 -> f5192aea)
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 76a18789 Kamelets Dependencies UI #315 new cdde30d4 Kamelets Dependencies UI #315 new f5192aea Fix #927 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/core/model/IntegrationDefinition.ts| 21 ++- karavan-core/test/kamelet.spec.ts | 3 +- .../public/example/aws-s3-source.kamelet.yaml | 190 +++ ...ependenciesCard.tsx => KameletTypesOutCard.tsx} | 2 +- karavan-vscode/icons/dark/rocket.svg | 69 --- karavan-vscode/icons/dark/wand.svg | 85 - karavan-vscode/icons/light/rocket.svg | 1 - karavan-vscode/icons/light/wand.svg| 1 - karavan-vscode/package.json| 10 +- .../src/main/resources/application.properties | 2 +- .../kamelet/KameletDefinitionPropertyCard.tsx | 125 +++- .../designer/kamelet/KameletDefinitionsPanel.tsx | 59 +- .../designer/kamelet/KameletDependenciesCard.tsx | 0 .../src/designer/kamelet/KameletProperties.tsx | 209 + .../src/designer/kamelet/KameletTypesOutCard.tsx | 2 +- .../main/webui/src/designer/kamelet/kamelet.css| 1 + 16 files changed, 388 insertions(+), 392 deletions(-) create mode 100644 karavan-designer/public/example/aws-s3-source.kamelet.yaml copy karavan-designer/src/designer/kamelet/{KameletDependenciesCard.tsx => KameletTypesOutCard.tsx} (99%) delete mode 100644 karavan-vscode/icons/dark/rocket.svg delete mode 100644 karavan-vscode/icons/dark/wand.svg delete mode 100644 karavan-vscode/icons/light/rocket.svg delete mode 100644 karavan-vscode/icons/light/wand.svg copy {karavan-designer => karavan-web/karavan-app/src/main/webui}/src/designer/kamelet/KameletDependenciesCard.tsx (100%) copy karavan-designer/src/designer/kamelet/KameletDependenciesCard.tsx => karavan-web/karavan-app/src/main/webui/src/designer/kamelet/KameletTypesOutCard.tsx (99%)
[camel-karavan] 02/02: Fix #927
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 f5192aea56db6a6736c9e1352af93b435d9c7a62 Author: Marat Gubaidullin AuthorDate: Wed Oct 4 15:19:12 2023 -0400 Fix #927 --- karavan-vscode/icons/dark/rocket.svg | 69 karavan-vscode/icons/dark/wand.svg| 85 --- karavan-vscode/icons/light/rocket.svg | 1 - karavan-vscode/icons/light/wand.svg | 1 - karavan-vscode/package.json | 10 + 5 files changed, 2 insertions(+), 164 deletions(-) diff --git a/karavan-vscode/icons/dark/rocket.svg b/karavan-vscode/icons/dark/rocket.svg deleted file mode 100644 index c2d6a737.. --- a/karavan-vscode/icons/dark/rocket.svg +++ /dev/null @@ -1,69 +0,0 @@ - -http://www.inkscape.org/namespaces/inkscape; - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; - xmlns="http://www.w3.org/2000/svg; - xmlns:svg="http://www.w3.org/2000/svg; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; - xmlns:cc="http://creativecommons.org/ns#; - xmlns:dc="http://purl.org/dc/elements/1.1/;> - - -.cls-1{fill:none;} - - rocket - - - - - - -rocket - - - - diff --git a/karavan-vscode/icons/dark/wand.svg b/karavan-vscode/icons/dark/wand.svg deleted file mode 100644 index 699be396.. --- a/karavan-vscode/icons/dark/wand.svg +++ /dev/null @@ -1,85 +0,0 @@ - -http://www.inkscape.org/namespaces/inkscape; - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; - xmlns="http://www.w3.org/2000/svg; - xmlns:svg="http://www.w3.org/2000/svg; - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#; - xmlns:cc="http://creativecommons.org/ns#; - xmlns:dc="http://purl.org/dc/elements/1.1/;> - - -.cls-1{fill:none;} - - magic-wand - - - - - - - - -magic-wand - - - - diff --git a/karavan-vscode/icons/light/rocket.svg b/karavan-vscode/icons/light/rocket.svg deleted file mode 100644 index 2d3b0221.. --- a/karavan-vscode/icons/light/rocket.svg +++ /dev/null @@ -1 +0,0 @@ -http://www.w3.org/2000/svg;>.cls-1{fill:none;}rockethttp://www.w3.org/2000/svg;>.cls-1{fill:none;}magic-wand--filled
Re: [I] Incorrect icons in vscode 1.83.0 [camel-karavan]
mgubaidullin closed issue #927: Incorrect icons in vscode 1.83.0 URL: https://github.com/apache/camel-karavan/issues/927 -- 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: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new fff2a09c1c8 Polished fff2a09c1c8 is described below commit fff2a09c1c84d8b6851f48e97d81c419a8b279e2 Author: Claus Ibsen AuthorDate: Wed Oct 4 21:11:35 2023 +0200 Polished --- .../org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java | 4 ++-- .../java/org/apache/camel/dsl/jbang/core/commands/Transform.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java index 7f0f22e1007..4f052d10534 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java @@ -129,6 +129,7 @@ public class CamelJBangMain implements Callable { .addSubcommand("copy", new CommandLine(new DependencyCopy(main .addSubcommand("generate", new CommandLine(new CodeGenerator(main)) .addSubcommand("rest", new CommandLine(new CodeRestGenerator(main +.addSubcommand("sbom", new CommandLine(new SBOMGenerator(main))) .addSubcommand("catalog", new CommandLine(new CatalogCommand(main)) .addSubcommand("component", new CommandLine(new CatalogComponent(main))) .addSubcommand("dataformat", new CommandLine(new CatalogDataFormat(main))) @@ -150,8 +151,7 @@ public class CamelJBangMain implements Callable { .addSubcommand("version", new CommandLine(new VersionCommand(main)) .addSubcommand("get", new CommandLine(new VersionGet(main))) .addSubcommand("set", new CommandLine(new VersionSet(main))) -.addSubcommand("list", new CommandLine(new VersionList(main -.addSubcommand("sbom", new CommandLine(new SBOMGenerator(main))); +.addSubcommand("list", new CommandLine(new VersionList(main; commandLine.getCommandSpec().versionProvider(() -> { CamelCatalog catalog = new DefaultCamelCatalog(); diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Transform.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Transform.java index 4439455a27b..d1e1bf60c95 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Transform.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Transform.java @@ -29,7 +29,7 @@ import org.apache.camel.util.StopWatch; import picocli.CommandLine; import picocli.CommandLine.Command; -@Command(name = "transform", description = "Transform Camel route to XML or YAML format", sortOptions = false) +@Command(name = "transform", description = "Transform Camel routes to XML or YAML format", sortOptions = false) public class Transform extends CamelCommand { @CommandLine.Parameters(description = "The Camel file(s) to run. If no files specified then application.properties is used as source for which files to run.", @@ -52,7 +52,8 @@ public class Transform extends CamelCommand { boolean resolvePlaceholders; @CommandLine.Option(names = { "--uri-as-parameters" }, -description = "Whether to expand URIs into separated key/value parameters (only in use for YAML format)") +description = "Whether to expand URIs into separated key/value parameters (only in use for YAML format" + + "and recommended to enable when using Apache Camel Karavan)") boolean uriAsParameters; @CommandLine.Option(names = { "--ignore-loading-error" },
[camel-quarkus] annotated tag 3.2.1 created (now 55d1f26dc7)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to annotated tag 3.2.1 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at 55d1f26dc7 (tag) tagging 91924c10e1243827b967911adc9d4d3f141ec55f (commit) replaces 3.2.0 by Peter Palaga on Wed Oct 4 21:01:08 2023 +0200 - Log - [maven-release-plugin] copy for tag 3.2.1 --- No new revisions were added by this update.
[camel] branch regen_bot updated (5df909910a3 -> d35d5a469e8)
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 5df909910a3 CAMEL-19939: camel-jbang - dependency copy - Use camel-tooling-maven (#11643) add d35d5a469e8 CAMEL-19949: camel-jbang - Allow to set a custom remote debugging port (#11645) No new revisions were added by this update. Summary of changes: .../apache/camel/dsl/jbang/core/commands/Run.java | 59 +++--- 1 file changed, 51 insertions(+), 8 deletions(-)
[camel] branch port deleted (was ac6db97a673)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch port in repository https://gitbox.apache.org/repos/asf/camel.git was ac6db97a673 CAMEL-19949: camel-jbang - Add --jvm-debug-port option 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] branch CAMEL-19949/camel-jbang-debug-port deleted (was af1cc7ff52b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-19949/camel-jbang-debug-port in repository https://gitbox.apache.org/repos/asf/camel.git was af1cc7ff52b CAMEL-19949: camel-jbang - Allow to set a custom remote debugging port 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-19949: camel-jbang - Add --jvm-debug-port option [camel]
davsclaus closed pull request #11644: CAMEL-19949: camel-jbang - Add --jvm-debug-port option URL: https://github.com/apache/camel/pull/11644 -- 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-19949: camel-jbang - Allow to set a custom remote debugging port [camel]
davsclaus commented on PR #11645: URL: https://github.com/apache/camel/pull/11645#issuecomment-1747436617 Thanks this is much better -- 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-19949: camel-jbang - Allow to set a custom remote debugging port [camel]
davsclaus merged PR #11645: URL: https://github.com/apache/camel/pull/11645 -- 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-19949: camel-jbang - Allow to set a custom remote debugging port (#11645)
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 d35d5a469e8 CAMEL-19949: camel-jbang - Allow to set a custom remote debugging port (#11645) d35d5a469e8 is described below commit d35d5a469e85e5d1092fcb443ae571d5efddd82a Author: Nicolas Filotto AuthorDate: Wed Oct 4 20:36:29 2023 +0200 CAMEL-19949: camel-jbang - Allow to set a custom remote debugging port (#11645) --- .../apache/camel/dsl/jbang/core/commands/Run.java | 59 +++--- 1 file changed, 51 insertions(+), 8 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java index ad0e0856925..5446fe8ee0c 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java @@ -16,7 +16,7 @@ */ package org.apache.camel.dsl.jbang.core.commands; -import java.awt.*; +import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.UnsupportedFlavorException; @@ -166,8 +166,10 @@ public class Run extends CamelCommand { description = "Whether to allow automatic downloading JAR dependencies (over the internet)") boolean download = true; -@Option(names = { "--jvm-debug" }, defaultValue = "false", description = "To enable JVM remote debug on localhost:4004") -boolean jvmDebug; +@Option(names = { "--jvm-debug" }, parameterConsumer = DebugConsumer.class, paramLabel = "", +description = "To enable JVM remote debugging on port 4004 by default. The supported values are true to " + + "enable the remote debugging, false to disable the remote debugging or a number to use a custom port") +int jvmDebugPort; @Option(names = { "--name" }, defaultValue = "CamelJBang", description = "The name of the Camel application") String name; @@ -300,6 +302,10 @@ public class Run extends CamelCommand { return run(); } +private boolean isDebugMode() { +return jvmDebugPort > 0; +} + private void writeSetting(KameletMain main, Properties existing, String key, String value) { String val = existing != null ? existing.getProperty(key, value) : value; if (val != null) { @@ -707,7 +713,7 @@ public class Run extends CamelCommand { } // okay we have validated all input and are ready to run -if (camelVersion != null || jvmDebug) { +if (camelVersion != null || isDebugMode()) { boolean custom = false; if (camelVersion != null) { // run in another JVM with different camel version (foreground or background) @@ -794,7 +800,7 @@ public class Run extends CamelCommand { openapi = answer.getProperty("camel.jbang.open-api", openapi); download = "true".equals(answer.getProperty("camel.jbang.download", download ? "true" : "false")); background = "true".equals(answer.getProperty("camel.jbang.background", background ? "true" : "false")); -jvmDebug = "true".equals(answer.getProperty("camel.jbang.jvmDebug", jvmDebug ? "true" : "false")); +jvmDebugPort = parseJvmDebugPort(answer.getProperty("camel.jbang.jvmDebug", Integer.toString(jvmDebugPort))); camelVersion = answer.getProperty("camel.jbang.camel-version", camelVersion); kameletsVersion = answer.getProperty("camel.jbang.kameletsVersion", kameletsVersion); gav = answer.getProperty("camel.jbang.gav", gav); @@ -808,6 +814,27 @@ public class Run extends CamelCommand { return answer; } +/** + * Parses the JVM debug port from the given value. + * + * The value can be {@code true} to indicate a default port which is {@code 4004}, {@code false} to indicate no + * debug, or a number corresponding to a custom port. + * + * @param value the value to parse. + * + * @return the JVM debug port corresponding to the given value. + */ +private static int parseJvmDebugPort(String value) { +if (value == null) { +return 0; +} else if (value.equals("true")) { +return 4004; +} else if (value.equals("false")) { +return 0; +} +return Integer.parseInt(value); +} + protected int runCamelVersion(KameletMain main) throws Exception { List cmds = new ArrayList<>(spec.commandLine().getParseResult().originalArgs()); @@ -831,9 +858,9 @@ public class Run extends CamelCommand { if
[camel] branch CAMEL-19949/camel-jbang-debug-port updated (a5be69b6e2c -> af1cc7ff52b)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch CAMEL-19949/camel-jbang-debug-port in repository https://gitbox.apache.org/repos/asf/camel.git omit a5be69b6e2c CAMEL-19949: camel-jbang - Allow to set a custom remote debugging port add af1cc7ff52b CAMEL-19949: camel-jbang - Allow to set a custom remote debugging port 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 (a5be69b6e2c) \ N -- N -- N refs/heads/CAMEL-19949/camel-jbang-debug-port (af1cc7ff52b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../org/apache/camel/dsl/jbang/core/commands/Run.java| 16 +--- 1 file changed, 13 insertions(+), 3 deletions(-)
Re: [PR] CAMEL-19949: camel-jbang - Add --jvm-debug-port option [camel]
essobedo commented on PR #11644: URL: https://github.com/apache/camel/pull/11644#issuecomment-1747126301 @davsclaus You can check my PR https://github.com/apache/camel/pull/11645 to see how to have only one parameter -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch CAMEL-19949/camel-jbang-debug-port updated (6329bf4bb53 -> a5be69b6e2c)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch CAMEL-19949/camel-jbang-debug-port in repository https://gitbox.apache.org/repos/asf/camel.git discard 6329bf4bb53 CAMEL-19949: camel-jbang - Allow to set a custom JVM remote debugging port new a5be69b6e2c CAMEL-19949: camel-jbang - Allow to set a custom remote debugging port 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 (6329bf4bb53) \ N -- N -- N refs/heads/CAMEL-19949/camel-jbang-debug-port (a5be69b6e2c) 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:
[camel] 01/01: CAMEL-19949: camel-jbang - Allow to set a custom remote debugging port
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch CAMEL-19949/camel-jbang-debug-port in repository https://gitbox.apache.org/repos/asf/camel.git commit a5be69b6e2c4ca0f3ce70dc841e399465053468b Author: Nicolas Filotto AuthorDate: Wed Oct 4 17:25:22 2023 +0200 CAMEL-19949: camel-jbang - Allow to set a custom remote debugging port --- .../apache/camel/dsl/jbang/core/commands/Run.java | 49 ++ 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java index ad0e0856925..ed52cda6e63 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java @@ -16,7 +16,7 @@ */ package org.apache.camel.dsl.jbang.core.commands; -import java.awt.*; +import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.UnsupportedFlavorException; @@ -166,8 +166,10 @@ public class Run extends CamelCommand { description = "Whether to allow automatic downloading JAR dependencies (over the internet)") boolean download = true; -@Option(names = { "--jvm-debug" }, defaultValue = "false", description = "To enable JVM remote debug on localhost:4004") -boolean jvmDebug; +@Option(names = { "--jvm-debug" }, parameterConsumer = DebugConsumer.class, paramLabel = "", +description = "To enable JVM remote debugging on port 4004 by default. The supported values are true to " + + "enable the remote debugging, false to disable the remote debugging or a number to use a custom port") +int jvmDebugPort; @Option(names = { "--name" }, defaultValue = "CamelJBang", description = "The name of the Camel application") String name; @@ -300,6 +302,10 @@ public class Run extends CamelCommand { return run(); } +private boolean isDebugMode() { +return jvmDebugPort > 0; +} + private void writeSetting(KameletMain main, Properties existing, String key, String value) { String val = existing != null ? existing.getProperty(key, value) : value; if (val != null) { @@ -707,7 +713,7 @@ public class Run extends CamelCommand { } // okay we have validated all input and are ready to run -if (camelVersion != null || jvmDebug) { +if (camelVersion != null || isDebugMode()) { boolean custom = false; if (camelVersion != null) { // run in another JVM with different camel version (foreground or background) @@ -794,7 +800,7 @@ public class Run extends CamelCommand { openapi = answer.getProperty("camel.jbang.open-api", openapi); download = "true".equals(answer.getProperty("camel.jbang.download", download ? "true" : "false")); background = "true".equals(answer.getProperty("camel.jbang.background", background ? "true" : "false")); -jvmDebug = "true".equals(answer.getProperty("camel.jbang.jvmDebug", jvmDebug ? "true" : "false")); +jvmDebugPort = parseJvmDebugPort(answer.getProperty("camel.jbang.jvmDebug", Integer.toString(jvmDebugPort))); camelVersion = answer.getProperty("camel.jbang.camel-version", camelVersion); kameletsVersion = answer.getProperty("camel.jbang.kameletsVersion", kameletsVersion); gav = answer.getProperty("camel.jbang.gav", gav); @@ -808,6 +814,27 @@ public class Run extends CamelCommand { return answer; } +/** + * Parses the JVM debug port from the given value. + * + * The value can be {@code true} to indicate a default port which is {@code 4004}, {@code false} to indicate no + * debug, or a number corresponding to a custom port. + * + * @param value the value to parse. + * + * @return the JVM debug port corresponding to the given value. + */ +private static int parseJvmDebugPort(String value) { +if (value == null) { +return 0; +} else if (value.equalsIgnoreCase("true")) { +return 4004; +} else if (value.equalsIgnoreCase("false")) { +return 0; +} +return Integer.parseInt(value); +} + protected int runCamelVersion(KameletMain main) throws Exception { List cmds = new ArrayList<>(spec.commandLine().getParseResult().originalArgs()); @@ -831,9 +858,9 @@ public class Run extends CamelCommand { if (kameletsVersion != null) { jbangArgs.add("-Dcamel-kamelets.version=" + kameletsVersion); } -if (jvmDebug) { -
[PR] CAMEL-19949: camel-jbang - Allow to set a custom remote debugging port [camel]
essobedo opened a new pull request, #11645: URL: https://github.com/apache/camel/pull/11645 (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
[camel] 01/01: CAMEL-19949: camel-jbang - Allow to set a custom JVM remote debugging port
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch CAMEL-19949/camel-jbang-debug-port in repository https://gitbox.apache.org/repos/asf/camel.git commit 6329bf4bb53b8356bd010ba0c8a750dfb97d2704 Author: Nicolas Filotto AuthorDate: Wed Oct 4 17:25:22 2023 +0200 CAMEL-19949: camel-jbang - Allow to set a custom JVM remote debugging port --- .../apache/camel/dsl/jbang/core/commands/Run.java | 49 ++ 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java index ad0e0856925..ed52cda6e63 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java @@ -16,7 +16,7 @@ */ package org.apache.camel.dsl.jbang.core.commands; -import java.awt.*; +import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.UnsupportedFlavorException; @@ -166,8 +166,10 @@ public class Run extends CamelCommand { description = "Whether to allow automatic downloading JAR dependencies (over the internet)") boolean download = true; -@Option(names = { "--jvm-debug" }, defaultValue = "false", description = "To enable JVM remote debug on localhost:4004") -boolean jvmDebug; +@Option(names = { "--jvm-debug" }, parameterConsumer = DebugConsumer.class, paramLabel = "", +description = "To enable JVM remote debugging on port 4004 by default. The supported values are true to " + + "enable the remote debugging, false to disable the remote debugging or a number to use a custom port") +int jvmDebugPort; @Option(names = { "--name" }, defaultValue = "CamelJBang", description = "The name of the Camel application") String name; @@ -300,6 +302,10 @@ public class Run extends CamelCommand { return run(); } +private boolean isDebugMode() { +return jvmDebugPort > 0; +} + private void writeSetting(KameletMain main, Properties existing, String key, String value) { String val = existing != null ? existing.getProperty(key, value) : value; if (val != null) { @@ -707,7 +713,7 @@ public class Run extends CamelCommand { } // okay we have validated all input and are ready to run -if (camelVersion != null || jvmDebug) { +if (camelVersion != null || isDebugMode()) { boolean custom = false; if (camelVersion != null) { // run in another JVM with different camel version (foreground or background) @@ -794,7 +800,7 @@ public class Run extends CamelCommand { openapi = answer.getProperty("camel.jbang.open-api", openapi); download = "true".equals(answer.getProperty("camel.jbang.download", download ? "true" : "false")); background = "true".equals(answer.getProperty("camel.jbang.background", background ? "true" : "false")); -jvmDebug = "true".equals(answer.getProperty("camel.jbang.jvmDebug", jvmDebug ? "true" : "false")); +jvmDebugPort = parseJvmDebugPort(answer.getProperty("camel.jbang.jvmDebug", Integer.toString(jvmDebugPort))); camelVersion = answer.getProperty("camel.jbang.camel-version", camelVersion); kameletsVersion = answer.getProperty("camel.jbang.kameletsVersion", kameletsVersion); gav = answer.getProperty("camel.jbang.gav", gav); @@ -808,6 +814,27 @@ public class Run extends CamelCommand { return answer; } +/** + * Parses the JVM debug port from the given value. + * + * The value can be {@code true} to indicate a default port which is {@code 4004}, {@code false} to indicate no + * debug, or a number corresponding to a custom port. + * + * @param value the value to parse. + * + * @return the JVM debug port corresponding to the given value. + */ +private static int parseJvmDebugPort(String value) { +if (value == null) { +return 0; +} else if (value.equalsIgnoreCase("true")) { +return 4004; +} else if (value.equalsIgnoreCase("false")) { +return 0; +} +return Integer.parseInt(value); +} + protected int runCamelVersion(KameletMain main) throws Exception { List cmds = new ArrayList<>(spec.commandLine().getParseResult().originalArgs()); @@ -831,9 +858,9 @@ public class Run extends CamelCommand { if (kameletsVersion != null) { jbangArgs.add("-Dcamel-kamelets.version=" + kameletsVersion); } -if (jvmDebug) { -
[camel] branch CAMEL-19949/camel-jbang-debug-port created (now 6329bf4bb53)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch CAMEL-19949/camel-jbang-debug-port in repository https://gitbox.apache.org/repos/asf/camel.git at 6329bf4bb53 CAMEL-19949: camel-jbang - Allow to set a custom JVM remote debugging port This branch includes the following new commits: new 6329bf4bb53 CAMEL-19949: camel-jbang - Allow to set a custom JVM remote debugging port 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.
Re: [PR] CAMEL-19949: camel-jbang - Add --jvm-debug-port option [camel]
essobedo commented on PR #11644: URL: https://github.com/apache/camel/pull/11644#issuecomment-1747047947 I was about to propose a PR too with only one parameter that manages all values as describe in the JIRA ticket, let me know if you prefer to keep it like this :-) -- 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-19949: camel-jbang - Add --jvm-debug-port option [camel]
davsclaus opened a new pull request, #11644: URL: https://github.com/apache/camel/pull/11644 # Description # Target - [ ] I checked that the commit is targeting the correct branch (note that Camel 3 uses `camel-3.x`, whereas Camel 4 uses the `main` branch) # Tracking - [ ] If this is a large change, bug fix, or code improvement, I checked there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). # Apache Camel coding standards and style - [ ] I checked that each commit in the pull request has a meaningful subject line and body. - [ ] I have run `mvn clean install -DskipTests` locally and I have committed all auto-generated changes -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/01: CAMEL-19949: camel-jbang - Add --jvm-debug-port option
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch port in repository https://gitbox.apache.org/repos/asf/camel.git commit ac6db97a6735d754171a7518eb2001ab5824da81 Author: Claus Ibsen AuthorDate: Wed Oct 4 16:45:30 2023 +0200 CAMEL-19949: camel-jbang - Add --jvm-debug-port option --- .../apache/camel/dsl/jbang/core/commands/Run.java| 20 +++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java index ad0e0856925..18b159c790a 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java @@ -169,6 +169,9 @@ public class Run extends CamelCommand { @Option(names = { "--jvm-debug" }, defaultValue = "false", description = "To enable JVM remote debug on localhost:4004") boolean jvmDebug; +@Option(names = { "--jvm-debug-port" }, description = "JVM remote debug port (default is 4004)") +int jvmDebugPort; + @Option(names = { "--name" }, defaultValue = "CamelJBang", description = "The name of the Camel application") String name; @@ -795,6 +798,7 @@ public class Run extends CamelCommand { download = "true".equals(answer.getProperty("camel.jbang.download", download ? "true" : "false")); background = "true".equals(answer.getProperty("camel.jbang.background", background ? "true" : "false")); jvmDebug = "true".equals(answer.getProperty("camel.jbang.jvmDebug", jvmDebug ? "true" : "false")); +jvmDebugPort = Integer.parseInt(answer.getProperty("camel.jbang.jvmDebugPort", String.valueOf(jvmDebugPort))); camelVersion = answer.getProperty("camel.jbang.camel-version", camelVersion); kameletsVersion = answer.getProperty("camel.jbang.kameletsVersion", kameletsVersion); gav = answer.getProperty("camel.jbang.gav", gav); @@ -832,8 +836,13 @@ public class Run extends CamelCommand { jbangArgs.add("-Dcamel-kamelets.version=" + kameletsVersion); } if (jvmDebug) { -jbangArgs.add("--debug"); // jbang --debug +if (jvmDebugPort > 0) { +jbangArgs.add("--debug=" + jvmDebugPort); // jbang --debug=port +} else { +jbangArgs.add("--debug"); // jbang --debug +} cmds.remove("--jvm-debug"); +cmds.removeIf(s -> s.startsWith("--jvm-debug-port")); } if (repos != null) { @@ -842,6 +851,9 @@ public class Run extends CamelCommand { jbangArgs.add("camel@apache/camel"); jbangArgs.addAll(cmds); +if (verbose) { +System.out.println(jbangArgs); +} ProcessBuilder pb = new ProcessBuilder(); pb.command(jbangArgs); if (background) { @@ -865,6 +877,9 @@ public class Run extends CamelCommand { cmds.add(0, "camel"); +if (verbose) { +System.out.println(cmds); +} ProcessBuilder pb = new ProcessBuilder(); pb.command(cmds); Process p = pb.start(); @@ -934,6 +949,9 @@ public class Run extends CamelCommand { jbangArgs.addAll(cmds); +if (verbose) { +System.out.println(jbangArgs); +} ProcessBuilder pb = new ProcessBuilder(); pb.command(jbangArgs); if (background) {
[camel] branch port created (now ac6db97a673)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch port in repository https://gitbox.apache.org/repos/asf/camel.git at ac6db97a673 CAMEL-19949: camel-jbang - Add --jvm-debug-port option This branch includes the following new commits: new ac6db97a673 CAMEL-19949: camel-jbang - Add --jvm-debug-port option The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] branch regen_bot_40x updated (231e3beaaee -> 5df909910a3)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_40x in repository https://gitbox.apache.org/repos/asf/camel.git from 231e3beaaee CAMEL-19918: camel-saxon - Using saxon=true does not work. (#11635) add 49eda4f5a40 [CAMEL-19935]upgrade to CXF 4.0.3 add 50e85a9f8d9 Use label as ppc64le (#11636) add 98e7aaf3f0c CAMEL-19948: camel jbang - Transform with no files should not show null.properties add 2ee3dcbe36e Upgrade AWS SDK v2 to version 2.20.159 (#11637) add 7ca9cf1e9ac Upgrade JNats to version 2.17.0 and Nats container image to 2.10.1 (#11639) add 3d2b79b5c2a camel-jbang - Trace should show size of collection/array add 763440dd0d3 License Maven Plugin: Remove deprecation and fixed configuration (#11642) add cd331591064 Upgrade Picocli to version 4.7.5 (#11641) add 5df909910a3 CAMEL-19939: camel-jbang - dependency copy - Use camel-tooling-maven (#11643) No new revisions were added by this update. Summary of changes: Jenkinsfile.ppc64le| 2 +- .../camel/component/cxf/jaxws/CxfProducerTest.java | 6 +- .../apache/camel/component/cxf/ssl/SslTest.java| 2 +- .../org/apache/camel/support/MessageHelper.java| 18 ++ .../modules/ROOT/pages/camel-jbang.adoc| 1 - .../dsl/jbang/core/commands/DependencyCopy.java| 127 - .../apache/camel/dsl/jbang/core/commands/Run.java | 5 +- .../core/commands/action/MessageTableHelper.java | 28 +- parent/pom.xml | 10 +- pom.xml| 306 +++-- .../nats/services/NatsLocalContainerService.java | 2 +- 11 files changed, 265 insertions(+), 242 deletions(-)
[camel] branch camel-4.0.x updated: [CAMEL-19935]upgrade to CXF 4.0.3
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch camel-4.0.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-4.0.x by this push: new db8f65b8350 [CAMEL-19935]upgrade to CXF 4.0.3 db8f65b8350 is described below commit db8f65b83503c3a81ddbd60457548b7acf4d586f Author: Freeman Fang AuthorDate: Tue Oct 3 16:10:56 2023 -0400 [CAMEL-19935]upgrade to CXF 4.0.3 (cherry picked from commit 49eda4f5a402f6865260984c62f7c5b732ed5004) --- .../java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java | 6 +++--- .../src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java | 2 +- parent/pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java index 33af8e8dbfd..6fed84b0eea 100644 --- a/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java +++ b/components/camel-cxf/camel-cxf-soap/src/test/java/org/apache/camel/component/cxf/jaxws/CxfProducerTest.java @@ -136,17 +136,17 @@ public class CxfProducerTest { public void testInvokingAWrongServer() throws Exception { Exchange reply = sendSimpleMessage(getWrongEndpointUri()); assertNotNull(reply.getException(), "We should get the exception here"); -assertTrue(reply.getException() instanceof ConnectException); +assertTrue(reply.getException().getCause() instanceof ConnectException); //Test the data format PAYLOAD reply = sendSimpleMessageWithPayloadMessage(getWrongEndpointUri() + "=PAYLOAD"); assertNotNull(reply.getException(), "We should get the exception here"); -assertTrue(reply.getException() instanceof ConnectException); +assertTrue(reply.getException().getCause() instanceof ConnectException); //Test the data format MESSAGE reply = sendSimpleMessageWithRawMessage(getWrongEndpointUri() + "=RAW"); assertNotNull(reply.getException(), "We should get the exception here"); -assertTrue(reply.getException() instanceof ConnectException); +assertTrue(reply.getException().getCause() instanceof ConnectException); } @Test diff --git a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java index 27d22d99e73..952942ea706 100644 --- a/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java +++ b/components/camel-cxf/camel-cxf-spring-soap/src/test/java/org/apache/camel/component/cxf/ssl/SslTest.java @@ -73,7 +73,7 @@ public class SslTest extends CamelSpringTestSupport { public void testInvokingNoTrustRoute() throws Exception { Exchange reply = sendJaxWsMessage("direct:noTrust"); assertTrue(reply.isFailed(), "We expect the exception here"); -Throwable e = reply.getException(); +Throwable e = reply.getException().getCause(); assertEquals("javax.net.ssl.SSLHandshakeException", e.getClass().getCanonicalName()); } diff --git a/parent/pom.xml b/parent/pom.xml index 907f8366ec4..239ad3a1981 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -115,8 +115,8 @@ 2.7 3.4.9 5.5.0 -4.0.2 -4.0.2 +4.0.3 +4.0.3 4.0.0 4.0.0
Re: [PR] CAMEL-19922 - Improve documentation on limitation for the file path [camel]
apupier closed pull request #11640: CAMEL-19922 - Improve documentation on limitation for the file path URL: https://github.com/apache/camel/pull/11640 -- 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-19922 - Improve documentation on limitation for the file path [camel]
apupier commented on PR #11640: URL: https://github.com/apache/camel/pull/11640#issuecomment-1746890433 limitations as been removed with https://github.com/apache/camel/pull/11643 -- 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-19923 - Fix Camel JBang dependency copy on Windows [camel]
apupier closed pull request #11603: CAMEL-19923 - Fix Camel JBang dependency copy on Windows URL: https://github.com/apache/camel/pull/11603 -- 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-19923 - Fix Camel JBang dependency copy on Windows [camel]
apupier commented on PR #11603: URL: https://github.com/apache/camel/pull/11603#issuecomment-1746885811 Fixed with another more maintainable approach https://github.com/apache/camel/pull/11643 -- 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] Kamelet - Inject secret in Vaults - AWS Secret Manager [camel-k]
gansheer commented on code in PR #4794: URL: https://github.com/apache/camel-k/pull/4794#discussion_r1345767015 ## addons/vault/aws/aws_secrets_manager.go: ## @@ -106,8 +112,20 @@ func (t *awsSecretsManagerTrait) Apply(environment *trait.Environment) error { } if environment.IntegrationInRunningPhases() { - environment.ApplicationProperties["camel.vault.aws.accessKey"] = t.AccessKey - environment.ApplicationProperties["camel.vault.aws.secretKey"] = t.SecretKey + hits := rex.FindAllStringSubmatch(t.AccessKey, -1) + if len(hits) >= 1 { + var res, _ = v1.DecodeValueSource(t.AccessKey, "aws-access-key", "The access Key provided is not valid") + environment.ApplicationProperties["camel.vault.aws.accessKey"] = res.SecretKeyRef.Key Review Comment: The DecodeValueSource will only translate your input expression to a golang struct object. Therefore here you are passing the value of the key from the expression `[configmap|secret]:name[/key]` instead of its value. If what you want is the value you need to retrieve the kubernetes object to have the value with: https://github.com/apache/camel-k/blob/f1b700cba2dc88f95737b10b141a0bf2e6b95a71/pkg/util/kubernetes/client.go#L179 Also it will manage both configmap and secret because you only do not as the DecodeValueSource contains ONLY ONE of the sub-objects ref `ConfigMapKeyRef` or `SecretKeyRef`. -- 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] Kamelet - Inject secret in Vaults - AWS Secret Manager [camel-k]
gansheer commented on code in PR #4794: URL: https://github.com/apache/camel-k/pull/4794#discussion_r1345768432 ## addons/vault/aws/aws_secrets_manager_test.go: ## @@ -75,6 +75,28 @@ func TestAwsSecretsManagerTraitNoDefaultCreds(t *testing.T) { assert.Equal(t, "false", e.ApplicationProperties["camel.vault.aws.defaultCredentialsProvider"]) } +func TestAwsSecretsManagerTraitWithSecrets(t *testing.T) { Review Comment: If you could add an configmap case in your test it would be nice. ## addons/vault/aws/aws_secrets_manager.go: ## @@ -106,8 +112,20 @@ func (t *awsSecretsManagerTrait) Apply(environment *trait.Environment) error { } if environment.IntegrationInRunningPhases() { - environment.ApplicationProperties["camel.vault.aws.accessKey"] = t.AccessKey - environment.ApplicationProperties["camel.vault.aws.secretKey"] = t.SecretKey + hits := rex.FindAllStringSubmatch(t.AccessKey, -1) + if len(hits) >= 1 { + var res, _ = v1.DecodeValueSource(t.AccessKey, "aws-access-key", "The access Key provided is not valid") + environment.ApplicationProperties["camel.vault.aws.accessKey"] = res.SecretKeyRef.Key Review Comment: The DecodeValueSource will only translate your input expression to a golang struct object. Therefore here you are passing the value of the key from the expression `[configmap|secret]:name[/key]` instead of its value. You need to retrieve the kubernetes object to have the value with: https://github.com/apache/camel-k/blob/f1b700cba2dc88f95737b10b141a0bf2e6b95a71/pkg/util/kubernetes/client.go#L179 Also it will manage both configmap and secret because you only do not as the DecodeValueSource contains ONLY ONE of the sub-objects ref `ConfigMapKeyRef` or `SecretKeyRef`. -- 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] Pointer to an external schema/CRD [camel-k]
squakez commented on issue #4788: URL: https://github.com/apache/camel-k/issues/4788#issuecomment-1746846981 For ObjectMeta, I am not sure this is something required by Kubernetes. Also, as it specify something external, maybe you can directly lookup for those resources. The templates are left outside on purpose. There was some attempt in the past, but the DSL from Camel is too big to fit into the CRD model and there are compatibility problems due to the fact that the DSL is not bound to Kubernetes CR versioning (which should not change that often) but to Camel versioning (which change often) [1]. [1] https://github.com/apache/camel-k/pull/2831 -- 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] Kamelet - Inject secret in Vaults - AWS Secret Manager [camel-k]
squakez commented on code in PR #4794: URL: https://github.com/apache/camel-k/pull/4794#discussion_r1345746059 ## addons/vault/aws/aws_secrets_manager.go: ## @@ -46,9 +47,13 @@ type Trait struct { traitv1.Trait `property:",squash"` // Enables automatic configuration of the trait. Auto *bool `property:"auto" json:"auto,omitempty"` - // The AWS Access Key to use + // The AWS Access Key to use. This could be a plain text or a configmap/secret + // The content of the aws access key is expected to be a text containing a valid AWS access key. + // Syntax: [configmap|secret]:name[/key], where name represents the resource name, key optionally represents the resource key to be filtered (default key value = aws-access-key). AccessKey string `property:"access-key" json:"accessKey,omitempty"` - // The AWS Secret Key to use + // The AWS Secret Key to use. This could be a plain text or a configmap/secret + // // The content of the aws secret key is expected to be a text containing a valid AWS secret key. Review Comment: Double `//` -- 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 (cd331591064 -> 5df909910a3)
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 cd331591064 Upgrade Picocli to version 4.7.5 (#11641) add 5df909910a3 CAMEL-19939: camel-jbang - dependency copy - Use camel-tooling-maven (#11643) No new revisions were added by this update. Summary of changes: .../modules/ROOT/pages/camel-jbang.adoc| 1 - .../dsl/jbang/core/commands/DependencyCopy.java| 127 + 2 files changed, 52 insertions(+), 76 deletions(-)
[PR] Kamelet - Inject secret in Vaults - AWS Secret Manager [camel-k]
oscerd opened a new pull request, #4794: URL: https://github.com/apache/camel-k/pull/4794 Related to #4743 **Release Note** ```release-note This is a first attempt at implementing the requested feature in AWS Secret Manager ``` I set this as draft because I need some feedback first @squakez @gansheer -- 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 4743 created (now 389fd1404)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch 4743 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 389fd1404 Kamelet - Inject secret in Vaults - AWS Secret Manager This branch includes the following new commits: new 389fd1404 Kamelet - Inject secret in Vaults - AWS Secret Manager The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel-k] 01/01: Kamelet - Inject secret in Vaults - AWS Secret Manager
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch 4743 in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 389fd1404d76ba10631bb9f60e1ec67f270793d7 Author: Andrea Cosentino AuthorDate: Wed Oct 4 14:15:48 2023 +0200 Kamelet - Inject secret in Vaults - AWS Secret Manager Signed-off-by: Andrea Cosentino --- addons/vault/aws/aws_secrets_manager.go| 26 addons/vault/aws/aws_secrets_manager_test.go | 22 + docs/modules/traits/pages/aws-secrets-manager.adoc | 8 +-- resources/traits.yaml | 28 -- 4 files changed, 76 insertions(+), 8 deletions(-) diff --git a/addons/vault/aws/aws_secrets_manager.go b/addons/vault/aws/aws_secrets_manager.go index 8ad20e026..87dd892c2 100644 --- a/addons/vault/aws/aws_secrets_manager.go +++ b/addons/vault/aws/aws_secrets_manager.go @@ -18,6 +18,7 @@ limitations under the License. package aws import ( + "regexp" "strconv" v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" @@ -46,9 +47,13 @@ type Trait struct { traitv1.Trait `property:",squash"` // Enables automatic configuration of the trait. Auto *bool `property:"auto" json:"auto,omitempty"` - // The AWS Access Key to use + // The AWS Access Key to use. This could be a plain text or a configmap/secret + // The content of the aws access key is expected to be a text containing a valid AWS access key. + // Syntax: [configmap|secret]:name[/key], where name represents the resource name, key optionally represents the resource key to be filtered (default key value = aws-access-key). AccessKey string `property:"access-key" json:"accessKey,omitempty"` - // The AWS Secret Key to use + // The AWS Secret Key to use. This could be a plain text or a configmap/secret + // // The content of the aws secret key is expected to be a text containing a valid AWS secret key. + // // Syntax: [configmap|secret]:name[/key], where name represents the resource name, key optionally represents the resource key to be filtered (default key value = aws-secret-key). SecretKey string `property:"secret-key" json:"secretKey,omitempty"` // The AWS Region to use Region string `property:"region" json:"region,omitempty"` @@ -98,6 +103,7 @@ func (t *awsSecretsManagerTrait) Configure(environment *trait.Environment) (bool } func (t *awsSecretsManagerTrait) Apply(environment *trait.Environment) error { + rex := regexp.MustCompile(`^(configmap|secret):([a-zA-Z0-9][a-zA-Z0-9-]*)(/([a-zA-Z0-9].*))?$`) if environment.IntegrationInPhase(v1.IntegrationPhaseInitialization) { util.StringSliceUniqueAdd(, v1.CapabilityAwsSecretsManager) // Deprecated @@ -106,8 +112,20 @@ func (t *awsSecretsManagerTrait) Apply(environment *trait.Environment) error { } if environment.IntegrationInRunningPhases() { - environment.ApplicationProperties["camel.vault.aws.accessKey"] = t.AccessKey - environment.ApplicationProperties["camel.vault.aws.secretKey"] = t.SecretKey + hits := rex.FindAllStringSubmatch(t.AccessKey, -1) + if len(hits) >= 1 { + var res, _ = v1.DecodeValueSource(t.AccessKey, "aws-access-key", "The access Key provided is not valid") + environment.ApplicationProperties["camel.vault.aws.accessKey"] = res.SecretKeyRef.Key + } else { + environment.ApplicationProperties["camel.vault.aws.accessKey"] = t.AccessKey + } + hits = rex.FindAllStringSubmatch(t.SecretKey, -1) + if len(hits) >= 1 { + var res, _ = v1.DecodeValueSource(t.SecretKey, "aws-secret-key", "The secret Key provided is not valid") + environment.ApplicationProperties["camel.vault.aws.secretKey"] = res.SecretKeyRef.Key + } else { + environment.ApplicationProperties["camel.vault.aws.secretKey"] = t.SecretKey + } environment.ApplicationProperties["camel.vault.aws.region"] = t.Region environment.ApplicationProperties["camel.vault.aws.defaultCredentialsProvider"] = strconv.FormatBool(*t.UseDefaultCredentialsProvider) environment.ApplicationProperties["camel.vault.aws.refreshEnabled"] = strconv.FormatBool(*t.RefreshEnabled) diff --git a/addons/vault/aws/aws_secrets_manager_test.go b/addons/vault/aws/aws_secrets_manager_test.go index a1084c3b0..2d5dbcd51 100644 --- a/addons/vault/aws/aws_secrets_manager_test.go +++ b/addons/vault/aws/aws_secrets_manager_test.go @@ -75,6 +75,28 @@ func TestAwsSecretsManagerTraitNoDefaultCreds(t *testing.T) { assert.Equal(t, "false",
[camel] branch CAMEL-19939/jbang-dependency-copy deleted (was 7ebe15faacd)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch CAMEL-19939/jbang-dependency-copy in repository https://gitbox.apache.org/repos/asf/camel.git was 7ebe15faacd CAMEL-19939: camel-jbang - dependency copy - Use camel-tooling-maven 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] branch main updated: CAMEL-19939: camel-jbang - dependency copy - Use camel-tooling-maven (#11643)
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 5df909910a3 CAMEL-19939: camel-jbang - dependency copy - Use camel-tooling-maven (#11643) 5df909910a3 is described below commit 5df909910a31aca7c7ab131f3ddb7ac56408248d Author: Nicolas Filotto AuthorDate: Wed Oct 4 14:09:32 2023 +0200 CAMEL-19939: camel-jbang - dependency copy - Use camel-tooling-maven (#11643) --- .../modules/ROOT/pages/camel-jbang.adoc| 1 - .../dsl/jbang/core/commands/DependencyCopy.java| 127 + 2 files changed, 52 insertions(+), 76 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index f3ab6737ffb..2b8ed14ae2b 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -2192,7 +2192,6 @@ org.apache.camel.kamelets:camel-kamelets:0.9.3 === Copying dependency JARs to a specific directory You can use the `camel dependency copy` command to copy the required JARs to a specific folder. -This command reuses Maven by invoking the `mvn dependency:copy-dependencies` command. IMPORTANT: The `camel dependency copy` and `camel dependency list` uses Apache Maven, This requires having Apache Maven installed, and `mvn` command in PATH environment, so Camel JBang diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCopy.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCopy.java index 6be4db2370d..57f60553f09 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCopy.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCopy.java @@ -16,21 +16,28 @@ */ package org.apache.camel.dsl.jbang.core.commands; -import java.io.File; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Properties; -import java.util.concurrent.TimeUnit; +import java.util.List; +import java.util.Set; -import org.apache.camel.dsl.jbang.core.common.RuntimeUtil; -import org.apache.camel.util.CamelCaseOrderedProperties; +import org.apache.camel.tooling.maven.MavenArtifact; +import org.apache.camel.tooling.maven.MavenDownloader; +import org.apache.camel.tooling.maven.MavenDownloaderImpl; +import org.apache.camel.tooling.maven.MavenGav; +import org.apache.camel.tooling.maven.MavenResolutionException; import org.apache.camel.util.FileUtil; import picocli.CommandLine; @CommandLine.Command(name = "copy", description = "Copies all Camel dependencies required to run to a specific directory") -public class DependencyCopy extends Export { +public class DependencyCopy extends DependencyList { +private static final Set EXCLUDED_GROUP_IDS = Set.of("org.fusesource.jansi", "org.apache.logging.log4j"); -protected static final String EXPORT_DIR = ".camel-jbang/export"; +private MavenDownloader downloader; @CommandLine.Option(names = { "--output-directory" }, description = "Directory where dependencies should be copied", defaultValue = "lib", required = true) @@ -40,83 +47,53 @@ public class DependencyCopy extends Export { super(main); } -@Override -public Integer doCall() throws Exception { -this.quiet = true; // be quiet and generate from fresh data to ensure the output is up-to-date -return super.doCall(); -} - -@Override -protected Integer export() throws Exception { -Integer answer = doExport(); -if (answer == 0) { -File buildDir = new File(EXPORT_DIR); -String outputDirectoryParameter = "-DoutputDirectory="; -if (Paths.get(outputDirectory).isAbsolute()) { -outputDirectoryParameter += outputDirectory; +private void createOutputDirectory() { +Path outputDirectoryPath = Paths.get(outputDirectory); +if (Files.exists(outputDirectoryPath)) { +if (Files.isDirectory(outputDirectoryPath)) { +FileUtil.removeDir(outputDirectoryPath.toFile()); } else { -outputDirectoryParameter += "../../" + outputDirectory; +System.err.println("Error creating the output directory: " + outputDirectory + + " is not a directory"); +return; } -Process p = Runtime.getRuntime() -.exec("mvn dependency:copy-dependencies -DincludeScope=compile
Re: [PR] CAMEL-19939: camel-jbang - dependency copy - Use camel-tooling-maven [camel]
davsclaus merged PR #11643: URL: https://github.com/apache/camel/pull/11643 -- 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 camel-main updated: Fixed azure tests
This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/camel-main by this push: new e534b88e3c Fixed azure tests e534b88e3c is described below commit e534b88e3c128b1a76da72fa1b9cf7c2e0dee0e3 Author: JiriOndrusek AuthorDate: Wed Oct 4 13:49:34 2023 +0200 Fixed azure tests --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 91439cb59f..8f5f31c8fb 100644 --- a/pom.xml +++ b/pom.xml @@ -208,7 +208,7 @@ docker.io/rmohr/activemq:5.15.9-alpine quay.io/artemiscloud/activemq-artemis-broker:1.0.20 docker.io/arangodb:3.11.2 - mcr.microsoft.com/azure-storage/azurite:3.25.0 + mcr.microsoft.com/azure-storage/azurite:3.26.0 quay.io/l2x6/calculator-ws:1.2 docker.io/cassandra:4.1.3 docker.io/hashicorp/consul:1.16
[camel-k] branch main updated: Added License headers to generated traits.yaml
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new f1b700cba Added License headers to generated traits.yaml f1b700cba is described below commit f1b700cba2dc88f95737b10b141a0bf2e6b95a71 Author: Andrea Cosentino AuthorDate: Wed Oct 4 13:08:05 2023 +0200 Added License headers to generated traits.yaml Signed-off-by: Andrea Cosentino --- pkg/resources/resources.go | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index f40cb53f1..e0ed8c96a 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -117,9 +117,9 @@ var assets = func() http.FileSystem { "/crd/bases/camel.apache.org_builds.yaml": ۰CompressedFileInfo{ name: "camel.apache.org_builds.yaml", modTime: time.Time{}, - uncompressedSize: 49805, + uncompressedSize: 91926, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6b\x73\x1b\x37\x96\xe8\x77\xfd\x8a\x53\xf1\x87\xc8\x55\x22\x95\x38\x33\x73\x73\x75\xeb\xd6\x96\x46\x4e\x32\x1a\xc7\x96\xd7\x94\x3d\x33\xb5\xb5\x55\x02\xbb\x0f\x49\x84\xdd\x40\x2f\x80\x16\xcd\xd9\xda\xff\xbe\x85\x57\x3f\xc8\x7e\x00\x14\x15\x67\x2a\xc4\x17\x5b\x6c\x3c\xce\x39\x38\x38\x2f\x1c\x00\x2f\x60\x72\xbc\x72\xf6\x02\x7e\xa6\x09\x32\x89\x29\x28\x0e\x6a\x85\x70\x5d\x90\x64\x85\x30\xe3\x0b\xb5\x21\x02\xe1\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6b\x73\x1b\x37\x96\xe8\x77\xfd\x8a\x53\xf1\x07\xcb\x55\x22\x35\xe3\xc9\xce\x66\x75\x6b\xeb\x96\x56\x4e\x66\x35\x4e\x6c\xaf\x29\x7b\x32\xb5\xb5\x55\x02\xbb\x0f\x49\x84\xdd\x40\x5f\x00\x2d\x9a\xb9\x75\xff\xfb\x2d\xbc\xfa\x21\xb2\xbb\x01\x8a\xf4\xa3\xd2\xf8\x92\x58\x44\x03\xe7\xe0\x71\xde\x38\xe7\x19\x4c\x8e\xd7\xce\x9e\xc1\xcf\x34\x41\x26\x31\x05\xc5\x41\xad\x10\xae\x0b\x92\xac\x10\x66\x7c\xa1\x36\x44\x20\xfc\x [...] }, "/crd/bases/camel.apache.org_camelcatalogs.yaml": ۰CompressedFileInfo{ name: "camel.apache.org_camelcatalogs.yaml", @@ -131,30 +131,30 @@ var assets = func() http.FileSystem { "/crd/bases/camel.apache.org_integrationkits.yaml": ۰CompressedFileInfo{ name: "camel.apache.org_integrationkits.yaml", modTime: time.Time{}, - uncompressedSize: 21596, + uncompressedSize: 23722, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3c\x5d\x73\xe3\x36\x92\xef\xfa\x15\x5d\xe3\x87\xb1\xab\x24\x79\x73\x97\x4a\x5d\x79\xb3\xa9\xf2\x3a\x93\xac\x6b\x3c\x33\xbe\x91\x27\xb9\xd4\x66\xab\xdc\x22\x5b\x12\x22\x12\x60\x00\x50\xb2\xee\xe3\xbf\x5f\xa1\x01\x50\x94\x44\x52\x1c\x39\xbe\xbd\x87\xe1\xcb\x8c\x49\xa0\xd1\x1f\xe8\x4f\x34\x74\x06\xa3\x3f\xee\x19\x9c\xc1\x9d\x48\x48\x1a\x4a\xc1\x2a\xb0\x0b\x82\xeb\x02\x93\x05\xc1\x44\xcd\xec\x1a\x35\xc1\x0f\xaa\x94\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7c\xeb\x6f\xeb\x36\x96\xf8\x77\xff\x15\x07\x37\x1f\x6e\x2e\x10\x3b\xd3\xdf\xaf\x28\x16\x99\x6e\x81\x4c\x7a\xdb\x09\xee\x2b\x9b\xe4\xb6\x18\x4c\x07\xf0\xb1\x74\x6c\xb3\x96\x48\x0d\x49\x39\xf1\x3e\xfe\xf7\x05\x0f\x49\x59\xb2\x25\x59\x71\x6e\x66\x3b\xbb\xf5\xa7\x44\x22\x0f\xcf\xfb\x45\x52\x27\x30\xfe\x72\xbf\xd1\x09\xbc\x17\x09\x49\x43\x29\x58\x05\x76\x49\x70\x59\x60\xb2\x24\xb8\x53\x73\xfb\x80\x9a\xe0\x07\x55\xca\x [...] }, "/crd/bases/camel.apache.org_integrationplatforms.yaml": ۰CompressedFileInfo{ name: "camel.apache.org_integrationplatforms.yaml", modTime: time.Time{}, - uncompressedSize: 192212, + uncompressedSize: 197164, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7d\x73\xdb\x36\xb6\x38\xfc\x7f\x3f\x05\xc6\x9d\x3b\x71\x32\x96\x94\xec\xde\xee\xf6\xfa\xde\xde\xe7\xe7\x3a\x69\xeb\x26\x8e\x7d\x6d\x27\xbb\x3b\x6d\xa7\x82\xc8\x23\x09\x35\x09\x70\x01\x50\xb6\x3a\xfb\xe1\x9f\xc1\x01\x40\x52\x12\x09\x52\x2f\xb6\xb3\x8d\x98\x99\xd6\x92\x48\xf0\x1c\xe0\xe0\xbc\xe1\xbc\x7c\x49\x7a\xbb\xbb\xbe\xf8\x92\xbc\x63\x11\x70\x05\x31\xd1\x82\xe8\x29\x90\x93\x8c\x46\x53\x20\xd7\x62\xac\xef\x [...] + compressedContent:
Re: [PR] Added License headers to generated traits.yaml [camel-k]
oscerd merged PR #4792: URL: https://github.com/apache/camel-k/pull/4792 -- 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] fix(ctrl): Change reconciliation of int in error [camel-k]
github-actions[bot] commented on PR #4793: URL: https://github.com/apache/camel-k/pull/4793#issuecomment-1746688697 :camel: **Thank you for contributing!** Code Coverage Report :heavy_check_mark: - Coverage unchanged. -- 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] fix(ctrl): Change reconciliation of int in error [camel-k]
gansheer opened a new pull request, #4793: URL: https://github.com/apache/camel-k/pull/4793 ## Description When the integration is in Error with the Kit condition in error, then if the integration kit referenced is still in error then finish the reconciliation process without any change to the integration. Fix the health trait to avoid panic errors. **Release Note** ```release-note Change reconciliation of integration in error ``` -- 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 (763440dd0d3 -> cd331591064)
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 763440dd0d3 License Maven Plugin: Remove deprecation and fixed configuration (#11642) add cd331591064 Upgrade Picocli to version 4.7.5 (#11641) No new revisions were added by this update. Summary of changes: parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel] branch CAMEL-19939/jbang-dependency-copy updated (6eae9d2e02f -> 7ebe15faacd)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch CAMEL-19939/jbang-dependency-copy in repository https://gitbox.apache.org/repos/asf/camel.git discard 6eae9d2e02f CAMEL-19939: camel-jbang - dependency copy - Use camel-tooling-maven add 7ebe15faacd CAMEL-19939: camel-jbang - dependency copy - Use camel-tooling-maven 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 (6eae9d2e02f) \ N -- N -- N refs/heads/CAMEL-19939/jbang-dependency-copy (7ebe15faacd) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/dsl/jbang/core/commands/DependencyCopy.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Re: [PR] Added License headers to generated traits.yaml [camel-k]
github-actions[bot] commented on PR #4792: URL: https://github.com/apache/camel-k/pull/4792#issuecomment-1746661498 :camel: **Thank you for contributing!** Code Coverage Report :heavy_check_mark: - Coverage unchanged. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch main updated: Upgrade Picocli to version 4.7.5 (#11641)
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 cd331591064 Upgrade Picocli to version 4.7.5 (#11641) cd331591064 is described below commit cd3315910649234b3e67fada38acadc6b5784552 Author: Andrea Cosentino AuthorDate: Wed Oct 4 13:11:49 2023 +0200 Upgrade Picocli to version 4.7.5 (#11641) Signed-off-by: Andrea Cosentino --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 221fe067c2c..7c0c031dc0f 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -375,7 +375,7 @@ 3.0.0 42.6.0 0.8.9 -4.7.4 +4.7.5 0.10.0 3.1.3 1.1.0
[camel] branch picocli-4.7.5 deleted (was 9138f7c1504)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch picocli-4.7.5 in repository https://gitbox.apache.org/repos/asf/camel.git was 9138f7c1504 Upgrade Picocli to version 4.7.5 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] Upgrade Picocli to version 4.7.5 [camel]
davsclaus merged PR #11641: URL: https://github.com/apache/camel/pull/11641 -- 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] Added License headers to generated traits.yaml [camel-k]
oscerd opened a new pull request, #4792: URL: https://github.com/apache/camel-k/pull/4792 **Release Note** ```release-note Added license header to generated traits.yaml ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch regen-source created (now f25cc1557)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch regen-source in repository https://gitbox.apache.org/repos/asf/camel-k.git at f25cc1557 Added License headers to generated traits.yaml This branch includes the following new commits: new f25cc1557 Added License headers to generated traits.yaml The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel-k] 01/01: Added License headers to generated traits.yaml
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch regen-source in repository https://gitbox.apache.org/repos/asf/camel-k.git commit f25cc15574788ebf516e031d4c633db1aa560a74 Author: Andrea Cosentino AuthorDate: Wed Oct 4 13:08:05 2023 +0200 Added License headers to generated traits.yaml Signed-off-by: Andrea Cosentino --- pkg/resources/resources.go | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index f40cb53f1..e0ed8c96a 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -117,9 +117,9 @@ var assets = func() http.FileSystem { "/crd/bases/camel.apache.org_builds.yaml": ۰CompressedFileInfo{ name: "camel.apache.org_builds.yaml", modTime: time.Time{}, - uncompressedSize: 49805, + uncompressedSize: 91926, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6b\x73\x1b\x37\x96\xe8\x77\xfd\x8a\x53\xf1\x87\xc8\x55\x22\x95\x38\x33\x73\x73\x75\xeb\xd6\x96\x46\x4e\x32\x1a\xc7\x96\xd7\x94\x3d\x33\xb5\xb5\x55\x02\xbb\x0f\x49\x84\xdd\x40\x2f\x80\x16\xcd\xd9\xda\xff\xbe\x85\x57\x3f\xc8\x7e\x00\x14\x15\x67\x2a\xc4\x17\x5b\x6c\x3c\xce\x39\x38\x38\x2f\x1c\x00\x2f\x60\x72\xbc\x72\xf6\x02\x7e\xa6\x09\x32\x89\x29\x28\x0e\x6a\x85\x70\x5d\x90\x64\x85\x30\xe3\x0b\xb5\x21\x02\xe1\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6b\x73\x1b\x37\x96\xe8\x77\xfd\x8a\x53\xf1\x07\xcb\x55\x22\x35\xe3\xc9\xce\x66\x75\x6b\xeb\x96\x56\x4e\x66\x35\x4e\x6c\xaf\x29\x7b\x32\xb5\xb5\x55\x02\xbb\x0f\x49\x84\xdd\x40\x5f\x00\x2d\x9a\xb9\x75\xff\xfb\x2d\xbc\xfa\x21\xb2\xbb\x01\x8a\xf4\xa3\xd2\xf8\x92\x58\x44\x03\xe7\xe0\x71\xde\x38\xe7\x19\x4c\x8e\xd7\xce\x9e\xc1\xcf\x34\x41\x26\x31\x05\xc5\x41\xad\x10\xae\x0b\x92\xac\x10\x66\x7c\xa1\x36\x44\x20\xfc\x [...] }, "/crd/bases/camel.apache.org_camelcatalogs.yaml": ۰CompressedFileInfo{ name: "camel.apache.org_camelcatalogs.yaml", @@ -131,30 +131,30 @@ var assets = func() http.FileSystem { "/crd/bases/camel.apache.org_integrationkits.yaml": ۰CompressedFileInfo{ name: "camel.apache.org_integrationkits.yaml", modTime: time.Time{}, - uncompressedSize: 21596, + uncompressedSize: 23722, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x3c\x5d\x73\xe3\x36\x92\xef\xfa\x15\x5d\xe3\x87\xb1\xab\x24\x79\x73\x97\x4a\x5d\x79\xb3\xa9\xf2\x3a\x93\xac\x6b\x3c\x33\xbe\x91\x27\xb9\xd4\x66\xab\xdc\x22\x5b\x12\x22\x12\x60\x00\x50\xb2\xee\xe3\xbf\x5f\xa1\x01\x50\x94\x44\x52\x1c\x39\xbe\xbd\x87\xe1\xcb\x8c\x49\xa0\xd1\x1f\xe8\x4f\x34\x74\x06\xa3\x3f\xee\x19\x9c\xc1\x9d\x48\x48\x1a\x4a\xc1\x2a\xb0\x0b\x82\xeb\x02\x93\x05\xc1\x44\xcd\xec\x1a\x35\xc1\x0f\xaa\x94\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7c\xeb\x6f\xeb\x36\x96\xf8\x77\xff\x15\x07\x37\x1f\x6e\x2e\x10\x3b\xd3\xdf\xaf\x28\x16\x99\x6e\x81\x4c\x7a\xdb\x09\xee\x2b\x9b\xe4\xb6\x18\x4c\x07\xf0\xb1\x74\x6c\xb3\x96\x48\x0d\x49\x39\xf1\x3e\xfe\xf7\x05\x0f\x49\x59\xb2\x25\x59\x71\x6e\x66\x3b\xbb\xf5\xa7\x44\x22\x0f\xcf\xfb\x45\x52\x27\x30\xfe\x72\xbf\xd1\x09\xbc\x17\x09\x49\x43\x29\x58\x05\x76\x49\x70\x59\x60\xb2\x24\xb8\x53\x73\xfb\x80\x9a\xe0\x07\x55\xca\x [...] }, "/crd/bases/camel.apache.org_integrationplatforms.yaml": ۰CompressedFileInfo{ name: "camel.apache.org_integrationplatforms.yaml", modTime: time.Time{}, - uncompressedSize: 192212, + uncompressedSize: 197164, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7d\x73\xdb\x36\xb6\x38\xfc\x7f\x3f\x05\xc6\x9d\x3b\x71\x32\x96\x94\xec\xde\xee\xf6\xfa\xde\xde\xe7\xe7\x3a\x69\xeb\x26\x8e\x7d\x6d\x27\xbb\x3b\x6d\xa7\x82\xc8\x23\x09\x35\x09\x70\x01\x50\xb6\x3a\xfb\xe1\x9f\xc1\x01\x40\x52\x12\x09\x52\x2f\xb6\xb3\x8d\x98\x99\xd6\x92\x48\xf0\x1c\xe0\xe0\xbc\xe1\xbc\x7c\x49\x7a\xbb\xbb\xbe\xf8\x92\xbc\x63\x11\x70\x05\x31\xd1\x82\xe8\x29\x90\x93\x8c\x46\x53\x20\xd7\x62\xac\xef\x [...] + compressedContent:
[camel] 01/01: CAMEL-19939: camel-jbang - dependency copy - Use camel-tooling-maven
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch CAMEL-19939/jbang-dependency-copy in repository https://gitbox.apache.org/repos/asf/camel.git commit 6eae9d2e02f120b1a4f4dddfb0d4b4cd9a58424d Author: Nicolas Filotto AuthorDate: Wed Oct 4 13:00:39 2023 +0200 CAMEL-19939: camel-jbang - dependency copy - Use camel-tooling-maven --- .../modules/ROOT/pages/camel-jbang.adoc| 1 - .../dsl/jbang/core/commands/DependencyCopy.java| 126 + 2 files changed, 51 insertions(+), 76 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc index f3ab6737ffb..2b8ed14ae2b 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc @@ -2192,7 +2192,6 @@ org.apache.camel.kamelets:camel-kamelets:0.9.3 === Copying dependency JARs to a specific directory You can use the `camel dependency copy` command to copy the required JARs to a specific folder. -This command reuses Maven by invoking the `mvn dependency:copy-dependencies` command. IMPORTANT: The `camel dependency copy` and `camel dependency list` uses Apache Maven, This requires having Apache Maven installed, and `mvn` command in PATH environment, so Camel JBang diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCopy.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCopy.java index 6be4db2370d..98679576686 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCopy.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyCopy.java @@ -16,21 +16,27 @@ */ package org.apache.camel.dsl.jbang.core.commands; -import java.io.File; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.file.Files; +import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Properties; -import java.util.concurrent.TimeUnit; +import java.util.List; +import java.util.Set; -import org.apache.camel.dsl.jbang.core.common.RuntimeUtil; -import org.apache.camel.util.CamelCaseOrderedProperties; +import org.apache.camel.tooling.maven.MavenArtifact; +import org.apache.camel.tooling.maven.MavenDownloader; +import org.apache.camel.tooling.maven.MavenDownloaderImpl; +import org.apache.camel.tooling.maven.MavenGav; +import org.apache.camel.tooling.maven.MavenResolutionException; import org.apache.camel.util.FileUtil; import picocli.CommandLine; @CommandLine.Command(name = "copy", description = "Copies all Camel dependencies required to run to a specific directory") -public class DependencyCopy extends Export { +public class DependencyCopy extends DependencyList { -protected static final String EXPORT_DIR = ".camel-jbang/export"; +private MavenDownloader downloader; @CommandLine.Option(names = { "--output-directory" }, description = "Directory where dependencies should be copied", defaultValue = "lib", required = true) @@ -40,83 +46,53 @@ public class DependencyCopy extends Export { super(main); } -@Override -public Integer doCall() throws Exception { -this.quiet = true; // be quiet and generate from fresh data to ensure the output is up-to-date -return super.doCall(); -} - -@Override -protected Integer export() throws Exception { -Integer answer = doExport(); -if (answer == 0) { -File buildDir = new File(EXPORT_DIR); -String outputDirectoryParameter = "-DoutputDirectory="; -if (Paths.get(outputDirectory).isAbsolute()) { -outputDirectoryParameter += outputDirectory; +private void createOutputDirectory() { +Path outputDirectoryPath = Paths.get(outputDirectory); +if (Files.exists(outputDirectoryPath)) { +if (Files.isDirectory(outputDirectoryPath)) { +FileUtil.removeDir(outputDirectoryPath.toFile()); } else { -outputDirectoryParameter += "../../" + outputDirectory; +System.err.println("Error creating the output directory: " + outputDirectory + + " is not a directory"); +return; } -Process p = Runtime.getRuntime() -.exec("mvn dependency:copy-dependencies -DincludeScope=compile -DexcludeGroupIds=org.fusesource.jansi,org.apache.logging.log4j " - + outputDirectoryParameter, -null, -buildDir); -boolean done = p.waitFor(60, TimeUnit.SECONDS); -if (!done) { -answer = 1; -} -if
[camel] branch CAMEL-19939/jbang-dependency-copy created (now 6eae9d2e02f)
This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a change to branch CAMEL-19939/jbang-dependency-copy in repository https://gitbox.apache.org/repos/asf/camel.git at 6eae9d2e02f CAMEL-19939: camel-jbang - dependency copy - Use camel-tooling-maven This branch includes the following new commits: new 6eae9d2e02f CAMEL-19939: camel-jbang - dependency copy - Use camel-tooling-maven The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] branch regen_bot updated (3d2b79b5c2a -> 763440dd0d3)
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 3d2b79b5c2a camel-jbang - Trace should show size of collection/array add 763440dd0d3 License Maven Plugin: Remove deprecation and fixed configuration (#11642) No new revisions were added by this update. Summary of changes: pom.xml | 306 ++-- 1 file changed, 162 insertions(+), 144 deletions(-)
[camel-k] 07/09: feat(trait): deprecate quarkus package-type
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit d8f8104a082c947b357f356c18cad8544051a0bd Author: Pasquale Congiusti AuthorDate: Wed Sep 27 11:52:24 2023 +0200 feat(trait): deprecate quarkus package-type This parameter exposed implementations details not user friendly. Enabling mode parameter which accept either `jvm` or `native` seems a better UX. --- .../bases/camel.apache.org_integrationkits.yaml| 30 +--- .../camel.apache.org_integrationplatforms.yaml | 52 + .../crd/bases/camel.apache.org_integrations.yaml | 22 -- .../bases/camel.apache.org_kameletbindings.yaml| 38 +++--- config/crd/bases/camel.apache.org_pipes.yaml | 38 +++--- docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 28 ++- docs/modules/traits/pages/quarkus.adoc | 15 +++- e2e/builder/build_test.go | 2 +- e2e/common/traits/builder_test.go | 8 +- .../catalog_builder_test.go| 32 +--- e2e/native/native_binding_test.go | 21 +- e2e/native/native_test.go | 18 ++--- e2e/native/native_test_support.go | 2 +- e2e/native/native_with_sources_test.go | 33 +++- e2e/support/test_support.go| 10 --- helm/camel-k/crds/crd-integration-kit.yaml | 30 +--- helm/camel-k/crds/crd-integration-platform.yaml| 52 + helm/camel-k/crds/crd-integration.yaml | 22 -- helm/camel-k/crds/crd-kamelet-binding.yaml | 38 +++--- helm/camel-k/crds/crd-pipe.yaml| 38 +++--- pkg/apis/camel/v1/integrationkit_types.go | 4 +- pkg/apis/camel/v1/integrationplatform_types.go | 1 + .../camel/v1/integrationplatform_types_support.go | 8 -- pkg/apis/camel/v1/trait/quarkus.go | 24 -- pkg/apis/camel/v1/trait/zz_generated.deepcopy.go | 5 ++ pkg/builder/image.go | 2 +- pkg/controller/build/build_monitor.go | 2 +- pkg/controller/build/build_monitor_test.go | 4 +- pkg/controller/integrationkit/build.go | 2 +- pkg/platform/defaults.go | 25 -- pkg/resources/resources.go | 45 --- pkg/trait/builder.go | 30 ++-- pkg/trait/builder_test.go | 28 ++- pkg/trait/camel_test.go| 2 +- pkg/trait/quarkus.go | 88 +++--- pkg/trait/trait_test.go| 4 +- resources/traits.yaml | 20 +++-- 37 files changed, 489 insertions(+), 334 deletions(-) diff --git a/config/crd/bases/camel.apache.org_integrationkits.yaml b/config/crd/bases/camel.apache.org_integrationkits.yaml index 359ef577c..f40c04244 100644 --- a/config/crd/bases/camel.apache.org_integrationkits.yaml +++ b/config/crd/bases/camel.apache.org_integrationkits.yaml @@ -311,12 +311,8 @@ spec: quarkus: description: 'The Quarkus trait configures the Quarkus runtime. It''s enabled by default. NOTE: Compiling to a native executable, - i.e. when using `package-type=native`, is only supported for - kamelets, as well as YAML and XML integrations. It also requires - at least 4GiB of memory, so the Pod running the native build, - that is either the operator Pod, or the build Pod (depending - on the build strategy configured for the platform), must have - enough memory available.' + requires at least 4GiB of memory, so the Pod running the native + build must have enough memory available.' properties: configuration: description: 'Legacy trait configuration parameters. Deprecated: @@ -327,19 +323,31 @@ spec: description: Can be used to enable or disable a trait. All traits share this common property. type: boolean + mode: +description: 'The Quarkus mode to run: either `jvm` or `native` + (default `jvm`). In case both `jvm` and `native` are specified, + two `IntegrationKit` resources are created, with the `native` + kit having precedence over the `jvm` one once ready.' +items: + description: QuarkusMode is the type of Quarkus build packaging. + enum: +
[camel-k] 02/09: chore(ctrl): get rid of dynamic builder image
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 084b771dbb53f26733dccd6e3498a2f3c9e5804e Author: Pasquale Congiusti AuthorDate: Mon Sep 25 12:43:38 2023 +0200 chore(ctrl): get rid of dynamic builder image It was introduced to decouple the operator from the runtime. No longer needed as the native phase is executed using catalog tool image directly. --- .../catalog_builder_test.go| 7 - e2e/install/cli/global_test.go | 7 - pkg/apis/camel/v1/camelcatalog_types.go| 2 +- pkg/controller/catalog/initialize.go | 539 + pkg/controller/integrationkit/build.go | 4 +- 5 files changed, 9 insertions(+), 550 deletions(-) diff --git a/e2e/commonwithcustominstall/catalog_builder_test.go b/e2e/commonwithcustominstall/catalog_builder_test.go index 0fe1061ed..436856c82 100644 --- a/e2e/commonwithcustominstall/catalog_builder_test.go +++ b/e2e/commonwithcustominstall/catalog_builder_test.go @@ -48,14 +48,7 @@ func TestCamelCatalogBuilder(t *testing.T) { Should(Equal(corev1.ConditionTrue)) catalogName := fmt.Sprintf("camel-catalog-%s", strings.ToLower(defaults.DefaultRuntimeVersion)) Eventually(CamelCatalog(ns, catalogName)).ShouldNot(BeNil()) - catalog := CamelCatalog(ns, catalogName)() - imageName := fmt.Sprintf("camel-k-runtime-%s-builder:%s", catalog.Spec.Runtime.Provider, strings.ToLower(catalog.Spec.Runtime.Version)) Eventually(CamelCatalogPhase(ns, catalogName), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady)) - Eventually(CamelCatalogImage(ns, catalogName), TestTimeoutMedium).Should(ContainSubstring(imageName)) - // The container may have been created by previous test - Eventually(CamelCatalogCondition(ns, catalogName, v1.CamelCatalogConditionReady)().Message).Should( - Or(Equal("Container image successfully built"), Equal("Container image exists on registry")), - ) // Run an integration with a catalog not compatible // The operator should create the catalog, but fail on reconciliation as it is not compatible diff --git a/e2e/install/cli/global_test.go b/e2e/install/cli/global_test.go index 479264255..27ad16159 100644 --- a/e2e/install/cli/global_test.go +++ b/e2e/install/cli/global_test.go @@ -66,14 +66,7 @@ func TestRunGlobalInstall(t *testing.T) { Should(Equal(corev1.ConditionTrue)) catalogName := fmt.Sprintf("camel-catalog-%s", strings.ToLower(defaults.DefaultRuntimeVersion)) Eventually(CamelCatalog(operatorNamespace, catalogName)).ShouldNot(BeNil()) - catalog := CamelCatalog(operatorNamespace, catalogName)() - imageName := fmt.Sprintf("camel-k-runtime-%s-builder:%s", catalog.Spec.Runtime.Provider, strings.ToLower(catalog.Spec.Runtime.Version)) Eventually(CamelCatalogPhase(operatorNamespace, catalogName), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady)) - Eventually(CamelCatalogImage(operatorNamespace, catalogName), TestTimeoutMedium).Should(ContainSubstring(imageName)) - // The container may have been created by previous test - Eventually(CamelCatalogCondition(operatorNamespace, catalogName, v1.CamelCatalogConditionReady)().Message).Should( - Or(Equal("Container image successfully built"), Equal("Container image exists on registry")), - ) }) t.Run("Global test on namespace with platform", func(t *testing.T) { diff --git a/pkg/apis/camel/v1/camelcatalog_types.go b/pkg/apis/camel/v1/camelcatalog_types.go index 9b38eb98b..5b83f378c 100644 --- a/pkg/apis/camel/v1/camelcatalog_types.go +++ b/pkg/apis/camel/v1/camelcatalog_types.go @@ -67,7 +67,7 @@ type CamelCatalogSpec struct { Loaders map[string]CamelLoader `json:"loaders" yaml:"loaders"` } -// CamelCatalogStatus defines the observed state of CamelCatalog. As the catalog is a static resource, we expect it to be empty. +// CamelCatalogStatus defines the observed state of CamelCatalog. type CamelCatalogStatus struct { // ObservedGeneration is the most recent generation observed for this Catalog. ObservedGeneration int64 `json:"observedGeneration,omitempty"` diff --git a/pkg/controller/catalog/initialize.go b/pkg/controller/catalog/initialize.go index a80712e65..20cd365d7 100644 --- a/pkg/controller/catalog/initialize.go +++ b/pkg/controller/catalog/initialize.go @@ -18,45 +18,10 @@ limitations under the License. package catalog
[camel-k] 09/09: fix(e2e): rename quarkus.mode to build-mode
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit aee0c5f9cfbff5f8363bb5d8d06775c3c19fe72f Author: Pasquale Congiusti AuthorDate: Wed Oct 4 10:38:17 2023 +0200 fix(e2e): rename quarkus.mode to build-mode It seems that usage of `mode` create some problem when unmarshalling the CRD --- .../bases/camel.apache.org_integrationkits.yaml| 22 +-- .../camel.apache.org_integrationplatforms.yaml | 44 +++--- .../crd/bases/camel.apache.org_integrations.yaml | 22 +-- .../bases/camel.apache.org_kameletbindings.yaml| 22 +-- config/crd/bases/camel.apache.org_pipes.yaml | 22 +-- docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 6 +-- docs/modules/traits/pages/quarkus.adoc | 6 +-- e2e/builder/build_test.go | 2 +- e2e/native/native_binding_test.go | 2 +- e2e/native/native_test.go | 10 ++--- e2e/native/native_with_sources_test.go | 10 ++--- helm/camel-k/crds/crd-integration-kit.yaml | 22 +-- helm/camel-k/crds/crd-integration-platform.yaml| 44 +++--- helm/camel-k/crds/crd-integration.yaml | 22 +-- helm/camel-k/crds/crd-kamelet-binding.yaml | 22 +-- helm/camel-k/crds/crd-pipe.yaml| 22 +-- pkg/apis/camel/v1/trait/quarkus.go | 6 +-- resources/traits.yaml | 6 +-- 18 files changed, 156 insertions(+), 156 deletions(-) diff --git a/config/crd/bases/camel.apache.org_integrationkits.yaml b/config/crd/bases/camel.apache.org_integrationkits.yaml index b796bc8f4..2a42beee8 100644 --- a/config/crd/bases/camel.apache.org_integrationkits.yaml +++ b/config/crd/bases/camel.apache.org_integrationkits.yaml @@ -314,16 +314,7 @@ spec: requires at least 4GiB of memory, so the Pod running the native build must have enough memory available.' properties: - configuration: -description: 'Legacy trait configuration parameters. Deprecated: - for backward compatibility.' -type: object -x-kubernetes-preserve-unknown-fields: true - enabled: -description: Can be used to enable or disable a trait. All - traits share this common property. -type: boolean - mode: + buildMode: description: 'The Quarkus mode to run: either `jvm` or `native` (default `jvm`). In case both `jvm` and `native` are specified, two `IntegrationKit` resources are created, with the `native` @@ -335,6 +326,15 @@ spec: - native type: string type: array + configuration: +description: 'Legacy trait configuration parameters. Deprecated: + for backward compatibility.' +type: object +x-kubernetes-preserve-unknown-fields: true + enabled: +description: Can be used to enable or disable a trait. All + traits share this common property. +type: boolean packageTypes: description: 'The Quarkus package types, `fast-jar` or `native` (default `fast-jar`). In case both `fast-jar` and `native` @@ -344,7 +344,7 @@ spec: current kit for the integration. The kit corresponding to the first package type will be assigned to the integration in case no existing kit that matches the integration exists. - Deprecated: use `mode` instead.' + Deprecated: use `build-mode` instead.' items: description: 'QuarkusPackageType is the type of Quarkus build packaging. Deprecated: use `QuarkusMode` instead.' diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml index 39827cdd4..0f473b801 100644 --- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -1607,16 +1607,7 @@ spec: quarkus: description: The configuration of Quarkus trait properties: -
[camel-k] 06/09: feat(pipeline): configure requests and limits for all tasks
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 889c4938f5250ab9f8fbd41d416710c11f3bd9a2 Author: Pasquale Congiusti AuthorDate: Tue Sep 26 15:31:02 2023 +0200 feat(pipeline): configure requests and limits for all tasks --- config/crd/bases/camel.apache.org_builds.yaml | 258 + .../bases/camel.apache.org_integrationkits.yaml| 46 +++- .../camel.apache.org_integrationplatforms.yaml | 92 ++-- .../crd/bases/camel.apache.org_integrations.yaml | 46 +++- .../bases/camel.apache.org_kameletbindings.yaml| 46 +++- config/crd/bases/camel.apache.org_pipes.yaml | 46 +++- docs/modules/ROOT/pages/pipeline/pipeline.adoc | 2 + docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 52 - docs/modules/traits/pages/builder.adoc | 22 +- helm/camel-k/crds/crd-build.yaml | 258 + helm/camel-k/crds/crd-integration-kit.yaml | 46 +++- helm/camel-k/crds/crd-integration-platform.yaml| 92 ++-- helm/camel-k/crds/crd-integration.yaml | 46 +++- helm/camel-k/crds/crd-kamelet-binding.yaml | 46 +++- helm/camel-k/crds/crd-pipe.yaml| 46 +++- pkg/apis/camel/v1/build_types.go | 4 +- pkg/apis/camel/v1/build_types_support.go | 33 ++- pkg/apis/camel/v1/trait/builder.go | 14 +- pkg/apis/camel/v1/trait/zz_generated.deepcopy.go | 20 ++ pkg/apis/camel/v1/zz_generated.deepcopy.go | 2 +- .../camel/applyconfiguration/camel/v1/basetask.go | 11 +- .../applyconfiguration/camel/v1/buildahtask.go | 8 + .../applyconfiguration/camel/v1/buildertask.go | 15 +- .../camel/applyconfiguration/camel/v1/jibtask.go | 8 + .../applyconfiguration/camel/v1/kanikotask.go | 8 + .../camel/applyconfiguration/camel/v1/s2itask.go | 8 + .../applyconfiguration/camel/v1/spectrumtask.go| 8 + .../camel/applyconfiguration/camel/v1/usertask.go | 8 + pkg/controller/build/build_monitor_test.go | 12 +- pkg/controller/build/build_pod.go | 9 +- pkg/controller/integrationkit/build.go | 2 +- pkg/resources/resources.go | 28 +-- pkg/trait/builder.go | 149 pkg/trait/builder_test.go | 33 ++- resources/traits.yaml | 34 ++- 35 files changed, 1343 insertions(+), 215 deletions(-) diff --git a/config/crd/bases/camel.apache.org_builds.yaml b/config/crd/bases/camel.apache.org_builds.yaml index 0ff027d69..08a6cc213 100644 --- a/config/crd/bases/camel.apache.org_builds.yaml +++ b/config/crd/bases/camel.apache.org_builds.yaml @@ -148,6 +148,49 @@ spec: baseImage: description: base image layer type: string +configuration: + description: The configuration that should be used to perform +the Build. + properties: +limitCPU: + description: The maximum amount of CPU required. Only +used for `pod` strategy + type: string +limitMemory: + description: The maximum amount of memory required. +Only used for `pod` strategy + type: string +operatorNamespace: + description: The namespace where to run the builder +Pod (must be the same of the operator in charge of +this Build reconciliation). + type: string +orderStrategy: + description: the build order strategy to adopt + enum: + - dependencies + - fifo + - sequential + type: string +requestCPU: + description: The minimum amount of CPU required. Only +used for `pod` strategy + type: string +requestMemory: + description: The minimum amount of memory required. +Only used for `pod` strategy + type: string +strategy: + description: the strategy to adopt + enum: + -
[camel-k] 01/09: feat: Quarkus native source
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 4de6cc3f6cc6a4726c5023cbfb7574d1d90cdec1 Author: Pasquale Congiusti AuthorDate: Fri Sep 22 14:39:25 2023 +0200 feat: Quarkus native source * Move the previous logic to native-source package type * A new task takes care to trigger a pipeline task to run Native Image * Split the builder task into 2 tasks - builder takes care of the building part (mvn package) - package task does the packaging (after custom tasks) Ref #4648 --- config/crd/bases/camel.apache.org_builds.yaml | 513 - .../bases/camel.apache.org_integrationkits.yaml| 22 +- .../camel.apache.org_integrationplatforms.yaml | 44 +- .../crd/bases/camel.apache.org_integrations.yaml | 22 +- .../bases/camel.apache.org_kameletbindings.yaml| 23 +- config/crd/bases/camel.apache.org_pipes.yaml | 23 +- .../pages/installation/advanced/build-config.adoc | 2 +- docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 46 +- docs/modules/traits/pages/quarkus.adoc | 12 +- helm/camel-k/crds/crd-build.yaml | 513 - helm/camel-k/crds/crd-integration-kit.yaml | 22 +- helm/camel-k/crds/crd-integration-platform.yaml| 44 +- helm/camel-k/crds/crd-integration.yaml | 22 +- helm/camel-k/crds/crd-kamelet-binding.yaml | 23 +- helm/camel-k/crds/crd-pipe.yaml| 23 +- pkg/apis/camel/v1/build_types.go | 16 +- pkg/apis/camel/v1/trait/quarkus.go | 23 +- pkg/apis/camel/v1/zz_generated.deepcopy.go | 20 +- pkg/builder/builder.go | 17 +- pkg/builder/image.go | 3 +- pkg/builder/spectrum.go| 2 + pkg/builder/tasks.go | 30 ++ .../camel/applyconfiguration/camel/v1/task.go | 27 +- .../camel/applyconfiguration/camel/v1/usertask.go | 15 +- pkg/controller/build/build_pod.go | 13 +- pkg/controller/build/monitor_routine.go| 33 +- pkg/resources/resources.go | 28 +- pkg/trait/builder.go | 70 ++- pkg/trait/builder_test.go | 91 +++- pkg/trait/quarkus.go | 67 +-- pkg/trait/quarkus_test.go | 8 +- pkg/trait/util.go | 9 + resources/traits.yaml | 21 +- 33 files changed, 1566 insertions(+), 281 deletions(-) diff --git a/config/crd/bases/camel.apache.org_builds.yaml b/config/crd/bases/camel.apache.org_builds.yaml index 9efe73a2d..0ff027d69 100644 --- a/config/crd/bases/camel.apache.org_builds.yaml +++ b/config/crd/bases/camel.apache.org_builds.yaml @@ -189,8 +189,7 @@ spec: type: boolean type: object builder: - description: a BuilderTask, used to generate and package the -project + description: a BuilderTask, used to generate and build the project properties: baseImage: description: the base image layer @@ -688,12 +687,17 @@ spec: type: array type: object custom: - description: UserTask is used to execute any generic custom -operation. + description: User customizable task execution. These are executed +after the build and before the package task. properties: command: - description: the command to execute + description: 'the command to execute Deprecated: use ContainerCommands' type: string +commands: + description: the command to execute + items: +type: string + type: array image: description: the container image to use type: string @@ -792,6 +796,505 @@ spec: description: log more information type: boolean type: object +package: + description: Application pre publishing a PackageTask, used +to package the project + properties: +baseImage: + description: the base image layer +
[camel-k] 04/09: fix(ci): lint complains
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 9ebf9f6b75a5e67d6659c1f1811f90511377f9fa Author: Pasquale Congiusti AuthorDate: Tue Sep 26 09:39:11 2023 +0200 fix(ci): lint complains --- pkg/builder/image.go | 2 +- pkg/builder/tasks.go | 6 +++--- pkg/trait/builder.go | 10 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/builder/image.go b/pkg/builder/image.go index c6bc6d9b8..1ea9a4983 100644 --- a/pkg/builder/image.go +++ b/pkg/builder/image.go @@ -50,7 +50,7 @@ type imageSteps struct { JvmDockerfile Step } -// Image used to export the steps available on an Image building process +// Image used to export the steps available on an Image building process. var Image = imageSteps{ IncrementalImageContext: NewStep(ApplicationPackagePhase, incrementalImageContext), NativeImageContext: NewStep(ApplicationPackagePhase, nativeImageContext), diff --git a/pkg/builder/tasks.go b/pkg/builder/tasks.go index 3b35e2db2..c61a8df2f 100644 --- a/pkg/builder/tasks.go +++ b/pkg/builder/tasks.go @@ -24,7 +24,7 @@ import ( v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" ) -// Build convert the Build CR in a struct that can be executable as an operator routing +// Build convert the Build CR in a struct that can be executable as an operator routine. func (b *Builder) Build(build *v1.Build) *Build { return { builder: *b, @@ -32,7 +32,7 @@ func (b *Builder) Build(build *v1.Build) *Build { } } -// Task convert the task in a routine task which can be executed inside operator +// Task convert the task in a routine task which can be executed inside operator. func (b *Build) Task(task v1.Task) Task { switch { case task.Builder != nil: @@ -129,7 +129,7 @@ func (t *unsupportedTask) Do(_ context.Context) v1.BuildStatus { var _ Task = {} -// TaskByName return the task identified by the name parameter +// TaskByName return the task identified by the name parameter. func (b *Build) TaskByName(name string) Task { for _, task := range b.build.Spec.Tasks { switch { diff --git a/pkg/trait/builder.go b/pkg/trait/builder.go index c8a514208..e59ee7da5 100644 --- a/pkg/trait/builder.go +++ b/pkg/trait/builder.go @@ -377,15 +377,15 @@ func getImageName(e *Environment) string { } func (t *builderTrait) customTasks() ([]v1.Task, error) { - customTasks := make([]v1.Task, len(t.Tasks), len(t.Tasks)) + customTasks := make([]v1.Task, len(t.Tasks)) for i, t := range t.Tasks { splitted := strings.Split(t, ";") if len(splitted) < 3 { - return nil, fmt.Errorf(`You need to provide a custom task with at least 3 arguments, ie "my-task-name;my-image;echo 'hello', was %v"`, t) + return nil, fmt.Errorf(`provide a custom task with at least 3 arguments, ie "my-task-name;my-image;echo 'hello', was %v"`, t) } var containerCommand string if len(splitted) > 3 { - //recompose in case of usage of separator char in the script + // recompose in case of usage of separator char in the script containerCommand = strings.Join(splitted[2:], ";") } else { containerCommand = splitted[2] @@ -405,12 +405,12 @@ func (t *builderTrait) customTasks() ([]v1.Task, error) { } // we may get a command in the following format `/bin/bash -c "ls && echo 'hello'` -// which should provide a string with {"/bin/bash", "-c", "ls && echo 'hello'"} +// which should provide a string with {"/bin/bash", "-c", "ls && echo 'hello'"}. func splitContainerCommand(command string) []string { matches := commandsRegexp.FindAllString(command, -1) removeQuotes := make([]string, 0, len(matches)) for _, m := range matches { - removeQuotes = append(removeQuotes, strings.Replace(m, "\"", "", -1)) + removeQuotes = append(removeQuotes, strings.ReplaceAll(m, "\"", "")) } return removeQuotes
[camel-k] 08/09: fix(trait): run old native process for runtime pre 3.5.0
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git commit de0d1af6345a11106ef9207f32fa3e5debd53039 Author: Pasquale Congiusti AuthorDate: Mon Oct 2 16:43:57 2023 +0200 fix(trait): run old native process for runtime pre 3.5.0 --- .../bases/camel.apache.org_integrationkits.yaml| 1 - .../camel.apache.org_integrationplatforms.yaml | 2 - .../crd/bases/camel.apache.org_integrations.yaml | 1 - .../bases/camel.apache.org_kameletbindings.yaml| 1 - config/crd/bases/camel.apache.org_pipes.yaml | 1 - docs/modules/ROOT/pages/pipeline/pipeline.adoc | 2 +- e2e/common/traits/builder_test.go | 5 +- .../catalog_builder_test.go| 6 +- e2e/native/native_test.go | 12 +-- e2e/native/native_with_sources_test.go | 12 ++- helm/camel-k/crds/crd-integration-kit.yaml | 1 - helm/camel-k/crds/crd-integration-platform.yaml| 2 - helm/camel-k/crds/crd-integration.yaml | 1 - helm/camel-k/crds/crd-kamelet-binding.yaml | 1 - helm/camel-k/crds/crd-pipe.yaml| 1 - pkg/apis/camel/v1/trait/quarkus.go | 2 +- pkg/builder/image.go | 2 +- pkg/builder/runtime_support.go | 91 ++ pkg/trait/builder.go | 10 +-- pkg/trait/builder_test.go | 9 ++- pkg/trait/quarkus.go | 9 ++- 21 files changed, 127 insertions(+), 45 deletions(-) diff --git a/config/crd/bases/camel.apache.org_integrationkits.yaml b/config/crd/bases/camel.apache.org_integrationkits.yaml index f40c04244..b796bc8f4 100644 --- a/config/crd/bases/camel.apache.org_integrationkits.yaml +++ b/config/crd/bases/camel.apache.org_integrationkits.yaml @@ -350,7 +350,6 @@ spec: build packaging. Deprecated: use `QuarkusMode` instead.' enum: - fast-jar - - native-sources - native type: string type: array diff --git a/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/config/crd/bases/camel.apache.org_integrationplatforms.yaml index b11b568ed..39827cdd4 100644 --- a/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -1643,7 +1643,6 @@ spec: build packaging. Deprecated: use `QuarkusMode` instead.' enum: - fast-jar - - native-sources - native type: string type: array @@ -3457,7 +3456,6 @@ spec: build packaging. Deprecated: use `QuarkusMode` instead.' enum: - fast-jar - - native-sources - native type: string type: array diff --git a/config/crd/bases/camel.apache.org_integrations.yaml b/config/crd/bases/camel.apache.org_integrations.yaml index e59cb1c45..21eb27225 100644 --- a/config/crd/bases/camel.apache.org_integrations.yaml +++ b/config/crd/bases/camel.apache.org_integrations.yaml @@ -7560,7 +7560,6 @@ spec: build packaging. Deprecated: use `QuarkusMode` instead.' enum: - fast-jar - - native-sources - native type: string type: array diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml b/config/crd/bases/camel.apache.org_kameletbindings.yaml index abde245c9..f51b72726 100644 --- a/config/crd/bases/camel.apache.org_kameletbindings.yaml +++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml @@ -7858,7 +7858,6 @@ spec: build packaging. Deprecated: use `QuarkusMode` instead.' enum: - fast-jar - - native-sources - native type: string type: array diff --git a/config/crd/bases/camel.apache.org_pipes.yaml b/config/crd/bases/camel.apache.org_pipes.yaml index a8a40da19..f58e4be83 100644 --- a/config/crd/bases/camel.apache.org_pipes.yaml +++ b/config/crd/bases/camel.apache.org_pipes.yaml @@ -7855,7 +7855,6 @@ spec: build packaging. Deprecated: use `QuarkusMode` instead.' enum: -