[camel-quarkus] branch quarkus-main updated (d6b8b22 -> 4ad3c91)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard d6b8b22 Upgrade to Quarkus 2.8.0.CR1 add ab74b6f Updated CHANGELOG.md new 4ad3c91 Upgrade to Quarkus 2.8.0.CR1 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (d6b8b22) \ N -- N -- N refs/heads/quarkus-main (4ad3c91) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: CHANGELOG.md | 4 1 file changed, 4 insertions(+)
[camel-quarkus] 01/01: Upgrade to Quarkus 2.8.0.CR1
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 4ad3c915d8cb176c11a59f8ace2adcaf66203eff
Author: James Netherton
AuthorDate: Thu Jan 20 07:52:37 2022 +
Upgrade to Quarkus 2.8.0.CR1
---
docs/antora.yml | 2 +-
integration-tests/http/pom.xml| 2 +-
integration-tests/vertx-websocket/pom.xml | 2 +-
pom.xml | 7 ---
poms/build-parent/pom.xml | 9 +
5 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index ce03b9d..488a8a9 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -31,7 +31,7 @@ asciidoc:
target-maven-version: 3.8.4 # replace ${target-maven-version}
camel-version: 3.14.1 # replace ${camel.version}
camel-docs-version: 3.14.x # replace ${camel.docs.components.version}
-quarkus-version: 2.7.0.Final # replace ${quarkus.version}
+quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
graalvm-version: 21.3.0 # replace ${graalvm.version}
graalvm-docs-version: 21.3
# attributes used in xrefs to other Antora components
diff --git a/integration-tests/http/pom.xml b/integration-tests/http/pom.xml
index 68daa40..8994b61 100644
--- a/integration-tests/http/pom.xml
+++ b/integration-tests/http/pom.xml
@@ -61,7 +61,7 @@
io.quarkus
-quarkus-undertow-websockets
+quarkus-websockets
io.quarkus
diff --git a/integration-tests/vertx-websocket/pom.xml
b/integration-tests/vertx-websocket/pom.xml
index 7947fe5..abd5e2a 100644
--- a/integration-tests/vertx-websocket/pom.xml
+++ b/integration-tests/vertx-websocket/pom.xml
@@ -39,7 +39,7 @@
io.quarkus
-quarkus-undertow-websockets
+quarkus-websockets
test
diff --git a/pom.xml b/pom.xml
index 032f6d1..15455f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
1.0.0
2.3.0
1.0.3
-2.7.0.Final
+999-SNAPSHOT
2.0.0
0.32.0
@@ -65,6 +65,7 @@
1.18
3.5.2
1.11.0
+3.22.0
2.17.103
1.11.714
1.0.5
@@ -85,8 +86,8 @@
1.111
0.8.0
0.22.2
-21.3.0
-1.43.2
+22.0.0.2
+1.44.0
4.0
${hadoop3-version}
${hapi-version}
diff --git a/poms/build-parent/pom.xml b/poms/build-parent/pom.xml
index 223aaa3..b90f131 100644
--- a/poms/build-parent/pom.xml
+++ b/poms/build-parent/pom.xml
@@ -37,6 +37,15 @@
false
+
+
+
+org.assertj
+assertj-core
+${assertj.version}
+
+
+
[camel-quarkus] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git The following commit(s) were added to refs/heads/main by this push: new b7e7fb7 Updated CHANGELOG.md b7e7fb7 is described below commit b7e7fb7a61f21e1790b63c8f76ba0b354cc07a9e Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sun Feb 6 03:11:21 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20bba0c..fdaf454 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ **Closed issues:** +- Incorrect version of `quarkus-maven-plugin` may be resolved [\#3520](https://github.com/apache/camel-quarkus/issues/3520) - Prevent various plugins from resolving commons-logging:commons-logging [\#3517](https://github.com/apache/camel-quarkus/issues/3517) - Expand Cassandra CQL extension test coverage [\#3514](https://github.com/apache/camel-quarkus/issues/3514) - Ban javax.servlet:servlet-api in favor of jakarta.servlet:jakarta.servlet-api [\#3496](https://github.com/apache/camel-quarkus/issues/3496)
[camel-k] branch main updated: Updated CHANGELOG.md
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k.git The following commit(s) were added to refs/heads/main by this push: new bf59c23 Updated CHANGELOG.md bf59c23 is described below commit bf59c23bebbf4f9d0fc3828ababbdcd48df8d36d Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sun Feb 6 03:10:30 2022 + Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f901059..1bb2d04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,9 @@ - Unable to access MongoDB [\#2684](https://github.com/apache/camel-k/issues/2684) - KAMEL\_INSTALL\_DEFAULT\_KAMELETS behavior [\#2560](https://github.com/apache/camel-k/issues/2560) - Documentation for `kamel local run`? [\#2490](https://github.com/apache/camel-k/issues/2490) +- Log warnings with kamelets [\#2395](https://github.com/apache/camel-k/issues/2395) - Json marshalling is needed for Rest route and uncommented code seems to be executed [\#2341](https://github.com/apache/camel-k/issues/2341) +- build: use golangci/golangci-lint-action [\#2334](https://github.com/apache/camel-k/issues/2334) - Change autogen doc template to adoc [\#2289](https://github.com/apache/camel-k/issues/2289) - Kamel dump: make the command smarter [\#2189](https://github.com/apache/camel-k/issues/2189)
[GitHub] [camel-k] github-actions[bot] closed issue #2334: build: use golangci/golangci-lint-action
github-actions[bot] closed issue #2334: URL: https://github.com/apache/camel-k/issues/2334 -- 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] github-actions[bot] commented on issue #1821: Support for POJO, bring it back!
github-actions[bot] commented on issue #1821: URL: https://github.com/apache/camel-k/issues/1821#issuecomment-1030718395 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] github-actions[bot] commented on issue #1031: Support for AWS ECR in kaniko builder in Operator
github-actions[bot] commented on issue #1031: URL: https://github.com/apache/camel-k/issues/1031#issuecomment-1030718399 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] github-actions[bot] closed issue #2395: Log warnings with kamelets
github-actions[bot] closed issue #2395: URL: https://github.com/apache/camel-k/issues/2395 -- 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] github-actions[bot] commented on issue #2179: Provide option to have symbolic link for kamel local build --integration-directory
github-actions[bot] commented on issue #2179: URL: https://github.com/apache/camel-k/issues/2179#issuecomment-1030718387 This issue has been automatically marked as stale due to 90 days of inactivity. It will be closed if no further activity occurs within 15 days. If you think that’s incorrect or the issue should never stale, please simply write any comment. Thanks for your contributions! -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-karavan] mgubaidullin opened a new issue #177: Outgoing arrows improvement
mgubaidullin opened a new issue #177: URL: https://github.com/apache/camel-karavan/issues/177 Add outgoing arrows for enrich, pollEnrich, wireTap Remove outgoing arrow for Kamelet action -- 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 (9ae53d8 -> 1800a51)
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 9ae53d8 Regen for commit 3a0fb0a4d431241516396082c402acf06b52f960 add 1800a51 Regen for commit 3a0fb0a4d431241516396082c402acf06b52f960 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 (9ae53d8) \ N -- N -- N refs/heads/regen_bot (1800a51) 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] branch main updated: Regen for commit 3a0fb0a4d431241516396082c402acf06b52f960
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 1800a51 Regen for commit 3a0fb0a4d431241516396082c402acf06b52f960
1800a51 is described below
commit 1800a510783be77aea71f9bd2051bf2fc8ea9774
Author: davsclaus
AuthorDate: Sat Feb 5 19:09:08 2022 +
Regen for commit 3a0fb0a4d431241516396082c402acf06b52f960
Signed-off-by: GitHub
---
.../org/apache/camel/catalog/models.properties | 1 +
.../org/apache/camel/catalog/models/property.json | 2 +-
.../camel/catalog/models/propertyExpression.json | 18 +++
.../org/apache/camel/catalog/models/saga.json | 2 +-
.../apache/camel/catalog/models/sagaOption.json| 2 +-
.../org/apache/camel/catalog/others.properties | 1 -
.../org/apache/camel/catalog/others/yaml-dsl.json | 15 ---
.../apache/camel/catalog/schemas/camel-spring.xsd | 128 +
8 files changed, 75 insertions(+), 94 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
index aae3d87..6a630a4 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models.properties
@@ -119,6 +119,7 @@ pollEnrich
post
process
property
+propertyExpression
protobuf
put
random
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/property.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/property.json
index 0c270fd..a20cf40 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/property.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/property.json
@@ -3,7 +3,7 @@
"kind": "model",
"name": "property",
"title": "Property",
-"description": "A key value pair",
+"description": "A key value pair where the value is a literal value",
"deprecated": false,
"label": "configuration",
"javaType": "org.apache.camel.model.PropertyDefinition",
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/propertyExpression.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/propertyExpression.json
new file mode 100644
index 000..41f68d8
--- /dev/null
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/propertyExpression.json
@@ -0,0 +1,18 @@
+{
+ "model": {
+"kind": "model",
+"name": "propertyExpression",
+"title": "Property Expression",
+"description": "A key value pair where the value is an expression.",
+"deprecated": false,
+"label": "configuration",
+"javaType": "org.apache.camel.model.PropertyExpressionDefinition",
+"abstract": false,
+"input": false,
+"output": false
+ },
+ "properties": {
+"expression": { "kind": "expression", "displayName": "Expression",
"required": true, "type": "object", "javaType":
"org.apache.camel.model.language.ExpressionDefinition", "oneOf": [ "constant",
"csimple", "datasonnet", "exchangeProperty", "groovy", "header", "hl7terser",
"joor", "jsonpath", "language", "method", "mvel", "ognl", "ref", "simple",
"spel", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false,
"autowired": false, "secret": false },
+"key": { "kind": "attribute", "displayName": "Key", "required": true,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Property key" }
+ }
+}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/saga.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/saga.json
index cae9146..f575885 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/saga.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/saga.json
@@ -17,7 +17,7 @@
"timeout": { "kind": "attribute", "displayName": "Timeout", "required":
false, "type": "duration", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Set the maximum amount of
time for the Saga. After the timeout is expired, the saga will be compensated
automatically (unless a different decision has been taken in the meantime)." },
"compensation": { "kind": "element", "displayName": "Compensation",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.SagaActionUriDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "The compensation endpoint
[GitHub] [camel] oscerd merged pull request #6893: Generated sources regen
oscerd merged pull request #6893: URL: https://github.com/apache/camel/pull/6893 -- 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 (a6210ab -> 9ae53d8)
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 a6210ab CAMEL-17599: camel-jdbc - ensure Statement is closed to not
leak.
add 16328d5 CAMEL-17585: Sage EIP - Options on Saga was not output in
json metadata. Update model to be aligned how other EIPs does that.
add 3a0fb0a CAMEL-17585: Sage EIP - Options on Saga was not output in
json metadata. Update model to be aligned how other EIPs does that.
add 9ae53d8 Regen for commit 3a0fb0a4d431241516396082c402acf06b52f960
No new revisions were added by this update.
Summary of changes:
.../org/apache/camel/catalog/models.properties | 1 +
.../org/apache/camel/catalog/models/property.json | 2 +-
.../camel/catalog/models/propertyExpression.json | 18 +++
.../org/apache/camel/catalog/models/saga.json | 2 +-
.../apache/camel/catalog/models/sagaOption.json| 2 +-
.../org/apache/camel/catalog/others.properties | 1 -
.../org/apache/camel/catalog/others/yaml-dsl.json | 15 ---
.../apache/camel/catalog/schemas/camel-spring.xsd | 128 +
.../org/apache/camel/spring/processor/saga.xml | 8 +-
.../org/apache/camel/spring/processor/sagaRef.xml | 8 +-
.../services/org/apache/camel/model.properties | 1 +
.../resources/org/apache/camel/model/jaxb.index| 2 +-
.../resources/org/apache/camel/model/property.json | 2 +-
.../org/apache/camel/model/propertyExpression.json | 18 +++
.../resources/org/apache/camel/model/saga.json | 2 +-
.../org/apache/camel/model/sagaOption.json | 2 +-
.../org/apache/camel/model/PropertyDefinition.java | 4 +-
...tion.java => PropertyExpressionDefinition.java} | 32 +++---
.../org/apache/camel/model/SagaDefinition.java | 10 +-
.../apache/camel/model/SagaOptionDefinition.java | 78 -
.../java/org/apache/camel/reifier/SagaReifier.java | 8 +-
.../apache/camel/processor/SagaOptionsTest.java| 14 ---
.../java/org/apache/camel/xml/in/ModelParser.java | 28 +++--
.../ROOT/pages/camel-3x-upgrade-guide-3_16.adoc| 10 +-
.../camel-yaml-dsl-deserializers/pom.xml | 1 -
.../dsl/yaml/deserializers/ModelDeserializers.java | 124
.../deserializers/ModelDeserializersResolver.java | 6 +-
.../dsl/yaml/deserializers/CustomResolver.java | 1 +
.../services/org/apache/camel/other.properties | 7 --
.../src/generated/resources/camel-yaml-dsl.json| 52 +++--
.../src/generated/resources/camelYamlDsl.json | 49 +++-
.../src/generated/resources/yaml-dsl.json | 15 ---
.../org/apache/camel/dsl/yaml/SagaTest.groovy | 46 +++-
33 files changed, 259 insertions(+), 438 deletions(-)
create mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/propertyExpression.json
delete mode 100644
catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/others/yaml-dsl.json
create mode 100644
core/camel-core-model/src/generated/resources/org/apache/camel/model/propertyExpression.json
copy
core/camel-core-model/src/main/java/org/apache/camel/model/{PropertyDefinition.java
=> PropertyExpressionDefinition.java} (65%)
delete mode 100644
core/camel-core-model/src/main/java/org/apache/camel/model/SagaOptionDefinition.java
delete mode 100644
dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/META-INF/services/org/apache/camel/other.properties
delete mode 100644
dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/yaml-dsl.json
[GitHub] [camel] github-actions[bot] opened a new pull request #6893: Generated sources regen
github-actions[bot] opened a new pull request #6893: URL: https://github.com/apache/camel/pull/6893 Regen bot :robot: found some uncommited changes after running build on :camel: main. 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-examples] branch main updated: Reduce the number of examples to maintain
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-examples.git
The following commit(s) were added to refs/heads/main by this push:
new be0aef3 Reduce the number of examples to maintain
be0aef3 is described below
commit be0aef3fca2369606698ef47b8a923b91a3ed41f
Author: Claus Ibsen
AuthorDate: Sat Feb 5 19:17:24 2022 +0100
Reduce the number of examples to maintain
---
examples/README.adoc | 4 +-
.../main-endpointdsl-google-pubsub/README.adoc | 44 -
examples/main-endpointdsl-google-pubsub/pom.xml| 106 -
.../org/apache/camel/example/MyApplication.java| 38
.../org/apache/camel/example/MyRouteBuilder.java | 37 ---
.../src/main/resources/application.properties | 39
.../src/main/resources/logback.xml | 30 --
examples/pom.xml | 1 -
8 files changed, 1 insertion(+), 298 deletions(-)
diff --git a/examples/README.adoc b/examples/README.adoc
index 3f628e3..e5c0b8a 100644
--- a/examples/README.adoc
+++ b/examples/README.adoc
@@ -11,7 +11,7 @@ View the individual example READMEs for details.
== Examples
// examples: START
-Number of Examples: 84 (0 deprecated)
+Number of Examples: 83 (0 deprecated)
[width="100%",cols="4,2,4",options="header"]
|===
@@ -59,8 +59,6 @@ Number of Examples: 84 (0 deprecated)
| link:main-endpointdsl-aws2-s3-kafka/README.adoc[Main Endpointdsl Aws2 S3
Kafka] (main-endpointdsl-aws2-s3-kafka) | Beginner | An example for showing
standalone Camel with Endpoint DSL and AWS2-S3 and Kafka
-| link:main-endpointdsl-google-pubsub/README.adoc[Main Endpointdsl Google
Pubsub] (main-endpointdsl-google-pubsub) | Beginner | An example for showing
standalone Camel with Endpoint DSL and Google Pubsub component
-
| link:main-endpointdsl-kafka-aws2-s3/README.adoc[Main Endpointdsl Kafka Aws2
S3] (main-endpointdsl-kafka-aws2-s3) | Beginner | An example for showing
standalone Camel with Endpoint DSL and Kafka and AWS2 S3
| link:main-endpointdsl-kafka-aws2-s3-restarting-policy/README.adoc[Main
Endpointdsl Kafka Aws2 S3 Restarting Policy]
(main-endpointdsl-kafka-aws2-s3-restarting-policy) | Beginner | An example for
showing standalone Camel with Endpoint DSL and Kafka, AWS2-S3 streaming upload
mode with restarting policy
diff --git a/examples/main-endpointdsl-google-pubsub/README.adoc
b/examples/main-endpointdsl-google-pubsub/README.adoc
deleted file mode 100644
index 3f34b9d..000
--- a/examples/main-endpointdsl-google-pubsub/README.adoc
+++ /dev/null
@@ -1,44 +0,0 @@
-== Camel Example Google PubSub Endpoint DSL
-
-This example shows how to use the endpoint DSL in your Camel routes
-to define endpoints using type safe fluent builders, which are Java methods
-that are compiled.
-
-Notice how you can configure Camel in the `application.properties` file.
-
-=== Setting up the google pubsub topic
-
-- You'll need to
- - Create a project and save the projectId
- - Create a topic and save the name
- - Create a subscription to that topic and save the subscription name
-
-- Update the application.properties accordingly
-
-=== Build
-
-First compile the example by executing:
-
-[source,sh]
-
-$ mvn compile
-
-
-=== How to run
-
-You can run this example using
-
-[source,sh]
-
-$ mvn camel:run
-
-
-=== Help and contributions
-
-If you hit any problem using Camel or have some feedback, then please
-https://camel.apache.org/community/support/[let us know].
-
-We also love contributors, so
-https://camel.apache.org/community/contributing/[get involved] :-)
-
-The Camel riders!
diff --git a/examples/main-endpointdsl-google-pubsub/pom.xml
b/examples/main-endpointdsl-google-pubsub/pom.xml
deleted file mode 100644
index 20d9ce1..000
--- a/examples/main-endpointdsl-google-pubsub/pom.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0;
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;>
-
-4.0.0
-
-
-org.apache.camel.example
-examples
-3.16.0-SNAPSHOT
-
-
-camel-example-main-endpointdsl-google-pubsub
-jar
-Camel :: Example :: Main :: Endpoint DSL :: Google Pubsub
-An example for showing standalone Camel with Endpoint DSL and
Google Pubsub component
-
-
-Beginner
-
-
-
-
-
-
-org.apache.camel
-camel-bom
-${camel.version}
-pom
-import
-
-
-
-
-
-
-
-org.apache.camel
-camel-main
-
-
-
-org.apache.camel
-camel-endpointdsl
-
-
-
-
[camel] branch main updated: CAMEL-17585: Sage EIP - Options on Saga was not output in json metadata. Update model to be aligned how other EIPs does that.
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 3a0fb0a CAMEL-17585: Sage EIP - Options on Saga was not output in
json metadata. Update model to be aligned how other EIPs does that.
3a0fb0a is described below
commit 3a0fb0a4d431241516396082c402acf06b52f960
Author: Claus Ibsen
AuthorDate: Sat Feb 5 19:13:14 2022 +0100
CAMEL-17585: Sage EIP - Options on Saga was not output in json metadata.
Update model to be aligned how other EIPs does that.
---
.../camel-yaml-dsl-deserializers/pom.xml | 1 -
.../dsl/yaml/deserializers/ModelDeserializers.java | 124 -
.../deserializers/ModelDeserializersResolver.java | 6 +-
.../dsl/yaml/deserializers/CustomResolver.java | 1 +
.../services/org/apache/camel/other.properties | 7 --
.../src/generated/resources/camel-yaml-dsl.json| 52 +++--
.../src/generated/resources/camelYamlDsl.json | 49 +++-
.../src/generated/resources/yaml-dsl.json | 15 ---
.../org/apache/camel/dsl/yaml/SagaTest.groovy | 46 +++-
9 files changed, 102 insertions(+), 199 deletions(-)
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
index 4b193b9..e9eb732 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/pom.xml
@@ -139,7 +139,6 @@
-
org.apache.camel.model.SagaOptionDefinition
org.apache.camel.model.SagaActionUriDefinition
org.apache.camel.builder.DeadLetterChannelBuilder
diff --git
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index cf7d612..280c881 100644
---
a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++
b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -58,6 +58,7 @@ import org.apache.camel.model.PolicyDefinition;
import org.apache.camel.model.PollEnrichDefinition;
import org.apache.camel.model.ProcessDefinition;
import org.apache.camel.model.PropertyDefinition;
+import org.apache.camel.model.PropertyExpressionDefinition;
import org.apache.camel.model.RecipientListDefinition;
import org.apache.camel.model.RedeliveryPolicyDefinition;
import org.apache.camel.model.RemoveHeaderDefinition;
@@ -77,7 +78,6 @@ import org.apache.camel.model.RouteTemplateScriptDefinition;
import org.apache.camel.model.RoutingSlipDefinition;
import org.apache.camel.model.SagaActionUriDefinition;
import org.apache.camel.model.SagaDefinition;
-import org.apache.camel.model.SagaOptionDefinition;
import org.apache.camel.model.SamplingDefinition;
import org.apache.camel.model.ScriptDefinition;
import org.apache.camel.model.SetBodyDefinition;
@@ -10261,6 +10261,50 @@ public final class ModelDeserializers extends
YamlDeserializerSupport {
}
@YamlType(
+types = org.apache.camel.model.PropertyExpressionDefinition.class,
+order =
org.apache.camel.dsl.yaml.common.YamlDeserializerResolver.ORDER_LOWEST - 1,
+nodes = {
+"property-expression",
+"propertyExpression"
+},
+properties = {
+@YamlProperty(name = "expression", type =
"object:org.apache.camel.model.language.ExpressionDefinition"),
+@YamlProperty(name = "key", type = "string", required =
true)
+}
+)
+public static class PropertyExpressionDefinitionDeserializer extends
YamlDeserializerBase {
+public PropertyExpressionDefinitionDeserializer() {
+super(PropertyExpressionDefinition.class);
+}
+
+@Override
+protected PropertyExpressionDefinition newInstance() {
+return new PropertyExpressionDefinition();
+}
+
+@Override
+protected boolean setProperty(PropertyExpressionDefinition target,
String propertyKey,
+String propertyName, Node node) {
+switch(propertyKey) {
+case "expression": {
+org.apache.camel.model.language.ExpressionDefinition val =
asType(node, org.apache.camel.model.language.ExpressionDefinition.class);
+target.setExpression(val);
+break;
+
[camel] branch main updated: CAMEL-17585: Sage EIP - Options on Saga was not output in json metadata. Update model to be aligned how other EIPs does that.
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 16328d5 CAMEL-17585: Sage EIP - Options on Saga was not output in json metadata. Update model to be aligned how other EIPs does that. 16328d5 is described below commit 16328d5cc9466e368cba1dfb448a400dffbf1b2a Author: Claus Ibsen AuthorDate: Sat Feb 5 18:41:45 2022 +0100 CAMEL-17585: Sage EIP - Options on Saga was not output in json metadata. Update model to be aligned how other EIPs does that. --- .../org/apache/camel/spring/processor/saga.xml | 8 ++-- .../org/apache/camel/spring/processor/sagaRef.xml | 8 ++-- .../services/org/apache/camel/model.properties | 1 + .../resources/org/apache/camel/model/jaxb.index| 2 +- .../resources/org/apache/camel/model/property.json | 2 +- .../org/apache/camel/model/propertyExpression.json | 18 .../resources/org/apache/camel/model/saga.json | 2 +- .../org/apache/camel/model/sagaOption.json | 2 +- .../org/apache/camel/model/PropertyDefinition.java | 4 +- ...tion.java => PropertyExpressionDefinition.java} | 53 +- .../org/apache/camel/model/SagaDefinition.java | 10 ++-- .../java/org/apache/camel/reifier/SagaReifier.java | 8 ++-- .../apache/camel/processor/SagaOptionsTest.java| 14 -- .../java/org/apache/camel/xml/in/ModelParser.java | 28 +++- .../ROOT/pages/camel-3x-upgrade-guide-3_16.adoc| 10 ++-- 15 files changed, 87 insertions(+), 83 deletions(-) diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/saga.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/saga.xml index 6a70c04..9f575e8 100644 --- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/saga.xml +++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/saga.xml @@ -33,12 +33,12 @@ - + myOptionValue - - + + myOptionValue2 - + diff --git a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/sagaRef.xml b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/sagaRef.xml index 098a793..c2473ca 100644 --- a/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/sagaRef.xml +++ b/components/camel-spring-xml/src/test/resources/org/apache/camel/spring/processor/sagaRef.xml @@ -34,12 +34,12 @@ - + myOptionValue - - + + myOptionValue2 - + diff --git a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties index c50cf9d..86de2b4 100644 --- a/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties +++ b/core/camel-core-model/src/generated/resources/META-INF/services/org/apache/camel/model.properties @@ -113,6 +113,7 @@ pollEnrich post process property +propertyExpression protobuf put random diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/jaxb.index b/core/camel-core-model/src/generated/resources/org/apache/camel/model/jaxb.index index c14b73c..b71d046 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/jaxb.index +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/jaxb.index @@ -52,6 +52,7 @@ PollEnrichDefinition ProcessDefinition PropertyDefinition PropertyDefinitions +PropertyExpressionDefinition RecipientListDefinition RedeliveryPolicyDefinition RemoveHeaderDefinition @@ -78,7 +79,6 @@ RoutesDefinition RoutingSlipDefinition SagaCompletionMode SagaDefinition -SagaOptionDefinition SagaPropagation SamplingDefinition ScriptDefinition diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/property.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/property.json index 0c270fd..a20cf40 100644 --- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/property.json +++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/property.json @@ -3,7 +3,7 @@ "kind": "model", "name": "property", "title": "Property", -"description": "A key value pair", +"description": "A key value pair where the value is a literal value", "deprecated": false,
[camel-examples] branch main updated: CAMEL-17575: main examples - even easier
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-examples.git
The following commit(s) were added to refs/heads/main by this push:
new 3f75df3 CAMEL-17575: main examples - even easier
3f75df3 is described below
commit 3f75df354b28aadb5adfeee58adada03b3bebf69
Author: Claus Ibsen
AuthorDate: Sat Feb 5 14:53:47 2022 +0100
CAMEL-17575: main examples - even easier
---
.../src/main/java/org/apache/camel/example/MyApplication.java | 6 +-
examples/kamelet/src/main/resources/application.properties | 4 ++--
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git
a/examples/kamelet/src/main/java/org/apache/camel/example/MyApplication.java
b/examples/kamelet/src/main/java/org/apache/camel/example/MyApplication.java
index e2799a0..fd50400 100644
--- a/examples/kamelet/src/main/java/org/apache/camel/example/MyApplication.java
+++ b/examples/kamelet/src/main/java/org/apache/camel/example/MyApplication.java
@@ -28,11 +28,7 @@ public final class MyApplication {
public static void main(String[] args) throws Exception {
// use Camels Main class
-Main main = new Main();
-// and add route templates via routes builder
-main.configure().addRoutesBuilder(MyRouteTemplates.class);
-// and add routes that will consume templates through kamelets
-main.configure().addRoutesBuilder(MyRoutes.class);
+Main main = new Main(MyApplication.class);
// now keep the application running until the JVM is terminated (ctrl
+ c or sigterm)
main.run(args);
diff --git a/examples/kamelet/src/main/resources/application.properties
b/examples/kamelet/src/main/resources/application.properties
index 7b15eec..8a4a59b 100644
--- a/examples/kamelet/src/main/resources/application.properties
+++ b/examples/kamelet/src/main/resources/application.properties
@@ -15,8 +15,8 @@
## limitations under the License.
## ---
-# to configure camel main
-# here you can configure options on camel main (see
MainConfigurationProperties class)
+# here you can configure options on camel main
+# https://camel.apache.org/components/next/others/main.html
camel.main.name = MyCoolCamel
# turn on lightweight mode
[camel-examples] branch main updated: CAMEL-17575: main examples - even easier
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-examples.git The following commit(s) were added to refs/heads/main by this push: new 65136e7 CAMEL-17575: main examples - even easier 65136e7 is described below commit 65136e78faf4f80f66fde58944259f09d40a7b0d Author: Claus Ibsen AuthorDate: Sat Feb 5 14:51:35 2022 +0100 CAMEL-17575: main examples - even easier --- .../src/main/resources/application.properties | 24 ++ 1 file changed, 24 insertions(+) diff --git a/examples/kamelet-chucknorris/src/main/resources/application.properties b/examples/kamelet-chucknorris/src/main/resources/application.properties new file mode 100644 index 000..8945f00 --- /dev/null +++ b/examples/kamelet-chucknorris/src/main/resources/application.properties @@ -0,0 +1,24 @@ +## --- +## 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. +## --- + +# here you can configure options on camel main +# https://camel.apache.org/components/next/others/main.html +camel.main.name = MyKameletCamel + +# routes to load +camel.main.routes-include-pattern = camel/*.xml +
[GitHub] [camel-karavan] davsclaus closed issue #158: Upgrade to Camel 3.15.0
davsclaus closed issue #158: URL: https://github.com/apache/camel-karavan/issues/158 -- 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 (5b4f40c -> a6210ab)
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 5b4f40c Merge branch 'main' of https://github.com/apache/camel into main add a6210ab CAMEL-17599: camel-jdbc - ensure Statement is closed to not leak. No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/component/jdbc/JdbcProducer.java | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-)
[camel-examples] branch main updated: CAMEL-17575: main examples - even easier
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-examples.git
The following commit(s) were added to refs/heads/main by this push:
new ea34731 CAMEL-17575: main examples - even easier
ea34731 is described below
commit ea34731a716303a27dbb6e6293da3b1a4ea75ef8
Author: Claus Ibsen
AuthorDate: Sat Feb 5 10:28:42 2022 +0100
CAMEL-17575: main examples - even easier
---
.../java/org/apache/camel/example/MyApplication.java | 18 ++
.../src/main/resources/application.properties | 16
2 files changed, 10 insertions(+), 24 deletions(-)
diff --git
a/examples/main-yaml/src/main/java/org/apache/camel/example/MyApplication.java
b/examples/main-yaml/src/main/java/org/apache/camel/example/MyApplication.java
index 66007d3..28cdcdd 100644
---
a/examples/main-yaml/src/main/java/org/apache/camel/example/MyApplication.java
+++
b/examples/main-yaml/src/main/java/org/apache/camel/example/MyApplication.java
@@ -21,25 +21,11 @@ import org.apache.camel.main.Main;
/**
* Main class that boot the Camel application
*/
-public final class MyApplication {
-
-private MyApplication() {
-}
+public class MyApplication {
public static void main(String[] args) throws Exception {
// use Camels Main class
-Main main = new Main();
-// lets use a configuration class (you can specify multiple classes)
-// (properties are automatic loaded from application.properties)
-main.configure().addConfiguration(MyConfiguration.class);
-// and add all the YAML routes
-main.configure().withRoutesIncludePattern("routes/*.yaml");
-// turn on reloading routes on code-changes
-main.configure().withRoutesReloadEnabled(true);
-main.configure().withRoutesReloadDirectory("src/main/resources");
-main.configure().withRoutesReloadPattern("routes/*.yaml");
-main.configure().withRoutesReloadRemoveAllRoutes(true);
-
+Main main = new Main(MyApplication.class);
// now keep the application running until the JVM is terminated (ctrl
+ c or sigterm)
main.run(args);
}
diff --git a/examples/main-yaml/src/main/resources/application.properties
b/examples/main-yaml/src/main/resources/application.properties
index 8aba99f..7148e6e 100644
--- a/examples/main-yaml/src/main/resources/application.properties
+++ b/examples/main-yaml/src/main/resources/application.properties
@@ -15,17 +15,17 @@
## limitations under the License.
## ---
-# to configure camel main
-# here you can configure options on camel main (see
MainConfigurationProperties class)
+# here you can configure options on camel main
+# https://camel.apache.org/components/next/others/main.html
camel.main.name = MyYamlCamel
-# turn on route reloading on file changes
+# routes to load
+camel.main.routes-include-pattern = routes/*.yaml
+
+# turn on route reloading on file changes (requires a bit of configuration)
camel.main.routes-reload-enabled = true
-# the base directory to watch
-camel.main.routes-reload-directory = src/main/resources/routes
-# pattern(s) for files to watch
-camel.main.routes-reload-pattern = *.yaml
-# on reload should all existing routes be removed first
+camel.main.routes-reload-directory = src/main/resources
+camel.main.routes-reload-pattern = routes/*.yaml
camel.main.routes-reload-remove-all-routes = true
# properties used in the route
[camel] branch regen_bot_3.14.x updated (8e991bc -> 0d41912)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch regen_bot_3.14.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 8e991bc Dependency upgrades add 0d41912 CAMEL-17599: camel-jdbc - ensure Statement is closed to not leak. No new revisions were added by this update. Summary of changes: .../java/org/apache/camel/component/jdbc/JdbcProducer.java | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-)
[GitHub] [camel-quarkus] jamesnetherton commented on issue #3520: Incorrect version of `quarkus-maven-plugin` may be resolved
jamesnetherton commented on issue #3520: URL: https://github.com/apache/camel-quarkus/issues/3520#issuecomment-1030584738 Seems to be fixed with https://github.com/apache/camel-quarkus/commit/6111679cef631d091056a724f487ccf50e75f758. -- 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] jamesnetherton closed issue #3520: Incorrect version of `quarkus-maven-plugin` may be resolved
jamesnetherton closed issue #3520: URL: https://github.com/apache/camel-quarkus/issues/3520 -- 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-examples] branch main updated: CAMEL-17575: main examples - even easier
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-examples.git
The following commit(s) were added to refs/heads/main by this push:
new 7d81cec CAMEL-17575: main examples - even easier
7d81cec is described below
commit 7d81cec1a199c9be4262502244a433dbf108457f
Author: Claus Ibsen
AuthorDate: Sat Feb 5 09:50:09 2022 +0100
CAMEL-17575: main examples - even easier
---
.../src/main/java/org/apache/camel/example/MyApplication.java | 6 +-
.../src/main/java/org/apache/camel/example/MyConfiguration.java | 5 +++--
examples/main-lambda/src/main/resources/application.properties | 4 ++--
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git
a/examples/main-lambda/src/main/java/org/apache/camel/example/MyApplication.java
b/examples/main-lambda/src/main/java/org/apache/camel/example/MyApplication.java
index 3646957..31197dc 100644
---
a/examples/main-lambda/src/main/java/org/apache/camel/example/MyApplication.java
+++
b/examples/main-lambda/src/main/java/org/apache/camel/example/MyApplication.java
@@ -28,11 +28,7 @@ public final class MyApplication {
public static void main(String[] args) throws Exception {
// use Camels Main class
-Main main = new Main();
-// let's use a configuration class (you can specify multiple classes)
-// (properties are automatic loaded from application.properties)
-// the configuration class has the configuration and also the routes
to be used
-main.configure().addConfiguration(MyConfiguration.class);
+Main main = new Main(MyApplication.class);
// now keep the application running until the JVM is terminated (ctrl
+ c or sigterm)
main.run(args);
}
diff --git
a/examples/main-lambda/src/main/java/org/apache/camel/example/MyConfiguration.java
b/examples/main-lambda/src/main/java/org/apache/camel/example/MyConfiguration.java
index f5dd990..aa1d61a 100644
---
a/examples/main-lambda/src/main/java/org/apache/camel/example/MyConfiguration.java
+++
b/examples/main-lambda/src/main/java/org/apache/camel/example/MyConfiguration.java
@@ -17,14 +17,15 @@
package org.apache.camel.example;
import org.apache.camel.BindToRegistry;
+import org.apache.camel.Configuration;
import org.apache.camel.PropertyInject;
import org.apache.camel.builder.LambdaRouteBuilder;
-import org.apache.camel.CamelConfiguration;
/**
* Class to configure the Camel application.
*/
-public class MyConfiguration implements CamelConfiguration {
+@Configuration
+public class MyConfiguration {
@BindToRegistry
public MyBean myBean(@PropertyInject("hi") String hi,
@PropertyInject("bye") String bye) {
diff --git a/examples/main-lambda/src/main/resources/application.properties
b/examples/main-lambda/src/main/resources/application.properties
index 6781126..6335cf3 100644
--- a/examples/main-lambda/src/main/resources/application.properties
+++ b/examples/main-lambda/src/main/resources/application.properties
@@ -15,8 +15,8 @@
## limitations under the License.
## ---
-# to configure camel main
-# here you can configure options on camel main (see
MainConfigurationProperties class)
+# here you can configure options on camel main
+# https://camel.apache.org/components/next/others/main.html
camel.main.name = MyCoolCamel
# extended runtime statistics about bean introspection usage (java reflection)
[camel-examples] branch main updated: CAMEL-17575: main examples - even easier
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-examples.git
The following commit(s) were added to refs/heads/main by this push:
new 33f5ae4 CAMEL-17575: main examples - even easier
33f5ae4 is described below
commit 33f5ae42b64f9085f9742b83aa3aa687d60a2f32
Author: Claus Ibsen
AuthorDate: Sat Feb 5 09:48:04 2022 +0100
CAMEL-17575: main examples - even easier
---
.../src/main/java/org/apache/camel/example/MyApplication.java | 7 +--
.../main/java/org/apache/camel/example/MyConfiguration.java | 11 +++
examples/main/src/main/resources/application.properties | 4 ++--
3 files changed, 6 insertions(+), 16 deletions(-)
diff --git
a/examples/main/src/main/java/org/apache/camel/example/MyApplication.java
b/examples/main/src/main/java/org/apache/camel/example/MyApplication.java
index 23ac6cd..31197dc 100644
--- a/examples/main/src/main/java/org/apache/camel/example/MyApplication.java
+++ b/examples/main/src/main/java/org/apache/camel/example/MyApplication.java
@@ -28,12 +28,7 @@ public final class MyApplication {
public static void main(String[] args) throws Exception {
// use Camels Main class
-Main main = new Main();
-// lets use a configuration class (you can specify multiple classes)
-// (properties are automatic loaded from application.properties)
-main.configure().addConfiguration(MyConfiguration.class);
-// and add the routes (you can specify multiple classes)
-main.configure().addRoutesBuilder(MyRouteBuilder.class);
+Main main = new Main(MyApplication.class);
// now keep the application running until the JVM is terminated (ctrl
+ c or sigterm)
main.run(args);
}
diff --git
a/examples/main/src/main/java/org/apache/camel/example/MyConfiguration.java
b/examples/main/src/main/java/org/apache/camel/example/MyConfiguration.java
index 326d4ae..c580e6b 100644
--- a/examples/main/src/main/java/org/apache/camel/example/MyConfiguration.java
+++ b/examples/main/src/main/java/org/apache/camel/example/MyConfiguration.java
@@ -17,14 +17,14 @@
package org.apache.camel.example;
import org.apache.camel.BindToRegistry;
-import org.apache.camel.CamelConfiguration;
-import org.apache.camel.CamelContext;
+import org.apache.camel.Configuration;
import org.apache.camel.PropertyInject;
/**
* Class to configure the Camel application.
*/
-public class MyConfiguration implements CamelConfiguration {
+@Configuration
+public class MyConfiguration {
@BindToRegistry
public MyBean myBean(@PropertyInject("hi") String hi,
@PropertyInject("bye") String bye) {
@@ -32,9 +32,4 @@ public class MyConfiguration implements CamelConfiguration {
return new MyBean(hi, bye);
}
-@Override
-public void configure(CamelContext camelContext) {
-// this method is optional and can be removed if no additional
configuration is needed.
-}
-
}
diff --git a/examples/main/src/main/resources/application.properties
b/examples/main/src/main/resources/application.properties
index 2854c44..531e879 100644
--- a/examples/main/src/main/resources/application.properties
+++ b/examples/main/src/main/resources/application.properties
@@ -15,8 +15,8 @@
## limitations under the License.
## ---
-# to configure camel main
-# here you can configure options on camel main (see
MainConfigurationProperties class)
+# here you can configure options on camel main
+# https://camel.apache.org/components/next/others/main.html
camel.main.name = MyCoolCamel
# enable tracing
[camel] branch camel-3.14.x updated: CAMEL-17599: camel-jdbc - ensure Statement is closed to not leak.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.14.x by this push:
new 0d41912 CAMEL-17599: camel-jdbc - ensure Statement is closed to not
leak.
0d41912 is described below
commit 0d41912531f7bbe259cb47b00caeb17c200eb71e
Author: Claus Ibsen
AuthorDate: Sat Feb 5 09:35:58 2022 +0100
CAMEL-17599: camel-jdbc - ensure Statement is closed to not leak.
---
.../java/org/apache/camel/component/jdbc/JdbcProducer.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git
a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
index 4effe05..1b9d189 100644
---
a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
+++
b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
@@ -35,6 +35,7 @@ import org.apache.camel.ExtendedExchange;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.support.PropertyBindingSupport;
+import org.apache.camel.support.SynchronizationAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -198,7 +199,14 @@ public class JdbcProducer extends DefaultProducer {
try {
// We might need to leave it open to allow post-processing of the
result set. This is why we
// are not using try-with-resources here.
-Statement stmt = conn.createStatement();
+final Statement stmt = conn.createStatement();
+// ensure statement is closed (to not leak) when exchange is done
+exchange.adapt(ExtendedExchange.class).addOnCompletion(new
SynchronizationAdapter() {
+@Override
+public void onDone(Exchange exchange) {
+closeQuietly(stmt);
+}
+});
if (parameters != null && !parameters.isEmpty()) {
Map copy = new HashMap<>(parameters);
[camel] branch main updated: CAMEL-17599: camel-jdbc - ensure Statement is closed to not leak.
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 a6210ab CAMEL-17599: camel-jdbc - ensure Statement is closed to not
leak.
a6210ab is described below
commit a6210abfd77ea363d330ac6b056989e5541b314e
Author: Claus Ibsen
AuthorDate: Sat Feb 5 09:35:58 2022 +0100
CAMEL-17599: camel-jdbc - ensure Statement is closed to not leak.
---
.../java/org/apache/camel/component/jdbc/JdbcProducer.java | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git
a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
index 4effe05..1b9d189 100644
---
a/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
+++
b/components/camel-jdbc/src/main/java/org/apache/camel/component/jdbc/JdbcProducer.java
@@ -35,6 +35,7 @@ import org.apache.camel.ExtendedExchange;
import org.apache.camel.spi.Synchronization;
import org.apache.camel.support.DefaultProducer;
import org.apache.camel.support.PropertyBindingSupport;
+import org.apache.camel.support.SynchronizationAdapter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -198,7 +199,14 @@ public class JdbcProducer extends DefaultProducer {
try {
// We might need to leave it open to allow post-processing of the
result set. This is why we
// are not using try-with-resources here.
-Statement stmt = conn.createStatement();
+final Statement stmt = conn.createStatement();
+// ensure statement is closed (to not leak) when exchange is done
+exchange.adapt(ExtendedExchange.class).addOnCompletion(new
SynchronizationAdapter() {
+@Override
+public void onDone(Exchange exchange) {
+closeQuietly(stmt);
+}
+});
if (parameters != null && !parameters.isEmpty()) {
Map copy = new HashMap<>(parameters);
