[camel] branch regen_bot updated (bb4141ecdc5 -> 3ace3ed881c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit bb4141ecdc5 Regen for commit cf2801b31cbdabb3874fcded785c85f31267f1d1 add 3ace3ed881c Upgrade AWS SDK v2 to version 2.20.136 (#11237) 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 (bb4141ecdc5) \ N -- N -- N refs/heads/regen_bot (3ace3ed881c) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java| 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[GitHub] [camel] github-actions[bot] closed pull request #11235: Generated sources regen
github-actions[bot] closed pull request #11235: Generated sources regen URL: https://github.com/apache/camel/pull/11235 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] oscerd commented on issue #4698: Release 2.0.1
oscerd commented on issue #4698: URL: https://github.com/apache/camel-k/issues/4698#issuecomment-1698509136 Updating to 0.11.2 helped, but now is failing at `docker build --target $(TARGET_STAGE) --platform=linux/$(IMAGE_ARCH) -t $(DOCKER_TAG) -f build/Dockerfile .` With failed to get destination image "sha256:de613745a8ee08de8c46631c38499232fdaafe5be22d268bd6cca7fd24095903": image with reference sha256:de613745a8ee08de8c46631c38499232fdaafe5be22d268bd6cca7fd24095903 was found but does not match the specified platform: wanted linux/arm64, actual: linux/amd64 -- 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 aws-sdk-2.20.136 deleted (was 36a095557c5)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch aws-sdk-2.20.136 in repository https://gitbox.apache.org/repos/asf/camel.git was 36a095557c5 Regen 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: Upgrade AWS SDK v2 to version 2.20.136 (#11237)
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 3ace3ed881c Upgrade AWS SDK v2 to version 2.20.136 (#11237)
3ace3ed881c is described below
commit 3ace3ed881c95163963410b56e17343a9a1a7fba
Author: Andrea Cosentino
AuthorDate: Wed Aug 30 07:07:48 2023 +0200
Upgrade AWS SDK v2 to version 2.20.136 (#11237)
* Upgrade AWS SDK v2 to version 2.20.136
Signed-off-by: Andrea Cosentino
* Regen
Signed-off-by: Andrea Cosentino
-
Signed-off-by: Andrea Cosentino
---
.../org/apache/camel/catalog/components/pdf.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 72 +++---
.../endpoint/dsl/PdfEndpointBuilderFactory.java| 2 +-
parent/pom.xml | 2 +-
4 files changed, 39 insertions(+), 39 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
index 0ba759ba3b5..18499dbc195 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
@@ -32,7 +32,7 @@
},
"properties": {
"operation": { "index": 0, "kind": "path", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType": "org.apache.camel.component.pdf.PdfOperation", "enum": [ "create",
"append", "extractText" ], "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.pdf.PdfConfiguration", "configurationField":
"pdfConfiguration", "description": "Operation type" },
-"font": { "index": 1, "kind": "parameter", "displayName": "Font", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "Courier", "Courier-Bold", "Courier-Oblique",
"Courier-BoldOblique", "Helvetica", "Helvetica-Bold", "Helvetica-Oblique",
"Helvetica-BoldOblique", "Times-Roman", "Times-Bold", "Times-Italic",
"Times-BoldItalic", "Symbol", "ZapfDingbats" ], "deprecated": false,
"autowired": false, "secret": false, "defaultValu [...]
+"font": { "index": 1, "kind": "parameter", "displayName": "Font", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "COURIER", "COURIER_BOLD", "COURIER_OBLIQUE",
"COURIER_BOLD_OBLIQUE", "HELVETICA", "HELVETICA_BOLD", "HELVETICA_OBLIQUE",
"HELVETICA_BOLD_OBLIQUE", "TIMES_ROMAN", "TIMES_BOLD", "TIMES_ITALIC",
"TIMES_BOLD_ITALIC", "SYMBOL", "ZAPF_DINGBATS" ], "deprecated": false,
"autowired": false, "secret": false, "default [...]
"fontSize": { "index": 2, "kind": "parameter", "displayName": "Font Size",
"group": "producer", "label": "", "required": false, "type": "number",
"javaType": "float", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 14.0, "configurationClass":
"org.apache.camel.component.pdf.PdfConfiguration", "configurationField":
"pdfConfiguration", "description": "Font size in pixels" },
"marginBottom": { "index": 3, "kind": "parameter", "displayName": "Margin
Bottom", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 20, "configurationClass":
"org.apache.camel.component.pdf.PdfConfiguration", "configurationField":
"pdfConfiguration", "description": "Margin bottom in pixels" },
"marginLeft": { "index": 4, "kind": "parameter", "displayName": "Margin
Left", "group": "producer", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 20, "configurationClass":
"org.apache.camel.component.pdf.PdfConfiguration", "configurationField":
"pdfConfiguration", "description": "Margin left in pixels" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 1b253cccd8a..b4bdabc4b57 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -5241,33 +5241,6 @@ detect the exception, and rollback. Default value: true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
[GitHub] [camel] oscerd merged pull request #11237: Upgrade AWS SDK v2 to version 2.20.136
oscerd merged PR #11237: URL: https://github.com/apache/camel/pull/11237 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] oscerd commented on issue #4698: Release 2.0.1
oscerd commented on issue #4698:
URL: https://github.com/apache/camel-k/issues/4698#issuecomment-1698489586
The step
"make generate clean build-resources build"
is failing with
```
Generating traits documentation...
go: downloading k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9
Generating traits documentation... done!
cd pkg/apis/camel && /home/oscerd/workspace/go/bin/controller-gen
paths="./..." object
/usr/local/go/src/sync/atomic/type.go:43:16: expected ']', found any
/usr/local/go/src/sync/atomic/type.go:43:19: expected ';', found ']'
/usr/local/go/src/sync/atomic/type.go:43:19: expected type, found ']'
/usr/local/go/src/sync/atomic/type.go:54:34: expected declaration, found
'return'
/usr/local/go/src/sync/atomic/type.go:43:16: expected ']', found any
/usr/local/go/src/sync/atomic/type.go:43:19: expected ';', found ']'
/usr/local/go/src/sync/atomic/type.go:43:19: expected type, found ']'
/usr/local/go/src/sync/atomic/type.go:54:34: expected declaration, found
'return'
/usr/local/go/src/sync/atomic/type.go:43:16: expected ']', found any
/usr/local/go/src/sync/atomic/type.go:43:19: expected ';', found ']'
/usr/local/go/src/sync/atomic/type.go:43:19: expected type, found ']'
/usr/local/go/src/sync/atomic/type.go:54:34: expected declaration, found
'return'
/usr/local/go/src/sync/map.go:47:21: expected ';', found '['
/usr/local/go/src/sync/map.go:71:1: expected '}', found 'type'
/usr/local/go/src/sync/map.go:71:6: expected ';', found readOnly
/usr/local/go/src/sync/map.go:101:18: expected ';', found '['
/usr/local/go/src/sync/map.go:107:2: expected '}', found 'return'
/usr/local/go/src/sync/map.go:107:9: expected ';', found e
/usr/local/go/src/sync/map.go:111:2: expected declaration, found 'if'
/usr/local/go/src/sync/map.go:47:21: expected ';', found '['
/usr/local/go/src/sync/map.go:71:1: expected '}', found 'type'
/usr/local/go/src/sync/map.go:71:6: expected ';', found readOnly
/usr/local/go/src/sync/map.go:101:18: expected ';', found '['
/usr/local/go/src/sync/map.go:107:2: expected '}', found 'return'
/usr/local/go/src/sync/map.go:107:9: expected ';', found e
/usr/local/go/src/sync/map.go:111:2: expected declaration, found 'if'
/usr/local/go/src/sync/map.go:47:21: expected ';', found '['
/usr/local/go/src/sync/map.go:71:1: expected '}', found 'type'
/usr/local/go/src/sync/map.go:71:6: expected ';', found readOnly
/usr/local/go/src/sync/map.go:101:18: expected ';', found '['
/usr/local/go/src/sync/map.go:107:2: expected '}', found 'return'
/usr/local/go/src/sync/map.go:107:9: expected ';', found e
/usr/local/go/src/sync/map.go:111:2: expected declaration, found 'if'
/usr/local/go/src/time/format_rfc3339.go:82:18: expected '(', found '['
/usr/local/go/src/time/format_rfc3339.go:82:19: mixed named and unnamed
parameters
/usr/local/go/src/time/format_rfc3339.go:82:32: missing ',' in parameter list
/usr/local/go/src/time/format_rfc3339.go:82:40: missing ',' in parameter list
/usr/local/go/src/time/format_rfc3339.go:82:44: expected ')', found bytes
/usr/local/go/src/time/format.go:452:10: expected '(', found '['
/usr/local/go/src/time/format.go:452:11: mixed named and unnamed parameters
/usr/local/go/src/time/format.go:452:24: missing ',' in parameter list
/usr/local/go/src/time/format.go:452:32: missing ',' in parameter list
/usr/local/go/src/time/format.go:452:36: expected ')', found bytes
/usr/local/go/src/time/format.go:899:13: expected '(', found '['
/usr/local/go/src/time/format.go:899:14: mixed named and unnamed parameters
/usr/local/go/src/time/format.go:899:27: missing ',' in parameter list
/usr/local/go/src/time/format.go:899:35: missing ',' in parameter list
/usr/local/go/src/time/format.go:899:39: expected ')', found bytes
/usr/local/go/src/time/format.go:1494:22: expected '(', found '['
/usr/local/go/src/time/format.go:1494:23: mixed named and unnamed parameters
/usr/local/go/src/time/format.go:1494:36: missing ',' in parameter list
/usr/local/go/src/time/format.go:1494:44: missing ',' in parameter list
/usr/local/go/src/time/format.go:1494:52: expected ')', found bytes
/usr/local/go/src/time/format.go:1522:16: expected '(', found '['
/usr/local/go/src/time/format.go:1522:17: mixed named and unnamed parameters
/usr/local/go/src/time/format.go:1522:30: missing ',' in parameter list
/usr/local/go/src/time/format.go:1522:38: missing ',' in parameter list
/usr/local/go/src/time/format.go:1522:42: expected ')', found bytes
/usr/local/go/src/time/format_rfc3339.go:82:18: expected '(', found '['
/usr/local/go/src/time/format_rfc3339.go:82:19: mixed named and unnamed
parameters
/usr/local/go/src/time/format_rfc3339.go:82:32: missing ',' in parameter list
/usr/local/go/src/time/format_rfc3339.go:82:40: missing ',' in parameter list
[GitHub] [camel] github-actions[bot] commented on pull request #11237: Upgrade AWS SDK v2 to version 2.20.136
github-actions[bot] commented on PR #11237: URL: https://github.com/apache/camel/pull/11237#issuecomment-1698483915 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] oscerd opened a new pull request, #11237: Upgrade AWS SDK v2 to version 2.20.136
oscerd opened a new pull request, #11237: URL: https://github.com/apache/camel/pull/11237 # Description # Target - [x] 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 - [x] I checked that each commit in the pull request has a meaningful subject line and body. - [x] 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/02: Upgrade AWS SDK v2 to version 2.20.136
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch aws-sdk-2.20.136 in repository https://gitbox.apache.org/repos/asf/camel.git commit 61f3d743bb999b416c13d79064a9cb19bf2c9d13 Author: Andrea Cosentino AuthorDate: Wed Aug 30 06:29:24 2023 +0200 Upgrade AWS SDK v2 to version 2.20.136 Signed-off-by: Andrea Cosentino --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 6b7a787cdbe..98c7609d986 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -68,7 +68,7 @@ 1.11.2 1.11.2 4.2.0 -2.20.135 +2.20.136 2.14.0 1.2.15 12.0.0-beta.18
[camel] branch aws-sdk-2.20.136 created (now 36a095557c5)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch aws-sdk-2.20.136 in repository https://gitbox.apache.org/repos/asf/camel.git at 36a095557c5 Regen This branch includes the following new commits: new 61f3d743bb9 Upgrade AWS SDK v2 to version 2.20.136 new 36a095557c5 Regen The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel] 02/02: Regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch aws-sdk-2.20.136
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 36a095557c5efc545a51ef5fcae518a8e9b7ff06
Author: Andrea Cosentino
AuthorDate: Wed Aug 30 06:42:41 2023 +0200
Regen
Signed-off-by: Andrea Cosentino
---
.../org/apache/camel/catalog/components/pdf.json | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 72 +++---
.../endpoint/dsl/PdfEndpointBuilderFactory.java| 2 +-
3 files changed, 38 insertions(+), 38 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
index 0ba759ba3b5..18499dbc195 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
@@ -32,7 +32,7 @@
},
"properties": {
"operation": { "index": 0, "kind": "path", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType": "org.apache.camel.component.pdf.PdfOperation", "enum": [ "create",
"append", "extractText" ], "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.pdf.PdfConfiguration", "configurationField":
"pdfConfiguration", "description": "Operation type" },
-"font": { "index": 1, "kind": "parameter", "displayName": "Font", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "Courier", "Courier-Bold", "Courier-Oblique",
"Courier-BoldOblique", "Helvetica", "Helvetica-Bold", "Helvetica-Oblique",
"Helvetica-BoldOblique", "Times-Roman", "Times-Bold", "Times-Italic",
"Times-BoldItalic", "Symbol", "ZapfDingbats" ], "deprecated": false,
"autowired": false, "secret": false, "defaultValu [...]
+"font": { "index": 1, "kind": "parameter", "displayName": "Font", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "COURIER", "COURIER_BOLD", "COURIER_OBLIQUE",
"COURIER_BOLD_OBLIQUE", "HELVETICA", "HELVETICA_BOLD", "HELVETICA_OBLIQUE",
"HELVETICA_BOLD_OBLIQUE", "TIMES_ROMAN", "TIMES_BOLD", "TIMES_ITALIC",
"TIMES_BOLD_ITALIC", "SYMBOL", "ZAPF_DINGBATS" ], "deprecated": false,
"autowired": false, "secret": false, "default [...]
"fontSize": { "index": 2, "kind": "parameter", "displayName": "Font Size",
"group": "producer", "label": "", "required": false, "type": "number",
"javaType": "float", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 14.0, "configurationClass":
"org.apache.camel.component.pdf.PdfConfiguration", "configurationField":
"pdfConfiguration", "description": "Font size in pixels" },
"marginBottom": { "index": 3, "kind": "parameter", "displayName": "Margin
Bottom", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 20, "configurationClass":
"org.apache.camel.component.pdf.PdfConfiguration", "configurationField":
"pdfConfiguration", "description": "Margin bottom in pixels" },
"marginLeft": { "index": 4, "kind": "parameter", "displayName": "Margin
Left", "group": "producer", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 20, "configurationClass":
"org.apache.camel.component.pdf.PdfConfiguration", "configurationField":
"pdfConfiguration", "description": "Margin left in pixels" },
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 1b253cccd8a..b4bdabc4b57 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -5241,33 +5241,6 @@ detect the exception, and rollback. Default value: true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -5328,6 +5301,42 @@ some EIP patterns such as splitter, multicast, will
create a new unit of work bo
sub-route (eg the splitted message); however these EIPs have an option named
shareUnitOfWork which allows to combine
with the parent unit of work in regard to error handling and therefore use the
parent original message. By
[camel-k] branch release-2.0.x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.0.x by this push: new f70fa77f9 [maven-release-plugin] prepare for next development iteration f70fa77f9 is described below commit f70fa77f9f1f0b2c36df57a7cca74487097494e3 Author: Andrea Cosentino AuthorDate: Wed Aug 30 06:41:44 2023 +0200 [maven-release-plugin] prepare for next development iteration --- java/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 5441d540f..cfa5242e0 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -25,7 +25,7 @@ 4.0.0 org.apache.camel.k camel-k-crds - 2.0.1 + 2.0.2-SNAPSHOT jar @@ -61,7 +61,7 @@ scm:git:http://gitbox.apache.org/repos/asf/camel-k.git scm:git:https://gitbox.apache.org/repos/asf/camel-k.git https://gitbox.apache.org/repos/asf?p=camel-k.git;a=summary -camel-k-crds-2.0.1 +camel-k-project-1.10.0
[camel-k] annotated tag camel-k-crds-2.0.1 created (now d0e7b90df)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to annotated tag camel-k-crds-2.0.1 in repository https://gitbox.apache.org/repos/asf/camel-k.git at d0e7b90df (tag) tagging 80711a17f55fb8f2a0811821cf2f70fadbb77a97 (commit) replaces camel-k-crds-2.0.0 by Andrea Cosentino on Wed Aug 30 06:41:31 2023 +0200 - Log - [maven-release-plugin] copy for tag camel-k-crds-2.0.1 --- No new revisions were added by this update.
[camel-k] branch release-2.0.x updated: [maven-release-plugin] prepare release camel-k-crds-2.0.1
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.0.x by this push: new 80711a17f [maven-release-plugin] prepare release camel-k-crds-2.0.1 80711a17f is described below commit 80711a17f55fb8f2a0811821cf2f70fadbb77a97 Author: Andrea Cosentino AuthorDate: Wed Aug 30 06:41:17 2023 +0200 [maven-release-plugin] prepare release camel-k-crds-2.0.1 --- java/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 0d12022c4..5441d540f 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -25,7 +25,7 @@ 4.0.0 org.apache.camel.k camel-k-crds - 2.0.1-SNAPSHOT + 2.0.1 jar @@ -61,7 +61,7 @@ scm:git:http://gitbox.apache.org/repos/asf/camel-k.git scm:git:https://gitbox.apache.org/repos/asf/camel-k.git https://gitbox.apache.org/repos/asf?p=camel-k.git;a=summary -camel-k-project-1.10.0 +camel-k-crds-2.0.1
[camel-kamelets] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git The following commit(s) were added to refs/heads/main by this push: new 4d0e4106 Updated CHANGELOG.md 4d0e4106 is described below commit 4d0e410632456a138f32e1c6076bdbc35e581ddf Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Aug 30 03:08:22 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9125855..7d105082 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ **Closed issues:** +- Azure Datalake still uses camel-kamelets-utils from github notation [\#1597](https://github.com/apache/camel-kamelets/issues/1597) - CI enablement for PPC64LE [\#1582](https://github.com/apache/camel-kamelets/issues/1582) - Fix yaks test failing on main branch [\#1579](https://github.com/apache/camel-kamelets/issues/1579) - Remove forbidden parameter names list in validator [\#1577](https://github.com/apache/camel-kamelets/issues/1577) @@ -23,6 +24,7 @@ **Merged pull requests:** +- Azure Datalake still uses camel-kamelets-utils from github notation [\#1598](https://github.com/apache/camel-kamelets/pull/1598) ([oscerd](https://github.com/oscerd)) - Generated sources regen for SBOM [\#1595](https://github.com/apache/camel-kamelets/pull/1595) ([github-actions[bot]](https://github.com/apps/github-actions)) - Added Opensearch Search Source Kamelet [\#1594](https://github.com/apache/camel-kamelets/pull/1594) ([oscerd](https://github.com/oscerd)) - Added Opensearch Sink Kamelet [\#1592](https://github.com/apache/camel-kamelets/pull/1592) ([oscerd](https://github.com/oscerd))
[camel-kafka-connector] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git The following commit(s) were added to refs/heads/main by this push: new c739bdf01 Updated CHANGELOG.md c739bdf01 is described below commit c739bdf016ba4ccb0540f114cd7e6b55bc1633f2 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Aug 30 03:05:17 2023 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 574494832..30f40e911 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- camel-minio-sink-connector giving library issue [\#1557](https://github.com/apache/camel-kafka-connector/issues/1557) - SNS Sink Connector failure - java.lang.NoClassDefFoundError: software/amazon/awssdk/utils/cache/CachedSupplier$StaleValueBehavior [\#1548](https://github.com/apache/camel-kafka-connector/issues/1548) - syslog connector failure [\#1528](https://github.com/apache/camel-kafka-connector/issues/1528)
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2926: [CI] - Quarkus Main Branch Build Failure
github-actions[bot] commented on issue #2926: URL: https://github.com/apache/camel-quarkus/issues/2926#issuecomment-1698385682 The [quarkus-main](https://github.com/apache/camel-quarkus/tree/quarkus-main) branch build has failed: * Build ID: 6019717490-1224-6b28a72c-0e4b-4ed2-aec4-2c8f713c3335 * Camel Quarkus Commit: 898dcb0c1c680f71c7fb1d9c96af0764b7dc2aae * Quarkus Main Commit: Unknown * Link to build: https://github.com/apache/camel-quarkus/actions/runs/6019717490 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2927: [CI] - Camel Main Branch Build Failure
github-actions[bot] commented on issue #2927: URL: https://github.com/apache/camel-quarkus/issues/2927#issuecomment-1698341939 The [camel-main](https://github.com/apache/camel-quarkus/tree/camel-main) branch build has failed: * Build ID: 6018859841-1120-47ac9712-5df9-4a5b-aa14-87d48c30df13 * Camel Quarkus Commit: e6cf0db9cb376a1699b500c5af6da03d023f84c5 * Camel Main Commit: 016406550f5c99c2336436f80523a371b18c0294 * Link to build: https://github.com/apache/camel-quarkus/actions/runs/6018859841 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] 02/03: 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 c70438664ce821948205e9e93b67801a9cba655a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Aug 30 00:46:40 2023 +
chore: nightly SBOM update
---
camel-k-sbom/camel-k-sbom.json | 204 ++---
1 file changed, 9 insertions(+), 195 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index 23a3c5f77..a83bad718 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:426e7b72-8951-4fdf-98d5-35264c65f08f",
+ "serialNumber": "urn:uuid:2df549b9-2a13-4042-8615-80719d33b4ca",
"version": 1,
"metadata": {
-"timestamp": "2023-08-29T01:00:47Z",
+"timestamp": "2023-08-30T00:46:40Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230829005838-b512d6d445aa?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230830004626-e25f16f0152f?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20230829005838-b512d6d445aa",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230829005838-b512d6d445aa?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20230830004626-e25f16f0152f",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230830004626-e25f16f0152f?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k;,
@@ -422,66 +422,6 @@
]
}
},
-{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230829005838-b512d6d445aa?type=module",
- "type": "library",
- "name": "github.com/apache/camel-k/v2/pkg/apis/camel",
- "version": "v0.0.0-20230829005838-b512d6d445aa",
- "scope": "required",
- "hashes": [
-{
- "alg": "SHA-256",
- "content":
"0735ad8114b1a534bce71cd2b8db9e3d15728e5d68b61bb888c3bf1d89a2c04e"
-}
- ],
- "purl":
"pkg:golang/github.com/apache/camel-k/v2/pkg/apis/camel@v0.0.0-20230829005838-b512d6d445aa?type=module\u0026goos=linux\u0026goarch=amd64",
- "externalReferences": [
-{
- "url": "https://github.com/apache/camel-k/v2/pkg/apis/camel;,
- "type": "vcs"
-}
- ]
-},
-{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230829005838-b512d6d445aa?type=module",
- "type": "library",
- "name": "github.com/apache/camel-k/v2/pkg/client/camel",
- "version": "v0.0.0-20230829005838-b512d6d445aa",
- "scope": "required",
- "hashes": [
-{
- "alg": "SHA-256",
- "content":
"7c954b144ec036d0eb0e8df887cf3e8aa40a60559c049a5d6207d67803076af9"
-}
- ],
- "purl":
"pkg:golang/github.com/apache/camel-k/v2/pkg/client/camel@v0.0.0-20230829005838-b512d6d445aa?type=module\u0026goos=linux\u0026goarch=amd64",
- "externalReferences": [
-{
- "url": "https://github.com/apache/camel-k/v2/pkg/client/camel;,
- "type": "vcs"
-}
- ]
-},
-{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230829005838-b512d6d445aa?type=module",
- "type": "library",
- "name": "github.com/apache/camel-k/v2/pkg/kamelet/repository",
- "version": "v0.0.0-20230829005838-b512d6d445aa",
- "scope": "required",
- "hashes": [
-{
- "alg": "SHA-256",
- "content":
"61667822926e6f205b73405726dd121f845a858d34ca894ba035caa2c8b04ef7"
-}
- ],
- "purl":
"pkg:golang/github.com/apache/camel-k/v2/pkg/kamelet/repository@v0.0.0-20230829005838-b512d6d445aa?type=module\u0026goos=linux\u0026goarch=amd64",
- "externalReferences": [
-{
- "url": "https://github.com/apache/camel-k/v2/pkg/kamelet/repository;,
- "type": "vcs"
-}
- ]
-},
{
"bom-ref": "pkg:golang/github.com/beorn7/perks@v1.0.1?type=module",
"type": "library",
@@ -4081,12 +4021,9 @@
],
"dependencies": [
{
- "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230829005838-b512d6d445aa?type=module",
+ "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230830004626-e25f16f0152f?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
-
[camel-k] 01/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 release-2.0.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit e25f16f0152f37cc83b20b9c612d148b652300c4
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Aug 30 00:46:26 2023 +
chore: autogenerated project resource update
---
pkg/resources/resources.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 2528befbd..5cbe08bf0 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -434,9 +434,9 @@ var assets = func() http.FileSystem {
"/rbac/operator-role.yaml": ۰CompressedFileInfo{
name: "operator-role.yaml",
modTime: time.Time{},
- uncompressedSize: 3232,
+ uncompressedSize: 3242,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x56\x41\x8f\x1a\x47\x13\xbd\xcf\xaf\x28\x31\x17\x5b\x5a\xe0\xfb\x72\x8a\xc8\x89\xac\x77\x13\x14\x0b\xa4\x05\xc7\xf2\xb1\xa6\xa7\x18\x2a\xf4\x74\x75\xaa\x7b\x96\x25\xbf\x3e\xea\x61\x30\xec\x0e\x58\x96\x6d\x69\xc3\x85\x9e\xea\x9a\xaa\x57\xef\xbd\x1e\x75\x0e\xc3\x1f\xf7\xcb\x72\x78\xcf\x86\x5c\xa0\x12\xa2\x40\xdc\x10\x4c\x3d\x9a\x0d\xc1\x52\xd6\x71\x87\x4a\x70\x2f\x8d\x2b\x31\xb2\x38\x78\x33\x5d\xde\xbf\x85\xc6\x95\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x56\x4d\x8f\xdb\x36\x10\xbd\xeb\x57\x0c\xac\x4b\x02\xac\xed\xb6\xa7\xc2\x3d\xb9\xfb\xd1\x1a\x0d\x6c\x60\xe5\x34\xc8\x71\x44\x8d\xe5\xa9\x29\x0e\x4b\x52\xeb\x75\x7f\x7d\x41\x59\x5a\x6b\x57\xf6\x22\x48\x02\x6c\x7c\x31\x35\x1c\xcd\xbc\x79\xef\x51\x60\x0a\xe3\xef\xf7\x4b\x52\xf8\xc0\x8a\x8c\xa7\x02\x82\x40\xd8\x12\xcc\x2d\xaa\x2d\x41\x26\x9b\xb0\x47\x47\x70\x27\xb5\x29\x30\xb0\x18\x78\x37\xcf\xee\xde\x43\x6d\x0a\x72\x
[...]
},
"/rbac/patch-role-to-clusterrole.yaml":
۰CompressedFileInfo{
name: "patch-role-to-clusterrole.yaml",
[camel-k] 03/03: chore: nightly coverage badge 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 a66479568aaf0d84031d0b2a0baf5862b09e3e93 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Wed Aug 30 00:48:04 2023 + chore: nightly coverage badge update --- README.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index d5be16c03..484f3b514 100644 --- a/README.adoc +++ b/README.adoc @@ -11,7 +11,7 @@ image:https://github.com/apache/camel-k/workflows/kubernetes/badge.svg["Kubernet image:https://github.com/apache/camel-k/workflows/knative/badge.svg["Knative;, link="https://github.com/apache/camel-k/actions/workflows/knative.yml;] image:https://github.com/apache/camel-k/actions/workflows/nightly-release.yml/badge.svg["Nightly releases", link="https://github.com/apache/camel-k/actions/workflows/nightly-release.yml;] image:https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml/badge.svg["Quarkus native", link="https://github.com/apache/camel-k/actions/workflows/nightly-native-test.yml;] -image:https://img.shields.io/badge/Coverage-39.4%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml;] +image:https://img.shields.io/badge/Coverage-33.8%25-yellow.svg["Go coverage", link="https://github.com/apache/camel-k/actions/workflows/nightly-coverage.yml;] image:https://img.shields.io/badge/zulip-join_chat-brightgreen.svg["Chat on Zulip", link="https://camel.zulipchat.com;] Apache Camel K is a lightweight integration framework built from **Apache Camel** that runs natively on Kubernetes and is specifically designed for serverless and microservice architectures. Users of `Camel K` can instantly run integration code written in Camel DSL on their preferred **Cloud** provider.
[camel-k] branch release-2.0.x updated (3a410b691 -> a66479568)
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 3a410b691 Reorganize project to have a single Go module (#4695) new e25f16f01 chore: autogenerated project resource update new c70438664 chore: nightly SBOM update new a66479568 chore: nightly coverage badge 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: README.adoc| 2 +- camel-k-sbom/camel-k-sbom.json | 204 ++--- pkg/resources/resources.go | 4 +- 3 files changed, 12 insertions(+), 198 deletions(-)
[camel-k] branch release-1.12.x updated: Periodic Sync of Camel K Main Branch for SBOM Generation
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch release-1.12.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-1.12.x by this push:
new 29c245cfe Periodic Sync of Camel K Main Branch for SBOM Generation
29c245cfe is described below
commit 29c245cfe8f43cb9a1067e682a6024a83b733734
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Aug 30 00:33:51 2023 +
Periodic Sync of Camel K Main Branch for SBOM Generation
---
camel-k-sbom/camel-k-sbom.json | 54 +-
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/camel-k-sbom/camel-k-sbom.json b/camel-k-sbom/camel-k-sbom.json
index ac43842c9..f75cd121e 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:afb6ab4f-1fc6-4b95-90c7-6ae8ee5e377d",
+ "serialNumber": "urn:uuid:6c226650-d770-4196-ade7-c9af5be90465",
"version": 1,
"metadata": {
-"timestamp": "2023-08-29T00:48:18Z",
+"timestamp": "2023-08-30T00:33:51Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20230829004400-c4c6b8bfe3cb?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20230829004818-692e067f8d51?type=module",
"type": "application",
"name": "github.com/apache/camel-k",
- "version": "v0.0.0-20230829004400-c4c6b8bfe3cb",
- "purl":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20230829004400-c4c6b8bfe3cb?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20230829004818-692e067f8d51",
+ "purl":
"pkg:golang/github.com/apache/camel-k@v0.0.0-20230829004818-692e067f8d51?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k;,
@@ -510,18 +510,18 @@
}
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230829004400-c4c6b8bfe3cb?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230829004818-692e067f8d51?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/apis/camel",
- "version": "v0.0.0-20230829004400-c4c6b8bfe3cb",
+ "version": "v0.0.0-20230829004818-692e067f8d51",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"fbf553c58aafae334fd86f39d6c87ff3da6c7c2b46431a240bc925cb6d376d94"
+ "content":
"da02155cb11ff1e0e77970212febb9aaff4822b2ce2e3f7f72d1ac10a274df91"
}
],
- "purl":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230829004400-c4c6b8bfe3cb?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/github.com/apache/camel-k/pkg/apis/camel@v0.0.0-20230829004818-692e067f8d51?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/pkg/apis/camel;,
@@ -530,18 +530,18 @@
]
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230829004400-c4c6b8bfe3cb?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230829004818-692e067f8d51?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/client/camel",
- "version": "v0.0.0-20230829004400-c4c6b8bfe3cb",
+ "version": "v0.0.0-20230829004818-692e067f8d51",
"scope": "required",
"hashes": [
{
"alg": "SHA-256",
- "content":
"e38b5ab649fa726ca52de254e3dda64ab6cc0aae82a63bc3eeb569c7f947a8be"
+ "content":
"e44b0377df489a3b3b3a6dc1efc78caefa476ac4a79fbbf5ce519ebac8b04cfd"
}
],
- "purl":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230829004400-c4c6b8bfe3cb?type=module\u0026goos=linux\u0026goarch=amd64",
+ "purl":
"pkg:golang/github.com/apache/camel-k/pkg/client/camel@v0.0.0-20230829004818-692e067f8d51?type=module\u0026goos=linux\u0026goarch=amd64",
"externalReferences": [
{
"url": "https://github.com/apache/camel-k/pkg/client/camel;,
@@ -550,18 +550,18 @@
]
},
{
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20230829004400-c4c6b8bfe3cb?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/pkg/kamelet/repository@v0.0.0-20230829004818-692e067f8d51?type=module",
"type": "library",
"name": "github.com/apache/camel-k/pkg/kamelet/repository",
-
[GitHub] [camel-spring-boot] github-actions[bot] opened a new pull request, #924: [Github Actions] Periodic Sync Camel Spring Boot (Camel 4)
github-actions[bot] opened a new pull request, #924: URL: https://github.com/apache/camel-spring-boot/pull/924 Periodic Sync of Camel Spring Boot Main Branch with main Camel Main. see https://github.com/apache/camel-spring-boot/blob/main/.github/workflows/automatic-sync-main.yml -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-k] branch main updated: 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
The following commit(s) were added to refs/heads/main by this push:
new d251dd732 chore: nightly SBOM update
d251dd732 is described below
commit d251dd7324e2b09c95c6ef1d5ff8d10e2dcfa79a
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Tue Aug 29 23:48:04 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 63b3f6624..0a5c514c4 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:dc76397b-2663-4ce2-a0aa-4a1e6a7f3d55",
+ "serialNumber": "urn:uuid:fc8f8f0d-c00c-49a2-a3a2-059284bb72c1",
"version": 1,
"metadata": {
-"timestamp": "2023-08-29T00:00:25Z",
+"timestamp": "2023-08-29T23:48:04Z",
"tools": [
{
"vendor": "CycloneDX",
@@ -46,11 +46,11 @@
}
],
"component": {
- "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230828235953-d9ac8c8817e6?type=module",
+ "bom-ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230829000318-f799e822b551?type=module",
"type": "application",
"name": "github.com/apache/camel-k/v2",
- "version": "v0.0.0-20230828235953-d9ac8c8817e6",
- "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230828235953-d9ac8c8817e6?type=module\u0026goos=linux\u0026goarch=amd64",
+ "version": "v0.0.0-20230829000318-f799e822b551",
+ "purl":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230829000318-f799e822b551?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-20230828235953-d9ac8c8817e6?type=module",
+ "ref":
"pkg:golang/github.com/apache/camel-k/v2@v0.0.0-20230829000318-f799e822b551?type=module",
"dependsOn": [
"pkg:golang/github.com/Masterminds/semver@v1.5.0?type=module",
"pkg:golang/github.com/container-tools/spectrum@v0.6.34?type=module",
[GitHub] [camel] christophd opened a new pull request, #11236: CAMEL-19805: Support IntegrationSpec as part of Pipe/KameletBinding
christophd opened a new pull request, #11236: URL: https://github.com/apache/camel/pull/11236 # Description - Enhance YAML DSL to support Integration specification as part of a pipe/binding - Integration spec adds configuration, traits and dependencies to the pipe/binding -- 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_3x updated (9d4801308a7 -> 5bf013f47de)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3x in repository https://gitbox.apache.org/repos/asf/camel.git from 9d4801308a7 Fix CS add 5bf013f47de CAMEL-19731 AS2: Fixed null pointer exception (#11229) No new revisions were added by this update. Summary of changes: .../component/as2/api/entity/EntityParser.java | 8 +++- .../camel/component/as2/AS2ClientManagerIT.java| 56 ++ 2 files changed, 63 insertions(+), 1 deletion(-)
[GitHub] [camel] davsclaus merged pull request #11230: CAMEL-19776 for camel-4.0.x
davsclaus merged PR #11230: URL: https://github.com/apache/camel/pull/11230 -- 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 (b9f3ea35f72 -> e9d6c776865)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from b9f3ea35f72 CAMEL-19776 for main(camel-4) (#11231) add e9d6c776865 CAMEL-19731 AS2: Fixed null pointer exception (#11229) No new revisions were added by this update. Summary of changes: .../component/as2/api/entity/EntityParser.java | 8 +++- .../camel/component/as2/AS2ClientManagerIT.java| 56 ++ 2 files changed, 63 insertions(+), 1 deletion(-)
[GitHub] [camel] davsclaus merged pull request #11233: chore: Allow DataTypeProcessor used as processor definition
davsclaus merged PR #11233: URL: https://github.com/apache/camel/pull/11233 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] opened a new pull request, #11235: Generated sources regen
github-actions[bot] opened a new pull request, #11235: URL: https://github.com/apache/camel/pull/11235 Regen bot :robot: found some uncommitted changes after running build on :camel: `main` branch. Please do not delete `regen_bot` branch after merge/rebase. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (be71348631a -> bb4141ecdc5)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot in repository https://gitbox.apache.org/repos/asf/camel.git omit be71348631a Regen for commit 6ffda9875dedc199071437ba4985e20aa6eabbd8 add cf2801b31cb CAMEL-19803: camel-core - Error handler model should have commonly used options moved higher up in index add bb4141ecdc5 Regen for commit cf2801b31cbdabb3874fcded785c85f31267f1d1 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 (be71348631a) \ N -- N -- N refs/heads/regen_bot (bb4141ecdc5) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: .../camel/catalog/models/deadLetterChannel.json| 24 +++--- .../camel/catalog/models/defaultErrorHandler.json | 24 +++--- .../catalog/models/jtaTransactionErrorHandler.json | 24 +++--- .../models/springTransactionErrorHandler.json | 24 +++--- .../apache/camel/catalog/schemas/camel-spring.xsd | 22 ++-- .../model/errorhandler/deadLetterChannel.json | 24 +++--- .../model/errorhandler/defaultErrorHandler.json| 24 +++--- .../errorhandler/jtaTransactionErrorHandler.json | 24 +++--- .../springTransactionErrorHandler.json | 24 +++--- .../DefaultErrorHandlerDefinition.java | 19 + .../dsl/yaml/deserializers/ModelDeserializers.java | 16 +++ .../generated/resources/schema/camel-yaml-dsl.json | 16 +++ .../generated/resources/schema/camelYamlDsl.json | 16 +++ 13 files changed, 141 insertions(+), 140 deletions(-)
[GitHub] [camel] davsclaus merged pull request #11229: CAMEL-19731 AS2: Fixed null pointer exception
davsclaus merged PR #11229: URL: https://github.com/apache/camel/pull/11229 -- 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 (f53a8801bee -> b9f3ea35f72)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from f53a8801bee Spring xml (#11234)
add b9f3ea35f72 CAMEL-19776 for main(camel-4) (#11231)
No new revisions were added by this update.
Summary of changes:
.../camel/opentelemetry}/NoopTracingStrategy.java | 2 +-
.../OpenTelemetryTracingStrategy.java | 107 +
.../CamelOpenTelemetryTestSupport.java | 7 ++
.../OpenTelemetryTracingStrategyTest.java | 94 ++
4 files changed, 209 insertions(+), 1 deletion(-)
copy
components/{camel-aws/camel-aws-xray/src/main/java/org/apache/camel/component/aws/xray
=>
camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry}/NoopTracingStrategy.java
(96%)
create mode 100644
components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
create mode 100644
components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategyTest.java
[camel] branch main updated (3fde21858a9 -> f53a8801bee)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from 3fde21858a9 (chores) camel-core: optimize copying exchanges (#11232) add f53a8801bee Spring xml (#11234) No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/xml/in/BaseParser.java | 30 +++--- .../camel/xml/jaxb/JaxbModelToXMLDumper.java | 2 +- .../java/org/apache/camel/main/KameletMain.java| 33 +-- .../apache/camel/dsl/xml/io/XmlModelParser.java| 47 ++ .../camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 15 --- .../camel/dsl/xml/io/XmlSpringBeansLoadTest.java | 25 ++-- .../org/apache/camel/dsl/xml/io/springBeans.xml| 10 - 7 files changed, 129 insertions(+), 33 deletions(-) create mode 100644 dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlModelParser.java copy components/camel-resourceresolver-github/src/test/java/org/apache/camel/github/GistResourceResolverTest.java => dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlSpringBeansLoadTest.java (58%) copy components/camel-spring-ws/src/test/resources/org/apache/camel/component/spring/ws/ConsumerExceptionPropagationRouteTest-context.xml => dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/springBeans.xml (84%)
[camel] branch regen_bot updated (e9d6c776865 -> be71348631a)
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 e9d6c776865 CAMEL-19731 AS2: Fixed null pointer exception (#11229) add d7ebff5f82e chore: Allow DataTypeProcessor used as processor definition (#11233) add 6856944e1bd CAMEL-19803: camel-core - Error handler model should have commonly used options moved higher up in index add 6ffda9875de Regen add be71348631a Regen for commit 6ffda9875dedc199071437ba4985e20aa6eabbd8 No new revisions were added by this update. Summary of changes: .../camel/catalog/models/deadLetterChannel.json| 10 ++-- .../camel/catalog/models/defaultErrorHandler.json | 10 ++-- .../catalog/models/jtaTransactionErrorHandler.json | 10 ++-- .../models/springTransactionErrorHandler.json | 10 ++-- .../apache/camel/catalog/schemas/camel-spring.xsd | 54 +++--- .../model/errorhandler/deadLetterChannel.json | 10 ++-- .../model/errorhandler/defaultErrorHandler.json| 10 ++-- .../errorhandler/jtaTransactionErrorHandler.json | 10 ++-- .../springTransactionErrorHandler.json | 10 ++-- .../DefaultErrorHandlerDefinition.java | 12 ++--- .../processor/transformer/DataTypeProcessor.java | 2 +- .../DefaultManagementObjectStrategy.java | 2 +- .../endpoint/dsl/PdfEndpointBuilderFactory.java| 2 +- 13 files changed, 76 insertions(+), 76 deletions(-)
[camel] branch main updated: CAMEL-19803: camel-core - Error handler model should have commonly used options moved higher up in index
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 cf2801b31cb CAMEL-19803: camel-core - Error handler model should have
commonly used options moved higher up in index
cf2801b31cb is described below
commit cf2801b31cbdabb3874fcded785c85f31267f1d1
Author: Claus Ibsen
AuthorDate: Tue Aug 29 21:17:52 2023 +0200
CAMEL-19803: camel-core - Error handler model should have commonly used
options moved higher up in index
---
.../camel/catalog/models/deadLetterChannel.json| 24 +++---
.../camel/catalog/models/defaultErrorHandler.json | 24 +++---
.../catalog/models/jtaTransactionErrorHandler.json | 24 +++---
.../models/springTransactionErrorHandler.json | 24 +++---
.../model/errorhandler/deadLetterChannel.json | 24 +++---
.../model/errorhandler/defaultErrorHandler.json| 24 +++---
.../errorhandler/jtaTransactionErrorHandler.json | 24 +++---
.../springTransactionErrorHandler.json | 24 +++---
.../DefaultErrorHandlerDefinition.java | 19 +
.../dsl/yaml/deserializers/ModelDeserializers.java | 16 +++
.../generated/resources/schema/camel-yaml-dsl.json | 16 +++
.../generated/resources/schema/camelYamlDsl.json | 16 +++
12 files changed, 130 insertions(+), 129 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/deadLetterChannel.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/deadLetterChannel.json
index a7d27bfaad3..4793afd6cf3 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/deadLetterChannel.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/deadLetterChannel.json
@@ -14,18 +14,18 @@
"properties": {
"deadLetterUri": { "index": 0, "kind": "attribute", "displayName": "Dead
Letter Uri", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The dead letter endpoint uri for the Dead Letter error
handler." },
"deadLetterHandleNewException": { "index": 1, "kind": "attribute",
"displayName": "Dead Letter Handle New Exception", "label": "advanced",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Whether the dead letter channel should handle (and ignore) any
new exception that may been thrown during sending the message to the dead
letter endpoint. The default value is true wh [...]
-"useOriginalMessage": { "index": 2, "kind": "attribute", "displayName":
"Use Original Message", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "Will use the
original input org.apache.camel.Message (original body and headers) when an
org.apache.camel.Exchange is moved to the dead letter queue. Notice: this only
applies when all redeliveries attem [...]
-"useOriginalBody": { "index": 3, "kind": "attribute", "displayName": "Use
Original Body", "label": "advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Will use the original
input org.apache.camel.Message body (original body only) when an
org.apache.camel.Exchange is moved to the dead letter queue. Notice: this only
applies when all redeliveries attempt have [...]
-"loggerRef": { "index": 4, "kind": "attribute", "displayName": "Logger
Ref", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "References to a logger to use as logger for the error handler"
},
-"level": { "index": 5, "kind": "attribute", "displayName": "Level",
"label": "advanced", "required": false, "type": "enum", "javaType":
"org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN",
"ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "ERROR", "description": "Logging level to use when using the
logging error handler type." },
-"logName": { "index": 6, "kind": "attribute", "displayName": "Log Name",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Name of the logger to use for the logging error handler" },
-
[camel] branch camel-3.20.x updated: CAMEL-19731 AS2: Fixed null pointer exception (#11229)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.20.x by this push:
new ac5ae3f06e2 CAMEL-19731 AS2: Fixed null pointer exception (#11229)
ac5ae3f06e2 is described below
commit ac5ae3f06e26e37e7e603655d1f7d038b679c42c
Author: Dmitry Kryukov
AuthorDate: Tue Aug 29 21:56:18 2023 +0300
CAMEL-19731 AS2: Fixed null pointer exception (#11229)
* CAMEL-19731 AS2: Fixed null pointer exception when request's header
dispositionNotificationTo isn't set
* CAMEL-19731 simplified the null-check - now it causes early exit
---
.../component/as2/api/entity/EntityParser.java | 8 +++-
.../camel/component/as2/AS2ClientManagerIT.java| 56 ++
2 files changed, 63 insertions(+), 1 deletion(-)
diff --git
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
index 01b4c7398cc..b05381b526a 100644
---
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
+++
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
@@ -443,6 +443,10 @@ public final class EntityParser {
try {
// Determine Content Type of Message
String contentTypeStr =
HttpMessageUtils.getHeaderValue(message, AS2Header.CONTENT_TYPE);
+if (contentTypeStr == null) {
+// contentTypeStr can be null when
dispositionNotificationTo isn't set
+return;
+}
ContentType contentType = ContentType.parse(contentTypeStr);
// Determine Charset
@@ -456,7 +460,8 @@ public final class EntityParser {
String boundary = HttpMessageUtils.getParameterValue(message,
AS2Header.CONTENT_TYPE, "boundary");
// Determine content transfer encoding
-String contentTransferEncoding =
HttpMessageUtils.getHeaderValue(message, AS2Header.CONTENT_TRANSFER_ENCODING);
+String contentTransferEncoding
+= HttpMessageUtils.getHeaderValue(message,
AS2Header.CONTENT_TRANSFER_ENCODING);
AS2SessionInputBuffer inBuffer = new AS2SessionInputBuffer(new
HttpTransportMetricsImpl(), 8 * 1024);
inBuffer.bind(entity.getContent());
@@ -496,6 +501,7 @@ public final class EntityParser {
throw new HttpException("Failed to parse entity content", e);
}
}
+
}
public static MultipartSignedEntity parseMultipartSignedEntityBody(
diff --git
a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
index f055938ca76..30ef86d8020 100644
---
a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
+++
b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
@@ -101,6 +101,7 @@ import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -305,6 +306,61 @@ public class AS2ClientManagerIT extends
AbstractAS2ITSupport {
}
+@Test
+public void plainMessageSendTestWhenDispositionNotificationToNotSet()
throws Exception {
+final Map headers = new HashMap<>();
+// parameter type is String
+headers.put("CamelAS2.requestUri", REQUEST_URI);
+// parameter type is String
+headers.put("CamelAS2.subject", SUBJECT);
+// parameter type is String
+headers.put("CamelAS2.from", FROM);
+// parameter type is String
+headers.put("CamelAS2.as2From", AS2_NAME);
+// parameter type is String
+headers.put("CamelAS2.as2To", AS2_NAME);
+// parameter type is
org.apache.camel.component.as2.api.AS2MessageStructure
+headers.put("CamelAS2.as2MessageStructure", AS2MessageStructure.PLAIN);
+// parameter type is org.apache.http.entity.ContentType
+headers.put("CamelAS2.ediMessageContentType",
+ContentType.create(AS2MediaType.APPLICATION_EDIFACT,
StandardCharsets.US_ASCII.name()));
+// parameter type is String
+headers.put("CamelAS2.ediMessageTransferEncoding",
[camel-kamelets-examples] branch main updated: Update example to use classic Spring XML XML file
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-kamelets-examples.git
The following commit(s) were added to refs/heads/main by this push:
new 8a65c3f Update example to use classic Spring XML XML file
8a65c3f is described below
commit 8a65c3f485f752b77587a7cc0fda075a64f93e42
Author: Claus Ibsen
AuthorDate: Tue Aug 29 20:41:24 2023 +0200
Update example to use classic Spring XML XML file
---
jbang/xml-to-yaml/OrderService.java | 7 ++-
jbang/xml-to-yaml/README.adoc| 4 ++--
jbang/xml-to-yaml/application.properties | 2 ++
jbang/xml-to-yaml/order-spring.xml | 35
4 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/jbang/xml-to-yaml/OrderService.java
b/jbang/xml-to-yaml/OrderService.java
index 36495bf..3f2e86c 100644
--- a/jbang/xml-to-yaml/OrderService.java
+++ b/jbang/xml-to-yaml/OrderService.java
@@ -7,6 +7,11 @@ public class OrderService {
private String customer;
private Address address;
+ public OrderService(boolean customer, Address address) {
+ this.customer = customer ? "Acme" : "None";
+ this.address = address;
+ }
+
public void setCustomer(String customer) {
this.customer = customer;
}
@@ -24,7 +29,7 @@ public class OrderService {
}
public String processorOrder(String id) {
- return "Order " + id + " ordered by " + customer + " to " +
address.getStreet();
+ return "Order2 " + id + " ordered by " + customer + " to " +
address.getStreet();
}
}
\ No newline at end of file
diff --git a/jbang/xml-to-yaml/README.adoc b/jbang/xml-to-yaml/README.adoc
index d001d5a..dfb32c4 100644
--- a/jbang/xml-to-yaml/README.adoc
+++ b/jbang/xml-to-yaml/README.adoc
@@ -1,6 +1,6 @@
== XML to YAML
-This example shows XML DSL with both bean and routes using the new
root tag.
+This example shows classic Spring XML file with and with
embedded .
The XML can be migrated to YAML DSL using Camel JBang.
@@ -47,7 +47,7 @@ This can also be done explicit from CLI, by executing:
$ camel transform * --format=yaml --output=my-dump
-This will transform the Camel XML DSL into YAML and store the output in the
my-dump directory.
+This will transform the XML DSL into YAML DSL and store the output in the
my-dump directory.
=== Help and contributions
diff --git a/jbang/xml-to-yaml/application.properties
b/jbang/xml-to-yaml/application.properties
new file mode 100644
index 000..ef1be51
--- /dev/null
+++ b/jbang/xml-to-yaml/application.properties
@@ -0,0 +1,2 @@
+zipCode = 90210
+streetName = Gardenstreet 444
diff --git a/jbang/xml-to-yaml/order-spring.xml
b/jbang/xml-to-yaml/order-spring.xml
index 29e0f81..e13393e 100644
--- a/jbang/xml-to-yaml/order-spring.xml
+++ b/jbang/xml-to-yaml/order-spring.xml
@@ -1,16 +1,23 @@
-
+
+http://www.springframework.org/schema/beans;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd;>
-
-http://www.springframework.org/schema/beans;>
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ http://camel.apache.org/schema/spring;>
@@ -21,4 +28,6 @@
-
+
+
+
[camel] branch regen_bot updated (3fde21858a9 -> e9d6c776865)
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 3fde21858a9 (chores) camel-core: optimize copying exchanges (#11232) add f53a8801bee Spring xml (#11234) add b9f3ea35f72 CAMEL-19776 for main(camel-4) (#11231) add e9d6c776865 CAMEL-19731 AS2: Fixed null pointer exception (#11229) No new revisions were added by this update. Summary of changes: .../component/as2/api/entity/EntityParser.java | 8 +- .../camel/component/as2/AS2ClientManagerIT.java| 56 +++ .../camel/opentelemetry/NoopTracingStrategy.java | 34 +++ .../OpenTelemetryTracingStrategy.java | 107 + .../CamelOpenTelemetryTestSupport.java | 7 ++ .../OpenTelemetryTracingStrategyTest.java | 94 ++ .../java/org/apache/camel/xml/in/BaseParser.java | 30 -- .../camel/xml/jaxb/JaxbModelToXMLDumper.java | 2 +- .../java/org/apache/camel/main/KameletMain.java| 33 ++- .../apache/camel/dsl/xml/io/XmlModelParser.java| 47 + .../camel/dsl/xml/io/XmlRoutesBuilderLoader.java | 15 ++- .../camel/dsl/xml/io/XmlSpringBeansLoadTest.java | 39 .../org/apache/camel/dsl/xml/io/springBeans.xml| 35 +++ 13 files changed, 487 insertions(+), 20 deletions(-) create mode 100644 components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/NoopTracingStrategy.java create mode 100644 components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java create mode 100644 components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategyTest.java create mode 100644 dsl/camel-xml-io-dsl/src/main/java/org/apache/camel/dsl/xml/io/XmlModelParser.java create mode 100644 dsl/camel-xml-io-dsl/src/test/java/org/apache/camel/dsl/xml/io/XmlSpringBeansLoadTest.java create mode 100644 dsl/camel-xml-io-dsl/src/test/resources/org/apache/camel/dsl/xml/io/springBeans.xml
[camel] branch camel-4.0.x updated: CAMEL-19776 for camel-4.0.x (#11230)
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 842673a7893 CAMEL-19776 for camel-4.0.x (#11230)
842673a7893 is described below
commit 842673a7893052a22aec9d8bfb0c96f6ccd0d605
Author: RuslanHryn
AuthorDate: Tue Aug 29 22:08:28 2023 +0300
CAMEL-19776 for camel-4.0.x (#11230)
* CAMEL-19776: Added tracing strategy for OpenTelemetry to trace processors
* CAMEL-19776: Removed unnecessary sleep in the test
-
Co-authored-by: Ruslan Hryn
---
.../camel/opentelemetry/NoopTracingStrategy.java | 34 +++
.../OpenTelemetryTracingStrategy.java | 107 +
.../CamelOpenTelemetryTestSupport.java | 7 ++
.../OpenTelemetryTracingStrategyTest.java | 94 ++
4 files changed, 242 insertions(+)
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/NoopTracingStrategy.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/NoopTracingStrategy.java
new file mode 100644
index 000..ad8d54ba761
--- /dev/null
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/NoopTracingStrategy.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.opentelemetry;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.NamedNode;
+import org.apache.camel.Processor;
+import org.apache.camel.spi.InterceptStrategy;
+import org.apache.camel.support.processor.DelegateAsyncProcessor;
+
+public class NoopTracingStrategy implements InterceptStrategy {
+
+@Override
+public Processor wrapProcessorInInterceptors(
+CamelContext camelContext, NamedNode processorDefinition,
+Processor target, Processor nextTarget)
+throws Exception {
+return new DelegateAsyncProcessor(target);
+}
+}
diff --git
a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
new file mode 100644
index 000..7e2266bf3ae
--- /dev/null
+++
b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategy.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.opentelemetry;
+
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.StatusCode;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.context.Scope;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.NamedNode;
+import org.apache.camel.Processor;
+import org.apache.camel.spi.InterceptStrategy;
+import org.apache.camel.support.PatternHelper;
+import org.apache.camel.support.processor.DelegateAsyncProcessor;
+import org.apache.camel.tracing.ActiveSpanManager;
+import org.apache.camel.tracing.SpanDecorator;
+
+public class OpenTelemetryTracingStrategy implements InterceptStrategy {
+private static final String UNNAMED = "unnamed";
+private final OpenTelemetryTracer tracer;
+
+public OpenTelemetryTracingStrategy(OpenTelemetryTracer
[camel] 01/02: CAMEL-19803: camel-core - Error handler model should have commonly used options moved higher up in index
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6856944e1bdecd120d48cb9046bb2c075ad3c6c1
Author: Claus Ibsen
AuthorDate: Tue Aug 29 21:05:45 2023 +0200
CAMEL-19803: camel-core - Error handler model should have commonly used
options moved higher up in index
---
.../org/apache/camel/catalog/models/deadLetterChannel.json | 10 +-
.../org/apache/camel/catalog/models/defaultErrorHandler.json | 10 +-
.../camel/catalog/models/jtaTransactionErrorHandler.json | 10 +-
.../camel/catalog/models/springTransactionErrorHandler.json | 10 +-
.../apache/camel/model/errorhandler/deadLetterChannel.json | 10 +-
.../apache/camel/model/errorhandler/defaultErrorHandler.json | 10 +-
.../camel/model/errorhandler/jtaTransactionErrorHandler.json | 10 +-
.../model/errorhandler/springTransactionErrorHandler.json| 10 +-
.../model/errorhandler/DefaultErrorHandlerDefinition.java| 12 ++--
9 files changed, 46 insertions(+), 46 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/deadLetterChannel.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/deadLetterChannel.json
index 2b8b46b1d39..a7d27bfaad3 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/deadLetterChannel.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/deadLetterChannel.json
@@ -14,11 +14,11 @@
"properties": {
"deadLetterUri": { "index": 0, "kind": "attribute", "displayName": "Dead
Letter Uri", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The dead letter endpoint uri for the Dead Letter error
handler." },
"deadLetterHandleNewException": { "index": 1, "kind": "attribute",
"displayName": "Dead Letter Handle New Exception", "label": "advanced",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": true,
"description": "Whether the dead letter channel should handle (and ignore) any
new exception that may been thrown during sending the message to the dead
letter endpoint. The default value is true wh [...]
-"loggerRef": { "index": 2, "kind": "attribute", "displayName": "Logger
Ref", "label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "References to a logger to use as logger for the error handler"
},
-"level": { "index": 3, "kind": "attribute", "displayName": "Level",
"label": "advanced", "required": false, "type": "enum", "javaType":
"org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN",
"ERROR", "OFF" ], "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "ERROR", "description": "Logging level to use when using the
logging error handler type." },
-"logName": { "index": 4, "kind": "attribute", "displayName": "Log Name",
"label": "advanced", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "Name of the logger to use for the logging error handler" },
-"useOriginalMessage": { "index": 5, "kind": "attribute", "displayName":
"Use Original Message", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "Will use the
original input org.apache.camel.Message (original body and headers) when an
org.apache.camel.Exchange is moved to the dead letter queue. Notice: this only
applies when all redeliveries attem [...]
-"useOriginalBody": { "index": 6, "kind": "attribute", "displayName": "Use
Original Body", "label": "advanced", "required": false, "type": "boolean",
"javaType": "java.lang.Boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Will use the original
input org.apache.camel.Message body (original body only) when an
org.apache.camel.Exchange is moved to the dead letter queue. Notice: this only
applies when all redeliveries attempt have [...]
+"useOriginalMessage": { "index": 2, "kind": "attribute", "displayName":
"Use Original Message", "label": "advanced", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": false, "description": "Will use the
original input org.apache.camel.Message (original body and headers) when an
org.apache.camel.Exchange is moved to the dead letter queue. Notice: this only
applies when
[camel] 02/02: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6ffda9875dedc199071437ba4985e20aa6eabbd8
Author: Claus Ibsen
AuthorDate: Tue Aug 29 21:07:37 2023 +0200
Regen
---
.../generated/resources/org/apache/camel/catalog/components/pdf.json| 2 +-
.../apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
index 18499dbc195..0ba759ba3b5 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/pdf.json
@@ -32,7 +32,7 @@
},
"properties": {
"operation": { "index": 0, "kind": "path", "displayName": "Operation",
"group": "producer", "label": "", "required": true, "type": "object",
"javaType": "org.apache.camel.component.pdf.PdfOperation", "enum": [ "create",
"append", "extractText" ], "deprecated": false, "deprecationNote": "",
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.pdf.PdfConfiguration", "configurationField":
"pdfConfiguration", "description": "Operation type" },
-"font": { "index": 1, "kind": "parameter", "displayName": "Font", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "COURIER", "COURIER_BOLD", "COURIER_OBLIQUE",
"COURIER_BOLD_OBLIQUE", "HELVETICA", "HELVETICA_BOLD", "HELVETICA_OBLIQUE",
"HELVETICA_BOLD_OBLIQUE", "TIMES_ROMAN", "TIMES_BOLD", "TIMES_ITALIC",
"TIMES_BOLD_ITALIC", "SYMBOL", "ZAPF_DINGBATS" ], "deprecated": false,
"autowired": false, "secret": false, "default [...]
+"font": { "index": 1, "kind": "parameter", "displayName": "Font", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "Courier", "Courier-Bold", "Courier-Oblique",
"Courier-BoldOblique", "Helvetica", "Helvetica-Bold", "Helvetica-Oblique",
"Helvetica-BoldOblique", "Times-Roman", "Times-Bold", "Times-Italic",
"Times-BoldItalic", "Symbol", "ZapfDingbats" ], "deprecated": false,
"autowired": false, "secret": false, "defaultValu [...]
"fontSize": { "index": 2, "kind": "parameter", "displayName": "Font Size",
"group": "producer", "label": "", "required": false, "type": "number",
"javaType": "float", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 14.0, "configurationClass":
"org.apache.camel.component.pdf.PdfConfiguration", "configurationField":
"pdfConfiguration", "description": "Font size in pixels" },
"marginBottom": { "index": 3, "kind": "parameter", "displayName": "Margin
Bottom", "group": "producer", "label": "", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 20, "configurationClass":
"org.apache.camel.component.pdf.PdfConfiguration", "configurationField":
"pdfConfiguration", "description": "Margin bottom in pixels" },
"marginLeft": { "index": 4, "kind": "parameter", "displayName": "Margin
Left", "group": "producer", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 20, "configurationClass":
"org.apache.camel.component.pdf.PdfConfiguration", "configurationField":
"pdfConfiguration", "description": "Margin left in pixels" },
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java
index d40b3db9af0..2cfd710fa81 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PdfEndpointBuilderFactory.java
@@ -46,7 +46,7 @@ public interface PdfEndpointBuilderFactory {
*
* The option is a: codejava.lang.String/code type.
*
- * Default: HELVETICA
+ * Default: Helvetica
* Group: producer
*
* @param font the value to set
[camel] branch main updated (d7ebff5f82e -> 6ffda9875de)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/camel.git from d7ebff5f82e chore: Allow DataTypeProcessor used as processor definition (#11233) new 6856944e1bd CAMEL-19803: camel-core - Error handler model should have commonly used options moved higher up in index new 6ffda9875de Regen The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../resources/org/apache/camel/catalog/components/pdf.json | 2 +- .../org/apache/camel/catalog/models/deadLetterChannel.json | 10 +- .../org/apache/camel/catalog/models/defaultErrorHandler.json | 10 +- .../camel/catalog/models/jtaTransactionErrorHandler.json | 10 +- .../camel/catalog/models/springTransactionErrorHandler.json | 10 +- .../apache/camel/model/errorhandler/deadLetterChannel.json | 10 +- .../apache/camel/model/errorhandler/defaultErrorHandler.json | 10 +- .../camel/model/errorhandler/jtaTransactionErrorHandler.json | 10 +- .../model/errorhandler/springTransactionErrorHandler.json| 10 +- .../model/errorhandler/DefaultErrorHandlerDefinition.java| 12 ++-- .../builder/endpoint/dsl/PdfEndpointBuilderFactory.java | 2 +- 11 files changed, 48 insertions(+), 48 deletions(-)
[camel] branch main updated: chore: Allow DataTypeProcessor used as processor definition (#11233)
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 d7ebff5f82e chore: Allow DataTypeProcessor used as processor
definition (#11233)
d7ebff5f82e is described below
commit d7ebff5f82e36311dd5506eda6ca19e2b51957f7
Author: Christoph Deppisch
AuthorDate: Tue Aug 29 20:56:28 2023 +0200
chore: Allow DataTypeProcessor used as processor definition (#11233)
* chore: Allow DataTypeProcessor used as processor definition
- Avoid ClassCastException when DataTypeProcessor is used as part of a
ProcessorDefinition
- Allows users to reference the DataTypeProcessor as a normal processor in
a route as an addition to using it in TransformDefinition
* chore: Avoid null value as from data type in data type processor
---
.../java/org/apache/camel/processor/transformer/DataTypeProcessor.java | 2 +-
.../org/apache/camel/management/DefaultManagementObjectStrategy.java| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/DataTypeProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/DataTypeProcessor.java
index a7f9212bead..4c665a21393 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/DataTypeProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/DataTypeProcessor.java
@@ -72,7 +72,7 @@ public class DataTypeProcessor implements Processor {
DataType fromDataType = DataType.ANY;
if (fromType != null) {
fromDataType = new DataType(fromType);
-} else if (message instanceof DataTypeAware) {
+} else if (message instanceof DataTypeAware && ((DataTypeAware)
message).hasDataType()) {
fromDataType = ((DataTypeAware) message).getDataType();
}
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
index 773573228aa..7e6f4ab6463 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
@@ -439,7 +439,7 @@ public class DefaultManagementObjectStrategy implements
ManagementObjectStrategy
answer = new ManagedThrowException(context,
(ThrowExceptionProcessor) target, definition);
} else if (target instanceof TransformProcessor) {
answer = new ManagedTransformer(context, target,
(TransformDefinition) definition);
-} else if (target instanceof DataTypeProcessor) {
+} else if (target instanceof DataTypeProcessor && definition
instanceof TransformDefinition) {
answer = new ManagedTransformer(context, target,
(TransformDefinition) definition);
} else if (target instanceof PredicateValidatingProcessor) {
answer = new ManagedValidate(context,
(PredicateValidatingProcessor) target, (ValidateDefinition) definition);
[GitHub] [camel] davsclaus merged pull request #11231: CAMEL-19776 for main(camel-4)
davsclaus merged PR #11231: URL: https://github.com/apache/camel/pull/11231 -- 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-3.x updated: CAMEL-19731 AS2: Fixed null pointer exception (#11229)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.x by this push:
new 5bf013f47de CAMEL-19731 AS2: Fixed null pointer exception (#11229)
5bf013f47de is described below
commit 5bf013f47de5a22e58a1cdc08e9f151336433c10
Author: Dmitry Kryukov
AuthorDate: Tue Aug 29 21:56:18 2023 +0300
CAMEL-19731 AS2: Fixed null pointer exception (#11229)
* CAMEL-19731 AS2: Fixed null pointer exception when request's header
dispositionNotificationTo isn't set
* CAMEL-19731 simplified the null-check - now it causes early exit
---
.../component/as2/api/entity/EntityParser.java | 8 +++-
.../camel/component/as2/AS2ClientManagerIT.java| 56 ++
2 files changed, 63 insertions(+), 1 deletion(-)
diff --git
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
index cba6b1d7ab2..f370065b417 100644
---
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
+++
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
@@ -444,6 +444,10 @@ public final class EntityParser {
try {
// Determine Content Type of Message
String contentTypeStr =
HttpMessageUtils.getHeaderValue(message, AS2Header.CONTENT_TYPE);
+if (contentTypeStr == null) {
+// contentTypeStr can be null when
dispositionNotificationTo isn't set
+return;
+}
ContentType contentType = ContentType.parse(contentTypeStr);
// Determine Charset
@@ -457,7 +461,8 @@ public final class EntityParser {
String boundary = HttpMessageUtils.getParameterValue(message,
AS2Header.CONTENT_TYPE, "boundary");
// Determine content transfer encoding
-String contentTransferEncoding =
HttpMessageUtils.getHeaderValue(message, AS2Header.CONTENT_TRANSFER_ENCODING);
+String contentTransferEncoding
+= HttpMessageUtils.getHeaderValue(message,
AS2Header.CONTENT_TRANSFER_ENCODING);
AS2SessionInputBuffer inBuffer = new AS2SessionInputBuffer(new
HttpTransportMetricsImpl(), 8 * 1024);
inBuffer.bind(entity.getContent());
@@ -497,6 +502,7 @@ public final class EntityParser {
throw new HttpException("Failed to parse entity content", e);
}
}
+
}
public static MultipartSignedEntity parseMultipartSignedEntityBody(
diff --git
a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
index cff3b7ba171..f969b8e39f4 100644
---
a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
+++
b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
@@ -88,6 +88,7 @@ import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -243,6 +244,61 @@ public class AS2ClientManagerIT extends
AbstractAS2ITSupport {
}
+@Test
+public void plainMessageSendTestWhenDispositionNotificationToNotSet()
throws Exception {
+final Map headers = new HashMap<>();
+// parameter type is String
+headers.put("CamelAS2.requestUri", REQUEST_URI);
+// parameter type is String
+headers.put("CamelAS2.subject", SUBJECT);
+// parameter type is String
+headers.put("CamelAS2.from", FROM);
+// parameter type is String
+headers.put("CamelAS2.as2From", AS2_NAME);
+// parameter type is String
+headers.put("CamelAS2.as2To", AS2_NAME);
+// parameter type is
org.apache.camel.component.as2.api.AS2MessageStructure
+headers.put("CamelAS2.as2MessageStructure", AS2MessageStructure.PLAIN);
+// parameter type is org.apache.http.entity.ContentType
+headers.put("CamelAS2.ediMessageContentType",
+ContentType.create(AS2MediaType.APPLICATION_EDIFACT,
StandardCharsets.US_ASCII.name()));
+// parameter type is String
+headers.put("CamelAS2.ediMessageTransferEncoding",
[camel] branch camel-3.21.x updated: CAMEL-19731 AS2: Fixed null pointer exception (#11229)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.21.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.21.x by this push:
new dc5cc7f4722 CAMEL-19731 AS2: Fixed null pointer exception (#11229)
dc5cc7f4722 is described below
commit dc5cc7f47224a3dbdef992b78614cfb2dcc2fa3a
Author: Dmitry Kryukov
AuthorDate: Tue Aug 29 21:56:18 2023 +0300
CAMEL-19731 AS2: Fixed null pointer exception (#11229)
* CAMEL-19731 AS2: Fixed null pointer exception when request's header
dispositionNotificationTo isn't set
* CAMEL-19731 simplified the null-check - now it causes early exit
---
.../component/as2/api/entity/EntityParser.java | 8 +++-
.../camel/component/as2/AS2ClientManagerIT.java| 56 ++
2 files changed, 63 insertions(+), 1 deletion(-)
diff --git
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
index cba6b1d7ab2..f370065b417 100644
---
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
+++
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
@@ -444,6 +444,10 @@ public final class EntityParser {
try {
// Determine Content Type of Message
String contentTypeStr =
HttpMessageUtils.getHeaderValue(message, AS2Header.CONTENT_TYPE);
+if (contentTypeStr == null) {
+// contentTypeStr can be null when
dispositionNotificationTo isn't set
+return;
+}
ContentType contentType = ContentType.parse(contentTypeStr);
// Determine Charset
@@ -457,7 +461,8 @@ public final class EntityParser {
String boundary = HttpMessageUtils.getParameterValue(message,
AS2Header.CONTENT_TYPE, "boundary");
// Determine content transfer encoding
-String contentTransferEncoding =
HttpMessageUtils.getHeaderValue(message, AS2Header.CONTENT_TRANSFER_ENCODING);
+String contentTransferEncoding
+= HttpMessageUtils.getHeaderValue(message,
AS2Header.CONTENT_TRANSFER_ENCODING);
AS2SessionInputBuffer inBuffer = new AS2SessionInputBuffer(new
HttpTransportMetricsImpl(), 8 * 1024);
inBuffer.bind(entity.getContent());
@@ -497,6 +502,7 @@ public final class EntityParser {
throw new HttpException("Failed to parse entity content", e);
}
}
+
}
public static MultipartSignedEntity parseMultipartSignedEntityBody(
diff --git
a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
index cff3b7ba171..f969b8e39f4 100644
---
a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
+++
b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
@@ -88,6 +88,7 @@ import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -243,6 +244,61 @@ public class AS2ClientManagerIT extends
AbstractAS2ITSupport {
}
+@Test
+public void plainMessageSendTestWhenDispositionNotificationToNotSet()
throws Exception {
+final Map headers = new HashMap<>();
+// parameter type is String
+headers.put("CamelAS2.requestUri", REQUEST_URI);
+// parameter type is String
+headers.put("CamelAS2.subject", SUBJECT);
+// parameter type is String
+headers.put("CamelAS2.from", FROM);
+// parameter type is String
+headers.put("CamelAS2.as2From", AS2_NAME);
+// parameter type is String
+headers.put("CamelAS2.as2To", AS2_NAME);
+// parameter type is
org.apache.camel.component.as2.api.AS2MessageStructure
+headers.put("CamelAS2.as2MessageStructure", AS2MessageStructure.PLAIN);
+// parameter type is org.apache.http.entity.ContentType
+headers.put("CamelAS2.ediMessageContentType",
+ContentType.create(AS2MediaType.APPLICATION_EDIFACT,
StandardCharsets.US_ASCII.name()));
+// parameter type is String
+headers.put("CamelAS2.ediMessageTransferEncoding",
[camel] branch camel-4.0.x updated: CAMEL-19731 AS2: Fixed null pointer exception (#11229)
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 000d1cb2e6c CAMEL-19731 AS2: Fixed null pointer exception (#11229)
000d1cb2e6c is described below
commit 000d1cb2e6cc0d84a6479c046531b17a3eeeae4b
Author: Dmitry Kryukov
AuthorDate: Tue Aug 29 21:56:18 2023 +0300
CAMEL-19731 AS2: Fixed null pointer exception (#11229)
* CAMEL-19731 AS2: Fixed null pointer exception when request's header
dispositionNotificationTo isn't set
* CAMEL-19731 simplified the null-check - now it causes early exit
---
.../component/as2/api/entity/EntityParser.java | 8 +++-
.../camel/component/as2/AS2ClientManagerIT.java| 56 ++
2 files changed, 63 insertions(+), 1 deletion(-)
diff --git
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
index 76fef7bed16..782637b5e2d 100644
---
a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
+++
b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
@@ -444,6 +444,10 @@ public final class EntityParser {
try {
// Determine Content Type of Message
String contentTypeStr =
HttpMessageUtils.getHeaderValue(message, AS2Header.CONTENT_TYPE);
+if (contentTypeStr == null) {
+// contentTypeStr can be null when
dispositionNotificationTo isn't set
+return;
+}
ContentType contentType = ContentType.parse(contentTypeStr);
// Determine Charset
@@ -457,7 +461,8 @@ public final class EntityParser {
String boundary = HttpMessageUtils.getParameterValue(message,
AS2Header.CONTENT_TYPE, "boundary");
// Determine content transfer encoding
-String contentTransferEncoding =
HttpMessageUtils.getHeaderValue(message, AS2Header.CONTENT_TRANSFER_ENCODING);
+String contentTransferEncoding
+= HttpMessageUtils.getHeaderValue(message,
AS2Header.CONTENT_TRANSFER_ENCODING);
AS2SessionInputBuffer inBuffer = new AS2SessionInputBuffer(new
HttpTransportMetricsImpl(), 8 * 1024);
inBuffer.bind(entity.getContent());
@@ -497,6 +502,7 @@ public final class EntityParser {
throw new HttpException("Failed to parse entity content", e);
}
}
+
}
public static MultipartSignedEntity parseMultipartSignedEntityBody(
diff --git
a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
index 9b1ff394201..3f45a164e12 100644
---
a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
+++
b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIT.java
@@ -88,6 +88,7 @@ import org.slf4j.LoggerFactory;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -243,6 +244,61 @@ public class AS2ClientManagerIT extends
AbstractAS2ITSupport {
}
+@Test
+public void plainMessageSendTestWhenDispositionNotificationToNotSet()
throws Exception {
+final Map headers = new HashMap<>();
+// parameter type is String
+headers.put("CamelAS2.requestUri", REQUEST_URI);
+// parameter type is String
+headers.put("CamelAS2.subject", SUBJECT);
+// parameter type is String
+headers.put("CamelAS2.from", FROM);
+// parameter type is String
+headers.put("CamelAS2.as2From", AS2_NAME);
+// parameter type is String
+headers.put("CamelAS2.as2To", AS2_NAME);
+// parameter type is
org.apache.camel.component.as2.api.AS2MessageStructure
+headers.put("CamelAS2.as2MessageStructure", AS2MessageStructure.PLAIN);
+// parameter type is org.apache.http.entity.ContentType
+headers.put("CamelAS2.ediMessageContentType",
+ContentType.create(AS2MediaType.APPLICATION_EDIFACT,
StandardCharsets.US_ASCII.name()));
+// parameter type is String
+headers.put("CamelAS2.ediMessageTransferEncoding",
[camel] branch camel-4.0.x updated: chore: Allow DataTypeProcessor used as processor definition (#11233)
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 a221df48783 chore: Allow DataTypeProcessor used as processor
definition (#11233)
a221df48783 is described below
commit a221df48783eb6045f45b710d5800e3c0e0bc2c2
Author: Christoph Deppisch
AuthorDate: Tue Aug 29 20:56:28 2023 +0200
chore: Allow DataTypeProcessor used as processor definition (#11233)
* chore: Allow DataTypeProcessor used as processor definition
- Avoid ClassCastException when DataTypeProcessor is used as part of a
ProcessorDefinition
- Allows users to reference the DataTypeProcessor as a normal processor in
a route as an addition to using it in TransformDefinition
* chore: Avoid null value as from data type in data type processor
---
.../java/org/apache/camel/processor/transformer/DataTypeProcessor.java | 2 +-
.../org/apache/camel/management/DefaultManagementObjectStrategy.java| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/DataTypeProcessor.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/DataTypeProcessor.java
index a7f9212bead..4c665a21393 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/DataTypeProcessor.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/transformer/DataTypeProcessor.java
@@ -72,7 +72,7 @@ public class DataTypeProcessor implements Processor {
DataType fromDataType = DataType.ANY;
if (fromType != null) {
fromDataType = new DataType(fromType);
-} else if (message instanceof DataTypeAware) {
+} else if (message instanceof DataTypeAware && ((DataTypeAware)
message).hasDataType()) {
fromDataType = ((DataTypeAware) message).getDataType();
}
diff --git
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
index 773573228aa..7e6f4ab6463 100644
---
a/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
+++
b/core/camel-management/src/main/java/org/apache/camel/management/DefaultManagementObjectStrategy.java
@@ -439,7 +439,7 @@ public class DefaultManagementObjectStrategy implements
ManagementObjectStrategy
answer = new ManagedThrowException(context,
(ThrowExceptionProcessor) target, definition);
} else if (target instanceof TransformProcessor) {
answer = new ManagedTransformer(context, target,
(TransformDefinition) definition);
-} else if (target instanceof DataTypeProcessor) {
+} else if (target instanceof DataTypeProcessor && definition
instanceof TransformDefinition) {
answer = new ManagedTransformer(context, target,
(TransformDefinition) definition);
} else if (target instanceof PredicateValidatingProcessor) {
answer = new ManagedValidate(context,
(PredicateValidatingProcessor) target, (ValidateDefinition) definition);
[GitHub] [camel] davsclaus merged pull request #11234: Spring xml
davsclaus merged PR #11234: URL: https://github.com/apache/camel/pull/11234 -- 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 spring-xml deleted (was f750d8e582d)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch spring-xml in repository https://gitbox.apache.org/repos/asf/camel.git was f750d8e582d CAMEL-19786: camel-jbang - Allow to run classic Spring XML files with embedded 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 spring-xml updated (faf00e6af42 -> f750d8e582d)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch spring-xml in repository https://gitbox.apache.org/repos/asf/camel.git from faf00e6af42 CAMEL-19786: camel-jbang - Allow to run classic Spring XML files with embedded add f750d8e582d CAMEL-19786: camel-jbang - Allow to run classic Spring XML files with embedded No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/main/KameletMain.java | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-)
[GitHub] [camel] davsclaus opened a new pull request, #11234: Spring xml
davsclaus opened a new pull request, #11234: URL: https://github.com/apache/camel/pull/11234 # 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
[GitHub] [camel] github-actions[bot] commented on pull request #11234: Spring xml
github-actions[bot] commented on PR #11234: URL: https://github.com/apache/camel/pull/11234#issuecomment-1697927220 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch spring-xml updated (1462b33a56e -> faf00e6af42)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch spring-xml in repository https://gitbox.apache.org/repos/asf/camel.git from 1462b33a56e CAMEL-19786: camel-jbang - Allow to run classic Spring XML files with embedded add faf00e6af42 CAMEL-19786: camel-jbang - Allow to run classic Spring XML files with embedded No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/dsl/xml/io/XmlModelParser.java | 2 ++ 1 file changed, 2 insertions(+)
[camel] branch spring-xml updated (81a89c1cae5 -> 1462b33a56e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch spring-xml in repository https://gitbox.apache.org/repos/asf/camel.git from 81a89c1cae5 CAMEL-19786: camel-jbang - Allow to run classic Spring XML files with embedded add 1462b33a56e CAMEL-19786: camel-jbang - Allow to run classic Spring XML files with embedded No new revisions were added by this update. Summary of changes: .../src/main/java/org/apache/camel/main/KameletMain.java | 1 - 1 file changed, 1 deletion(-)
[camel] branch spring-xml created (now 81a89c1cae5)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch spring-xml in repository https://gitbox.apache.org/repos/asf/camel.git at 81a89c1cae5 CAMEL-19786: camel-jbang - Allow to run classic Spring XML files with embedded No new revisions were added by this update.
[GitHub] [camel-kafka-connector] shubhamcoc commented on issue #1560: How to create an object in s3 bucket using camle-minio-sink plugin
shubhamcoc commented on issue #1560: URL: https://github.com/apache/camel-kafka-connector/issues/1560#issuecomment-1697913400 Thanks @oscerd for the response, I think it will be helpful if you add it in the documentation as well. I will try it out and will ask again if we face some 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 For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] oscerd commented on pull request #4695: Reorganize project to have a single Go module (2.0.x)
oscerd commented on PR #4695: URL: https://github.com/apache/camel-k/pull/4695#issuecomment-1697837068 I'll release tomorrow. Thanks -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] oscerd opened a new issue, #4698: Release 2.0.1
oscerd opened a new issue, #4698: URL: https://github.com/apache/camel-k/issues/4698 ### Requirement Release 2.0.1 ### Problem This is needed for camel-kamelets 4.0.0 ### Proposal _No response_ ### Open questions _No response_ -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] claudio4j commented on pull request #4245: Add Kameletbinding test to olm_upgrade_tes
claudio4j commented on PR #4245: URL: https://github.com/apache/camel-k/pull/4245#issuecomment-1697830019 Is there going to be some work on this PR or can we close 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
[GitHub] [camel-k] claudio4j merged pull request #4696: Fix: Helm roles and doc (2.0.x)
claudio4j merged PR #4696: URL: https://github.com/apache/camel-k/pull/4696 -- 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 release-2.0.x updated: Fix: Helm roles and doc (#4696)
This is an automated email from the ASF dual-hosted git repository.
claudio4j pushed a commit to branch release-2.0.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-2.0.x by this push:
new 8727c462e Fix: Helm roles and doc (#4696)
8727c462e is described below
commit 8727c462e7d667c5a1ee468d3031097aeeba3048
Author: Claudio Miranda
AuthorDate: Tue Aug 29 13:59:19 2023 -0300
Fix: Helm roles and doc (#4696)
Bring helm roles update from main branch
---
config/rbac/operator-role.yaml | 3 ++-
.../ROOT/pages/contributing/developers.adoc| 25 +++---
helm/camel-k/templates/operator-cluster-roles.yaml | 25 +-
helm/camel-k/templates/operator-role.yaml | 30 +++---
4 files changed, 67 insertions(+), 16 deletions(-)
diff --git a/config/rbac/operator-role.yaml b/config/rbac/operator-role.yaml
index 5c01d853d..4ddc2d4c1 100644
--- a/config/rbac/operator-role.yaml
+++ b/config/rbac/operator-role.yaml
@@ -184,4 +184,5 @@ rules:
resources:
- namespaces
verbs:
- - get
\ No newline at end of file
+ - get
+ - list
diff --git a/docs/modules/ROOT/pages/contributing/developers.adoc
b/docs/modules/ROOT/pages/contributing/developers.adoc
index fcd57bdaf..1e4dccc80 100644
--- a/docs/modules/ROOT/pages/contributing/developers.adoc
+++ b/docs/modules/ROOT/pages/contributing/developers.adoc
@@ -83,8 +83,8 @@ This executes a full build of the Go code. If you need to
build the components s
Currently the build is not entirely supported on Windows. If you're building
on a Windows system, here's a temporary workaround:
-1. Copy the `script/Makefile` to the root of the project.
-2. Run `make -f script/Makefile`.
+1. Copy the `script/Makefile` to the root of the project.
+2. Run `make -f script/Makefile`.
3. If the above command fails, run `make build-kamel`.
4. Rename the `kamel` binary in the root to `kamel.exe`.
@@ -135,9 +135,12 @@ The commands assume you have an already running CRC
instance and logged in corre
=== For Minikube
-* Run `make install-minikube`: to build the project and install it in the
current namespace on Minikube
+First remove any camel k operator you may have installed, otherwise it will
conflict with the new one we will build and install.
-This command assumes you have an already running Minikube instance with
registry enabled (can be enabled with `minikube addons enable registry`) and no
previous Camel K instance installed.
+* Enable the `registry` minikube addon: `minikube addons enable registry`
+* Set the access to the internal minikube registry: `eval $(minikube
docker-env)`
+* Run `make images`: to build the project and install the image in the
internal minikube registry
+* Install camel-k-operator: `./kamel install`
=== For remote Kubernetes/OpenShift clusters
@@ -150,6 +153,20 @@ kamel install
--operator-image=docker.io/myrepo/camel-k:1.5.0-SNAPSHOT --operato
Note `--olm=false` is necessary as otherwise the OLM bundle version is
preferred.
+=== Local Helm installation
+
+If you want to test Helm installation
+
+* Build the Helm chart `make release-helm`
+* Build the project and the image: `make images`
+* Set the internal registry `export REGISTRY_ADDRESS=$(kubectl -n kube-system
get service registry -o jsonpath='{.spec.clusterIP}')`
+* Install with Helm (look at the latest version produced by `make
release-helm`)
+```
+ helm install camel-k-dev docs/charts/camel-k-2.0.1-SNAPSHOT.tgz --set
platform.build.registry.address=${REGISTRY_ADDRESS} --set
platform.build.registry.insecure=true --set
operator.image=apache/camel-k:2.0.1-SNAPSHOT
+```
+
+To uninstall: `helm uninstall camel-k-dev`
+
=== Use
Now you can play with Camel K:
diff --git a/helm/camel-k/templates/operator-cluster-roles.yaml
b/helm/camel-k/templates/operator-cluster-roles.yaml
index e1dccd478..9dba288c5 100644
--- a/helm/camel-k/templates/operator-cluster-roles.yaml
+++ b/helm/camel-k/templates/operator-cluster-roles.yaml
@@ -35,7 +35,9 @@ rules:
- integrationkits
- integrationplatforms
- integrations
- - bindings
+ - pipes
+ # Deprecated: kameletbindings CR
+ - kameletbindings
- kamelets
verbs:
- create
@@ -55,8 +57,11 @@ rules:
- integrationplatforms/status
- integrations/scale
- integrations/status
- - bindings/scale
- - bindings/status
+ - pipes/status
+ - pipes/scale
+ # Deprecated: kameletbindings CR
+ - kameletbindings/status
+ - kameletbindings/scale
- kamelets/status
verbs:
- get
@@ -81,7 +86,9 @@ rules:
- integrationkits
- integrationplatforms
- integrations
- - bindings
+ - pipes
+ # Deprecated: kameletbindings CR
+ - kameletbindings
- kamelets
verbs:
- create
@@ -105,8 +112,11 @@ rules:
- integrationplatforms/status
- integrations/scale
- integrations/status
- - bindings/status
- - bindings/scale
[GitHub] [camel-k] claudio4j commented on pull request #4695: Reorganize project to have a single Go module (2.0.x)
claudio4j commented on PR #4695: URL: https://github.com/apache/camel-k/pull/4695#issuecomment-1697824232 I think this is it, the two PR are the main bugs for 2.0.0. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch camel-spring-boot-3.x updated: CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x (#921)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-spring-boot-3.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/camel-spring-boot-3.x by this push: new c30b9c91e8d CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x (#921) c30b9c91e8d is described below commit c30b9c91e8df48a0ecdce3b60695c5331ec6327b Author: Andrea Cosentino AuthorDate: Tue Aug 29 18:59:53 2023 +0200 CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x (#921) Signed-off-by: Andrea Cosentino --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c28ffa107e..84afee10344 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -2.7.14 +2.7.15 3.22.0-SNAPSHOT
[camel-k] branch release-2.0.x updated: Reorganize project to have a single Go module (#4695)
This is an automated email from the ASF dual-hosted git repository. claudio4j pushed a commit to branch release-2.0.x in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/release-2.0.x by this push: new 3a410b691 Reorganize project to have a single Go module (#4695) 3a410b691 is described below commit 3a410b691acd4efa082cad1aa7d46645b7fb5721 Author: Claudio Miranda AuthorDate: Tue Aug 29 13:59:44 2023 -0300 Reorganize project to have a single Go module (#4695) Fix https://github.com/apache/camel-k/issues/4686 --- docs/modules/ROOT/partials/apis/kamelets-crds.adoc | 6 +- go.mod | 14 +- pkg/apis/camel/go.mod | 30 -- pkg/apis/camel/go.sum | 92 pkg/client/camel/go.mod| 55 --- pkg/client/camel/go.sum| 485 - pkg/kamelet/repository/go.mod | 65 --- pkg/kamelet/repository/go.sum | 240 -- script/Makefile| 27 +- script/build_submodules.sh | 35 -- script/gen_crd/gen-kamelets-crd-api-config.json| 2 +- script/git_tag.sh | 15 - script/set_go_modules_version.sh | 38 -- 13 files changed, 12 insertions(+), 1092 deletions(-) diff --git a/docs/modules/ROOT/partials/apis/kamelets-crds.adoc b/docs/modules/ROOT/partials/apis/kamelets-crds.adoc index 38e0760ac..6785aeb07 100644 --- a/docs/modules/ROOT/partials/apis/kamelets-crds.adoc +++ b/docs/modules/ROOT/partials/apis/kamelets-crds.adoc @@ -967,7 +967,7 @@ string A human readable message indicating details about the transition. |`pods` + -[]github.com/apache/camel-k/v2/pkg/apis/camel/v1.PodCondition +*xref:apis/camel-k.adoc#_camel_apache_org_v1_PodCondition[[\]github.com/apache/camel-k/v2/pkg/apis/camel/v1.PodCondition]* | @@ -1011,7 +1011,7 @@ KameletBindingSpec defines the binding between a source and a sink. It can inclu |Description |`integration` + -github.com/apache/camel-k/v2/pkg/apis/camel/v1.IntegrationSpec +*xref:apis/camel-k.adoc#_camel_apache_org_v1_IntegrationSpec[github.com/apache/camel-k/v2/pkg/apis/camel/v1.IntegrationSpec]* | @@ -1246,7 +1246,7 @@ KameletSpec specifies the configuration required to execute a Kamelet defines the formal configuration of the Kamelet |`sources` + -[]github.com/apache/camel-k/v2/pkg/apis/camel/v1.SourceSpec +*xref:apis/camel-k.adoc#_camel_apache_org_v1_SourceSpec[[\]github.com/apache/camel-k/v2/pkg/apis/camel/v1.SourceSpec]* | diff --git a/go.mod b/go.mod index 4d7ea777e..6f83ba54e 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,6 @@ go 1.18 require ( github.com/Masterminds/semver v1.5.0 - github.com/apache/camel-k/v2/pkg/apis/camel v0.0.0 - github.com/apache/camel-k/v2/pkg/client/camel v0.0.0 - github.com/apache/camel-k/v2/pkg/kamelet/repository v0.0.0 github.com/container-tools/spectrum v0.6.29 github.com/evanphx/json-patch v5.6.0+incompatible github.com/fsnotify/fsnotify v1.6.0 @@ -14,6 +11,7 @@ require ( github.com/go-logr/logr v1.2.4 github.com/google/go-github/v52 v52.0.0 github.com/google/uuid v1.3.0 + github.com/imdario/mergo v0.3.13 github.com/jpillora/backoff v1.0.0 github.com/magiconair/properties v1.8.7 github.com/mattn/go-shellwords v1.0.12 @@ -57,6 +55,7 @@ require ( knative.dev/pkg v0.0.0-20230418073056-dfad48eaa5d0 knative.dev/serving v0.37.2 sigs.k8s.io/controller-runtime v0.13.1 + sigs.k8s.io/structured-merge-diff/v4 v4.2.3 ) require ( @@ -106,7 +105,6 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/imdario/mergo v0.3.13 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -157,13 +155,5 @@ require ( k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect knative.dev/networking v0.0.0-20230419144338-e5d04e805e50 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) - -// Local modules -replace ( - github.com/apache/camel-k/v2/pkg/apis/camel => ./pkg/apis/camel - github.com/apache/camel-k/v2/pkg/client/camel => ./pkg/client/camel - github.com/apache/camel-k/v2/pkg/kamelet/repository => ./pkg/kamelet/repository -) diff --git a/pkg/apis/camel/go.mod b/pkg/apis/camel/go.mod deleted file mode 100644 index e3c991736..0
[camel-spring-boot] branch sb-2.7.15 deleted (was 70bf4752ad4)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch sb-2.7.15 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was 70bf4752ad4 CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[GitHub] [camel-spring-boot] oscerd merged pull request #921: CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring…
oscerd merged PR #921: URL: https://github.com/apache/camel-spring-boot/pull/921 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] claudio4j merged pull request #4695: Reorganize project to have a single Go module (2.0.x)
claudio4j merged PR #4695: URL: https://github.com/apache/camel-k/pull/4695 -- 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 (3214273bb2c -> 3fde21858a9)
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 3214273bb2c Camel-Tracing: Removing NsqSpanDecorator since component is no more available (#11228) add 3fde21858a9 (chores) camel-core: optimize copying exchanges (#11232) No new revisions were added by this update. Summary of changes: .../component/disruptor/DisruptorConsumer.java | 3 +- .../java/org/apache/camel/ExchangeExtension.java | 8 ++ .../org/apache/camel/support/AbstractExchange.java | 15 +- .../org/apache/camel/support/DefaultExchange.java | 10 ++- .../org/apache/camel/support/ExchangeHelper.java | 33 ++ .../camel/support/ExtendedExchangeExtension.java | 20 + 6 files changed, 54 insertions(+), 35 deletions(-)
[GitHub] [camel-k] oscerd commented on pull request #4695: Reorganize project to have a single Go module (2.0.x)
oscerd commented on PR #4695: URL: https://github.com/apache/camel-k/pull/4695#issuecomment-1697736196 @claudio4j @christophd excluding this PR and the helm one, is there anything else that needs to go in 2.0.1? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch sb-2.7.15-3.20.x deleted (was e241c51accc)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch sb-2.7.15-3.20.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was e241c51accc Regen 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-spring-boot] branch camel-spring-boot-3.20.x updated: CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x (#923)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-spring-boot-3.20.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/camel-spring-boot-3.20.x by this push: new 71f43c92004 CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x (#923) 71f43c92004 is described below commit 71f43c92004cf99ffbd3936e044ef351344bb3db Author: Andrea Cosentino AuthorDate: Tue Aug 29 17:59:32 2023 +0200 CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x (#923) * CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x Signed-off-by: Andrea Cosentino * Regen Signed-off-by: Andrea Cosentino - Signed-off-by: Andrea Cosentino --- pom.xml| 2 +- tooling/camel-spring-boot-dependencies/pom.xml | 5 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8462fb80e4e..8e810654bbe 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -2.7.13 +2.7.15 3.20.7-SNAPSHOT diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index bd760c3a542..77812d4c420 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -4608,6 +4608,11 @@ rdf4j-rio-api 3.7.4 + +org.json +json +20230618 + org.junit-pioneer junit-pioneer
[camel-spring-boot] branch sb-2.7.15-3.21.x deleted (was 30f3015ccf6)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch sb-2.7.15-3.21.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git was 30f3015ccf6 Regen 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-spring-boot] 01/02: CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch sb-2.7.15-3.20.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 945e113438862003f38e3e70ba2282e1bc583d4a Author: Andrea Cosentino AuthorDate: Tue Aug 29 17:56:24 2023 +0200 CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x Signed-off-by: Andrea Cosentino --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8462fb80e4e..8e810654bbe 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -2.7.13 +2.7.15 3.20.7-SNAPSHOT
[camel-spring-boot] 02/02: Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch sb-2.7.15-3.20.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit e241c51accca24551e87fe6699eb7f77810711a1 Author: Andrea Cosentino AuthorDate: Tue Aug 29 17:58:23 2023 +0200 Regen Signed-off-by: Andrea Cosentino --- tooling/camel-spring-boot-dependencies/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index bd760c3a542..77812d4c420 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -4608,6 +4608,11 @@ rdf4j-rio-api 3.7.4 + +org.json +json +20230618 + org.junit-pioneer junit-pioneer
[camel-spring-boot] branch sb-2.7.15-3.20.x created (now e241c51accc)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch sb-2.7.15-3.20.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at e241c51accc Regen This branch includes the following new commits: new 945e1134388 CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x new e241c51accc Regen The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel-spring-boot] branch camel-spring-boot-3.21.x updated: CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x (#922)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch camel-spring-boot-3.21.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git The following commit(s) were added to refs/heads/camel-spring-boot-3.21.x by this push: new 1a2035ea692 CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x (#922) 1a2035ea692 is described below commit 1a2035ea6925cbc8e72e584d8f4b28ecda029bf9 Author: Andrea Cosentino AuthorDate: Tue Aug 29 17:57:03 2023 +0200 CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x (#922) * CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x Signed-off-by: Andrea Cosentino * Regen Signed-off-by: Andrea Cosentino - Signed-off-by: Andrea Cosentino --- pom.xml| 2 +- tooling/camel-spring-boot-dependencies/pom.xml | 5 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c497e47fdcd..220642ba70b 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -2.7.13 +2.7.15 3.21.1-SNAPSHOT diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 7b439c35854..76ff40cba1b 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -4618,6 +4618,11 @@ rdf4j-rio-api 3.7.4 + +org.json +json +20230618 + org.junit-pioneer junit-pioneer
[camel-spring-boot] 02/02: Regen
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch sb-2.7.15-3.21.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 30f3015ccf6b6f567a85e87d9936be8eb8062939 Author: Andrea Cosentino AuthorDate: Tue Aug 29 17:54:38 2023 +0200 Regen Signed-off-by: Andrea Cosentino --- tooling/camel-spring-boot-dependencies/pom.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 7b439c35854..76ff40cba1b 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -4618,6 +4618,11 @@ rdf4j-rio-api 3.7.4 + +org.json +json +20230618 + org.junit-pioneer junit-pioneer
[camel-spring-boot] branch sb-2.7.15-3.21.x created (now 30f3015ccf6)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch sb-2.7.15-3.21.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at 30f3015ccf6 Regen This branch includes the following new commits: new 6ea068ec69c CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x new 30f3015ccf6 Regen The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel-spring-boot] 01/02: CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch sb-2.7.15-3.21.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 6ea068ec69c8c5ceda08f4c5fc2cfbb08efc04d4 Author: Andrea Cosentino AuthorDate: Tue Aug 29 17:52:35 2023 +0200 CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x Signed-off-by: Andrea Cosentino --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c497e47fdcd..220642ba70b 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -2.7.13 +2.7.15 3.21.1-SNAPSHOT
[GitHub] [camel] orpiske commented on a diff in pull request #11231: CAMEL-19776 for main(camel-4)
orpiske commented on code in PR #11231:
URL: https://github.com/apache/camel/pull/11231#discussion_r1309043383
##
components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategyTest.java:
##
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.opentelemetry;
+
+import java.util.function.Function;
+
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.context.Scope;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spi.InterceptStrategy;
+import org.junit.jupiter.api.Test;
+
+class OpenTelemetryTracingStrategyTest extends CamelOpenTelemetryTestSupport {
+
+private static SpanTestData[] testdata = {
+new
SpanTestData().setLabel("camel-process").setOperation("third-party-span")
+.setParentId(1),
+new
SpanTestData().setLabel("camel-process").setOperation("third-party-processor")
+.setParentId(6),
+new
SpanTestData().setLabel("camel-process").setOperation("direct-processor")
+.setParentId(3),
+new
SpanTestData().setLabel("direct:serviceB").setOperation("serviceB")
+.setParentId(4),
+new
SpanTestData().setLabel("direct:serviceB").setOperation("serviceB")
+.setKind(SpanKind.CLIENT)
+.setParentId(5),
+new
SpanTestData().setLabel("to:serviceB").setOperation("to-serviceB")
+.setParentId(6),
+new
SpanTestData().setLabel("direct:serviceA").setUri("direct://start").setOperation("serviceA")
+.setParentId(7),
+new
SpanTestData().setLabel("direct:serviceA").setUri("direct://start").setOperation("serviceA")
+.setKind(SpanKind.CLIENT)
+};
+
+OpenTelemetryTracingStrategyTest() {
+super(testdata);
+}
+
+@Test
+void testTracingOfProcessors() {
+template.requestBody("direct:serviceA", "Hello");
+
+verify();
+}
+
+@Override
+protected RoutesBuilder createRouteBuilder() {
+return new RouteBuilder() {
+@Override
+public void configure() {
+from("direct:serviceA").routeId("serviceA")
+.process(exchange -> {
+callThirdPartyInstrumentation();
+}).id("third-party-processor")
+.to("direct:serviceB").id("to-serviceB");
+
+from("direct:serviceB").routeId("serviceB")
+.process(exchange -> {
+Thread.sleep(100);
Review Comment:
Thanks!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[camel] branch main updated: (chores) camel-core: optimize copying exchanges (#11232)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 3fde21858a9 (chores) camel-core: optimize copying exchanges (#11232)
3fde21858a9 is described below
commit 3fde21858a9d6db1b4ad75842f2105b972b8adaa
Author: Otavio Rodolfo Piske
AuthorDate: Tue Aug 29 17:51:26 2023 +0200
(chores) camel-core: optimize copying exchanges (#11232)
---
.../component/disruptor/DisruptorConsumer.java | 3 +-
.../java/org/apache/camel/ExchangeExtension.java | 8 ++
.../org/apache/camel/support/AbstractExchange.java | 15 +-
.../org/apache/camel/support/DefaultExchange.java | 10 ++-
.../org/apache/camel/support/ExchangeHelper.java | 33 ++
.../camel/support/ExtendedExchangeExtension.java | 20 +
6 files changed, 54 insertions(+), 35 deletions(-)
diff --git
a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorConsumer.java
b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorConsumer.java
index 99c79f1646f..1a8b1128b86 100644
---
a/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorConsumer.java
+++
b/components/camel-disruptor/src/main/java/org/apache/camel/component/disruptor/DisruptorConsumer.java
@@ -135,8 +135,7 @@ public class DisruptorConsumer extends ServiceSupport
implements Consumer, Suspe
private Exchange prepareExchange(final Exchange exchange) {
// send a new copied exchange with new camel context
// don't copy handovers as they are handled by the Disruptor Event
Handlers
-final Exchange newExchange = ExchangeHelper
-.copyExchangeAndSetCamelContext(exchange,
endpoint.getCamelContext(), false);
+final Exchange newExchange =
ExchangeHelper.copyExchangeWithProperties(exchange, endpoint.getCamelContext());
// set the from endpoint
newExchange.getExchangeExtension().setFromEndpoint(endpoint);
return newExchange;
diff --git
a/core/camel-api/src/main/java/org/apache/camel/ExchangeExtension.java
b/core/camel-api/src/main/java/org/apache/camel/ExchangeExtension.java
index baeaa44aa2f..7ea4a144193 100644
--- a/core/camel-api/src/main/java/org/apache/camel/ExchangeExtension.java
+++ b/core/camel-api/src/main/java/org/apache/camel/ExchangeExtension.java
@@ -264,4 +264,12 @@ public interface ExchangeExtension {
* @param failureHandled true if failure handled or false otherwise
*/
void setFailureHandled(boolean failureHandled);
+
+/**
+ * Create a new exchange copied from this, with the context set to the
given context
+ *
+ * @param context the context associated with the new exchange
+ * @return A new Exchange instance
+ */
+Exchange createCopyWithProperties(CamelContext context);
}
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index 48bffb2ae04..709497805b9 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -52,7 +52,7 @@ import static org.apache.camel.support.MessageHelper.copyBody;
* @see DefaultExchange
*/
class AbstractExchange implements Exchange {
-protected final EnumMap internalProperties =
new EnumMap<>(ExchangePropertyKey.class);
+protected final EnumMap internalProperties;
protected final CamelContext context;
protected Map properties; // create properties on-demand
as we use internal properties mostly
@@ -69,6 +69,14 @@ class AbstractExchange implements Exchange {
private final ExtendedExchangeExtension privateExtension;
private RedeliveryTraitPayload externalRedelivered =
RedeliveryTraitPayload.UNDEFINED_REDELIVERY;
+AbstractExchange(CamelContext context, EnumMap internalProperties,
+ Map properties) {
+this.context = context;
+this.internalProperties = new EnumMap<>(internalProperties);
+this.privateExtension = new ExtendedExchangeExtension(this);
+this.properties = properties;
+}
+
public AbstractExchange(CamelContext context) {
this(context, ExchangePattern.InOnly);
}
@@ -78,6 +86,7 @@ class AbstractExchange implements Exchange {
this.pattern = pattern;
this.created = System.currentTimeMillis();
+internalProperties = new EnumMap<>(ExchangePropertyKey.class);
privateExtension = new ExtendedExchangeExtension(this);
}
@@ -86,6 +95,8 @@ class AbstractExchange implements Exchange {
this.pattern = parent.getPattern();
this.created = parent.getCreated();
+
[camel-spring-boot] 01/01: CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch sb-2.7.15 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 70bf4752ad4d3f15d0e2883db340c1d81bc2ad8e Author: Andrea Cosentino AuthorDate: Tue Aug 29 17:47:10 2023 +0200 CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x Signed-off-by: Andrea Cosentino --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c28ffa107e..84afee10344 100644 --- a/pom.xml +++ b/pom.xml @@ -108,7 +108,7 @@ false -2.7.14 +2.7.15 3.22.0-SNAPSHOT
[camel-spring-boot] branch sb-2.7.15 created (now 70bf4752ad4)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch sb-2.7.15 in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git at 70bf4752ad4 CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x This branch includes the following new commits: new 70bf4752ad4 CAMEL-19799 - Camel-Spring-Boot: Upgrade to SB 2.7.15 on Camel Spring Boot 3.x The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[GitHub] [camel-kafka-connector] oscerd commented on issue #1560: How to create an object in s3 bucket using camle-minio-sink plugin
oscerd commented on issue #1560: URL: https://github.com/apache/camel-kafka-connector/issues/1560#issuecomment-1697706287 You need to use an header with the minio sink Kamelet. Supposing you're using kafkacat while moving the file, you should set a kafka header in your record: ./kafkacat -P -b localhost:9092 -t mytopic -H "CamelHeader.CamelMinioObjectName=fileName" And the record value will be stored. I'll add the ability to set the objectName statically too in the Kamelet. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] zbendhiba merged pull request #5231: Next is 3.3.0
zbendhiba merged PR #5231: URL: https://github.com/apache/camel-quarkus/pull/5231 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11233: chore: Allow DataTypeProcessor used as processor definition
github-actions[bot] commented on PR #11233: URL: https://github.com/apache/camel/pull/11233#issuecomment-1697609898 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] christophd opened a new pull request, #11233: chore: Allow DataTypeProcessor used as processor definition
christophd opened a new pull request, #11233: URL: https://github.com/apache/camel/pull/11233 # Description - Avoid ClassCastException when DataTypeProcessor is used as part of a ProcessorDefinition - Allows users to reference the DataTypeProcessor as a normal processor in a route as an addition to using it in TransformDefinition -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] RuslanHryn commented on a diff in pull request #11230: CAMEL-19776 for camel-4.0.x
RuslanHryn commented on code in PR #11230:
URL: https://github.com/apache/camel/pull/11230#discussion_r1308956019
##
components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategyTest.java:
##
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.opentelemetry;
+
+import java.util.function.Function;
+
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.context.Scope;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spi.InterceptStrategy;
+import org.junit.jupiter.api.Test;
+
+class OpenTelemetryTracingStrategyTest extends CamelOpenTelemetryTestSupport {
+
+private static SpanTestData[] testdata = {
+new
SpanTestData().setLabel("camel-process").setOperation("third-party-span")
+.setParentId(1),
+new
SpanTestData().setLabel("camel-process").setOperation("third-party-processor")
+.setParentId(6),
+new
SpanTestData().setLabel("camel-process").setOperation("direct-processor")
+.setParentId(3),
+new
SpanTestData().setLabel("direct:serviceB").setOperation("serviceB")
+.setParentId(4),
+new
SpanTestData().setLabel("direct:serviceB").setOperation("serviceB")
+.setKind(SpanKind.CLIENT)
+.setParentId(5),
+new
SpanTestData().setLabel("to:serviceB").setOperation("to-serviceB")
+.setParentId(6),
+new
SpanTestData().setLabel("direct:serviceA").setUri("direct://start").setOperation("serviceA")
+.setParentId(7),
+new
SpanTestData().setLabel("direct:serviceA").setUri("direct://start").setOperation("serviceA")
+.setKind(SpanKind.CLIENT)
+};
+
+OpenTelemetryTracingStrategyTest() {
+super(testdata);
+}
+
+@Test
+void testTracingOfProcessors() {
+template.requestBody("direct:serviceA", "Hello");
+
+verify();
+}
+
+@Override
+protected RoutesBuilder createRouteBuilder() {
+return new RouteBuilder() {
+@Override
+public void configure() {
+from("direct:serviceA").routeId("serviceA")
+.process(exchange -> {
+callThirdPartyInstrumentation();
+}).id("third-party-processor")
+.to("direct:serviceB").id("to-serviceB");
+
+from("direct:serviceB").routeId("serviceB")
+.process(exchange -> {
+Thread.sleep(100);
Review Comment:
Thanks.
Removed and test is working fine
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] RuslanHryn commented on a diff in pull request #11231: CAMEL-19776 for main(camel-4)
RuslanHryn commented on code in PR #11231:
URL: https://github.com/apache/camel/pull/11231#discussion_r1308955260
##
components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategyTest.java:
##
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.opentelemetry;
+
+import java.util.function.Function;
+
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.context.Scope;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spi.InterceptStrategy;
+import org.junit.jupiter.api.Test;
+
+class OpenTelemetryTracingStrategyTest extends CamelOpenTelemetryTestSupport {
+
+private static SpanTestData[] testdata = {
+new
SpanTestData().setLabel("camel-process").setOperation("third-party-span")
+.setParentId(1),
+new
SpanTestData().setLabel("camel-process").setOperation("third-party-processor")
+.setParentId(6),
+new
SpanTestData().setLabel("camel-process").setOperation("direct-processor")
+.setParentId(3),
+new
SpanTestData().setLabel("direct:serviceB").setOperation("serviceB")
+.setParentId(4),
+new
SpanTestData().setLabel("direct:serviceB").setOperation("serviceB")
+.setKind(SpanKind.CLIENT)
+.setParentId(5),
+new
SpanTestData().setLabel("to:serviceB").setOperation("to-serviceB")
+.setParentId(6),
+new
SpanTestData().setLabel("direct:serviceA").setUri("direct://start").setOperation("serviceA")
+.setParentId(7),
+new
SpanTestData().setLabel("direct:serviceA").setUri("direct://start").setOperation("serviceA")
+.setKind(SpanKind.CLIENT)
+};
+
+OpenTelemetryTracingStrategyTest() {
+super(testdata);
+}
+
+@Test
+void testTracingOfProcessors() {
+template.requestBody("direct:serviceA", "Hello");
+
+verify();
+}
+
+@Override
+protected RoutesBuilder createRouteBuilder() {
+return new RouteBuilder() {
+@Override
+public void configure() {
+from("direct:serviceA").routeId("serviceA")
+.process(exchange -> {
+callThirdPartyInstrumentation();
+}).id("third-party-processor")
+.to("direct:serviceB").id("to-serviceB");
+
+from("direct:serviceB").routeId("serviceB")
+.process(exchange -> {
+Thread.sleep(100);
Review Comment:
Thanks.
I've removed sleeps and test is working fine
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel-k] claudio4j commented on a diff in pull request #4695: Reorganize project to have a single Go module (2.0.x)
claudio4j commented on code in PR #4695:
URL: https://github.com/apache/camel-k/pull/4695#discussion_r1308921921
##
script/gen_crd/gen-kamelets-crd-api-config.json:
##
@@ -13,7 +13,7 @@
"docsURLTemplate":
"https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#{{lower
.TypeIdentifier}}-{{arrIndex .PackageSegments -1}}-{{arrIndex .PackageSegments
-2}}"
},
{
- "typeMatchPrefix":
"^github\\.com/apache/camel-k/pkg/apis/camel/v1\\.",
+ "typeMatchPrefix":
"^github\\.com/apache/camel-k/v2/pkg/apis/camel/v1\\.",
Review Comment:
Yes, when it was upgrade to v2.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] orpiske commented on a diff in pull request #11231: CAMEL-19776 for main(camel-4)
orpiske commented on code in PR #11231:
URL: https://github.com/apache/camel/pull/11231#discussion_r1308904844
##
components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategyTest.java:
##
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.opentelemetry;
+
+import java.util.function.Function;
+
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.context.Scope;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spi.InterceptStrategy;
+import org.junit.jupiter.api.Test;
+
+class OpenTelemetryTracingStrategyTest extends CamelOpenTelemetryTestSupport {
+
+private static SpanTestData[] testdata = {
+new
SpanTestData().setLabel("camel-process").setOperation("third-party-span")
+.setParentId(1),
+new
SpanTestData().setLabel("camel-process").setOperation("third-party-processor")
+.setParentId(6),
+new
SpanTestData().setLabel("camel-process").setOperation("direct-processor")
+.setParentId(3),
+new
SpanTestData().setLabel("direct:serviceB").setOperation("serviceB")
+.setParentId(4),
+new
SpanTestData().setLabel("direct:serviceB").setOperation("serviceB")
+.setKind(SpanKind.CLIENT)
+.setParentId(5),
+new
SpanTestData().setLabel("to:serviceB").setOperation("to-serviceB")
+.setParentId(6),
+new
SpanTestData().setLabel("direct:serviceA").setUri("direct://start").setOperation("serviceA")
+.setParentId(7),
+new
SpanTestData().setLabel("direct:serviceA").setUri("direct://start").setOperation("serviceA")
+.setKind(SpanKind.CLIENT)
+};
+
+OpenTelemetryTracingStrategyTest() {
+super(testdata);
+}
+
+@Test
+void testTracingOfProcessors() {
+template.requestBody("direct:serviceA", "Hello");
+
+verify();
+}
+
+@Override
+protected RoutesBuilder createRouteBuilder() {
+return new RouteBuilder() {
+@Override
+public void configure() {
+from("direct:serviceA").routeId("serviceA")
+.process(exchange -> {
+callThirdPartyInstrumentation();
+}).id("third-party-processor")
+.to("direct:serviceB").id("to-serviceB");
+
+from("direct:serviceB").routeId("serviceB")
+.process(exchange -> {
+Thread.sleep(100);
Review Comment:
Also, the same note for the other sleep below.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] orpiske commented on a diff in pull request #11230: CAMEL-19776 for camel-4.0.x
orpiske commented on code in PR #11230:
URL: https://github.com/apache/camel/pull/11230#discussion_r1308902410
##
components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategyTest.java:
##
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.opentelemetry;
+
+import java.util.function.Function;
+
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.context.Scope;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spi.InterceptStrategy;
+import org.junit.jupiter.api.Test;
+
+class OpenTelemetryTracingStrategyTest extends CamelOpenTelemetryTestSupport {
+
+private static SpanTestData[] testdata = {
+new
SpanTestData().setLabel("camel-process").setOperation("third-party-span")
+.setParentId(1),
+new
SpanTestData().setLabel("camel-process").setOperation("third-party-processor")
+.setParentId(6),
+new
SpanTestData().setLabel("camel-process").setOperation("direct-processor")
+.setParentId(3),
+new
SpanTestData().setLabel("direct:serviceB").setOperation("serviceB")
+.setParentId(4),
+new
SpanTestData().setLabel("direct:serviceB").setOperation("serviceB")
+.setKind(SpanKind.CLIENT)
+.setParentId(5),
+new
SpanTestData().setLabel("to:serviceB").setOperation("to-serviceB")
+.setParentId(6),
+new
SpanTestData().setLabel("direct:serviceA").setUri("direct://start").setOperation("serviceA")
+.setParentId(7),
+new
SpanTestData().setLabel("direct:serviceA").setUri("direct://start").setOperation("serviceA")
+.setKind(SpanKind.CLIENT)
+};
+
+OpenTelemetryTracingStrategyTest() {
+super(testdata);
+}
+
+@Test
+void testTracingOfProcessors() {
+template.requestBody("direct:serviceA", "Hello");
+
+verify();
+}
+
+@Override
+protected RoutesBuilder createRouteBuilder() {
+return new RouteBuilder() {
+@Override
+public void configure() {
+from("direct:serviceA").routeId("serviceA")
+.process(exchange -> {
+callThirdPartyInstrumentation();
+}).id("third-party-processor")
+.to("direct:serviceB").id("to-serviceB");
+
+from("direct:serviceB").routeId("serviceB")
+.process(exchange -> {
+Thread.sleep(100);
Review Comment:
Made a comment about this on another PR.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] orpiske commented on a diff in pull request #11231: CAMEL-19776 for main(camel-4)
orpiske commented on code in PR #11231:
URL: https://github.com/apache/camel/pull/11231#discussion_r1308899923
##
components/camel-opentelemetry/src/test/java/org/apache/camel/opentelemetry/OpenTelemetryTracingStrategyTest.java:
##
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.opentelemetry;
+
+import java.util.function.Function;
+
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.context.Scope;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spi.InterceptStrategy;
+import org.junit.jupiter.api.Test;
+
+class OpenTelemetryTracingStrategyTest extends CamelOpenTelemetryTestSupport {
+
+private static SpanTestData[] testdata = {
+new
SpanTestData().setLabel("camel-process").setOperation("third-party-span")
+.setParentId(1),
+new
SpanTestData().setLabel("camel-process").setOperation("third-party-processor")
+.setParentId(6),
+new
SpanTestData().setLabel("camel-process").setOperation("direct-processor")
+.setParentId(3),
+new
SpanTestData().setLabel("direct:serviceB").setOperation("serviceB")
+.setParentId(4),
+new
SpanTestData().setLabel("direct:serviceB").setOperation("serviceB")
+.setKind(SpanKind.CLIENT)
+.setParentId(5),
+new
SpanTestData().setLabel("to:serviceB").setOperation("to-serviceB")
+.setParentId(6),
+new
SpanTestData().setLabel("direct:serviceA").setUri("direct://start").setOperation("serviceA")
+.setParentId(7),
+new
SpanTestData().setLabel("direct:serviceA").setUri("direct://start").setOperation("serviceA")
+.setKind(SpanKind.CLIENT)
+};
+
+OpenTelemetryTracingStrategyTest() {
+super(testdata);
+}
+
+@Test
+void testTracingOfProcessors() {
+template.requestBody("direct:serviceA", "Hello");
+
+verify();
+}
+
+@Override
+protected RoutesBuilder createRouteBuilder() {
+return new RouteBuilder() {
+@Override
+public void configure() {
+from("direct:serviceA").routeId("serviceA")
+.process(exchange -> {
+callThirdPartyInstrumentation();
+}).id("third-party-processor")
+.to("direct:serviceB").id("to-serviceB");
+
+from("direct:serviceB").routeId("serviceB")
+.process(exchange -> {
+Thread.sleep(100);
Review Comment:
Thanks for your contribution!
Please, is there a way, maybe this can be done without the `Thread.sleep`?
These hard-coded sleeps are almost always a pain in our CI.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
[GitHub] [camel] orpiske commented on pull request #11232: (chores) camel-core: optimize copying exchanges
orpiske commented on PR #11232: URL: https://github.com/apache/camel/pull/11232#issuecomment-1697525403 Just a minor optimization while I wait for the tests on the fixes for #11225. The code is not perfect, but I logged the issue CAMEL-19801 so we can refactor the Exchange copy code and try to make it consistent (and, possibly, performing as well as this). -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] github-actions[bot] commented on pull request #11232: (chores) camel-core: optimize copying exchanges
github-actions[bot] commented on PR #11232: URL: https://github.com/apache/camel/pull/11232#issuecomment-1697522075 :star2: Thank you for your contribution to the Apache Camel project! :star2: :camel: Maintainers, please note that first-time contributors *require manual approval* for the GitHub Actions to run. :warning: Please note that the changes on this PR may be **tested automatically** if they change components. :robot: Use the command `/component-test (camel-)component-name1 (camel-)component-name2..` to request a test from the test bot. If necessary Apache Camel Committers may access logs and test results in the job summaries! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] JiriOndrusek opened a new issue, #5233: [camel-main] Nats native failure, because of missing sun.security.x509.X509Key
JiriOndrusek opened a new issue, #5233:
URL: https://github.com/apache/camel-quarkus/issues/5233
### Bug description
After upgrade of JNats to 2.16.14 (in Camel), there is a native error about
unknown type `sun.security.x509.X509Key` when parsing `EdDSAEngine`
I added a module containing x509Key into test module quarkus execution by
```
java.base/sun.security.x509=ALL-UNNAMED
--add-opens ${opens}
-J--add-opens=${opens}
```
which fixes the error.
I'm not sure why upgrade of the dependency is causing this error.
If addition of the module is the right solution, documentation should be
updated to cover thus requirement.
(Another solution might exist. It might be possible to remove
`sun.security.x509.X509Key` part from `EdDSAEngine` by using @Substitute - but
I didn't try 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.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
