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-1780318319 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 6648572528-1281-a49e2be9-6d42-4adc-985b-48be0c6c342c * Camel Quarkus Commit: d26099a738464527049d85262c9aa9a8d85c5cd3 * Quarkus Main Commit: 9f52c497c886678b1a291701df165044c59b04a7 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/6648572528 -- 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 (a6b9d64a -> cd99698b)
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 a6b9d64a Update README.md new 40d3914d Kamelet Editor in App for #315 new cd99698b Readme 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: README.md | 9 +- docs/ARCHITECTURE.md | 39 images/karavan-architecture.png| Bin 0 -> 46631 bytes .../webui/src/knowledgebase/KnowledgebasePage.tsx | 22 + .../karavan-app/src/main/webui/src/main/Main.tsx | 6 +- .../src/main/webui/src/project/ProjectPage.tsx | 2 +- .../webui/src/project/files/CreateFileModal.tsx| 99 + 7 files changed, 138 insertions(+), 39 deletions(-) create mode 100644 docs/ARCHITECTURE.md create mode 100644 images/karavan-architecture.png
[camel-karavan] 01/02: Kamelet Editor in App for #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 40d3914dd74b219fbd17e3a07780714a1f0d3172 Author: Marat Gubaidullin AuthorDate: Wed Oct 25 20:42:16 2023 -0400 Kamelet Editor in App for #315 --- .../webui/src/knowledgebase/KnowledgebasePage.tsx | 22 + .../karavan-app/src/main/webui/src/main/Main.tsx | 6 +- .../src/main/webui/src/project/ProjectPage.tsx | 2 +- .../webui/src/project/files/CreateFileModal.tsx| 99 ++ 4 files changed, 91 insertions(+), 38 deletions(-) diff --git a/karavan-web/karavan-app/src/main/webui/src/knowledgebase/KnowledgebasePage.tsx b/karavan-web/karavan-app/src/main/webui/src/knowledgebase/KnowledgebasePage.tsx index 35368b54..02c6b641 100644 --- a/karavan-web/karavan-app/src/main/webui/src/knowledgebase/KnowledgebasePage.tsx +++ b/karavan-web/karavan-app/src/main/webui/src/knowledgebase/KnowledgebasePage.tsx @@ -16,21 +16,7 @@ */ import React, {useState} from 'react'; import '../designer/karavan.css'; -import { -Button, -Flex, -FlexItem, -PageSection, -Switch, -Tab, -Tabs, -Text, -TextContent, -TextInput, -Toolbar, -ToolbarContent, -ToolbarItem -} from "@patternfly/react-core"; +import {Flex, FlexItem, PageSection, Switch, Tab, Tabs, Text, TextContent, TextInput, Toolbar, ToolbarContent, ToolbarItem} from "@patternfly/react-core"; import {MainToolbar} from "../designer/MainToolbar"; import {KameletsTab} from "./kamelets/KameletsTab"; import {EipTab} from "./eip/EipTab"; @@ -38,7 +24,6 @@ import {ComponentsTab} from "./components/ComponentsTab"; interface Props { dark: boolean, -onKameletsReload? (): void; } export const KnowledgebasePage = (props: Props) => { @@ -56,11 +41,6 @@ export const KnowledgebasePage = (props: Props) => { function getTools() { return -{tab === 'kamelets' && - props.onKameletsReload?.()} ->Reload -} {tab === 'kamelets' && +}/> +, []); + return ( {showSpinner() && diff --git a/karavan-web/karavan-app/src/main/webui/src/project/ProjectPage.tsx b/karavan-web/karavan-app/src/main/webui/src/project/ProjectPage.tsx index 1df4f70e..43feee58 100644 --- a/karavan-web/karavan-app/src/main/webui/src/project/ProjectPage.tsx +++ b/karavan-web/karavan-app/src/main/webui/src/project/ProjectPage.tsx @@ -65,7 +65,7 @@ export function ProjectPage() { } const buildIn = isBuildIn(); - +console.log("Project refresh") const showFilePanel = file !== undefined && operation === 'select'; return ( diff --git a/karavan-web/karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx b/karavan-web/karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx index 60723466..53473734 100644 --- a/karavan-web/karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx +++ b/karavan-web/karavan-app/src/main/webui/src/project/files/CreateFileModal.tsx @@ -22,7 +22,9 @@ import { FormGroup, ModalVariant, Form, -ToggleGroupItem, ToggleGroup, FormHelperText, HelperText, HelperTextItem, TextInput +ToggleGroupItem, ToggleGroup, FormHelperText, HelperText, HelperTextItem, TextInput, Select, +SelectOption, +SelectList, MenuToggleElement, MenuToggle, TextInputGroup, TextInputGroupMain, TextInputGroupUtilities, } from '@patternfly/react-core'; import '../../designer/karavan.css'; import {Integration, KameletTypes, MetadataLabels} from "karavan-core/lib/model/IntegrationDefinition"; @@ -33,19 +35,23 @@ import {CamelUi} from "../../designer/utils/CamelUi"; import {ProjectService} from "../../api/ProjectService"; import {shallow} from "zustand/shallow"; import {CamelUtil} from "karavan-core/lib/api/CamelUtil"; +import {KameletApi} from "karavan-core/lib/api/KameletApi"; interface Props { types: string[], isKameletsProject: boolean } -export function CreateFileModal (props: Props) { +export function CreateFileModal(props: Props) { const [project] = useProjectStore((s) => [s.project], shallow); const [operation, setFile] = useFileStore((s) => [s.operation, s.setFile], shallow); -const [name, setName] = useState( ''); +const [name, setName] = useState(''); const [fileType, setFileType] = useState(); const [kameletType, setKameletType] = useState('source'); +const [inputValue, setInputValue] = useState(); +const [selectIsOpen, setSelectIsOpen] = useState(false); +const [selectedKamelet, setSelectedKamelet] = useState<[string, string]>(['', '']); useEffect(() => { if (props.types.length > 0) { @@ -53,12 +59,12 @@ export function CreateFileModal (props: Props) { } }, [props]); -
[camel-karavan] 02/02: Readme update
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 cd99698b44eeb06a7a73fd93657eae72b6733569 Author: Marat Gubaidullin AuthorDate: Wed Oct 25 20:59:29 2023 -0400 Readme update --- README.md | 9 - docs/ARCHITECTURE.md| 39 +++ images/karavan-architecture.png | Bin 0 -> 46631 bytes 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 74d56da1..0ce664f0 100644 --- a/README.md +++ b/README.md @@ -55,6 +55,13 @@ Karavan provides VS Code extension for local developer experience * [Openshift](docs/WEB_OPENSHIFT.md) ### Developer guide -[How to build Karavan](docs/DEV.md) +* [Architecture](docs/ARCHITECTURE.md) +* [How to build](docs/DEV.md) + +### Feedback If you haven't done so yet, please be sure to download Karavan and give it a try. We're excited to receive your feedback and learn about your experiences! + +* [Ask questions](https://github.com/apache/camel-karavan/discussions) +* [Open Issues](https://github.com/apache/camel-karavan/issues) + diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md new file mode 100644 index ..6362e271 --- /dev/null +++ b/docs/ARCHITECTURE.md @@ -0,0 +1,39 @@ +## Apache Camel Karavan Architecture + +![How to use](../images/karavan-architecture.png) + +### Karavan components + + Web application + +End-user application to interact with. + + Infinispan + +Karavan keeps all project files and monitoring data in Infinispan Caches + + Karavan run + +Container created by Karavan application to run project in developer mode. +Container uses `apache/camel-karavan-devmode` image to run. + + Karavan build + +Container created by Karavan application to build and deploy project. +Container uses `apache/camel-karavan-devmode` image to run. + + Git repository + +All Karavan projects and build scripts stored in Git repository. + + Image Registry + +Karavan Build push images to Image registry configured + + Maven Repository + +Karavan run and build use Maven repository to get dependencies. + + Integrations + +Running integration microservices diff --git a/images/karavan-architecture.png b/images/karavan-architecture.png new file mode 100644 index ..cce331d2 Binary files /dev/null and b/images/karavan-architecture.png differ
[camel-k] branch dependabot/go_modules/github.com/onsi/gomega-1.29.0 created (now 3f84d3701)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/github.com/onsi/gomega-1.29.0 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 3f84d3701 chore(deps): bump github.com/onsi/gomega from 1.28.0 to 1.29.0 No new revisions were added by this update.
[PR] chore(deps): bump github.com/onsi/gomega from 1.28.0 to 1.29.0 [camel-k]
dependabot[bot] opened a new pull request, #4866: URL: https://github.com/apache/camel-k/pull/4866 Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.28.0 to 1.29.0. Release notes Sourced from https://github.com/onsi/gomega/releases;>github.com/onsi/gomega's releases. v1.29.0 1.29.0 Features MatchError can now take an optional func(error) bool + description [2b39142] v1.28.1 1.28.1 Maintenance Bump github.com/onsi/ginkgo/v2 from 2.12.0 to 2.13.0 [635d196] Bump github.com/google/go-cmp from 0.5.9 to 0.6.0 [14f8859] Bump golang.org/x/net from 0.14.0 to 0.17.0 [d8a6508] https://redirect.github.com/onsi/gomega/issues/703;>#703 doc(matchers): HaveEach() doc comment updated [2705bdb] Minor typos (https://redirect.github.com/onsi/gomega/issues/699;>#699) [375648c] Changelog Sourced from https://github.com/onsi/gomega/blob/master/CHANGELOG.md;>github.com/onsi/gomega's changelog. 1.29.0 Features MatchError can now take an optional func(error) bool + description [2b39142] 1.28.1 Maintenance Bump github.com/onsi/ginkgo/v2 from 2.12.0 to 2.13.0 [635d196] Bump github.com/google/go-cmp from 0.5.9 to 0.6.0 [14f8859] Bump golang.org/x/net from 0.14.0 to 0.17.0 [d8a6508] https://redirect.github.com/onsi/gomega/issues/703;>#703 doc(matchers): HaveEach() doc comment updated [2705bdb] Minor typos (https://redirect.github.com/onsi/gomega/issues/699;>#699) [375648c] Commits https://github.com/onsi/gomega/commit/b94b19531bbbae5035bea1f743bf19429d55d810;>b94b195 v1.29.0 https://github.com/onsi/gomega/commit/2b39142b16e69fa9405d5c7401dc62a5776a9bf5;>2b39142 MatchError can now take an optional func(error) bool + description https://github.com/onsi/gomega/commit/ab6045cc633540de49e604523abe5f45927b630d;>ab6045c v1.28.1 https://github.com/onsi/gomega/commit/635d196963ae7175cd2d66ac36f7120a958a1ff2;>635d196 Bump github.com/onsi/ginkgo/v2 from 2.12.0 to 2.13.0 https://github.com/onsi/gomega/commit/14f885915f3b7b194fceacd0d185897e77464c01;>14f8859 Bump github.com/google/go-cmp from 0.5.9 to 0.6.0 https://github.com/onsi/gomega/commit/d8a65088ea144abd6d2985412a8182a753549f3b;>d8a6508 Bump golang.org/x/net from 0.14.0 to 0.17.0 https://github.com/onsi/gomega/commit/2705bdb916f06139a24a11af5eb91ab235e8234e;>2705bdb https://redirect.github.com/onsi/gomega/issues/703;>#703 doc(matchers): HaveEach() doc comment updated https://github.com/onsi/gomega/commit/375648c5a99d936849f1191dbe52474d819fb4b5;>375648c Minor typos (https://redirect.github.com/onsi/gomega/issues/699;>#699) See full diff in https://github.com/onsi/gomega/compare/v1.28.0...v1.29.0;>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/onsi/gomega=go_modules=1.28.0=1.29.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For
[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 8cda05e70343924006329c990ea368c1cddfdb7b Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Oct 26 00:38:59 2023 + chore: changelog automatic update --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a26aa..7b4d17c27 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,10 @@ **Closed issues:** +- TestCamelTrait flaky test [\#4845](https://github.com/apache/camel-k/issues/4845) +- Release 2.1.0 [\#4752](https://github.com/apache/camel-k/issues/4752) - Failing to serialize java.time.\* objects into json [\#4547](https://github.com/apache/camel-k/issues/4547) +- Run without source code [\#3295](https://github.com/apache/camel-k/issues/3295) ## [2.1.1-nightly](https://github.com/apache/camel-k/tree/2.1.1-nightly) (2023-10-24)
[camel-k] branch release-2.0.x updated (4ab294a6a -> 0c82f665a)
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 4ab294a6a chore: nightly SBOM update new 8cda05e70 chore: changelog automatic update new 0c82f665a 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 | 3 +++ camel-k-sbom/camel-k-sbom.json | 12 ++-- 2 files changed, 9 insertions(+), 6 deletions(-)
[camel-k] 02/02: chore: nightly SBOM update
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git commit 0c82f665aa0f97e5f657bb0c1a946be09b07d926 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Thu Oct 26 00:44:13 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 b0bf2d2d1..e3b2baec6 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:912080d1-f4ef-4ebd-9174-8c79c04d7094", + "serialNumber": "urn:uuid:8054705d-f9f8-4631-a3f3-724cd04aa7e8", "version": 1, "metadata": { -"timestamp": "2023-10-25T01:30:32Z", +"timestamp": "2023-10-26T00:44:13Z", "tools": [ { "vendor": "CycloneDX", @@ -46,11 +46,11 @@ } ], "component": { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231025012445-ec3d7fbf76d2?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231026003859-8cda05e70343?type=module", "type": "application", "name": "github.com/apache/camel-k/v2", - "version": "v0.0.0-20231025012445-ec3d7fbf76d2", - "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231025012445-ec3d7fbf76d2?type=module\u0026goos=linux\u0026goarch=amd64", + "version": "v0.0.0-20231026003859-8cda05e70343", + "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231026003859-8cda05e70343?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-20231025012445-ec3d7fbf76d2?type=module", + "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231026003859-8cda05e70343?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-karavan] branch main updated: Update README.md
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 a6b9d64a Update README.md a6b9d64a is described below commit a6b9d64aa80d816680fb894fb884edf0d0880f61 Author: Marat Gubaidullin AuthorDate: Wed Oct 25 20:40:41 2023 -0400 Update README.md --- README.md | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 33b19a4b..74d56da1 100644 --- a/README.md +++ b/README.md @@ -41,12 +41,20 @@ It simplifies the Apache Camel experience and accelerates developer performance * View live logs during development * Tracing Exchange Data -### Supported platforms +### Local +Karavan provides VS Code extension for local developer experience +* Design, code and run integrations on your laptop or PC +* Deploy to Kubernetes or Openshift +* Download from [Marketplace](https://marketplace.visualstudio.com/items?itemName=camel-karavan.karavan) or [Open VSX Registry](https://open-vsx.org/extension/camel-karavan/karavan) + +## Documentation + +### How to install on * [Docker](docs/WEB_DOCKER.md) * [Kubernetes](docs/WEB_KUBERNETES.md) * [Openshift](docs/WEB_OPENSHIFT.md) -## Documentation -[Karavan documentation](docs/README.md) +### Developer guide +[How to build Karavan](docs/DEV.md) If you haven't done so yet, please be sure to download Karavan and give it a try. We're excited to receive your feedback and learn about your experiences!
[camel-karavan] branch main updated: Update README.md
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 c120b708 Update README.md c120b708 is described below commit c120b708407030d18d2ca457bb76b99b024b78bb Author: Marat Gubaidullin AuthorDate: Wed Oct 25 20:32:59 2023 -0400 Update README.md --- README.md | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f779b9c8..33b19a4b 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ **Apache Camel Karavan** is a **Low-Code Data Integration Platform** - + It simplifies the Apache Camel experience and accelerates developer performance by visually designing and rapidly deploying integration microservices. @@ -23,8 +23,6 @@ It simplifies the Apache Camel experience and accelerates developer performance ### Designer - - * Enterprise Integration Patterns * 300+ Integration Components * REST API designer with OpenAPI to REST DSL generator @@ -35,9 +33,10 @@ It simplifies the Apache Camel experience and accelerates developer performance * Configuration * Predefined customizable scripts for different platforms - + ### Dashboards + * Monitoring running integration microservices * View live logs during development * Tracing Exchange Data
[camel-karavan] branch main updated: Update README.md
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 cea2e398 Update README.md cea2e398 is described below commit cea2e398fca4898c9dea40eb5ab0918d857fc39c Author: Marat Gubaidullin AuthorDate: Wed Oct 25 20:17:16 2023 -0400 Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bd4fb61e..f779b9c8 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ It simplifies the Apache Camel experience and accelerates developer performance ### Designer - + * Enterprise Integration Patterns * 300+ Integration Components @@ -35,7 +35,7 @@ It simplifies the Apache Camel experience and accelerates developer performance * Configuration * Predefined customizable scripts for different platforms - + ### Dashboards * Monitoring running integration microservices
[camel-karavan] branch main updated: Update README.md
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 78cb5ebd Update README.md 78cb5ebd is described below commit 78cb5ebdc7bf8fd834fb12a98f7279eb59380dd1 Author: Marat Gubaidullin AuthorDate: Wed Oct 25 20:16:30 2023 -0400 Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 975f54f5..bd4fb61e 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ **Apache Camel Karavan** is a **Low-Code Data Integration Platform** - + It simplifies the Apache Camel experience and accelerates developer performance by visually designing and rapidly deploying integration microservices. @@ -22,6 +22,7 @@ It simplifies the Apache Camel experience and accelerates developer performance ## Features ### Designer + * Enterprise Integration Patterns
Re: [I] Image Vulnerability of Go package [camel-k]
github-actions[bot] commented on issue #4581: URL: https://github.com/apache/camel-k/issues/4581#issuecomment-1780227870 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- 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: Readme update
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 5c98a303 Readme update 5c98a303 is described below commit 5c98a30385c48f574fe4cc9bb01bd2afc721d6c2 Author: Marat Gubaidullin AuthorDate: Wed Oct 25 20:15:16 2023 -0400 Readme update --- README.md | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 5eca1821..975f54f5 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,11 @@ ![Typescript](https://img.shields.io/badge/-Typescript-blue.svg?style=for-the-badge=typescript) ![License](https://img.shields.io/badge/License-Apache-blue.svg?style=for-the-badge=apache) -**Apache Camel Karavan** is an **Open-Source Low-code Data Integration Platform** +## Apache Camel Karavan - +**Apache Camel Karavan** is a **Low-Code Data Integration Platform** + + It simplifies the Apache Camel experience and accelerates developer performance by visually designing and rapidly deploying integration microservices. @@ -17,9 +19,11 @@ It simplifies the Apache Camel experience and accelerates developer performance * From Low-code use-cases to Pro-code projects * Powered by 10+ years of Community Intelligence - ## Features + ### Designer + + * Enterprise Integration Patterns * 300+ Integration Components * REST API designer with OpenAPI to REST DSL generator @@ -27,18 +31,16 @@ It simplifies the Apache Camel experience and accelerates developer performance ### Deployer * Simple shell scripts for build and deploy -* Configuration (application.properties, docker-compose.yaml, deployment.yaml, etc) +* Configuration * Predefined customizable scripts for different platforms - + ### Dashboards * Monitoring running integration microservices * View live logs during development * Tracing Exchange Data - - ### Supported platforms * [Docker](docs/WEB_DOCKER.md) * [Kubernetes](docs/WEB_KUBERNETES.md)
[camel-karavan] branch main updated: Readme update
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 05fbb326 Readme update 05fbb326 is described below commit 05fbb326d353da668bc9d2487eb04099762ff086 Author: Marat Gubaidullin AuthorDate: Wed Oct 25 20:14:30 2023 -0400 Readme update --- README.md | 4 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 9e99cc32..5eca1821 100644 --- a/README.md +++ b/README.md @@ -30,11 +30,15 @@ It simplifies the Apache Camel experience and accelerates developer performance * Configuration (application.properties, docker-compose.yaml, deployment.yaml, etc) * Predefined customizable scripts for different platforms + + ### Dashboards * Monitoring running integration microservices * View live logs during development * Tracing Exchange Data + + ### Supported platforms * [Docker](docs/WEB_DOCKER.md) * [Kubernetes](docs/WEB_KUBERNETES.md)
[camel-karavan] branch main updated: Readme update
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 028ec11c Readme update 028ec11c is described below commit 028ec11cf5333b75c34e163bdec29b3bc3fca96e Author: Marat Gubaidullin AuthorDate: Wed Oct 25 20:06:17 2023 -0400 Readme update --- .asf.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.asf.yaml b/.asf.yaml index 6c60b8e2..51dcbdc8 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -20,7 +20,7 @@ notifications: issues: commits@camel.apache.org pullrequests: commits@camel.apache.org github: - description: "Karavan an Integration Toolkit for Apache Camel" + description: "Apache Camel Karavan a Low-code Data Integration Platform" homepage: https://camel.apache.org labels: - camel
[camel-karavan] 05/07: Kamelet Editor in App for #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 cce1dd34b98e62a12afa7499ee8ff18ee6de4902 Author: Marat Gubaidullin AuthorDate: Mon Oct 23 20:10:47 2023 -0400 Kamelet Editor in App for #315 --- .../src/core/model/IntegrationDefinition.ts| 10 ++-- .../main/webui/src/designer/KaravanDesigner.tsx| 2 - .../webui/src/designer/icons/ComponentIcons.tsx| 23 +- .../main/webui/src/designer/icons/KaravanIcons.tsx | 3 +- .../webui/src/designer/route/DslConnections.tsx| 2 + .../main/webui/src/designer/route/DslElement.tsx | 14 +- .../main/webui/src/designer/route/DslSelector.tsx | 3 +- .../webui/src/designer/route/RouteDesigner.tsx | 53 ++ .../src/designer/route/useRouteDesignerHook.tsx| 42 +++-- .../src/main/webui/src/designer/utils/CamelUi.tsx | 12 - .../main/webui/src/knowledgebase/eip/EipModal.tsx | 35 ++ .../src/main/webui/src/project/file/FileEditor.tsx | 2 +- .../webui/src/project/files/CreateFileModal.tsx| 51 + .../src/main/webui/src/project/files/FilesTab.tsx | 2 +- .../src/project/topology/ProjectTopologyTab.tsx| 2 +- 15 files changed, 186 insertions(+), 70 deletions(-) diff --git a/karavan-core/src/core/model/IntegrationDefinition.ts b/karavan-core/src/core/model/IntegrationDefinition.ts index fb1c11f3..18d01dc8 100644 --- a/karavan-core/src/core/model/IntegrationDefinition.ts +++ b/karavan-core/src/core/model/IntegrationDefinition.ts @@ -73,8 +73,10 @@ export class Spec { } } +export type KameletTypes = "sink" | "source" | "action"; + export class MetadataLabels { -"camel.apache.org/kamelet.type": "sink" | "source" | "action" = 'source' +"camel.apache.org/kamelet.type": KameletTypes = 'source' public constructor(init?: Partial) { Object.assign(this, init); @@ -82,10 +84,10 @@ export class MetadataLabels { } export class MetadataAnnotations { -"camel.apache.org/kamelet.support.level:": string = 'Preview'; +"camel.apache.org/kamelet.support.level": string = 'Preview'; "camel.apache.org/catalog.version": string = ''; -"camel.apache.org/kamelet.icon": string = ''; -"camel.apache.org/provider": string = ''; +"camel.apache.org/kamelet.icon": string = "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%2300' viewBox='0 0 32 32' id='icon'%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill:none;%7D%3C/style%3E%3C/defs%3E%3Ctitle%3Eapplication%3C/title%3E%3Cpath d='M16,18H6a2,2,0,0,1-2-2V6A2,2,0,0,1,6,4H16a2,2,0,0,1,2,2V16A2,2,0,0,1,16,18ZM6,6V16H16V6Z' transform='translate(0 0)'/%3E%3Cpath d='M26,12v4H22V12h4m0-2H22a2,2,0,0,0-2,2v4a2,2,0,0,0,2,2h4a2,2,0,0,0,2-2V12a2,2,0,0,0-2-2Z' tran [...] +"camel.apache.org/provider": string = 'Custom'; "camel.apache.org/kamelet.group": string = ''; "camel.apache.org/kamelet.namespace": string = ''; diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/KaravanDesigner.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/KaravanDesigner.tsx index 4b7b3c7a..b1af73c5 100644 --- a/karavan-web/karavan-app/src/main/webui/src/designer/KaravanDesigner.tsx +++ b/karavan-web/karavan-app/src/main/webui/src/designer/KaravanDesigner.tsx @@ -24,8 +24,6 @@ import { Tabs, TabTitleIcon, TabTitleText, -Tooltip, -TooltipPosition, } from '@patternfly/react-core'; import './karavan.css'; import {RouteDesigner} from "./route/RouteDesigner"; diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/icons/ComponentIcons.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/icons/ComponentIcons.tsx index a05f5e70..bda35d53 100644 --- a/karavan-web/karavan-app/src/main/webui/src/designer/icons/ComponentIcons.tsx +++ b/karavan-web/karavan-app/src/main/webui/src/designer/icons/ComponentIcons.tsx @@ -1165,7 +1165,28 @@ export function ApiIcon() { ); } -export function MonitoringIcon() { +export function KameletIcon() { +return ( +http://www.w3.org/2000/svg; +viewBox="0 0 32 32" +> +{"application"} + + + +) +} + + +export function MonitoringIcon() { return ( http://www.w3.org/2000/svg; diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/icons/KaravanIcons.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/icons/KaravanIcons.tsx index b7165b93..b0b8042f 100644 --- a/karavan-web/karavan-app/src/main/webui/src/designer/icons/KaravanIcons.tsx +++ b/karavan-web/karavan-app/src/main/webui/src/designer/icons/KaravanIcons.tsx @@ -260,7 +260,7 @@ export function CamelIcon(props?: (JSX.IntrinsicAttributes & React.SVGProps ) +return <>; } diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/route/DslConnections.tsx
[camel-karavan] 07/07: Readme update
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 f11283032399a8581bd4b8a4e9c0f2f9b2c7071e Author: Marat Gubaidullin AuthorDate: Wed Oct 25 20:04:53 2023 -0400 Readme update --- README.md | 34 ++ images/karavan-clouds-large.png | Bin 321879 -> 321382 bytes images/karavan-dashboard.png| Bin 0 -> 68462 bytes images/karavan-right.png| Bin 0 -> 321382 bytes 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 3b3a446d..9e99cc32 100644 --- a/README.md +++ b/README.md @@ -6,31 +6,41 @@ ![Typescript](https://img.shields.io/badge/-Typescript-blue.svg?style=for-the-badge=typescript) ![License](https://img.shields.io/badge/License-Apache-blue.svg?style=for-the-badge=apache) -![karavan-logo](images/karavan-logo-dark.png#gh-dark-mode-only) -![karavan-logo](images/karavan-logo-light.png#gh-light-mode-only) +**Apache Camel Karavan** is an **Open-Source Low-code Data Integration Platform** -Karavan is an Integration Toolkit for Apache Camel, which makes integration easy and fun through the visualization of pipelines, integration with runtimes and package, image build and deploy to Docker or Kubernetes out-of-the-box. + -[![Introduction](images/introduction.png)](https://www.youtube.com/watch?v=RA8sH3AH8Gg) -Integrations could be created using visual designer that includes Enterprise Integration Patterns DSL, REST API and Beans builder, all Camel Kamelets and Components. Karavan uses YAML to read/write integrations. Integrations could be run directly from Karavan or they could be exported in the Maven project with preconfigured Camel Quarkus, Camel Spring-Boot or Camel Main runtime. Integration project output is a runnable uber-jar or an OCI image for local environment or a deployed applicat [...] +It simplifies the Apache Camel experience and accelerates developer performance by visually designing and rapidly deploying integration microservices. + +* Full power of Apache Camel through Visual Tool +* From Low-code use-cases to Pro-code projects +* Powered by 10+ years of Community Intelligence + ## Features -### Visual Designer +### Designer * Enterprise Integration Patterns +* 300+ Integration Components * REST API designer with OpenAPI to REST DSL generator -* 300+ Components -* Custom Java code snippets +* YAML for Integration and Java custom code -### All in Git -* Integration routes (YAML, Java) +### Deployer +* Simple shell scripts for build and deploy * Configuration (application.properties, docker-compose.yaml, deployment.yaml, etc) -* Customizable build scripts +* Predefined customizable scripts for different platforms -### Target deployment +### Dashboards +* Monitoring running integration microservices +* View live logs during development +* Tracing Exchange Data + +### Supported platforms * [Docker](docs/WEB_DOCKER.md) * [Kubernetes](docs/WEB_KUBERNETES.md) * [Openshift](docs/WEB_OPENSHIFT.md) ## Documentation [Karavan documentation](docs/README.md) + +If you haven't done so yet, please be sure to download Karavan and give it a try. We're excited to receive your feedback and learn about your experiences! diff --git a/images/karavan-clouds-large.png b/images/karavan-clouds-large.png index 2fb0b93e..b350b44d 100644 Binary files a/images/karavan-clouds-large.png and b/images/karavan-clouds-large.png differ diff --git a/images/karavan-dashboard.png b/images/karavan-dashboard.png new file mode 100644 index ..79d54234 Binary files /dev/null and b/images/karavan-dashboard.png differ diff --git a/images/karavan-right.png b/images/karavan-right.png new file mode 100644 index ..b350b44d Binary files /dev/null and b/images/karavan-right.png differ
[camel-karavan] 06/07: Kamelet Editor in App for #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 62ba6f147b9f89b417192a800cba46cff2118cd2 Author: Marat Gubaidullin AuthorDate: Mon Oct 23 20:39:22 2023 -0400 Kamelet Editor in App for #315 --- .../src/main/webui/src/api/ProjectService.ts | 12 + .../webui/src/knowledgebase/KnowledgebasePage.tsx | 22 +++- .../src/main/webui/src/main/useMainHook.tsx| 10 ++-- .../webui/src/project/ImageDownloadToolbar.tsx | 8 +++--- .../webui/src/project/files/CreateFileModal.tsx| 1 - .../main/webui/src/project/files/FilesToolbar.tsx | 29 +- 6 files changed, 67 insertions(+), 15 deletions(-) diff --git a/karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts b/karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts index 7f3f2128..5e074888 100644 --- a/karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts +++ b/karavan-web/karavan-app/src/main/webui/src/api/ProjectService.ts @@ -29,6 +29,7 @@ import { } from './ProjectStore'; import {ProjectEventBus} from './ProjectEventBus'; import {EventBus} from "../designer/utils/EventBus"; +import {KameletApi} from "karavan-core/lib/api/KameletApi"; export class ProjectService { @@ -135,6 +136,17 @@ export class ProjectService { }); } +public static reloadKamelets() { +KaravanApi.getKamelets(yamls => { +const kamelets: string[] = []; +yamls.split("\n---\n").map(c => c.trim()).forEach(z => kamelets.push(z)); +KameletApi.saveKamelets(kamelets, true); +}) +KaravanApi.getCustomKameletNames(names => { +KameletApi.saveCustomKameletNames(names); +}) +} + public static saveFile(file: ProjectFile, active: boolean) { KaravanApi.postProjectFile(file, res => { if (res.status === 200) { diff --git a/karavan-web/karavan-app/src/main/webui/src/knowledgebase/KnowledgebasePage.tsx b/karavan-web/karavan-app/src/main/webui/src/knowledgebase/KnowledgebasePage.tsx index 02c6b641..35368b54 100644 --- a/karavan-web/karavan-app/src/main/webui/src/knowledgebase/KnowledgebasePage.tsx +++ b/karavan-web/karavan-app/src/main/webui/src/knowledgebase/KnowledgebasePage.tsx @@ -16,7 +16,21 @@ */ import React, {useState} from 'react'; import '../designer/karavan.css'; -import {Flex, FlexItem, PageSection, Switch, Tab, Tabs, Text, TextContent, TextInput, Toolbar, ToolbarContent, ToolbarItem} from "@patternfly/react-core"; +import { +Button, +Flex, +FlexItem, +PageSection, +Switch, +Tab, +Tabs, +Text, +TextContent, +TextInput, +Toolbar, +ToolbarContent, +ToolbarItem +} from "@patternfly/react-core"; import {MainToolbar} from "../designer/MainToolbar"; import {KameletsTab} from "./kamelets/KameletsTab"; import {EipTab} from "./eip/EipTab"; @@ -24,6 +38,7 @@ import {ComponentsTab} from "./components/ComponentsTab"; interface Props { dark: boolean, +onKameletsReload? (): void; } export const KnowledgebasePage = (props: Props) => { @@ -41,6 +56,11 @@ export const KnowledgebasePage = (props: Props) => { function getTools() { return +{tab === 'kamelets' && + props.onKameletsReload?.()} +>Reload +} {tab === 'kamelets' && { await new Promise(resolve => { -KaravanApi.getKamelets(yamls => { -const kamelets: string[] = []; -yamls.split("\n---\n").map(c => c.trim()).forEach(z => kamelets.push(z)); -KameletApi.saveKamelets(kamelets, true); -}) -KaravanApi.getCustomKameletNames(names => { -KameletApi.saveCustomKameletNames(names); -}) +ProjectService.reloadKamelets(); }); } diff --git a/karavan-web/karavan-app/src/main/webui/src/project/ImageDownloadToolbar.tsx b/karavan-web/karavan-app/src/main/webui/src/project/ImageDownloadToolbar.tsx index 82b5e6f8..3316b008 100644 --- a/karavan-web/karavan-app/src/main/webui/src/project/ImageDownloadToolbar.tsx +++ b/karavan-web/karavan-app/src/main/webui/src/project/ImageDownloadToolbar.tsx @@ -55,10 +55,10 @@ export function ImageDownloadToolbar() { {isIntegration() && - -} -onClick={e => downloadImage()}/> - +{/**/} +{/*}*/} +{/*onClick={e => downloadImage()}/>*/} +{/**/} } diff --git
[camel-karavan] 04/07: Remove WARN IPROTO000002 from Infinispan
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 e208f02b84cd41cce47d4f269dd30045044fa076 Author: Marat Gubaidullin AuthorDate: Mon Oct 23 19:31:12 2023 -0400 Remove WARN IPROTO02 from Infinispan --- .../camel/karavan/infinispan/InfinispanService.java | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/infinispan/InfinispanService.java b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/infinispan/InfinispanService.java index bfacd49b..30440c1c 100644 --- a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/infinispan/InfinispanService.java +++ b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/infinispan/InfinispanService.java @@ -16,12 +16,8 @@ */ package org.apache.camel.karavan.infinispan; -import io.smallrye.mutiny.tuples.Tuple2; import jakarta.enterprise.inject.Default; import jakarta.inject.Singleton; -import jakarta.transaction.NotSupportedException; -import jakarta.transaction.SystemException; -import jakarta.transaction.TransactionManager; import org.apache.camel.karavan.infinispan.model.*; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.eclipse.microprofile.faulttolerance.Retry; @@ -35,6 +31,9 @@ import org.infinispan.client.hotrod.configuration.ClientIntelligence; import org.infinispan.client.hotrod.configuration.ConfigurationBuilder; import org.infinispan.commons.configuration.StringConfiguration; import org.infinispan.commons.marshall.ProtoStreamMarshaller; +import org.infinispan.protostream.ProtobufUtil; +import org.infinispan.protostream.SerializationContext; +import org.infinispan.protostream.config.Configuration; import org.infinispan.query.dsl.QueryFactory; import org.jboss.logging.Logger; @@ -84,7 +83,10 @@ public class InfinispanService implements HealthCheck { void start() throws Exception { LOGGER.info("InfinispanService is starting in remote mode"); -ProtoStreamMarshaller marshaller = new ProtoStreamMarshaller(); +Configuration.Builder cfgBuilder = Configuration.builder().setLogOutOfSequenceWrites(false); +SerializationContext ctx = ProtobufUtil.newSerializationContext(cfgBuilder.build()); + +ProtoStreamMarshaller marshaller = new ProtoStreamMarshaller(ctx); marshaller.register(new KaravanSchemaImpl()); ConfigurationBuilder builder = new ConfigurationBuilder(); @@ -154,9 +156,9 @@ public class InfinispanService implements HealthCheck { public ProjectFile getProjectFile(String projectId, String filename) { QueryFactory queryFactory = Search.getQueryFactory(files); -List list = queryFactory.create("FROM karavan.ProjectFile WHERE projectId = :projectId AND name = :name") -.setParameter("projectId", projectId) +List list = queryFactory.create("FROM karavan.ProjectFile WHERE name = :name AND projectId = :projectId") .setParameter("name", filename) +.setParameter("projectId", projectId) .execute().list(); return list.size() > 0 ? list.get(0) : null; }
[camel-karavan] 02/07: Kamelet Source in Sink Kamelet for #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 2d8216b482315e970141e1ff6398b4f310c55178 Author: Marat Gubaidullin AuthorDate: Mon Oct 23 17:58:18 2023 -0400 Kamelet Source in Sink Kamelet for #315 --- karavan-core/src/core/model/KameletModels.ts | 2 +- .../example/aws-cloudwatch-sink.kamelet.yaml | 185 + karavan-designer/src/App.tsx | 3 +- .../src/designer/route/DslConnections.tsx | 1 + karavan-designer/src/designer/route/DslElement.tsx | 4 +- .../src/designer/route/RouteDesigner.tsx | 53 +++--- .../src/designer/route/useRouteDesignerHook.tsx| 31 +++- 7 files changed, 254 insertions(+), 25 deletions(-) diff --git a/karavan-core/src/core/model/KameletModels.ts b/karavan-core/src/core/model/KameletModels.ts index e5c9855e..342d8a35 100644 --- a/karavan-core/src/core/model/KameletModels.ts +++ b/karavan-core/src/core/model/KameletModels.ts @@ -49,7 +49,7 @@ export class KameletSpec { } export class Labels { -'camel.apache.org/kamelet.type': string | any = ''; +'camel.apache.org/kamelet.type': "sink" | "source" | "action" = 'source'; public constructor(init?: Partial) { Object.assign(this, init); diff --git a/karavan-designer/public/example/aws-cloudwatch-sink.kamelet.yaml b/karavan-designer/public/example/aws-cloudwatch-sink.kamelet.yaml new file mode 100644 index ..d22ca1fc --- /dev/null +++ b/karavan-designer/public/example/aws-cloudwatch-sink.kamelet.yaml @@ -0,0 +1,185 @@ +# --- +# 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. +# --- + +apiVersion: camel.apache.org/v1 +kind: Kamelet +metadata: + name: aws-cloudwatch-sink + annotations: +camel.apache.org/kamelet.support.level: "Stable" +camel.apache.org/catalog.version: "4.0.1" +camel.apache.org/kamelet.icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjIwNyIgaGVpZ2h0PSIyNTAwIiB2aWV3Qm94PSIwIDAgMjU2IDI5MCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCI+PHBhdGggZD0iTTI1NiAxOTkuMzA1bC0xMjcuOTU3LTE4Ljc5N0wwIDE5OS4zMjlsMTI4LjAxIDQ3LjQzOUwyNTYgMTk5LjMwNSIgZmlsbD0iI0I3Q0E5RCIvPjxwYXRoIGQ9Ik0yNS42MjEgMTk3LjExM2wyMS42MyA2Ljc2MSAxLjk3MS0yLjIzOFY1MC4yODRsLTEuOTcxLTIuNTg1LTIxLjYzIDguMjc0djE0MS4xNCIgZmlsbD0iIzRCNjEyQyIvPjxwYXRoIG [...] +camel.apache.org/provider: "Apache Software Foundation" +camel.apache.org/kamelet.group: "AWS Cloudwatch" +camel.apache.org/kamelet.namespace: "AWS" + labels: +camel.apache.org/kamelet.type: "sink" +spec: + definition: +title: "AWS CloudWatch Metrics Sink" +description: |- + Send data to Amazon CloudWatch metrics. + + The basic authentication method for the AWS CloudWatch metrics 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 CloudWatch client loads the credentials through this provider and doesn't use the basic authentication method. + + You can set the following properties in the header: + + `metric-name` / `ce-metricname` for the metric name. + `metric-value` / `ce-metricvalue` for the metric value. + `metric-unit` / `ce-metricunit` for the metric unit. + `metric-timestamp` / `ce-metrictimestamp` for the metric timestamp. + `metric-dimension-name` / `ce-metricdimensionname` for the dimension name. + `metric-dimension-value` / `ce-metricdimensionvalue` for the dimension value. +required: + - cwNamespace + - region +type: object +properties: + cwNamespace: +title: Cloud Watch Namespace +description: The CloudWatch metric namespace. +type: string + accessKey: +title: Access Key +description: The access key obtained from AWS. +type: string +format: password +x-descriptors: + -
[camel-karavan] 01/07: Kamelet Sink in Source Kamelet Selector for #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 211dd994b3d3873ca5325de4ae93f937850b962c Author: Marat Gubaidullin AuthorDate: Mon Oct 23 16:53:01 2023 -0400 Kamelet Sink in Source Kamelet Selector for #315 --- karavan-designer/src/App.tsx | 4 ++-- karavan-designer/src/designer/KaravanDesigner.tsx | 2 -- .../src/designer/icons/ComponentIcons.tsx | 23 +- .../src/designer/icons/KaravanIcons.tsx| 3 ++- .../src/designer/route/DslConnections.tsx | 1 + karavan-designer/src/designer/route/DslElement.tsx | 12 +-- .../src/designer/route/DslSelector.tsx | 3 +-- .../src/designer/route/useRouteDesignerHook.tsx| 9 - karavan-designer/src/designer/utils/CamelUi.tsx| 12 +-- 9 files changed, 56 insertions(+), 13 deletions(-) diff --git a/karavan-designer/src/App.tsx b/karavan-designer/src/App.tsx index 933c493d..30196dab 100644 --- a/karavan-designer/src/App.tsx +++ b/karavan-designer/src/App.tsx @@ -81,8 +81,8 @@ class App extends React.Component { fetch("components/components.json"), fetch("snippets/org.apache.camel.AggregationStrategy"), fetch("snippets/org.apache.camel.Processor"), -fetch("example/demo.camel.yaml") -// fetch("example/aws-s3-cdc-source.kamelet.yaml") +// fetch("example/demo.camel.yaml") +fetch("example/aws-s3-cdc-source.kamelet.yaml") // fetch("components/supported-components.json"), ]).then(responses => Promise.all(responses.map(response => response.text())) diff --git a/karavan-designer/src/designer/KaravanDesigner.tsx b/karavan-designer/src/designer/KaravanDesigner.tsx index 4b7b3c7a..b1af73c5 100644 --- a/karavan-designer/src/designer/KaravanDesigner.tsx +++ b/karavan-designer/src/designer/KaravanDesigner.tsx @@ -24,8 +24,6 @@ import { Tabs, TabTitleIcon, TabTitleText, -Tooltip, -TooltipPosition, } from '@patternfly/react-core'; import './karavan.css'; import {RouteDesigner} from "./route/RouteDesigner"; diff --git a/karavan-designer/src/designer/icons/ComponentIcons.tsx b/karavan-designer/src/designer/icons/ComponentIcons.tsx index a05f5e70..bda35d53 100644 --- a/karavan-designer/src/designer/icons/ComponentIcons.tsx +++ b/karavan-designer/src/designer/icons/ComponentIcons.tsx @@ -1165,7 +1165,28 @@ export function ApiIcon() { ); } -export function MonitoringIcon() { +export function KameletIcon() { +return ( +http://www.w3.org/2000/svg; +viewBox="0 0 32 32" +> +{"application"} + + + +) +} + + +export function MonitoringIcon() { return ( http://www.w3.org/2000/svg; diff --git a/karavan-designer/src/designer/icons/KaravanIcons.tsx b/karavan-designer/src/designer/icons/KaravanIcons.tsx index b7165b93..b0b8042f 100644 --- a/karavan-designer/src/designer/icons/KaravanIcons.tsx +++ b/karavan-designer/src/designer/icons/KaravanIcons.tsx @@ -260,7 +260,7 @@ export function CamelIcon(props?: (JSX.IntrinsicAttributes & React.SVGProps ) +return <>; } diff --git a/karavan-designer/src/designer/route/DslConnections.tsx b/karavan-designer/src/designer/route/DslConnections.tsx index de6a0060..10338ae9 100644 --- a/karavan-designer/src/designer/route/DslConnections.tsx +++ b/karavan-designer/src/designer/route/DslConnections.tsx @@ -142,6 +142,7 @@ export function DslConnections() { .filter(pos => pos.step.dslName === 'ToDefinition' && !CamelUi.isActionKamelet(pos.step) && !TopologyUtils.isElementInternalComponent(pos.step)) .filter(pos => !(outgoingDefinitions.includes(pos.step.dslName) && TopologyUtils.hasInternalUri(pos.step))) .filter(pos => pos.step.dslName !== 'SagaDefinition') +.filter(pos => !CamelUi.isKameletSink(pos.step)) .sort((pos1: DslPosition, pos2: DslPosition) => { const y1 = pos1.headerRect.y + pos1.headerRect.height / 2; const y2 = pos2.headerRect.y + pos2.headerRect.height / 2; diff --git a/karavan-designer/src/designer/route/DslElement.tsx b/karavan-designer/src/designer/route/DslElement.tsx index 305b7859..c45dcbe4 100644 --- a/karavan-designer/src/designer/route/DslElement.tsx +++ b/karavan-designer/src/designer/route/DslElement.tsx @@ -42,7 +42,7 @@ interface Props { export function DslElement(props: Props) { const headerRef = React.useRef(null); -const {selectElement, moveElement, onShowDeleteConfirmation, openSelector} = useRouteDesignerHook(); +const {selectElement, moveElement, onShowDeleteConfirmation, openSelector, isKamelet} = useRouteDesignerHook(); const [integration] = useIntegrationStore((s) => [s.integration,
[camel-karavan] 03/07: nodePrefixId for #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 fd3432e935445e24ef35c5d8490255528ed03df3 Author: Marat Gubaidullin AuthorDate: Mon Oct 23 18:50:28 2023 -0400 nodePrefixId for #315 --- karavan-designer/src/designer/route/useRouteDesignerHook.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/karavan-designer/src/designer/route/useRouteDesignerHook.tsx b/karavan-designer/src/designer/route/useRouteDesignerHook.tsx index 0d97214d..f48fc850 100644 --- a/karavan-designer/src/designer/route/useRouteDesignerHook.tsx +++ b/karavan-designer/src/designer/route/useRouteDesignerHook.tsx @@ -27,6 +27,7 @@ import {CamelDisplayUtil} from "karavan-core/lib/api/CamelDisplayUtil"; import {toPng} from 'html-to-image'; import {useDesignerStore, useIntegrationStore, useSelectorStore} from "../DesignerStore"; import {shallow} from "zustand/shallow"; +import {v4 as uuidv4} from 'uuid'; export function useRouteDesignerHook () { @@ -224,7 +225,8 @@ export function useRouteDesignerHook () { function onDslSelect (dsl: DslMetaModel, parentId: string, position?: number | undefined) { switch (dsl.dsl) { case 'FromDefinition' : -const route = CamelDefinitionApi.createRouteDefinition({from: new FromDefinition({uri: dsl.uri})}); +const nodePrefixId = isKamelet() ? integration.metadata.name : 'route-' + uuidv4().substring(0,3); +const route = CamelDefinitionApi.createRouteDefinition({from: new FromDefinition({uri: dsl.uri}), nodePrefixId: nodePrefixId}); addStep(route, parentId, position) break; case 'ToDefinition' :
[camel-karavan] branch main updated (56ed9809 -> f1128303)
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 56ed9809 #905 new 211dd994 Kamelet Sink in Source Kamelet Selector for #315 new 2d8216b4 Kamelet Source in Sink Kamelet for #315 new fd3432e9 nodePrefixId for #315 new e208f02b Remove WARN IPROTO02 from Infinispan new cce1dd34 Kamelet Editor in App for #315 new 62ba6f14 Kamelet Editor in App for #315 new f1128303 Readme update The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README.md | 34 ++-- images/karavan-clouds-large.png| Bin 321879 -> 321382 bytes images/karavan-dashboard.png | Bin 0 -> 68462 bytes images/karavan-right.png | Bin 0 -> 321382 bytes .../src/core/model/IntegrationDefinition.ts| 10 +- karavan-core/src/core/model/KameletModels.ts | 2 +- .../example/aws-cloudwatch-sink.kamelet.yaml | 185 + karavan-designer/src/App.tsx | 3 +- karavan-designer/src/designer/KaravanDesigner.tsx | 2 - .../src/designer/icons/ComponentIcons.tsx | 23 ++- .../src/designer/icons/KaravanIcons.tsx| 3 +- .../src/designer/route/DslConnections.tsx | 2 + karavan-designer/src/designer/route/DslElement.tsx | 14 +- .../src/designer/route/DslSelector.tsx | 3 +- .../src/designer/route/RouteDesigner.tsx | 53 +++--- .../src/designer/route/useRouteDesignerHook.tsx| 42 - karavan-designer/src/designer/utils/CamelUi.tsx| 12 +- .../karavan/infinispan/InfinispanService.java | 16 +- .../src/main/webui/src/api/ProjectService.ts | 12 ++ .../main/webui/src/designer/KaravanDesigner.tsx| 2 - .../webui/src/designer/icons/ComponentIcons.tsx| 23 ++- .../main/webui/src/designer/icons/KaravanIcons.tsx | 3 +- .../webui/src/designer/route/DslConnections.tsx| 2 + .../main/webui/src/designer/route/DslElement.tsx | 14 +- .../main/webui/src/designer/route/DslSelector.tsx | 3 +- .../webui/src/designer/route/RouteDesigner.tsx | 53 +++--- .../src/designer/route/useRouteDesignerHook.tsx| 42 - .../src/main/webui/src/designer/utils/CamelUi.tsx | 12 +- .../webui/src/knowledgebase/KnowledgebasePage.tsx | 22 ++- .../main/webui/src/knowledgebase/eip/EipModal.tsx | 35 ++-- .../src/main/webui/src/main/useMainHook.tsx| 10 +- .../webui/src/project/ImageDownloadToolbar.tsx | 8 +- .../src/main/webui/src/project/file/FileEditor.tsx | 2 +- .../webui/src/project/files/CreateFileModal.tsx| 50 -- .../src/main/webui/src/project/files/FilesTab.tsx | 2 +- .../main/webui/src/project/files/FilesToolbar.tsx | 29 +++- .../src/project/topology/ProjectTopologyTab.tsx| 2 +- 37 files changed, 592 insertions(+), 138 deletions(-) create mode 100644 images/karavan-dashboard.png create mode 100644 images/karavan-right.png create mode 100644 karavan-designer/public/example/aws-cloudwatch-sink.kamelet.yaml
[camel-k] 02/03: 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 0a305beb01cbc8c868aabf3c74a7cffeee314592 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Oct 25 23:46:23 2023 + chore: autogenerated project resource update --- docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 6 +- docs/modules/traits/pages/jvm.adoc| 6 +- pkg/resources/resources.go| 4 ++-- resources/traits.yaml | 7 ++- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index 4799180e7..b7c9b9604 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -6752,7 +6752,11 @@ Forces the value for labels `sidecar.istio.io/inject`. By default the label is s * <<#_camel_apache_org_v1_Traits, Traits>> -The JVM trait is used to configure the JVM that runs the integration. +The JVM trait is used to configure the JVM that runs the Integration. This trait can be configured only for Integration and related IntegrationKits +(bound to a container image) built by Camel K operator. If the system detects the usage of a different container image (ie, built externally), then, the +trait is disabled by the platform. + +NOTE: the platform will skip the trait configuration for those container image matching `camel-k-kit-` name. [cols="2,2a",options="header"] diff --git a/docs/modules/traits/pages/jvm.adoc b/docs/modules/traits/pages/jvm.adoc index 7c7056d5c..6e2654c44 100755 --- a/docs/modules/traits/pages/jvm.adoc +++ b/docs/modules/traits/pages/jvm.adoc @@ -1,7 +1,11 @@ = Jvm Trait // Start of autogenerated code - DO NOT EDIT! (description) -The JVM trait is used to configure the JVM that runs the integration. +The JVM trait is used to configure the JVM that runs the Integration. This trait can be configured only for Integration and related IntegrationKits +(bound to a container image) built by Camel K operator. If the system detects the usage of a different container image (ie, built externally), then, the +trait is disabled by the platform. + +NOTE: the platform will skip the trait configuration for those container image matching `camel-k-kit-` name. This trait is available in the following profiles: **Kubernetes, Knative, OpenShift**. diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index 0dc749afd..29a40fb4c 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: 72796, + uncompressedSize: 73193, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x6b\x73\x1c\xb9\x91\x00\xf8\x5d\xbf\x02\xd1\x73\x1b\x24\x75\xfd\xa0\xc6\x6b\xef\x2c\xd7\xf2\x1e\x47\xa3\xb1\x69\xbd\x78\x22\x67\xbc\x0e\x9d\xc2\x8d\xae\x42\x77\x43\xac\x06\x6a\x00\x14\xa9\x9e\xdb\xfb\xef\x17\xc8\x4c\x3c\xaa\xba\x9a\xdd\x94\x48\xd9\xda\xf5\x6e\x84\x47\x24\x0b\x40\x22\x91\x48\xe4\x3b\xbf\x61\xa3\xfb\xfb\xbf\x47\xdf\xb0\x97\xb2\x10\xca\x8a\x92\x39\xcd\xdc\x52\xb0\xd3\x9a\x17\x4b\xc1\x2e\xf4\xdc\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x6b\x73\x1c\xb9\x91\x00\xf8\x5d\xbf\x02\xd1\x73\x1b\x24\x75\xfd\xa0\xc6\x6b\xef\x2c\xd7\xf2\x1e\x47\xa3\xb1\x69\xbd\x78\x22\x67\xbc\x0e\x9d\xc2\x8d\xae\x42\x77\x43\xac\x06\x6a\x00\x14\xa9\x9e\xdb\xfb\xef\x17\xc8\x4c\x3c\xaa\xba\x9a\xdd\x94\x48\xd9\xda\xf5\x6e\x84\x47\x24\x0b\x40\x22\x91\x48\xe4\x3b\xbf\x61\xa3\xfb\xfb\xbf\x47\xdf\xb0\x97\xb2\x10\xca\x8a\x92\x39\xcd\xdc\x52\xb0\xd3\x9a\x17\x4b\xc1\x2e\xf4\xdc\x [...] }, } fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ diff --git a/resources/traits.yaml b/resources/traits.yaml index dee0be418..8eb955ea4 100755 --- a/resources/traits.yaml +++ b/resources/traits.yaml @@ -865,7 +865,12 @@ traits: - Kubernetes - Knative - OpenShift - description: The JVM trait is used to configure the JVM that runs the integration. + description: 'The JVM trait is used to configure the JVM that runs the Integration. +This trait can be configured only for Integration and related IntegrationKits +(bound to a container image) built by Camel K operator. If the system detects +the usage of a different container image (ie, built externally), then, the trait +is disabled by the platform. NOTE: the platform will skip the trait configuration +for those container image matching
[camel-k] branch main updated (b1a94dfa0 -> ea2bfa647)
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 b1a94dfa0 doc(runtimes): kamel --image instructions new f1824b6ff chore: changelog automatic update new 0a305beb0 chore: autogenerated project resource update new ea2bfa647 chore: nightly SBOM update The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG.md | 181 -- camel-k-sbom/camel-k-sbom.json| 12 +- docs/modules/ROOT/partials/apis/camel-k-crds.adoc | 6 +- docs/modules/traits/pages/jvm.adoc| 6 +- pkg/resources/resources.go| 4 +- resources/traits.yaml | 7 +- 6 files changed, 125 insertions(+), 91 deletions(-)
[camel-k] 01/03: 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 f1824b6ffcd38ecfeff105f40d478a0c191bca34 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Oct 25 23:43:41 2023 + chore: changelog automatic update --- CHANGELOG.md | 181 +-- 1 file changed, 101 insertions(+), 80 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad4556f22..6e2f5183e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,28 @@ ## [Unreleased](https://github.com/apache/camel-k/tree/HEAD) -[Full Changelog](https://github.com/apache/camel-k/compare/v2.1.0...HEAD) +[Full Changelog](https://github.com/apache/camel-k/compare/2.1.1-nightly...HEAD) + +**Closed issues:** + +- TestCamelTrait flaky test [\#4845](https://github.com/apache/camel-k/issues/4845) +- Release 2.1.0 [\#4752](https://github.com/apache/camel-k/issues/4752) +- Failing to serialize java.time.\* objects into json [\#4547](https://github.com/apache/camel-k/issues/4547) +- Run without source code [\#3295](https://github.com/apache/camel-k/issues/3295) + +**Merged pull requests:** + +- fix\(ci\): Fix golang version file setup in coverage workflow [\#4862](https://github.com/apache/camel-k/pull/4862) ([gansheer](https://github.com/gansheer)) +- fix\(e2e\): Fix TestCamelTrait [\#4857](https://github.com/apache/camel-k/pull/4857) ([gansheer](https://github.com/gansheer)) +- feat\(runtime\): enable source less integrations [\#4831](https://github.com/apache/camel-k/pull/4831) ([squakez](https://github.com/squakez)) + +## [2.1.1-nightly](https://github.com/apache/camel-k/tree/2.1.1-nightly) (2023-10-24) + +[Full Changelog](https://github.com/apache/camel-k/compare/2.2.0-nightly...2.1.1-nightly) + +## [2.2.0-nightly](https://github.com/apache/camel-k/tree/2.2.0-nightly) (2023-10-24) + +[Full Changelog](https://github.com/apache/camel-k/compare/v2.1.0...2.2.0-nightly) **Closed issues:** @@ -330,7 +351,7 @@ ## [2.0.1-nightly](https://github.com/apache/camel-k/tree/2.0.1-nightly) (2023-07-24) -[Full Changelog](https://github.com/apache/camel-k/compare/v2.0.0...2.0.1-nightly) +[Full Changelog](https://github.com/apache/camel-k/compare/pkg/apis/camel/v2.0.0...2.0.1-nightly) **Closed issues:** @@ -404,21 +425,21 @@ - fix\(build\): complete repo name for default baseImage [\#4480](https://github.com/apache/camel-k/pull/4480) ([gansheer](https://github.com/gansheer)) - fix\(e2e\): remove workaround pre 1.12.1 [\#4479](https://github.com/apache/camel-k/pull/4479) ([squakez](https://github.com/squakez)) -## [v2.0.0](https://github.com/apache/camel-k/tree/v2.0.0) (2023-07-17) +## [pkg/apis/camel/v2.0.0](https://github.com/apache/camel-k/tree/pkg/apis/camel/v2.0.0) (2023-07-17) -[Full Changelog](https://github.com/apache/camel-k/compare/pkg/kamelet/repository/v2.0.0...v2.0.0) +[Full Changelog](https://github.com/apache/camel-k/compare/v2.0.0...pkg/apis/camel/v2.0.0) -## [pkg/kamelet/repository/v2.0.0](https://github.com/apache/camel-k/tree/pkg/kamelet/repository/v2.0.0) (2023-07-17) +## [v2.0.0](https://github.com/apache/camel-k/tree/v2.0.0) (2023-07-17) -[Full Changelog](https://github.com/apache/camel-k/compare/pkg/client/camel/v2.0.0...pkg/kamelet/repository/v2.0.0) +[Full Changelog](https://github.com/apache/camel-k/compare/pkg/client/camel/v2.0.0...v2.0.0) ## [pkg/client/camel/v2.0.0](https://github.com/apache/camel-k/tree/pkg/client/camel/v2.0.0) (2023-07-17) -[Full Changelog](https://github.com/apache/camel-k/compare/pkg/apis/camel/v2.0.0...pkg/client/camel/v2.0.0) +[Full Changelog](https://github.com/apache/camel-k/compare/pkg/kamelet/repository/v2.0.0...pkg/client/camel/v2.0.0) -## [pkg/apis/camel/v2.0.0](https://github.com/apache/camel-k/tree/pkg/apis/camel/v2.0.0) (2023-07-17) +## [pkg/kamelet/repository/v2.0.0](https://github.com/apache/camel-k/tree/pkg/kamelet/repository/v2.0.0) (2023-07-17) -[Full Changelog](https://github.com/apache/camel-k/compare/camel-k-crds-2.0.0...pkg/apis/camel/v2.0.0) +[Full Changelog](https://github.com/apache/camel-k/compare/camel-k-crds-2.0.0...pkg/kamelet/repository/v2.0.0) ## [camel-k-crds-2.0.0](https://github.com/apache/camel-k/tree/camel-k-crds-2.0.0) (2023-07-17) @@ -644,15 +665,15 @@ ## [v1.12.1](https://github.com/apache/camel-k/tree/v1.12.1) (2023-06-07) -[Full Changelog](https://github.com/apache/camel-k/compare/pkg/client/camel/v1.12.1...v1.12.1) +[Full Changelog](https://github.com/apache/camel-k/compare/pkg/kamelet/repository/v1.12.1...v1.12.1) -## [pkg/client/camel/v1.12.1](https://github.com/apache/camel-k/tree/pkg/client/camel/v1.12.1) (2023-06-07) +## [pkg/kamelet/repository/v1.12.1](https://github.com/apache/camel-k/tree/pkg/kamelet/repository/v1.12.1) (2023-06-07) -[Full
[camel-k] 03/03: 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 ea2bfa64759b20f7d7b2a50aa6a3069f3cb5c7cb Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Oct 25 23:46:52 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 dd8320ce7..36b32f2b8 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:a56e06f7-1ae3-4fc6-b67c-7ab28c72617d", + "serialNumber": "urn:uuid:7234f541-20c6-4c20-bfb5-481e81353795", "version": 1, "metadata": { -"timestamp": "2023-10-24T23:48:50Z", +"timestamp": "2023-10-25T23:46:52Z", "tools": [ { "vendor": "CycloneDX", @@ -46,11 +46,11 @@ } ], "component": { - "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231024234814-b94acfcdee8c?type=module", + "bom-ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231025234623-0a305beb01cb?type=module", "type": "application", "name": "github.com/apache/camel-k/v2", - "version": "v0.0.0-20231024234814-b94acfcdee8c", - "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231024234814-b94acfcdee8c?type=module\u0026goos=linux\u0026goarch=amd64", + "version": "v0.0.0-20231025234623-0a305beb01cb", + "purl": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231025234623-0a305beb01cb?type=module\u0026goos=linux\u0026goarch=amd64", "externalReferences": [ { "url": "https://github.com/apache/camel-k;, @@ -3853,7 +3853,7 @@ ], "dependencies": [ { - "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231024234814-b94acfcdee8c?type=module", + "ref": "pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20231025234623-0a305beb01cb?type=module", "dependsOn": [ "pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module", "pkg:golang/github.com/container-tools/spectrum@v0.6.38?type=module",
[camel-kamelets] branch dependabot/go_modules/script/validator/google.golang.org/grpc-1.56.3 created (now fb2d9cfc)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/script/validator/google.golang.org/grpc-1.56.3 in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git at fb2d9cfc Bump google.golang.org/grpc from 1.55.0 to 1.56.3 in /script/validator No new revisions were added by this update.
[PR] Bump google.golang.org/grpc from 1.55.0 to 1.56.3 in /script/validator [camel-kamelets]
dependabot[bot] opened a new pull request, #1706: URL: https://github.com/apache/camel-kamelets/pull/1706 Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.55.0 to 1.56.3. Release notes Sourced from https://github.com/grpc/grpc-go/releases;>google.golang.org/grpc's releases. Release 1.56.3 Security server: prohibit more than MaxConcurrentStreams handlers from running at once (CVE-2023-44487) In addition to this change, applications should ensure they do not leave running tasks behind related to the RPC before returning from method handlers, or should enforce appropriate limits on any such work. Release 1.56.2 status: To fix a panic, status.FromError now returns an error with codes.Unknown when the error implements the GRPCStatus() method, and calling GRPCStatus() returns nil. (https://redirect.github.com/grpc/grpc-go/issues/6374;>#6374) Release 1.56.1 client: handle empty address lists correctly in addrConn.updateAddrs Release 1.56.0 New Features client: support channel idleness using WithIdleTimeout dial option (https://redirect.github.com/grpc/grpc-go/issues/6263;>#6263) This feature is currently disabled by default, but will be enabled with a 30 minute default in the future. client: when using pickfirst, keep channel state in TRANSIENT_FAILURE until it becomes READY (https://github.com/grpc/proposal/blob/master/A62-pick-first.md;>gRFC A62) (https://redirect.github.com/grpc/grpc-go/issues/6306;>#6306) xds: Add support for Custom LB Policies (https://github.com/grpc/proposal/blob/master/A52-xds-custom-lb-policies.md;>gRFC A52) (https://redirect.github.com/grpc/grpc-go/issues/6224;>#6224) xds: support pick_first Custom LB policy (https://github.com/grpc/proposal/blob/master/A62-pick-first.md;>gRFC A62) (https://redirect.github.com/grpc/grpc-go/issues/6314;>#6314) (https://redirect.github.com/grpc/grpc-go/issues/6317;>#6317) client: add support for pickfirst address shuffling (https://github.com/grpc/proposal/blob/master/A62-pick-first.md;>gRFC A62) (https://redirect.github.com/grpc/grpc-go/issues/6311;>#6311) xds: Add support for String Matcher Header Matcher in RDS (https://redirect.github.com/grpc/grpc-go/issues/6313;>#6313) xds/outlierdetection: Add Channelz Logger to Outlier Detection LB (https://redirect.github.com/grpc/grpc-go/issues/6145;>#6145) Special Thanks: https://github.com/s-matyukevich;>@s-matyukevich xds: enable RLS in xDS by default (https://redirect.github.com/grpc/grpc-go/issues/6343;>#6343) orca: add support for application_utilization field and missing range checks on several metrics setters balancer/weightedroundrobin: add new LB policy for balancing between backends based on their load reports (https://github.com/grpc/proposal/blob/master/A58-client-side-weighted-round-robin-lb-policy.md;>gRFC A58) (https://redirect.github.com/grpc/grpc-go/issues/6241;>#6241) authz: add conversion of json to RBAC Audit Logging config (https://redirect.github.com/grpc/grpc-go/issues/6192;>#6192) authz: add support for stdout logger (https://redirect.github.com/grpc/grpc-go/issues/6230;>#6230 and https://redirect.github.com/grpc/grpc-go/issues/6298;>#6298) authz: support customizable audit functionality for authorization policy (https://redirect.github.com/grpc/grpc-go/issues/6192;>#6192 https://redirect.github.com/grpc/grpc-go/issues/6230;>#6230 https://redirect.github.com/grpc/grpc-go/issues/6298;>#6298 https://redirect.github.com/grpc/grpc-go/issues/6158;>#6158 https://redirect.github.com/grpc/grpc-go/issues/6304;>#6304 and https://redirect.github.com/grpc/grpc-go/issues/6225;>#6225) Bug Fixes orca: fix a race at startup of out-of-band metric subscriptions that would cause the report interval to request 0 (https://redirect.github.com/grpc/grpc-go/issues/6245;>#6245) xds/xdsresource: Fix Outlier Detection Config Handling and correctly set xDS Defaults (https://redirect.github.com/grpc/grpc-go/issues/6361;>#6361) xds/outlierdetection: Fix Outlier Detection Config Handling by setting defaults in ParseConfig() (https://redirect.github.com/grpc/grpc-go/issues/6361;>#6361) API Changes orca: allow a ServerMetricsProvider to be passed to the ORCA service and ServerOption (https://redirect.github.com/grpc/grpc-go/issues/6223;>#6223) Release 1.55.1 status: To fix a panic, status.FromError now returns an error with codes.Unknown when the error implements the GRPCStatus() method, and calling GRPCStatus() returns nil. (https://redirect.github.com/grpc/grpc-go/issues/6374;>#6374) Commits https://github.com/grpc/grpc-go/commit/1055b481ed2204a29d233286b9b50c42b63f8825;>1055b48 Update version.go to 1.56.3 (https://redirect.github.com/grpc/grpc-go/issues/6713;>#6713)
[camel-quarkus] branch dependabot/maven/quarkiverse-mybatis.version-2.2.0 created (now d0b71bb2e7)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/quarkiverse-mybatis.version-2.2.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git at d0b71bb2e7 Bump quarkiverse-mybatis.version from 2.1.0 to 2.2.0 No new revisions were added by this update.
[PR] Bump quarkiverse-mybatis.version from 2.1.0 to 2.2.0 [camel-quarkus]
dependabot[bot] opened a new pull request, #5459: URL: https://github.com/apache/camel-quarkus/pull/5459 Bumps `quarkiverse-mybatis.version` from 2.1.0 to 2.2.0. Updates `io.quarkiverse.mybatis:quarkus-mybatis` from 2.1.0 to 2.2.0 Updates `io.quarkiverse.mybatis:quarkus-mybatis-deployment` from 2.1.0 to 2.2.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-k] branch dependabot/go_modules/google.golang.org/grpc-1.58.3 created (now 87014acbe)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/go_modules/google.golang.org/grpc-1.58.3 in repository https://gitbox.apache.org/repos/asf/camel-k.git at 87014acbe chore(deps): bump google.golang.org/grpc from 1.58.2 to 1.58.3 No new revisions were added by this update.
[PR] chore(deps): bump google.golang.org/grpc from 1.58.2 to 1.58.3 [camel-k]
dependabot[bot] opened a new pull request, #4865: URL: https://github.com/apache/camel-k/pull/4865 Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.58.2 to 1.58.3. Release notes Sourced from https://github.com/grpc/grpc-go/releases;>google.golang.org/grpc's releases. Release 1.58.3 Security server: prohibit more than MaxConcurrentStreams handlers from running at once (CVE-2023-44487) In addition to this change, applications should ensure they do not leave running tasks behind related to the RPC before returning from method handlers, or should enforce appropriate limits on any such work. Commits https://github.com/grpc/grpc-go/commit/bf05b9558c16677e362d231120f8213eb276d406;>bf05b95 Change version.go to v1.58.3 (https://redirect.github.com/grpc/grpc-go/issues/6707;>#6707) https://github.com/grpc/grpc-go/commit/c40c9ba31558eb4dc74ba9d8bbc5058f1dfa;>c40c9ba server: prohibit more than MaxConcurrentStreams handlers from running at once... https://github.com/grpc/grpc-go/commit/dd9270d663c346b82341f7f51c4cded2bba5a653;>dd9270d update version to 1.58.3-dev (https://redirect.github.com/grpc/grpc-go/issues/6656;>#6656) See full diff in https://github.com/grpc/grpc-go/compare/v1.58.2...v1.58.3;>compare view [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=google.golang.org/grpc=go_modules=1.58.2=1.58.3)](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-k/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
Re: [PR] CAMEL-20048: findSingleByType should be consistent. Added mandatory v… [camel]
github-actions[bot] commented on PR #11840: URL: https://github.com/apache/camel/pull/11840#issuecomment-1780066654 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] CAMEL-20048: findSingleByType should be consistent. Added mandatory v… [camel]
davsclaus opened a new pull request, #11840: URL: https://github.com/apache/camel/pull/11840 …ariant and NoSuchBeanTypeException that better reflect this. # 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-20048: findSingleByType should be consistent. Added mandatory variant and NoSuchBeanTypeException that better reflect this.
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch primary in repository https://gitbox.apache.org/repos/asf/camel.git commit f69417759f19e80c582a6d4063d97e8346526131 Author: Claus Ibsen AuthorDate: Wed Oct 25 23:13:22 2023 +0200 CAMEL-20048: findSingleByType should be consistent. Added mandatory variant and NoSuchBeanTypeException that better reflect this. --- .../apache/camel/component/saga/SagaProducer.java | 5 +- .../JavaDslTransactedNoTXManagerTest.java | 4 +- .../java/org/apache/camel/NoSuchBeanException.java | 7 ++ .../org/apache/camel/NoSuchBeanTypeException.java | 32 .../java/org/apache/camel/spi/BeanRepository.java | 18 + .../impl/engine/CamelPostProcessorHelper.java | 18 ++--- .../camel/impl/engine/SimpleCamelContext.java | 5 +- .../java/org/apache/camel/impl/DefaultModel.java | 15 +--- .../camel/reifier/AbstractPolicyReifier.java | 86 +- .../java/org/apache/camel/reifier/LogReifier.java | 15 +--- .../java/org/apache/camel/reifier/SagaReifier.java | 8 +- .../org/apache/camel/util/EndpointHelperTest.java | 2 +- .../apache/camel/support/CamelContextHelper.java | 8 ++ .../org/apache/camel/support/DefaultEndpoint.java | 5 +- .../org/apache/camel/support/EndpointHelper.java | 9 +-- .../camel/support/LifecycleStrategySupport.java| 6 +- .../camel/support/PropertyBindingSupport.java | 25 +-- 17 files changed, 121 insertions(+), 147 deletions(-) diff --git a/components/camel-saga/src/main/java/org/apache/camel/component/saga/SagaProducer.java b/components/camel-saga/src/main/java/org/apache/camel/component/saga/SagaProducer.java index d03ef49ee5d..31ee7fc9515 100644 --- a/components/camel-saga/src/main/java/org/apache/camel/component/saga/SagaProducer.java +++ b/components/camel-saga/src/main/java/org/apache/camel/component/saga/SagaProducer.java @@ -37,10 +37,7 @@ public class SagaProducer extends DefaultAsyncProducer { CamelSagaService sagaService = endpoint.getCamelContext().hasService(CamelSagaService.class); if (sagaService == null) { -sagaService = CamelContextHelper.findSingleByType(endpoint.getCamelContext(), CamelSagaService.class); -} -if (sagaService == null) { -throw new IllegalStateException("Cannot find saga service: saga producers can only be used within a saga"); +sagaService = CamelContextHelper.mandatoryFindSingleByType(endpoint.getCamelContext(), CamelSagaService.class); } this.camelSagaService = sagaService; } diff --git a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/JavaDslTransactedNoTXManagerTest.java b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/JavaDslTransactedNoTXManagerTest.java index 6d44c15c849..e0f9537f52c 100644 --- a/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/JavaDslTransactedNoTXManagerTest.java +++ b/components/camel-spring-xml/src/test/java/org/apache/camel/spring/processor/JavaDslTransactedNoTXManagerTest.java @@ -44,7 +44,9 @@ public class JavaDslTransactedNoTXManagerTest extends ContextTestSupport { fail("Should have thrown an exception"); } catch (Exception e) { NoSuchBeanException cause = assertIsInstanceOf(NoSuchBeanException.class, e.getCause()); -assertEquals("No bean could be found in the registry of type: PlatformTransactionManager", cause.getMessage()); +assertEquals( +"No bean could be found in the registry for: org.springframework.transaction.PlatformTransactionManager", +cause.getMessage()); } } diff --git a/core/camel-api/src/main/java/org/apache/camel/NoSuchBeanException.java b/core/camel-api/src/main/java/org/apache/camel/NoSuchBeanException.java index 888668f1bcc..42bc3053d8d 100644 --- a/core/camel-api/src/main/java/org/apache/camel/NoSuchBeanException.java +++ b/core/camel-api/src/main/java/org/apache/camel/NoSuchBeanException.java @@ -28,6 +28,13 @@ public class NoSuchBeanException extends RuntimeCamelException { this.name = name; } +public NoSuchBeanException(String name, int size) { +super(size > 0 +? "Found " + size + " beans for: " + name + " in the registry, only 1 bean excepted." +: "No bean could be found in the registry for: " + name); +this.name = name; +} + public NoSuchBeanException(String name, String type) { super("No bean could be found in the registry" + (name != null ? " for: " + name : "") + " of type: " + type); this.name = name; diff --git a/core/camel-api/src/main/java/org/apache/camel/NoSuchBeanTypeException.java b/core/camel-api/src/main/java/org/apache/camel/NoSuchBeanTypeException.java new file mode 100644 index
[camel] branch primary created (now f69417759f1)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch primary in repository https://gitbox.apache.org/repos/asf/camel.git at f69417759f1 CAMEL-20048: findSingleByType should be consistent. Added mandatory variant and NoSuchBeanTypeException that better reflect this. This branch includes the following new commits: new f69417759f1 CAMEL-20048: findSingleByType should be consistent. Added mandatory variant and NoSuchBeanTypeException that better reflect this. 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] Adding possibility to send binary messages to Azure Service Bus [camel]
davsclaus commented on PR #11838: URL: https://github.com/apache/camel/pull/11838#issuecomment-1779946244 eg BinaryData is azure specifc and end users dont know about this, and its a hazzle for them to write code that creates a BinaryData object and populate it, to use in Camel -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Adding possibility to send binary messages to Azure Service Bus [camel]
davsclaus commented on PR #11838: URL: https://github.com/apache/camel/pull/11838#issuecomment-1779945323 I wonder if BinaryData can be created with InputStream as input source, eg if you do binary=true, and have a FileInputStream / File as message body, then IMHO it would be good that this can automatic convert this into BinaryData and use that. eg for big files then the file content is not needed to be loaded into memory, as byte[] otherwise would require. -- 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] Adding possibility to send binary messages to Azure Service Bus [camel]
a-mazurok commented on code in PR #11838: URL: https://github.com/apache/camel/pull/11838#discussion_r1372249368 ## components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusProducer.java: ## @@ -147,12 +147,12 @@ private BiConsumer sendMessages() { Mono sendMessageAsync; -if (exchange.getMessage().getBody() instanceof Iterable) { +if (exchange.getMessage().getBody() instanceof Iterable) { sendMessageAsync -= serviceBusSenderOperations.sendMessages(convertBodyToList((Iterable) inputBody), += serviceBusSenderOperations.sendMessages(convertBodyToList((Iterable) inputBody), configurationOptionsProxy.getServiceBusTransactionContext(exchange), applicationProperties); } else { -sendMessageAsync = serviceBusSenderOperations.sendMessages(exchange.getMessage().getBody(String.class), +sendMessageAsync = serviceBusSenderOperations.sendMessages(inputBody, Review Comment: Added new property "binary". -- 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] Set features to DocumentBuilderFactory to protect from XXE; fix for SAST [camel-spring-boot]
davsclaus commented on code in PR #989: URL: https://github.com/apache/camel-spring-boot/pull/989#discussion_r1372246340 ## tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/util/DependencyResolver.java: ## @@ -151,6 +151,9 @@ private static String getParentVersion(File pom) throws Exception { } private static String xpath(File pom, String expression) throws Exception { + factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl",true); Review Comment: space after comma is the code style we use -- 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] Set features to DocumentBuilderFactory to protect from XXE; fix for SAST [camel-spring-boot]
cunningt opened a new pull request, #989: URL: https://github.com/apache/camel-spring-boot/pull/989 Set features to DocumentBuilderFactory to protect from XXE; fix for SAST -- 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] Externalize credentials to properties files for SAST tests [camel-spring-boot]
cunningt opened a new pull request, #988: URL: https://github.com/apache/camel-spring-boot/pull/988 Externalize credentials to properties files for SAST tests.Found a typo in the filename of one of the test classes (EncryptedProperiesTestBase), renamed it. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Remove duplicate quarkus-resteasy dependency from camel-quarkus-integration-test-azure-servicebus [camel-quarkus]
jamesnetherton merged PR #5458: URL: https://github.com/apache/camel-quarkus/pull/5458 -- 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 main updated: Remove duplicate quarkus-resteasy dependency from camel-quarkus-integration-test-azure-servicebus
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new 9f52c497c8 Remove duplicate quarkus-resteasy dependency from camel-quarkus-integration-test-azure-servicebus 9f52c497c8 is described below commit 9f52c497c886678b1a291701df165044c59b04a7 Author: James Netherton AuthorDate: Wed Oct 25 15:11:41 2023 +0100 Remove duplicate quarkus-resteasy dependency from camel-quarkus-integration-test-azure-servicebus --- integration-tests-jvm/azure-servicebus/pom.xml | 4 1 file changed, 4 deletions(-) diff --git a/integration-tests-jvm/azure-servicebus/pom.xml b/integration-tests-jvm/azure-servicebus/pom.xml index 53cbef0fa3..fb6eb0cb85 100644 --- a/integration-tests-jvm/azure-servicebus/pom.xml +++ b/integration-tests-jvm/azure-servicebus/pom.xml @@ -66,10 +66,6 @@ org.apache.camel.quarkus camel-quarkus-mock - -io.quarkus -quarkus-resteasy - io.quarkus quarkus-resteasy-jsonb
[camel-quarkus] branch main updated: Upgrade to Quarkus CXF 2.5.0 fix #5442
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new e8cf6c974c Upgrade to Quarkus CXF 2.5.0 fix #5442 e8cf6c974c is described below commit e8cf6c974c6d3c29f1f24ecb345e85e47d28847c Author: Peter Palaga AuthorDate: Wed Oct 25 11:04:06 2023 +0200 Upgrade to Quarkus CXF 2.5.0 fix #5442 --- .../cxf/soap/mtom/awt/it/CxfSoapMtomAwtIT.java | 2 - pom.xml| 2 +- poms/bom/src/main/generated/flattened-full-pom.xml | 500 ++--- .../src/main/generated/flattened-reduced-pom.xml | 46 +- .../generated/flattened-reduced-verbose-pom.xml| 500 ++--- 5 files changed, 524 insertions(+), 526 deletions(-) diff --git a/integration-test-groups/cxf-soap/cxf-soap-mtom-awt/src/test/java/org/apache/camel/quarkus/component/cxf/soap/mtom/awt/it/CxfSoapMtomAwtIT.java b/integration-test-groups/cxf-soap/cxf-soap-mtom-awt/src/test/java/org/apache/camel/quarkus/component/cxf/soap/mtom/awt/it/CxfSoapMtomAwtIT.java index 38698246db..5920b37eb5 100644 --- a/integration-test-groups/cxf-soap/cxf-soap-mtom-awt/src/test/java/org/apache/camel/quarkus/component/cxf/soap/mtom/awt/it/CxfSoapMtomAwtIT.java +++ b/integration-test-groups/cxf-soap/cxf-soap-mtom-awt/src/test/java/org/apache/camel/quarkus/component/cxf/soap/mtom/awt/it/CxfSoapMtomAwtIT.java @@ -16,10 +16,8 @@ */ package org.apache.camel.quarkus.component.cxf.soap.mtom.awt.it; -import io.quarkus.test.junit.DisabledOnIntegrationTest; import io.quarkus.test.junit.QuarkusIntegrationTest; -@DisabledOnIntegrationTest("https://github.com/apache/camel-quarkus/issues/5442;) @QuarkusIntegrationTest class CxfSoapMtomAwtIT extends CxfSoapMtomAwtTest { } diff --git a/pom.xml b/pom.xml index 93cbc16425..b3082a0dae 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ 9.37.0.Final 2.5.0 3.1.2 -2.4.1 +2.5.0 1.0.0 3.5.0 2.0.1 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 2864b2ba2f..b4be0f091f 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6819,436 +6819,436 @@ 3.9.0 -org.apache.cxf -cxf-core -4.0.3 +org.apache.cxf +cxf-core +4.0.3 -org.apache.cxf -cxf-rt-features-logging -4.0.3 +org.apache.cxf +cxf-rt-features-logging +4.0.3 -org.apache.cxf -cxf-rt-features-metrics -4.0.3 +org.apache.cxf +cxf-rt-features-metrics +4.0.3 -org.apache.cxf -cxf-rt-frontend-jaxws -4.0.3 +org.apache.cxf +cxf-rt-frontend-jaxws +4.0.3 -org.ow2.asm -asm +org.ow2.asm +asm -org.apache.cxf -cxf-rt-transports-http -4.0.3 +org.apache.cxf +cxf-rt-transports-http +4.0.3 -org.apache.cxf -cxf-rt-transports-http-hc5 -4.0.3 +org.apache.cxf +cxf-rt-transports-http-hc5 +4.0.3 -org.slf4j -jcl-over-slf4j +org.slf4j +jcl-over-slf4j -org.apache.cxf -cxf-rt-ws-mex -4.0.3 +org.apache.cxf +cxf-rt-ws-mex +4.0.3 -org.apache.cxf -cxf-rt-ws-security -4.0.3 +org.apache.cxf +cxf-rt-ws-security +4.0.3 -org.apache.cxf -cxf-rt-ws-rm -4.0.3 +org.apache.cxf +cxf-rt-ws-rm +4.0.3 -org.apache.cxf -cxf-rt-wsdl -4.0.3 +org.apache.cxf +cxf-rt-wsdl +4.0.3 -org.ow2.asm -asm +org.ow2.asm +asm -org.apache.cxf.services.sts -cxf-services-sts-core -4.0.3 +org.apache.cxf.services.sts +cxf-services-sts-core +4.0.3 -org.apache.cxf.xjcplugins -cxf-xjc-boolean -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-boolean +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-dv -4.0.0 +org.apache.cxf.xjcplugins +cxf-xjc-dv +4.0.0 -org.apache.cxf.xjcplugins -cxf-xjc-javadoc -4.0.0 +org.apache.cxf.xjcplugins +
Re: [PR] Upgrade to Quarkus CXF 2.5.0 [camel-quarkus]
jamesnetherton merged PR #5457: URL: https://github.com/apache/camel-quarkus/pull/5457 -- 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] cxf-soap CxfSoapMtomAwtIT fails with Mandrel 23.1 JDK 21 [camel-quarkus]
jamesnetherton closed issue #5442: cxf-soap CxfSoapMtomAwtIT fails with Mandrel 23.1 JDK 21 URL: https://github.com/apache/camel-quarkus/issues/5442 -- 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 (5d8c2cc894e -> b3f38eb9c19)
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 5d8c2cc894e Update known camel releases add b3f38eb9c19 CAMEL-20036: camel-endpointdsl - Add static builders for alias scheme… (#11839) No new revisions were added by this update. Summary of changes: .../builder/endpoint/StaticEndpointBuilders.java | 261 - .../endpoint/dsl/AWS2S3EndpointBuilderFactory.java | 4 +- .../dsl/EventbridgeEndpointBuilderFactory.java | 4 +- .../endpoint/dsl/HttpEndpointBuilderFactory.java | 6 +- .../{HttpsBasicAuthTest.java => HttpsTest.java}| 20 +- .../camel/maven/packaging/EndpointDslMojo.java | 37 ++- .../maven/packaging/generics/JavadocUtil.java | 13 +- 7 files changed, 293 insertions(+), 52 deletions(-) copy dsl/camel-endpointdsl/src/test/java/org/apache/camel/builder/endpoint/{HttpsBasicAuthTest.java => HttpsTest.java} (69%)
Re: [I] perf-regression: mean throughput regression appears with Camel Quarkus 3.5.0 [camel-quarkus]
orpiske commented on issue #5452: URL: https://github.com/apache/camel-quarkus/issues/5452#issuecomment-1779799762 @aldettinger Yes, something like that would help. I'd recommend something like this (that's what I use for Camel Core): ``` -agentpath:/path/to/libasyncProfiler.so=start,ann,threads,event=cpu,file=report.html ``` You probably don't need to adjust the interval - I believe the default of 10ms used by the profiler is enough, but we can adjust if we don't collect enough detail. Also, if I understand it correctly, your tests run for a very long time ... We don't need that much and, probably, around 5-10 minutes should give enough information. > Looking at the git logs, there are quite some commits with impact on core. So, maybe we'll need a kind of Camel only reproducer at some points to help ensure the regression is fixed ? Yes. The core of Camel Core has been very much active recently I have a load generator for core but it's mostly for local components (ie.: `seda`, `disruptor`, `direct`, etc). It could be modified, but I don't have the tooling to generate external load (besides Kafka). -- 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 dsl-https deleted (was 9f75e3df208)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch dsl-https in repository https://gitbox.apache.org/repos/asf/camel.git was 9f75e3df208 CAMEL-20036: camel-endpointdsl - Add static builders for alias schemes such as https 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-20036: camel-endpointdsl - Add static builders for alias scheme… (#11839)
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 b3f38eb9c19 CAMEL-20036: camel-endpointdsl - Add static builders for alias scheme… (#11839) b3f38eb9c19 is described below commit b3f38eb9c193751f1834b68e574317045661767d Author: Claus Ibsen AuthorDate: Wed Oct 25 19:57:38 2023 +0200 CAMEL-20036: camel-endpointdsl - Add static builders for alias scheme… (#11839) * CAMEL-20036: camel-endpointdsl - Add static builders for alias schemes such as https * CAMEL-20036: camel-endpointdsl - Add static builders for alias schemes such as https --- .../builder/endpoint/StaticEndpointBuilders.java | 261 - .../endpoint/dsl/AWS2S3EndpointBuilderFactory.java | 4 +- .../dsl/EventbridgeEndpointBuilderFactory.java | 4 +- .../endpoint/dsl/HttpEndpointBuilderFactory.java | 6 +- .../apache/camel/builder/endpoint/HttpsTest.java | 54 + .../camel/maven/packaging/EndpointDslMojo.java | 37 ++- .../maven/packaging/generics/JavadocUtil.java | 13 +- 7 files changed, 342 insertions(+), 37 deletions(-) diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java index 6459890cd79..3b64cddb62c 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java @@ -738,7 +738,7 @@ public class StaticEndpointBuilders { * Path parameter: eventbusNameOrArn (required) * Event bus name or ARN * - * @param path //eventbusNameOrArn + * @param path eventbusNameOrArn * @return the dsl builder */ public static org.apache.camel.builder.endpoint.dsl.EventbridgeEndpointBuilderFactory.EventbridgeEndpointBuilder aws2Eventbridge( @@ -760,7 +760,7 @@ public class StaticEndpointBuilders { * * @param componentName to use a custom component name for the endpoint * instead of the default name - * @param path //eventbusNameOrArn + * @param path eventbusNameOrArn * @return the dsl builder */ public static org.apache.camel.builder.endpoint.dsl.EventbridgeEndpointBuilderFactory.EventbridgeEndpointBuilder aws2Eventbridge( @@ -1125,7 +1125,7 @@ public class StaticEndpointBuilders { * Path parameter: bucketNameOrArn (required) * Bucket name or ARN * - * @param path //bucketNameOrArn + * @param path bucketNameOrArn * @return the dsl builder */ public static org.apache.camel.builder.endpoint.dsl.AWS2S3EndpointBuilderFactory.AWS2S3EndpointBuilder aws2S3( @@ -1147,7 +1147,7 @@ public class StaticEndpointBuilders { * * @param componentName to use a custom component name for the endpoint * instead of the default name - * @param path //bucketNameOrArn + * @param path bucketNameOrArn * @return the dsl builder */ public static org.apache.camel.builder.endpoint.dsl.AWS2S3EndpointBuilderFactory.AWS2S3EndpointBuilder aws2S3( @@ -2591,6 +2591,66 @@ public class StaticEndpointBuilders { String path) { return org.apache.camel.builder.endpoint.dsl.CoAPEndpointBuilderFactory.endpointBuilder(componentName, path); } +/** + * CoAP (Secure) (camel-coap) + * Send and receive messages to/from COAP capable devices. + * + * Category: iot + * Since: 2.16 + * Maven coordinates: org.apache.camel:camel-coap + * + * Syntax: coaps:uri + * + * Path parameter: uri + * The URI for the CoAP endpoint + * + * @param path uri + * @return the dsl builder + */ +public static org.apache.camel.builder.endpoint.dsl.CoAPEndpointBuilderFactory.CoAPEndpointBuilder coaps( +String path) { +return org.apache.camel.builder.endpoint.dsl.CoAPEndpointBuilderFactory.endpointBuilder("coaps", path); +} +/** + * CoAP (camel-coap) + * Send and receive messages to/from COAP capable devices. + * + * Category: iot + * Since: 2.16 + * Maven coordinates: org.apache.camel:camel-coap + * + * Syntax: coaps+tcp:uri + * + * Path parameter: uri + * The URI for the CoAP endpoint + * + * @param path uri + * @return the dsl builder + */ +public static org.apache.camel.builder.endpoint.dsl.CoAPEndpointBuilderFactory.CoAPEndpointBuilder coapsTcp( +String path) { +return org.apache.camel.builder.endpoint.dsl.CoAPEndpointBuilderFactory.endpointBuilder("coaps+tcp", path); +} +/** + * CoAP (camel-coap) + * Send and receive
Re: [PR] CAMEL-20036: camel-endpointdsl - Add static builders for alias scheme… [camel]
davsclaus merged PR #11839: URL: https://github.com/apache/camel/pull/11839 -- 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] Adding possibility to send binary messages to Azure Service Bus [camel]
davsclaus commented on code in PR #11838: URL: https://github.com/apache/camel/pull/11838#discussion_r1372124086 ## components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusProducer.java: ## @@ -147,12 +147,12 @@ private BiConsumer sendMessages() { Mono sendMessageAsync; -if (exchange.getMessage().getBody() instanceof Iterable) { +if (exchange.getMessage().getBody() instanceof Iterable) { sendMessageAsync -= serviceBusSenderOperations.sendMessages(convertBodyToList((Iterable) inputBody), += serviceBusSenderOperations.sendMessages(convertBodyToList((Iterable) inputBody), configurationOptionsProxy.getServiceBusTransactionContext(exchange), applicationProperties); } else { -sendMessageAsync = serviceBusSenderOperations.sendMessages(exchange.getMessage().getBody(String.class), +sendMessageAsync = serviceBusSenderOperations.sendMessages(inputBody, Review Comment: Yeah that sounds like a good idea. -- 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] Adding possibility to send binary messages to Azure Service Bus [camel]
a-mazurok commented on code in PR #11838: URL: https://github.com/apache/camel/pull/11838#discussion_r1372068319 ## components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusProducer.java: ## @@ -147,12 +147,12 @@ private BiConsumer sendMessages() { Mono sendMessageAsync; -if (exchange.getMessage().getBody() instanceof Iterable) { +if (exchange.getMessage().getBody() instanceof Iterable) { sendMessageAsync -= serviceBusSenderOperations.sendMessages(convertBodyToList((Iterable) inputBody), += serviceBusSenderOperations.sendMessages(convertBodyToList((Iterable) inputBody), configurationOptionsProxy.getServiceBusTransactionContext(exchange), applicationProperties); } else { -sendMessageAsync = serviceBusSenderOperations.sendMessages(exchange.getMessage().getBody(String.class), +sendMessageAsync = serviceBusSenderOperations.sendMessages(inputBody, Review Comment: Yes, BinaryData is Azure special class that is like wrapper that can hold both Strings and bytes inside. If I correctly understand your thoughts direction then probably some new endpoint configuration property should be added e.g. `binary` with default value false(backward compatible) that will control if Camel should try to convert any Java class to String or byte[] unless it is already BinaryData type that doesn't need any conversion. -- 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 dsl-https updated (381e9cfdb4a -> 9f75e3df208)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch dsl-https in repository https://gitbox.apache.org/repos/asf/camel.git from 381e9cfdb4a CAMEL-20036: camel-endpointdsl - Add static builders for alias schemes such as https add 9f75e3df208 CAMEL-20036: camel-endpointdsl - Add static builders for alias schemes such as https No new revisions were added by this update. Summary of changes: .../camel/builder/endpoint/StaticEndpointBuilders.java | 14 +++--- .../builder/endpoint/dsl/AWS2S3EndpointBuilderFactory.java | 4 ++-- .../endpoint/dsl/EventbridgeEndpointBuilderFactory.java| 4 ++-- .../builder/endpoint/dsl/HttpEndpointBuilderFactory.java | 6 +++--- .../apache/camel/maven/packaging/generics/JavadocUtil.java | 13 +++-- 5 files changed, 25 insertions(+), 16 deletions(-)
Re: [PR] Adding possibility to send binary messages to Azure Service Bus [camel]
davsclaus commented on code in PR #11838: URL: https://github.com/apache/camel/pull/11838#discussion_r1372060730 ## components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusProducer.java: ## @@ -147,12 +147,12 @@ private BiConsumer sendMessages() { Mono sendMessageAsync; -if (exchange.getMessage().getBody() instanceof Iterable) { +if (exchange.getMessage().getBody() instanceof Iterable) { sendMessageAsync -= serviceBusSenderOperations.sendMessages(convertBodyToList((Iterable) inputBody), += serviceBusSenderOperations.sendMessages(convertBodyToList((Iterable) inputBody), configurationOptionsProxy.getServiceBusTransactionContext(exchange), applicationProperties); } else { -sendMessageAsync = serviceBusSenderOperations.sendMessages(exchange.getMessage().getBody(String.class), +sendMessageAsync = serviceBusSenderOperations.sendMessages(inputBody, Review Comment: Ok thanks, but we need to leverage Camels type converter systems, so eg if your body is a `java.io.File` or `InputStream` then they can be sent as-is also. And is BinaryData some kind of azure class ? -- 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-20036: camel-endpointdsl - Add static builders for alias scheme… [camel]
davsclaus opened a new pull request, #11839: URL: https://github.com/apache/camel/pull/11839 …s such as https # 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-20036: camel-endpointdsl - Add static builders for alias schemes such as https
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch dsl-https in repository https://gitbox.apache.org/repos/asf/camel.git commit 381e9cfdb4a44b065c237efe4e566b8c22d1a8e7 Author: Claus Ibsen AuthorDate: Wed Oct 25 18:50:14 2023 +0200 CAMEL-20036: camel-endpointdsl - Add static builders for alias schemes such as https --- .../builder/endpoint/StaticEndpointBuilders.java | 249 + .../apache/camel/builder/endpoint/HttpsTest.java | 54 + .../camel/maven/packaging/EndpointDslMojo.java | 37 ++- 3 files changed, 318 insertions(+), 22 deletions(-) diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java index 6459890cd79..3a0a2809710 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java @@ -2591,6 +2591,66 @@ public class StaticEndpointBuilders { String path) { return org.apache.camel.builder.endpoint.dsl.CoAPEndpointBuilderFactory.endpointBuilder(componentName, path); } +/** + * CoAP (Secure) (camel-coap) + * Send and receive messages to/from COAP capable devices. + * + * Category: iot + * Since: 2.16 + * Maven coordinates: org.apache.camel:camel-coap + * + * Syntax: coaps:uri + * + * Path parameter: uri + * The URI for the CoAP endpoint + * + * @param path uri + * @return the dsl builder + */ +public static org.apache.camel.builder.endpoint.dsl.CoAPEndpointBuilderFactory.CoAPEndpointBuilder coaps( +String path) { +return org.apache.camel.builder.endpoint.dsl.CoAPEndpointBuilderFactory.endpointBuilder("coaps", path); +} +/** + * CoAP (camel-coap) + * Send and receive messages to/from COAP capable devices. + * + * Category: iot + * Since: 2.16 + * Maven coordinates: org.apache.camel:camel-coap + * + * Syntax: coaps+tcp:uri + * + * Path parameter: uri + * The URI for the CoAP endpoint + * + * @param path uri + * @return the dsl builder + */ +public static org.apache.camel.builder.endpoint.dsl.CoAPEndpointBuilderFactory.CoAPEndpointBuilder coapsTcp( +String path) { +return org.apache.camel.builder.endpoint.dsl.CoAPEndpointBuilderFactory.endpointBuilder("coaps+tcp", path); +} +/** + * CoAP (camel-coap) + * Send and receive messages to/from COAP capable devices. + * + * Category: iot + * Since: 2.16 + * Maven coordinates: org.apache.camel:camel-coap + * + * Syntax: coap+tcp:uri + * + * Path parameter: uri + * The URI for the CoAP endpoint + * + * @param path uri + * @return the dsl builder + */ +public static org.apache.camel.builder.endpoint.dsl.CoAPEndpointBuilderFactory.CoAPEndpointBuilder coapTcp( +String path) { +return org.apache.camel.builder.endpoint.dsl.CoAPEndpointBuilderFactory.endpointBuilder("coap+tcp", path); +} /** * CometD (camel-cometd) * Offers publish/subscribe, peer-to-peer (via a server), and RPC style @@ -2650,6 +2710,34 @@ public class StaticEndpointBuilders { String path) { return org.apache.camel.builder.endpoint.dsl.CometdEndpointBuilderFactory.endpointBuilder(componentName, path); } +/** + * CometD (Secure) (camel-cometd) + * Offers publish/subscribe, peer-to-peer (via a server), and RPC style + * messaging using the CometD/Bayeux protocol. + * + * Category: networking,messaging + * Since: 2.0 + * Maven coordinates: org.apache.camel:camel-cometd + * + * Syntax: cometds:host:port/channelName + * + * Path parameter: host (required) + * Hostname + * + * Path parameter: port (required) + * Host port number + * + * Path parameter: channelName (required) + * The channelName represents a topic that can be subscribed to by the Camel + * endpoints. + * + * @param path host:port/channelName + * @return the dsl builder + */ +public static org.apache.camel.builder.endpoint.dsl.CometdEndpointBuilderFactory.CometdEndpointBuilder cometds( +String path) { +return org.apache.camel.builder.endpoint.dsl.CometdEndpointBuilderFactory.endpointBuilder("cometds", path); +} /** * Consul (camel-consul) * Integrate with Consul service discovery and configuration store. @@ -6407,6 +6495,26 @@ public class StaticEndpointBuilders { String path) { return org.apache.camel.builder.endpoint.dsl.HttpEndpointBuilderFactory.endpointBuilder(componentName,
[camel] branch dsl-https created (now 381e9cfdb4a)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch dsl-https in repository https://gitbox.apache.org/repos/asf/camel.git at 381e9cfdb4a CAMEL-20036: camel-endpointdsl - Add static builders for alias schemes such as https This branch includes the following new commits: new 381e9cfdb4a CAMEL-20036: camel-endpointdsl - Add static builders for alias schemes such as https 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 (fcb3da2abea -> 5d8c2cc894e)
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 fcb3da2abea CAMEL-20033: camel-jbang - Write to settings properties file using JDK Properties code that escapes key and value so it works on Windows. add 5d8c2cc894e Update known camel releases No new revisions were added by this update. Summary of changes: .../org/apache/camel/catalog/releases/camel-quarkus-releases.json| 5 + 1 file changed, 5 insertions(+)
[camel] branch regen_bot_40x updated (59ee8f30c61 -> 5d8c2cc894e)
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 59ee8f30c61 [CAMEL-20037] camel-http builds StringEntity with wrong contentEncoding (#11828) add 6a07b38223e Update route-template.adoc (#11832) add f12421c5232 Polished add 9f887d5d92e (chores) camel-core: added unit test for some ObjectHelper methods add dbf79132760 (chores) camel-core: avoid checking for the first char during the loop add b7831e34609 cleanups: replaced File#delete with Files#delete add ff942fa2ac5 CAMEL-20007: Disable camel-ignite tests on java 21 as its not compatible yet add d8eda095c29 CAMEL-19973 - Camel-AWS components: Revisit description - EC2 component (#11834) add 5143723fb2f CAMEL-20033: camel-jbang - Write to settings properties file using JDK Properties code that escapes key and value so it works on Windows. (#11836) add 09c1a8ee42b CAMEL-19973 - Camel-AWS components: Revisit description - ECS Component (#11835) add fcb3da2abea CAMEL-20033: camel-jbang - Write to settings properties file using JDK Properties code that escapes key and value so it works on Windows. add 5d8c2cc894e Update known camel releases No new revisions were added by this update. Summary of changes: .../catalog/releases/camel-quarkus-releases.json | 5 + components/camel-aws/camel-aws2-ec2/pom.xml| 2 +- .../services/org/apache/camel/component.properties | 2 +- components/camel-aws/camel-aws2-ecs/pom.xml| 2 +- .../services/org/apache/camel/component.properties | 2 +- components/camel-ignite/pom.xml| 26 - .../src/main/docs/opentelemetry.adoc | 13 ++- .../camel/opentelemetry/AttributeProcessor.java| 10 -- .../OpenTelemetryTracingStrategy.java | 2 + .../SetCorrelationContextProcessor.java| 16 +-- .../propagators/OpenTelemetrySetter.java | 1 + .../org/apache/camel/test/junit5/TestSupport.java | 5 +- .../org/apache/camel/support/ObjectHelper.java | 56 ++ .../org/apache/camel/support/ObjectHelperTest.java | 123 + .../modules/ROOT/pages/route-template.adoc | 2 +- .../dsl/jbang/core/commands/ExportBaseCommand.java | 10 +- .../apache/camel/dsl/jbang/core/commands/Run.java | 19 +++- .../camel/dsl/jbang/core/common/RuntimeUtil.java | 26 - 18 files changed, 255 insertions(+), 67 deletions(-) create mode 100644 core/camel-support/src/test/java/org/apache/camel/support/ObjectHelperTest.java
Re: [PR] Adding possibility to send binary messages to Azure Service Bus [camel]
a-mazurok commented on code in PR #11838: URL: https://github.com/apache/camel/pull/11838#discussion_r1372043405 ## components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusProducer.java: ## @@ -147,12 +147,12 @@ private BiConsumer sendMessages() { Mono sendMessageAsync; -if (exchange.getMessage().getBody() instanceof Iterable) { +if (exchange.getMessage().getBody() instanceof Iterable) { sendMessageAsync -= serviceBusSenderOperations.sendMessages(convertBodyToList((Iterable) inputBody), += serviceBusSenderOperations.sendMessages(convertBodyToList((Iterable) inputBody), configurationOptionsProxy.getServiceBusTransactionContext(exchange), applicationProperties); } else { -sendMessageAsync = serviceBusSenderOperations.sendMessages(exchange.getMessage().getBody(String.class), +sendMessageAsync = serviceBusSenderOperations.sendMessages(inputBody, Review Comment: In case of other Java types `ServiceBusUtils` will throw `IllegalArgumentException("Make sure your message data is in String, byte[] or BinaryData")`(not changed that). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
Re: [PR] Adding possibility to send binary messages to Azure Service Bus [camel]
a-mazurok commented on code in PR #11838: URL: https://github.com/apache/camel/pull/11838#discussion_r1372031655 ## components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusProducer.java: ## @@ -147,12 +147,12 @@ private BiConsumer sendMessages() { Mono sendMessageAsync; -if (exchange.getMessage().getBody() instanceof Iterable) { +if (exchange.getMessage().getBody() instanceof Iterable) { sendMessageAsync -= serviceBusSenderOperations.sendMessages(convertBodyToList((Iterable) inputBody), += serviceBusSenderOperations.sendMessages(convertBodyToList((Iterable) inputBody), configurationOptionsProxy.getServiceBusTransactionContext(exchange), applicationProperties); } else { -sendMessageAsync = serviceBusSenderOperations.sendMessages(exchange.getMessage().getBody(String.class), +sendMessageAsync = serviceBusSenderOperations.sendMessages(inputBody, Review Comment: As I can see both consumers and producers will support only String, byte[] and BinaryData and only those types(besides special AmqpMessageBody and ServiceBusReceivedMessage types) are supported by underlying Azure library. I think that client developer can always convert any other Java type to String if necessary in proper way(including Camel type converters) than doing it internally and implicitly with toString() method or implicit Camel type converters(as it works so far). Binary data like Protobuf messages(our case) can't be properly converted to String type and I believe that many other organizations may have met the same limitation already. I understand that potentially that change can break some potentially existing clients who were relying on such implicit conversion of different Java types to String so such change shouldn't be released as minor version upgrade 4.1.X but I hope it can be included in 4.2.0 release together with documentation update. Maybe we can add the same change in new Camel 3.X.0 release as well(if any planned). -- 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] Adding possibility to send binary messages to Azure Service Bus [camel]
a-mazurok commented on code in PR #11838: URL: https://github.com/apache/camel/pull/11838#discussion_r1372031655 ## components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusProducer.java: ## @@ -147,12 +147,12 @@ private BiConsumer sendMessages() { Mono sendMessageAsync; -if (exchange.getMessage().getBody() instanceof Iterable) { +if (exchange.getMessage().getBody() instanceof Iterable) { sendMessageAsync -= serviceBusSenderOperations.sendMessages(convertBodyToList((Iterable) inputBody), += serviceBusSenderOperations.sendMessages(convertBodyToList((Iterable) inputBody), configurationOptionsProxy.getServiceBusTransactionContext(exchange), applicationProperties); } else { -sendMessageAsync = serviceBusSenderOperations.sendMessages(exchange.getMessage().getBody(String.class), +sendMessageAsync = serviceBusSenderOperations.sendMessages(inputBody, Review Comment: As I can see both consumers and producers will support only String, byte[] and BinaryData and only those types(besides special AmqpMessageBody and ServiceBusReceivedMessage types) are supported by underlying Azure library. I think that client developer can always convert any other Java type to String if necessary in proper way(including Camel type converters) than doing it internally and implicitly with toString() method or implicit Camel type converters. Binary data like Protobuf messages(our case) can't be properly converted to String type and I believe that many other organizations may have met the same limitation already. I understand that potentially that change can break some potentially existing clients who were relying on such implicit conversion of different Java types to String so such change shouldn't be released as minor version upgrade 4.1.X but I hope it can be included in 4.2.0 release together with documentation update. Maybe we can add the same change in new Camel 3.X.0 release as well(if any planned). -- 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-4.0.x updated: Update known camel releases
This is an automated email from the ASF dual-hosted git repository. davsclaus 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 2cdc706370d Update known camel releases 2cdc706370d is described below commit 2cdc706370d74e3b119041599caa105781244d57 Author: Claus Ibsen AuthorDate: Wed Oct 25 18:20:15 2023 +0200 Update known camel releases --- .../org/apache/camel/catalog/releases/camel-quarkus-releases.json| 5 + 1 file changed, 5 insertions(+) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json index ef265e8f4d8..b72cb8928a9 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json @@ -196,5 +196,10 @@ "version": "3.4.0", "date": "2023-09-18", "jdk": "17" +}, +{ +"version": "3.5.0", +"date": "2023-10-25", +"jdk": "17" } ]
[camel] branch main updated: Update known camel releases
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 5d8c2cc894e Update known camel releases 5d8c2cc894e is described below commit 5d8c2cc894e85b56c2358e76df530c82b335e3a5 Author: Claus Ibsen AuthorDate: Wed Oct 25 18:20:15 2023 +0200 Update known camel releases --- .../org/apache/camel/catalog/releases/camel-quarkus-releases.json| 5 + 1 file changed, 5 insertions(+) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json index ef265e8f4d8..b72cb8928a9 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/releases/camel-quarkus-releases.json @@ -196,5 +196,10 @@ "version": "3.4.0", "date": "2023-09-18", "jdk": "17" +}, +{ +"version": "3.5.0", +"date": "2023-10-25", +"jdk": "17" } ]
Error while running github feature from .asf.yaml in camel-website-pub!
An error occurred while running github feature in .asf.yaml!: 422 {"message": "Validation Failed", "errors": [{"message": "Sorry, you need to allow at least one merge strategy. (no_merge_method)", "resource": "Repository", "field": "merge_commit_allowed", "code": "invalid"}], "documentation_url": "https://docs.github.com/rest/repos/repos#update-a-repository"}
[camel] branch regen_bot updated (09c1a8ee42b -> fcb3da2abea)
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 09c1a8ee42b CAMEL-19973 - Camel-AWS components: Revisit description - ECS Component (#11835) add fcb3da2abea CAMEL-20033: camel-jbang - Write to settings properties file using JDK Properties code that escapes key and value so it works on Windows. No new revisions were added by this update. Summary of changes: .../dsl/jbang/core/commands/ExportBaseCommand.java | 10 - .../camel/dsl/jbang/core/common/RuntimeUtil.java | 26 -- 2 files changed, 29 insertions(+), 7 deletions(-)
Re: [PR] Adding possibility to send binary messages to Azure Service Bus [camel]
davsclaus commented on code in PR #11838: URL: https://github.com/apache/camel/pull/11838#discussion_r1371949444 ## components/camel-azure/camel-azure-servicebus/src/main/java/org/apache/camel/component/azure/servicebus/ServiceBusProducer.java: ## @@ -147,12 +147,12 @@ private BiConsumer sendMessages() { Mono sendMessageAsync; -if (exchange.getMessage().getBody() instanceof Iterable) { +if (exchange.getMessage().getBody() instanceof Iterable) { sendMessageAsync -= serviceBusSenderOperations.sendMessages(convertBodyToList((Iterable) inputBody), += serviceBusSenderOperations.sendMessages(convertBodyToList((Iterable) inputBody), configurationOptionsProxy.getServiceBusTransactionContext(exchange), applicationProperties); } else { -sendMessageAsync = serviceBusSenderOperations.sendMessages(exchange.getMessage().getBody(String.class), +sendMessageAsync = serviceBusSenderOperations.sendMessages(inputBody, Review Comment: What if the input body is a Java class or somethig else. Does ASB know how to handle all kind of java objects ? -- 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-20033: camel-jbang - Write to settings properties file using JDK Properties code that escapes key and value so it works on Windows.
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 fcb3da2abea CAMEL-20033: camel-jbang - Write to settings properties file using JDK Properties code that escapes key and value so it works on Windows. fcb3da2abea is described below commit fcb3da2abead53b27ac8b5e0da1835994366c63f Author: Claus Ibsen AuthorDate: Wed Oct 25 17:11:59 2023 +0200 CAMEL-20033: camel-jbang - Write to settings properties file using JDK Properties code that escapes key and value so it works on Windows. --- .../dsl/jbang/core/commands/ExportBaseCommand.java | 10 - .../camel/dsl/jbang/core/common/RuntimeUtil.java | 26 -- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java index a208ae7659c..317047df8d6 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java @@ -304,7 +304,7 @@ abstract class ExportBaseCommand extends CamelCommand { } } -List lines = Files.readAllLines(settings.toPath()); +List lines = RuntimeUtil.loadPropertiesLines(settings); boolean kamelets = lines.stream().anyMatch(l -> l.startsWith("kamelet=")); for (String line : lines) { if (line.startsWith("dependency=")) { @@ -644,7 +644,7 @@ abstract class ExportBaseCommand extends CamelCommand { } // there may be additional extra repositories -List lines = Files.readAllLines(settings.toPath()); +List lines = RuntimeUtil.loadPropertiesLines(settings); for (String line : lines) { if (line.startsWith("repository=")) { String r = StringHelper.after(line, "repository="); @@ -661,7 +661,7 @@ abstract class ExportBaseCommand extends CamelCommand { protected static boolean hasModeline(File settings) { try { -List lines = Files.readAllLines(settings.toPath()); +List lines = RuntimeUtil.loadPropertiesLines(settings); return lines.stream().anyMatch(l -> l.startsWith("modeline=")); } catch (Exception e) { // ignore @@ -671,7 +671,7 @@ abstract class ExportBaseCommand extends CamelCommand { protected static int httpServerPort(File settings) { try { -List lines = Files.readAllLines(settings.toPath()); +List lines = RuntimeUtil.loadPropertiesLines(settings); String port = lines.stream().filter(l -> l.startsWith("camel.jbang.platform-http.port=")) .map(s -> StringHelper.after(s, "=")).findFirst().orElse("-1"); return Integer.parseInt(port); @@ -683,7 +683,7 @@ abstract class ExportBaseCommand extends CamelCommand { protected static String jibMavenPluginVersion(File settings) { try { -List lines = Files.readAllLines(settings.toPath()); +List lines = RuntimeUtil.loadPropertiesLines(settings); return lines.stream().filter(l -> l.startsWith("camel.jbang.jib-maven-plugin-version=")) .map(s -> StringHelper.after(s, "=")).findFirst().orElse("3.4.0"); } catch (Exception e) { diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java index 1f1952aed31..97d985590b6 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/RuntimeUtil.java @@ -19,9 +19,12 @@ package org.apache.camel.dsl.jbang.core.common; import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import java.util.Properties; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.camel.util.OrderedProperties; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.config.Configurator; @@ -88,9 +91,28 @@ public final class RuntimeUtil { } public static void loadProperties(Properties properties, File file) throws IOException { -try (final FileInputStream fileInputStream = new FileInputStream(file)) { -properties.load(fileInputStream); +if (file.exists()) { +try (final FileInputStream fileInputStream = new
Re: [PR] Adding possibility to send binary messages to Azure Service Bus [camel]
github-actions[bot] commented on PR #11838: URL: https://github.com/apache/camel/pull/11838#issuecomment-1779481843 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] Adding possibility to send binary messages to Azure Service Bus [camel]
a-mazurok opened a new pull request, #11838: URL: https://github.com/apache/camel/pull/11838 # Description Adding possibility to send binary messages to Azure Service Bus. So far only string messages are supported in producer(all types are converted to string internally) while consumer supports both string and binary messages. Binary messages are quire popular e.g. Protobuf messages. # Target - [yes] 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 - [yes] 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 - [yes] I checked that each commit in the pull request has a meaningful subject line and body. - [yes] 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
Re: [PR] CAMEL-19986: created throttling executor in camel-test [camel]
github-actions[bot] commented on PR #11837: URL: https://github.com/apache/camel/pull/11837#issuecomment-1779477756 :star2: Thank you for your contribution to the Apache Camel project! :star2: :robot: CI automation will test this PR automatically. :camel: Apache Camel Committers, please review the following items: * First-time contributors **require MANUAL approval** for the GitHub Actions to run * You can use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. * You can label PRs using `build-all`, `build-dependents`, `skip-tests` and `test-dependents` to fine-tune the checks executed by this PR. * Build and test logs are available in the Summary page. **Only** [Apache Camel committers](https://camel.apache.org/community/team/#committers) have access to the summary. * :warning: Be careful when sharing logs. Review their contents before sharing them publicly. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[PR] CAMEL-19986: created throttling executor in camel-test [camel]
LostArtist opened a new pull request, #11837: URL: https://github.com/apache/camel/pull/11837 (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
[I] Issue format Datetime java [camel-karavan]
huuhoait opened a new issue, #958: URL: https://github.com/apache/camel-karavan/issues/958 Hi all , there is an issue with jackson format date. I take simple route with yaml dsl: - route: id: route-692d from: uri: kamelet:mysql-source id: from-4e99 parameters: serverName: localhost databaseName: simple_admin username: root password: '123456' serverPort: '3306' query: select * from users delay: 5000 steps: - log: message: 'sqlsourcce: ${body} \n' logName: out sql source id: log-5a7f When this app run, i got error about ; **_"com.fasterxml.jackson.databind.exc.InvalidDefinitionException: Java 8 date/time type `java.time.LocalDateTime` not supported by default: add Module "com.fasterxml.jackson.datatype:jackson-datatype-jsr310" to enable handling (through reference chain: org.springframework.util.LinkedCaseInsensitiveMap["created_at"])"_** I added dependency: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 and config env:camel.dataformat.jackson.module-class-names=com.fasterxml.jackson.datatype.jsr310.JavaTimeModule but i can not resolved above issue -- 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
Re: [PR] Camel Quarkus 3.5.0 announcement blog post [camel-website]
jamesnetherton merged PR #1080: URL: https://github.com/apache/camel-website/pull/1080 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-website] branch main updated: Camel Quarkus 3.5.0 announcement blog post
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-website.git The following commit(s) were added to refs/heads/main by this push: new 4b3985d2 Camel Quarkus 3.5.0 announcement blog post 4b3985d2 is described below commit 4b3985d26513f6059aba7c0e540d4fa795706901 Author: James Netherton AuthorDate: Wed Oct 25 08:30:52 2023 +0100 Camel Quarkus 3.5.0 announcement blog post --- antora-playbook-snippets/antora-playbook.yml | 2 +- .../camel-featured.jpeg| Bin 0 -> 625206 bytes .../2023/10/camel-quarkus-release-3.5.0/index.md | 24 + content/releases/q/release-3.5.0.md| 12 +++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/antora-playbook-snippets/antora-playbook.yml b/antora-playbook-snippets/antora-playbook.yml index 81436eb8..89bc4f32 100644 --- a/antora-playbook-snippets/antora-playbook.yml +++ b/antora-playbook-snippets/antora-playbook.yml @@ -56,7 +56,7 @@ content: - url: https://github.com/apache/camel-quarkus.git branches: - main -- 3.4.x +- 3.5.x - 3.2.x - 2.16.x start_path: docs diff --git a/content/blog/2023/10/camel-quarkus-release-3.5.0/camel-featured.jpeg b/content/blog/2023/10/camel-quarkus-release-3.5.0/camel-featured.jpeg new file mode 100644 index ..36c23a02 Binary files /dev/null and b/content/blog/2023/10/camel-quarkus-release-3.5.0/camel-featured.jpeg differ diff --git a/content/blog/2023/10/camel-quarkus-release-3.5.0/index.md b/content/blog/2023/10/camel-quarkus-release-3.5.0/index.md new file mode 100644 index ..88765f89 --- /dev/null +++ b/content/blog/2023/10/camel-quarkus-release-3.5.0/index.md @@ -0,0 +1,24 @@ +--- +title: "Camel Quarkus 3.5.0 Released" +date: 2023-10-25 +authors: ["jamesnetherton"] +categories: ["Releases", "Camel Quarkus"] +preview: "Camel Quarkus 3.5.0 Released" +summary: "Camel Quarkus 3.5.0 release" +--- + +Image by https://www.flickr.com/photos/lanzen/5984113332;>Anders Lanzen https://creativecommons.org/licenses/by-nc-sa/2.0;>CC BY-NC-SA 2.0 + +We are pleased to announce the 3.5.0 release of Camel Quarkus. It aligns with the Camel 4.1.0 and Quarkus 3.5.0 releases. + +## Camel 4.1.0 + +Please refer to the [Camel 4.1.0 announcement](/blog/2023/10/RELEASE-4.1.0/) for more details. There's more information in the "what's new" [blog post](/blog/2023/10/camel41-whatsnew/). + +## Quarkus 3.5.0.Final + +Please refer to the [Quarkus 3.5.0 announcement](https://quarkus.io/blog/quarkus-3-5-0-released/) + +For more information, please check the [Release notes](/releases/q-3.5.0/). + +Many thanks to all contributors and issue reporters! diff --git a/content/releases/q/release-3.5.0.md b/content/releases/q/release-3.5.0.md new file mode 100644 index ..49d2067e --- /dev/null +++ b/content/releases/q/release-3.5.0.md @@ -0,0 +1,12 @@ +--- +url: "/releases/q-3.5.0/" +date: 2023-10-25 +type: release-note +version: 3.5.0 +title: "Camel Quarkus release 3.5.0" +preview: "" +changelog: "" +category: "camel-quarkus" +milestone: 48 +jdk: [17] +--- \ No newline at end of file
[camel-quarkus] branch quarkus-main updated (2f22fcfeb5 -> 91733dde38)
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git discard 2f22fcfeb5 Upgrade Quarkus to 3.6.0.CR1 add 51461900c9 Add gRPC codegen protoc support for ppc64le architecture add e95d9ddfea Support user TypeConverter as CDI beans add b3691d5a82 Ftp fails in the FIPS because of the not supported key. add 261a489c80 Fix #5437 to avoid FastCamelContext creating TypeConverter add d59a5da8e6 Upgrade Quarkus to 3.5.0 add 2c1def0a92 Disable groovy-dsl native profile due to #5441 add ff9a4c9d00 Disable CxfSoapMtomAwtIT due to #5442 add 3e1c6eb1d6 Disable SimpleIT.simpleExchangeMethods due to #5444 add 1e31563598 Disable DebugTest on Windows due to #5443 add 3e79480bee Next is 3.6.0-SNAPSHOT add e4bbd1ac98 Update Maven wrapper distribution URL to Maven 3.9.5 add 6ca0fc54f7 Regen SBOM from commit e4bbd1ac980c0684714567ac703ae424f796bc1a (#5448) add ed6533d913 Fix package path to XmlSlurper in camel-k-maven-plugin integration tests add 500b763fa5 Run tests in all tooling sub modules add 327dbb987b Add changelog for 3.5.0 add d7519344e6 Sync pr-validate paths-ignore with ci-build workflow add 145c9e0ca5 Bump quarkiverse-groovy.version from 3.4.0 to 3.5.0 add a9179ed94a Auto generated changes for dependabot commit b6d2e822a66884c51a4433b40cff0e0ba3d1f81b add 7b0e7a9b28 Fix build order for camel-quarkus-camel-k-deployment test dependencies new 91733dde38 Upgrade Quarkus to 3.6.0.CR1 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 (2f22fcfeb5) \ N -- N -- N refs/heads/quarkus-main (91733dde38) 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: .github/workflows/camel-master-cron.yaml | 6 +- .github/workflows/ci-build.yaml| 6 +- .github/workflows/pr-validate.yml | 2 + .github/workflows/quarkus-master-cron.yaml | 6 +- .mvn/wrapper/maven-wrapper.properties | 2 +- CHANGELOG.md |77 + camel-quarkus-sbom/camel-quarkus-sbom.json | 27264 +- camel-quarkus-sbom/camel-quarkus-sbom.xml | 28460 ++- catalog/pom.xml| 2 +- docs/pom.xml | 2 +- extensions-core/core-cloud/deployment/pom.xml | 2 +- extensions-core/core-cloud/pom.xml | 2 +- extensions-core/core-cloud/runtime/pom.xml | 2 +- extensions-core/core/deployment/pom.xml| 2 +- .../quarkus/core/deployment/CamelProcessor.java|13 +- ...est.java => CamelTypeConverterCdiBeanTest.java} |80 +- .../runtime/CamelTypeConverterSimpleBeanTest.java |79 +- extensions-core/core/pom.xml | 2 +- extensions-core/core/runtime/pom.xml | 2 +- .../camel/quarkus/core/CamelContextRecorder.java |10 +- .../camel/quarkus/core/FastCamelContext.java | 5 + .../quarkus/core/FastTypeConverterInjector.java|61 + extensions-core/http-common/deployment/pom.xml | 2 +- extensions-core/http-common/pom.xml| 2 +- extensions-core/http-common/runtime/pom.xml| 2 +- extensions-core/pom.xml| 2 +- .../reactive-executor/deployment/pom.xml | 2 +- extensions-core/reactive-executor/pom.xml | 2 +- extensions-core/reactive-executor/runtime/pom.xml | 2 +- .../threadpoolfactory-vertx/deployment/pom.xml | 2 +- extensions-core/threadpoolfactory-vertx/pom.xml| 2 +- .../threadpoolfactory-vertx/runtime/pom.xml| 2 +- extensions-core/xml-io-dsl/deployment/pom.xml | 2 +- extensions-core/xml-io-dsl/pom.xml | 2 +- extensions-core/xml-io-dsl/runtime/pom.xml | 2 +- extensions-core/xml-jaxb/deployment/pom.xml| 2 +- extensions-core/xml-jaxb/pom.xml | 2 +- extensions-core/xml-jaxb/runtime/pom.xml
[camel-quarkus] 01/01: Upgrade Quarkus to 3.6.0.CR1
This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 91733dde3829aea5f36578eac09cc9aa33547ff0 Author: James Netherton AuthorDate: Wed Oct 25 15:36:49 2023 +0100 Upgrade Quarkus to 3.6.0.CR1 --- docs/antora.yml | 2 +- pom.xml | 8 poms/bom/src/main/generated/flattened-full-pom.xml| 6 +++--- poms/bom/src/main/generated/flattened-reduced-pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index adfe0b55ae..71c59a1a36 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -30,7 +30,7 @@ asciidoc: # Project versions camel-version: 4.1.0 # replace ${camel.version} camel-docs-version: 4.0.x -quarkus-version: 3.5.0 # replace ${quarkus.version} +quarkus-version: 999-SNAPSHOT # replace ${quarkus.version} graalvm-version: 23.0.1 # replace ${graalvm.version} graalvm-docs-version: jdk17 mapstruct-version: 1.5.5.Final # replace ${mapstruct.version} diff --git a/pom.xml b/pom.xml index 93cbc16425..fba08f65ec 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 2.1.0 2.2.0 2.0.2 -3.5.0 +999-SNAPSHOT 4.0.0 2.4.0 @@ -102,7 +102,7 @@ 1.125.0 23.0.1 4.0.15 -1.57.2 +1.59.0 ${hapi-version} ${hapi-base-version} ${hapi-fhir-version} @@ -127,7 +127,7 @@ 0.2.11 ${json-path-version} 2.4.10 -3.5.1 +3.6.0 ${kudu-version} 1.9.10 2.24.0 @@ -140,7 +140,7 @@ ${squareup-okio-version} 0.31.0 0.26.0 -3.22.0 +3.24.4 3.4.31 ${reactor-netty-version} 2.9.0 diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 2864b2ba2f..e81fb9b2ed 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6082,7 +6082,7 @@ com.google.protobuf protoc -3.22.0 +3.24.4 exe linux-ppcle_64 @@ -6181,7 +6181,7 @@ io.grpc protoc-gen-grpc-java -1.57.2 +1.59.0 exe linux-ppcle_64 @@ -6451,7 +6451,7 @@ org.apache.kafka connect-runtime -3.5.1 +3.6.0 javax.activation diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index d82e90aa61..f5f9bae43b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6082,7 +6082,7 @@ com.google.protobuf protoc -3.22.0 +3.24.4 exe linux-ppcle_64 @@ -6171,7 +6171,7 @@ io.grpc protoc-gen-grpc-java -1.57.2 +1.59.0 exe linux-ppcle_64 @@ -6406,7 +6406,7 @@ org.apache.kafka connect-runtime -3.5.1 +3.6.0 javax.activation diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 29d295bc42..fd5dc3bbdc 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6082,7 +6082,7 @@ com.google.protobuf protoc -3.22.0 +3.24.4 exe linux-ppcle_64 @@ -6171,7 +6171,7 @@ io.grpc protoc-gen-grpc-java -1.57.2 +1.59.0 exe linux-ppcle_64 @@ -6406,7 +6406,7 @@ org.apache.kafka connect-runtime -3.5.1 +3.6.0 javax.activation
[PR] fix(ci): logging errors [camel-k]
squakez opened a new pull request, #4864: URL: https://github.com/apache/camel-k/pull/4864 Ref #4754 **Release Note** ```release-note fix(ci): logging errors ``` -- 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] Camel sjms2 source connector doesn't stop properly [camel-kafka-connector]
filippzorin commented on issue #1522: URL: https://github.com/apache/camel-kafka-connector/issues/1522#issuecomment-1779396201 One more update: jstack state when connector failed on connect-1 service there is connector thread ``` [appuser@connect-1 ~]$ jstack -e 1 | grep tibco -A 13 -B 1 "connector-thread-tibco_connector" #267 prio=5 os_prio=0 cpu=23.32ms elapsed=108410.10s allocated=921K defined_classes=28 tid=0x7f3014059800 nid=0x7da in Object.wait() [0x7f30ac533000] java.lang.Thread.State: WAITING (on object monitor) at java.lang.Object.wait(java.base@11.0.16.1/Native Method) - waiting on at java.lang.Object.wait(java.base@11.0.16.1/Object.java:328) at org.apache.kafka.connect.runtime.WorkerConnector.doRun(WorkerConnector.java:154) - waiting to re-lock in wait() <0x000704e98058> (a org.apache.kafka.connect.runtime.WorkerConnector) at org.apache.kafka.connect.runtime.WorkerConnector.run(WorkerConnector.java:123) at java.util.concurrent.Executors$RunnableAdapter.call(java.base@11.0.16.1/Executors.java:515) at java.util.concurrent.FutureTask.run(java.base@11.0.16.1/FutureTask.java:264) at java.util.concurrent.ThreadPoolExecutor.runWorker(java.base@11.0.16.1/ThreadPoolExecutor.java:1128) at java.util.concurrent.ThreadPoolExecutor$Worker.run(java.base@11.0.16.1/ThreadPoolExecutor.java:628) at java.lang.Thread.run(java.base@11.0.16.1/Thread.java:829) ``` And on other host there is TIBCO EMS TCPLink Reader ``` [appuser@connect-3 ~]$ jstack -e 1 | grep jms -A 1 -B 11 "TIBCO EMS TCPLink Reader (Server-1049459457)" #325 daemon prio=5 os_prio=0 cpu=932.19ms elapsed=109478.06s allocated=1009K defined_classes=4 tid=0x7f62ac619800 nid=0x23d runnable [0x7f61abffe000] java.lang.Thread.State: RUNNABLE at java.net.SocketInputStream.socketRead0(java.base@11.0.16.1/Native Method) at java.net.SocketInputStream.socketRead(java.base@11.0.16.1/SocketInputStream.java:115) at java.net.SocketInputStream.read(java.base@11.0.16.1/SocketInputStream.java:168) at java.net.SocketInputStream.read(java.base@11.0.16.1/SocketInputStream.java:140) at java.io.BufferedInputStream.fill(java.base@11.0.16.1/BufferedInputStream.java:252) at java.io.BufferedInputStream.read(java.base@11.0.16.1/BufferedInputStream.java:271) - locked <0x00070513b8a8> (a java.io.BufferedInputStream) at java.io.DataInputStream.readInt(java.base@11.0.16.1/DataInputStream.java:392) at com.tibco.tibjms.TibjmsxLinkTcp._readWireMsg(TibjmsxLinkTcp.java:630) at com.tibco.tibjms.TibjmsxLinkTcp$LinkReader.work(TibjmsxLinkTcp.java:285) at com.tibco.tibjms.TibjmsxLinkTcp$LinkReader.run(TibjmsxLinkTcp.java:264) ``` And after deleting connector from kafka connect I see that connector thread was deleted from jstack, but I still see TIBCO EMS TCPLink Reader in jstack ``` [appuser@connect-3 ~]$ jstack -e 1 | grep jms -A 1 -B 11 "TIBCO EMS TCPLink Reader (Server-1049459457)" #325 daemon prio=5 os_prio=0 cpu=938.54ms elapsed=110211.84s allocated=1009K defined_classes=4 tid=0x7f62ac619800 nid=0x23d runnable [0x7f61abffe000] java.lang.Thread.State: RUNNABLE at java.net.SocketInputStream.socketRead0(java.base@11.0.16.1/Native Method) at java.net.SocketInputStream.socketRead(java.base@11.0.16.1/SocketInputStream.java:115) at java.net.SocketInputStream.read(java.base@11.0.16.1/SocketInputStream.java:168) at java.net.SocketInputStream.read(java.base@11.0.16.1/SocketInputStream.java:140) at java.io.BufferedInputStream.fill(java.base@11.0.16.1/BufferedInputStream.java:252) at java.io.BufferedInputStream.read(java.base@11.0.16.1/BufferedInputStream.java:271) - locked <0x00070513b8a8> (a java.io.BufferedInputStream) at java.io.DataInputStream.readInt(java.base@11.0.16.1/DataInputStream.java:392) at com.tibco.tibjms.TibjmsxLinkTcp._readWireMsg(TibjmsxLinkTcp.java:630) at com.tibco.tibjms.TibjmsxLinkTcp$LinkReader.work(TibjmsxLinkTcp.java:285) at com.tibco.tibjms.TibjmsxLinkTcp$LinkReader.run(TibjmsxLinkTcp.java:264) ``` And I guess this is cause why I cannot restart or recreate connector without restarting kafka connect service. Is it possible to fix it or workaround manually or using script (like remove this thread manually)? Or maybe I missed something in connector config? -- 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
[camel] branch regen_bot updated (5143723fb2f -> 09c1a8ee42b)
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 5143723fb2f CAMEL-20033: camel-jbang - Write to settings properties file using JDK Properties code that escapes key and value so it works on Windows. (#11836) add 09c1a8ee42b CAMEL-19973 - Camel-AWS components: Revisit description - ECS Component (#11835) No new revisions were added by this update. Summary of changes: components/camel-aws/camel-aws2-ecs/pom.xml | 2 +- .../resources/META-INF/services/org/apache/camel/component.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[PR] Remove duplicate quarkus-resteasy dependency from camel-quarkus-integration-test-azure-servicebus [camel-quarkus]
jamesnetherton opened a new pull request, #5458: URL: https://github.com/apache/camel-quarkus/pull/5458 (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-spring-boot] 01/02: Target Camel 3.20.8 for release
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a commit to branch release/3.20.8 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 492c7edc20350ca6ff2c5bf2f8bbd40bff2395b3 Author: Gregor Zurowski AuthorDate: Wed Oct 25 13:09:46 2023 + Target Camel 3.20.8 for release --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1dc20cdcbd8..01435b64f58 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.apache.camel camel-dependencies -3.20.8-SNAPSHOT +3.20.8 org.apache.camel.springboot @@ -111,7 +111,7 @@ 2.7.17 -3.20.8-SNAPSHOT +3.20.8 1.0.2.v20150114 @@ -452,7 +452,7 @@ dev -3.20.8-SNAPSHOT +3.20.8
[camel-spring-boot] annotated tag camel-spring-boot-3.20.8 created (now e23412ae65b)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to annotated tag camel-spring-boot-3.20.8 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at e23412ae65b (tag) tagging c674d37a6af17f40fabded818c88a52cc793455a (commit) replaces camel-spring-boot-3.20.7 by Gregor Zurowski on Wed Oct 25 14:11:28 2023 + - Log - [maven-release-plugin] copy for tag camel-spring-boot-3.20.8 --- No new revisions were added by this update.
[camel-spring-boot] branch release/3.20.8 created (now c674d37a6af)
This is an automated email from the ASF dual-hosted git repository. gzurowski pushed a change to branch release/3.20.8 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at c674d37a6af [maven-release-plugin] prepare release camel-spring-boot-3.20.8 This branch includes the following new commits: new 492c7edc203 Target Camel 3.20.8 for release new c674d37a6af [maven-release-plugin] prepare release camel-spring-boot-3.20.8 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.
[camel] branch regen_bot updated (d8eda095c29 -> 5143723fb2f)
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 d8eda095c29 CAMEL-19973 - Camel-AWS components: Revisit description - EC2 component (#11834) add 5143723fb2f CAMEL-20033: camel-jbang - Write to settings properties file using JDK Properties code that escapes key and value so it works on Windows. (#11836) No new revisions were added by this update. Summary of changes: .../org/apache/camel/dsl/jbang/core/commands/Run.java | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-)
[camel] branch CAMEL-19973-ecs deleted (was 5e2b69bd26a)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch CAMEL-19973-ecs in repository https://gitbox.apache.org/repos/asf/camel.git was 5e2b69bd26a CAMEL-19973 - Camel-AWS components: Revisit description - ECS Component 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-19973 - Camel-AWS components: Revisit description - ECS Component (#11835)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/main by this push: new 09c1a8ee42b CAMEL-19973 - Camel-AWS components: Revisit description - ECS Component (#11835) 09c1a8ee42b is described below commit 09c1a8ee42be3b3b88b800bfc46f0e70eebf57b4 Author: Andrea Cosentino AuthorDate: Wed Oct 25 15:56:38 2023 +0200 CAMEL-19973 - Camel-AWS components: Revisit description - ECS Component (#11835) Signed-off-by: Andrea Cosentino --- components/camel-aws/camel-aws2-ecs/pom.xml | 2 +- .../resources/META-INF/services/org/apache/camel/component.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-aws/camel-aws2-ecs/pom.xml b/components/camel-aws/camel-aws2-ecs/pom.xml index df3186ee058..451a360841d 100644 --- a/components/camel-aws/camel-aws2-ecs/pom.xml +++ b/components/camel-aws/camel-aws2-ecs/pom.xml @@ -30,7 +30,7 @@ jar Camel :: AWS2 ECS -A Camel Amazon ECS Web Service Component Version 2 +Execute different operations on Amazon Elastic Container Service diff --git a/components/camel-aws/camel-aws2-ecs/src/generated/resources/META-INF/services/org/apache/camel/component.properties b/components/camel-aws/camel-aws2-ecs/src/generated/resources/META-INF/services/org/apache/camel/component.properties index eabdf770c92..641660434a4 100644 --- a/components/camel-aws/camel-aws2-ecs/src/generated/resources/META-INF/services/org/apache/camel/component.properties +++ b/components/camel-aws/camel-aws2-ecs/src/generated/resources/META-INF/services/org/apache/camel/component.properties @@ -4,4 +4,4 @@ groupId=org.apache.camel artifactId=camel-aws2-ecs version=4.2.0-SNAPSHOT projectName=Camel :: AWS2 ECS -projectDescription=A Camel Amazon ECS Web Service Component Version 2 +projectDescription=Execute different operations on Amazon Elastic Container Service
Re: [PR] CAMEL-19973 - Camel-AWS components: Revisit description - ECS Component [camel]
oscerd merged PR #11835: URL: https://github.com/apache/camel/pull/11835 -- 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] Camel K 2.1 documentation still contains information on using local files for runtime resources despite it is no more supported [camel-k]
gansheer commented on issue #4853: URL: https://github.com/apache/camel-k/issues/4853#issuecomment-1779333044 @squakez I will fix the doc. -- 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 jbang-win deleted (was 0033e2b8d1b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch jbang-win in repository https://gitbox.apache.org/repos/asf/camel.git was 0033e2b8d1b CAMEL-20033: camel-jbang - Write to settings properties file using JDK Properties code that escapes key and value so it works on Windows. 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-20033: camel-jbang - Write to settings properties file using JDK Properties code that escapes key and value so it works on Windows. (#11836)
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 5143723fb2f CAMEL-20033: camel-jbang - Write to settings properties file using JDK Properties code that escapes key and value so it works on Windows. (#11836) 5143723fb2f is described below commit 5143723fb2f885537942d870e0c603614e22c200 Author: Claus Ibsen AuthorDate: Wed Oct 25 15:40:57 2023 +0200 CAMEL-20033: camel-jbang - Write to settings properties file using JDK Properties code that escapes key and value so it works on Windows. (#11836) --- .../org/apache/camel/dsl/jbang/core/commands/Run.java | 19 --- 1 file changed, 16 insertions(+), 3 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 3c718fe5eca..d432e2daec1 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 @@ -26,6 +26,7 @@ import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.StringWriter; import java.nio.charset.StandardCharsets; import java.nio.file.FileSystems; import java.nio.file.Files; @@ -1282,10 +1283,22 @@ public class Run extends CamelCommand { private void writeSettings(String key, String value) { FileOutputStream fos = null; try { +// use java.util.Properties to ensure the value is escaped correctly +Properties prop = new Properties(); +prop.setProperty(key, value); +StringWriter sw = new StringWriter(); +prop.store(sw, null); + fos = new FileOutputStream(WORK_DIR + "/" + RUN_SETTINGS_FILE, true); -String line = key + "=" + value; -fos.write(line.getBytes(StandardCharsets.UTF_8)); -fos.write(System.lineSeparator().getBytes(StandardCharsets.UTF_8)); + +String[] lines = sw.toString().split(System.lineSeparator()); +for (String line : lines) { +// properties store timestamp as comment which we want to skip +if (!line.startsWith("#")) { +fos.write(line.getBytes(StandardCharsets.UTF_8)); + fos.write(System.lineSeparator().getBytes(StandardCharsets.UTF_8)); +} +} } catch (Exception e) { // ignore } finally {
Re: [PR] CAMEL-20033: camel-jbang - Write to settings properties file using JD… [camel]
davsclaus merged PR #11836: URL: https://github.com/apache/camel/pull/11836 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 01/02: feat(runtime): enable source less integrations
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 27e07a2fdde207099c2f7ce96b8ca0265aa07a27 Author: Pasquale Congiusti AuthorDate: Tue Oct 17 17:28:22 2023 +0200 feat(runtime): enable source less integrations Closes #3295 --- e2e/common/runtimes/default.go | 26 ++ e2e/common/runtimes/runtimes_test.go | 70 pkg/cmd/run.go | 30 +++- pkg/cmd/run_test.go | 34 ++ pkg/util/kubernetes/sanitize_test.go | 2 ++ script/Makefile | 1 + 6 files changed, 149 insertions(+), 14 deletions(-) diff --git a/e2e/common/runtimes/default.go b/e2e/common/runtimes/default.go new file mode 100644 index 0..1cc41c3f9 --- /dev/null +++ b/e2e/common/runtimes/default.go @@ -0,0 +1,26 @@ +//go:build integration +// +build integration + +/* +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package runtimes + +import "github.com/apache/camel-k/v2/e2e/support" + +var ns = support.GetEnvOrDefault("CAMEL_K_TEST_NAMESPACE", support.GetCIProcessID()) +var operatorID = support.GetEnvOrDefault("CAMEL_K_OPERATOR_ID", support.GetCIProcessID()) diff --git a/e2e/common/runtimes/runtimes_test.go b/e2e/common/runtimes/runtimes_test.go new file mode 100644 index 0..d95c6820c --- /dev/null +++ b/e2e/common/runtimes/runtimes_test.go @@ -0,0 +1,70 @@ +//go:build integration +// +build integration + +// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "integration" + +/* +Licensed to the Apache Software Foundation (ASF) under one or more +contributor license agreements. See the NOTICE file distributed with +this work for additional information regarding copyright ownership. +The ASF licenses this file to You under the Apache License, Version 2.0 +(the "License"); you may not use this file except in compliance with +the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package runtimes + +import ( + "testing" + + . "github.com/onsi/gomega" + + corev1 "k8s.io/api/core/v1" + + . "github.com/apache/camel-k/v2/e2e/support" + v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1" +) + +func TestSourceLessIntegrations(t *testing.T) { + RegisterTestingT(t) + var cmData = make(map[string]string) + cmData["my-file.txt"] = "Hello World!" + CreatePlainTextConfigmap(ns, "my-cm-sourceless", cmData) + + t.Run("Camel Main", func(t *testing.T) { + itName := "my-camel-main-v1" + Expect(KamelRunWithID(operatorID, ns, "--image", "docker.io/squakez/my-camel-main:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed()) + Eventually(IntegrationPodPhase(ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning)) + Eventually(IntegrationConditionStatus(ns, itName, v1.IntegrationConditionReady), TestTimeoutShort).Should(Equal(corev1.ConditionTrue)) + Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring(cmData["my-file.txt"])) + Eventually(IntegrationLogs(ns, itName), TestTimeoutShort).Should(ContainSubstring("Apache Camel (Main)")) + }) + + t.Run("Camel Spring Boot", func(t *testing.T) { + itName := "my-camel-sb-v1" + Expect(KamelRunWithID(operatorID, ns, "--image", "docker.io/squakez/my-camel-sb:1.0.0", "--resource", "configmap:my-cm-sourceless@/tmp/app/data").Execute()).To(Succeed()) + Eventually(IntegrationPodPhase(ns, itName), TestTimeoutShort).Should(Equal(corev1.PodRunning)) + Eventually(IntegrationConditionStatus(ns, itName,
Re: [PR] feat(runtime): enable source less integrations [camel-k]
squakez merged PR #4831: URL: https://github.com/apache/camel-k/pull/4831 -- 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 main updated (a9b0e336e -> b1a94dfa0)
This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git from a9b0e336e fix(ci): Fix golang version file setup in coverage workflow new 27e07a2fd feat(runtime): enable source less integrations new b1a94dfa0 doc(runtimes): kamel --image instructions 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: addons/telemetry/telemetry.go | 2 +- docs/modules/ROOT/nav.adoc | 1 + .../modules/ROOT/pages/running/camel-runtimes.adoc | 22 +++ e2e/common/{misc => runtimes}/default.go | 2 +- e2e/common/runtimes/runtimes_test.go | 73 ++ .../incremental_build_test.go | 3 +- pkg/apis/camel/v1/trait/jvm.go | 6 +- pkg/cmd/run.go | 29 ++--- pkg/cmd/run_test.go| 32 -- pkg/trait/builder.go | 8 +-- pkg/trait/builder_test.go | 8 +-- pkg/trait/container.go | 6 ++ pkg/trait/container_probes_test.go | 4 +- pkg/trait/cron_test.go | 4 +- pkg/trait/gc_test.go | 2 +- pkg/trait/jvm.go | 14 +++-- pkg/trait/quarkus.go | 2 +- pkg/trait/route_test.go| 2 +- pkg/trait/service.go | 2 +- pkg/trait/service_test.go | 10 +-- pkg/trait/trait_catalog.go | 2 +- pkg/trait/trait_condition_types.go | 20 +++--- pkg/util/kubernetes/sanitize_test.go | 2 + script/Makefile| 1 + 24 files changed, 202 insertions(+), 55 deletions(-) create mode 100644 docs/modules/ROOT/pages/running/camel-runtimes.adoc copy e2e/common/{misc => runtimes}/default.go (98%) create mode 100644 e2e/common/runtimes/runtimes_test.go