[camel] branch master updated: Regen for commit c72a76f4fc66ac88eccea60b847ee5ec4f9a9fed
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new b56a706 Regen for commit c72a76f4fc66ac88eccea60b847ee5ec4f9a9fed b56a706 is described below commit b56a70673b9f3072485640b6652b72b21631ef7f Author: oscerd AuthorDate: Tue Dec 15 07:45:21 2020 + Regen for commit c72a76f4fc66ac88eccea60b847ee5ec4f9a9fed Signed-off-by: GitHub --- .../apache/camel/catalog/schemas/camel-spring.xsd | 71 +- 1 file changed, 70 insertions(+), 1 deletion(-) 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 feb800e..2a6a255 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 @@ -4374,7 +4374,6 @@ To use a specific charset when converting. - @@ -6442,6 +6441,16 @@ true (which is the default). + + + + + @@ -6725,6 +6734,16 @@ enabled when desired to be used. Default value: false ]]> + + + + + @@ -6884,6 +6903,16 @@ JAXB provider properties to be used with the JAXB marshaller. ]]> + + + + + @@ -7063,6 +7092,16 @@ Default value: false ]]> + + + + + @@ -7177,6 +7216,16 @@ value is native. Default value: native ]]> + + + + + @@ -7448,6 +7497,16 @@ representation. The default value is binary. Default value: binary ]]> + + + + + @@ -7759,6 +7818,16 @@ SINGLE_NODE_XPATH_RELATIVE_REFERENCES SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES. ]]> + + + + +
[GitHub] [camel] oscerd merged pull request #4766: Generated sources regen
oscerd merged pull request #4766: URL: https://github.com/apache/camel/pull/4766 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (077cf4a -> fdd2caa)
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 077cf4a Fix upsert timeouts issues when using the couchbase test-infra (#4764) add 33ca169 Upgrade AWS SDK v2 to version 2.15.46 add c72a76f Sync deps add fdd2caa Regen for commit c72a76f4fc66ac88eccea60b847ee5ec4f9a9fed No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request #4766: Generated sources regen
github-actions[bot] opened a new pull request #4766: URL: https://github.com/apache/camel/pull/4766 Regen bot :robot: found some uncommited changes after running build on :camel: master. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] branch master updated: Regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 2972a35 Regen
2972a35 is described below
commit 2972a35e129efadaf046718d6cdbfc42adc1c23d
Author: Andrea Cosentino
AuthorDate: Tue Dec 15 08:44:46 2020 +0100
Regen
---
components-starter/camel-corda-starter/pom.xml | 8 +++
components-starter/camel-iota-starter/pom.xml | 12
tooling/camel-spring-boot-dependencies/pom.xml | 86 +-
3 files changed, 63 insertions(+), 43 deletions(-)
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 5ad677a..252daab 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -41,6 +41,14 @@
+ ch.qos.logback
+ logback-classic
+
+
+ ch.qos.logback
+ logback-core
+
+
org.apache.logging.log4j
log4j-core
diff --git a/components-starter/camel-iota-starter/pom.xml
b/components-starter/camel-iota-starter/pom.xml
index a8484cc..0f60048 100644
--- a/components-starter/camel-iota-starter/pom.xml
+++ b/components-starter/camel-iota-starter/pom.xml
@@ -38,6 +38,18 @@
org.apache.camel
camel-iota
${camel-version}
+
+
+
+ ch.qos.logback
+ logback-classic
+
+
+ ch.qos.logback
+ logback-core
+
+
+
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index bb7089f..ed15d8e 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -4356,229 +4356,229 @@
org.optaplanner
optaplanner-benchmark
-7.46.0.Final
+7.47.0.Final
org.optaplanner
optaplanner-benchmark
-7.46.0.Final
+7.47.0.Final
javadoc
org.optaplanner
optaplanner-core
-7.46.0.Final
+7.47.0.Final
org.optaplanner
optaplanner-core
-7.46.0.Final
+7.47.0.Final
javadoc
org.optaplanner
optaplanner-distribution
-7.46.0.Final
+7.47.0.Final
zip
org.optaplanner
optaplanner-docs
-7.46.0.Final
+7.47.0.Final
zip
org.optaplanner
optaplanner-examples
-7.46.0.Final
+7.47.0.Final
org.optaplanner
optaplanner-persistence-common
-7.46.0.Final
+7.47.0.Final
org.optaplanner
optaplanner-persistence-common
-7.46.0.Final
+7.47.0.Final
javadoc
org.optaplanner
optaplanner-persistence-jackson
-7.46.0.Final
+7.47.0.Final
org.optaplanner
optaplanner-persistence-jackson
-7.46.0.Final
+7.47.0.Final
javadoc
org.optaplanner
optaplanner-persistence-jaxb
-7.46.0.Final
+7.47.0.Final
org.optaplanner
optaplanner-persistence-jaxb
-7.46.0.Final
+7.47.0.Final
javadoc
org.optaplanner
optaplanner-persistence-jpa
-7.46.0.Final
+7.47.0.Final
org.optaplanner
optaplanner-persistence-jpa
-7.46.0.Final
+7.47.0.Final
javadoc
org.optaplanner
optaplanner-persistence-jsonb
-7.46.0.Final
+7.47.0.Final
org.optaplanner
optaplanner-persistence-jsonb
-7.46.0.Final
+7.47.0.Final
javadoc
org.optaplanner
optaplanner-persistence-xstream
-7.46.0.Final
+7.47.0.Final
org.optaplanner
optaplanner-persistence-xstream
-7.46.0.Final
+7.47.0.Final
javadoc
org.optaplanner
optaplanner-quarkus
-7.46.0.Final
+7.47.0.Final
org.optaplanner
optaplanner-quarkus-deployment
-7.46.0.Final
+7.47.0.Final
org.optaplanner
optaplanner-quarkus-jackson
-7.46.0.Final
+7.47.0.Final
org.optaplanner
optaplanner-quarkus-jackson-deployment
-7.46.0.Final
+7.47.0.Final
org.optaplanner
[camel] 04/05: Upgrade Optaplanner to version 7.47.0.Final
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 9ab25df99e3b344a866b59f53093a2971d2e108b Author: Andrea Cosentino AuthorDate: Tue Dec 15 08:35:46 2020 +0100 Upgrade Optaplanner to version 7.47.0.Final --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 4c42640..6034904 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -442,7 +442,7 @@ 0.31.0 0.1.8 -7.46.0.Final +7.47.0.Final 1.6.2 6.0.0 1.2.5
[camel] 05/05: Sync deps
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 4a597665a023eb1972cfe7f3bfdb45582cec2ae1 Author: Andrea Cosentino AuthorDate: Tue Dec 15 08:39:27 2020 +0100 Sync deps --- camel-dependencies/pom.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 03f3823..66919ff 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -178,7 +178,7 @@ 3.3.1 3.2.6 6.5.0 -7.46.0.Final +7.47.0.Final 3.1.5 2.1.5 3.9.0 @@ -314,7 +314,7 @@ 1.4.10.Final 7.5.1.Final 3.3.8.Final -7.46.0.Final +7.47.0.Final 1.1.0_1 18.0 [18.0,19.0) @@ -370,7 +370,7 @@ 2.5.3 1.1.3 2.6.0 -7.46.0.Final +7.47.0.Final 4.13.0 4.13.0 1.12.0 @@ -454,7 +454,7 @@ 0.31.0 1.7.3 1.2.7 -7.46.0.Final +7.47.0.Final 1.6.2 6.0.0 1.2.5
[camel] 03/05: Upgrade Drools to version 7.47.0.Final
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 8e9ea51984b748541ee4b4612681c500cd852b07 Author: Andrea Cosentino AuthorDate: Tue Dec 15 08:35:23 2020 +0100 Upgrade Drools to version 7.47.0.Final --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 0752ea8..4c42640 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -157,7 +157,7 @@ 2.3.0 3.2.6 6.5.0 -7.46.0.Final +7.47.0.Final 3.1.5 1.3.1.Final 8.0.22
[camel] 02/05: Upgrade Kie to version 7.47.0.Final
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 875f4d575b607c2d6819f6a485c8b0495847eb73 Author: Andrea Cosentino AuthorDate: Tue Dec 15 08:35:04 2020 +0100 Upgrade Kie to version 7.47.0.Final --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 3aa6def..0752ea8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -353,7 +353,7 @@ 2.5.3 1.1.3 2.6.0 -7.46.0.Final +7.47.0.Final 4.13.0 4.13.0 1.12.0
[camel] 01/05: Upgrade JBPM to version 7.47.0.Final
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit e3402a1b9adf62609f2407bff14721e2106f7500 Author: Andrea Cosentino AuthorDate: Tue Dec 15 08:34:48 2020 +0100 Upgrade JBPM to version 7.47.0.Final --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 368b33c..3aa6def 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -292,7 +292,7 @@ 1.0.4 2.3.3 2.5.0 -7.46.0.Final +7.47.0.Final 2.0.0.Final 3.4.0.Final 1.4.10.Final
[camel] branch master updated (c72a76f -> 4a59766)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from c72a76f Sync deps new e3402a1 Upgrade JBPM to version 7.47.0.Final new 875f4d5 Upgrade Kie to version 7.47.0.Final new 8e9ea51 Upgrade Drools to version 7.47.0.Final new 9ab25df Upgrade Optaplanner to version 7.47.0.Final new 4a59766 Sync deps The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: camel-dependencies/pom.xml | 8 parent/pom.xml | 8 2 files changed, 8 insertions(+), 8 deletions(-)
[camel] 01/02: Upgrade AWS SDK v2 to version 2.15.46
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 33ca1694be70c994a56d6581d50fc5ce3fae5f51 Author: Andrea Cosentino AuthorDate: Tue Dec 15 07:56:15 2020 +0100 Upgrade AWS SDK v2 to version 2.15.46 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 68409ea..368b33c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -78,7 +78,7 @@ 1.10.0 4.0.3 1.11.714 -2.15.45 +2.15.46 1.11.22 2.6.1 1.2.14
[camel] 02/02: Sync deps
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit c72a76f4fc66ac88eccea60b847ee5ec4f9a9fed Author: Andrea Cosentino AuthorDate: Tue Dec 15 08:02:30 2020 +0100 Sync deps --- camel-dependencies/pom.xml | 2 +- .../apache/camel/catalog/schemas/camel-spring.xsd | 71 +- 2 files changed, 2 insertions(+), 71 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index cb40b70..03f3823 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -71,7 +71,7 @@ 4.0.3 1.11.22 1.11.714 -2.15.45 +2.15.46 2.6.1 1.2.14 1.2.0 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 2a6a255..feb800e 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 @@ -4374,6 +4374,7 @@ To use a specific charset when converting. + @@ -6441,16 +6442,6 @@ true (which is the default). - - - - - @@ -6734,16 +6725,6 @@ enabled when desired to be used. Default value: false ]]> - - - - - @@ -6903,16 +6884,6 @@ JAXB provider properties to be used with the JAXB marshaller. ]]> - - - - - @@ -7092,16 +7063,6 @@ Default value: false ]]> - - - - - @@ -7216,16 +7177,6 @@ value is native. Default value: native ]]> - - - - - @@ -7497,16 +7448,6 @@ representation. The default value is binary. Default value: binary ]]> - - - - - @@ -7818,16 +7759,6 @@ SINGLE_NODE_XPATH_RELATIVE_REFERENCES SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES. ]]> - - - - -
[camel] branch master updated (077cf4a -> c72a76f)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 077cf4a Fix upsert timeouts issues when using the couchbase test-infra (#4764) new 33ca169 Upgrade AWS SDK v2 to version 2.15.46 new c72a76f Sync deps 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: camel-dependencies/pom.xml | 2 +- .../apache/camel/catalog/schemas/camel-spring.xsd | 71 +- parent/pom.xml | 2 +- 3 files changed, 3 insertions(+), 72 deletions(-)
[camel-k-runtime] branch master updated: build(deps): bump gmavenplus-plugin from 1.11.1 to 1.12.0
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git The following commit(s) were added to refs/heads/master by this push: new c96d700 build(deps): bump gmavenplus-plugin from 1.11.1 to 1.12.0 c96d700 is described below commit c96d700c3d99f4c7445eea3f0f84c3d8f9da85bf Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Mon Dec 14 20:03:30 2020 + build(deps): bump gmavenplus-plugin from 1.11.1 to 1.12.0 Bumps [gmavenplus-plugin](https://github.com/groovy/GMavenPlus) from 1.11.1 to 1.12.0. - [Release notes](https://github.com/groovy/GMavenPlus/releases) - [Commits](https://github.com/groovy/GMavenPlus/compare/1.11.1...1.12.0) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3aa434e..ccea225 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 2.2.14 -1.11.1 +1.12.0 3.8.1 3.0.0-M5 1.7.0
[GitHub] [camel-k-runtime] lburgazzoli merged pull request #572: build(deps): bump gmavenplus-plugin from 1.11.1 to 1.12.0
lburgazzoli merged pull request #572: URL: https://github.com/apache/camel-k-runtime/pull/572 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k-runtime] lburgazzoli opened a new pull request #573: Update to camel 3.7.0 and camel-quarkus 1.5.0
lburgazzoli opened a new pull request #573: URL: https://github.com/apache/camel-k-runtime/pull/573 **Release Note** ```release-note NONE ``` 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k-runtime] lburgazzoli closed pull request #563: camel-kamelet: improve global properties handling #560
lburgazzoli closed pull request #563: URL: https://github.com/apache/camel-k-runtime/pull/563 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (afc6fed -> 077cf4a)
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 afc6fed CAMEL-15946: Regen add 077cf4a Fix upsert timeouts issues when using the couchbase test-infra (#4764) No new revisions were added by this update. Summary of changes: .../services/CouchbaseLocalContainerService.java | 22 +- 1 file changed, 21 insertions(+), 1 deletion(-)
[camel-spring-boot-examples] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git The following commit(s) were added to refs/heads/master by this push: new 76ca306 Polished 76ca306 is described below commit 76ca306b6152cef5c6f03df0e7a322be2fa8146e Author: Claus Ibsen AuthorDate: Tue Dec 15 06:50:26 2020 +0100 Polished --- camel-example-spring-boot-widget-gadget/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-example-spring-boot-widget-gadget/pom.xml b/camel-example-spring-boot-widget-gadget/pom.xml index fe8f273..4f3bd5f 100644 --- a/camel-example-spring-boot-widget-gadget/pom.xml +++ b/camel-example-spring-boot-widget-gadget/pom.xml @@ -28,7 +28,7 @@ 4.0.0 camel-example-spring-boot-widget-gadget -Camel SB Examples :: +Camel SB Examples :: Widget Gadget The widget and gadget example from EIP book, running on Spring Boot
[camel-spring-boot-examples] branch master updated: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot-examples.git
The following commit(s) were added to refs/heads/master by this push:
new 1d9c9df Polished
1d9c9df is described below
commit 1d9c9dfe0a7d91c61384e3dfb196ebd98ac5d48d
Author: Claus Ibsen
AuthorDate: Tue Dec 15 06:40:50 2020 +0100
Polished
---
pom.xml | 14 +-
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/pom.xml b/pom.xml
index a9c6caa..802a613 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,18 +85,12 @@
-
-
-
${project.artifactId}
3.7.0-SNAPSHOT
false
4.0.1
-
4.4.1
5.2.2
3.2.16.RELEASE
- 1.14.3
- 9.0.31
@@ -129,7 +123,7 @@
javax.servlet
@@ -140,12 +134,6 @@
-
-
-
-
-
-
org.apache.maven.plugins
[camel-spring-boot] branch master updated: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 2fe6b65 Regen
2fe6b65 is described below
commit 2fe6b65b46bf4f6efeac17b5780d42e0c63764fc
Author: Claus Ibsen
AuthorDate: Tue Dec 15 06:47:18 2020 +0100
Regen
---
.../apache/camel/springboot/catalog/components/dataset.json | 2 +-
.../apache/camel/springboot/catalog/components/jclouds.json | 2 +-
.../org/apache/camel/springboot/catalog/components/sip.json | 2 +-
.../org/apache/camel/springboot/catalog/components/sips.json | 2 +-
components-starter/README.adoc | 4 ++--
components-starter/camel-corda-starter/pom.xml | 8
.../dataset/springboot/DataSetComponentConfiguration.java| 2 +-
components-starter/camel-iota-starter/pom.xml| 12
.../jclouds/springboot/JcloudsComponentConfiguration.java| 2 +-
docs/modules/ROOT/pages/list.adoc| 4 ++--
tooling/camel-spring-boot-dependencies/pom.xml | 2 +-
11 files changed, 11 insertions(+), 31 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset.json
index d339d9a2..c74d054 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "dataset",
"title": "Dataset",
-"description": "Provide data for load & soak testing of your Camel
application.",
+"description": "Provide data for load and soak testing of your Camel
application.",
"deprecated": false,
"firstVersion": "1.3.0",
"label": "core,testing",
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jclouds.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jclouds.json
index 6dce320..7f05be5 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jclouds.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jclouds.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "jclouds",
"title": "JClouds",
-"description": "Interact with jclouds compute & blobstore service.",
+"description": "Interact with jclouds compute and blobstore service.",
"deprecated": false,
"firstVersion": "2.9.0",
"label": "api,cloud,compute",
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sip.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sip.json
index f2a3573..06a3ba5 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sip.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sip.json
@@ -46,7 +46,7 @@
"transport": { "kind": "parameter", "displayName": "Transport", "group":
"common", "label": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "tcp", "udp" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "tcp", "configurationClass":
"org.apache.camel.component.sip.SipConfiguration", "configurationField":
"configuration", "description": "Setting for choice of transport protocol.
Valid choices are tcp or udp." },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a m [...]
"consumer": { "kind": "parameter", "displayName": "Consumer", "group":
"consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.sip.SipConfiguration", "configurationField":
"configuration", "description": "This
[camel-spring-boot] branch camel-spring-boot-3.7.x updated (15356d9 -> 4ff194b)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-spring-boot-3.7.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. from 15356d9 [create-pull-request] automated change new 7fe8c96 Upgrade Spring Boot to version 2.4.1 new 4ff194b Upgrade Spring Boot version in archetype too to version 2.4.1 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: archetypes/camel-archetype-spring-boot/pom.xml | 2 +- pom.xml| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel-spring-boot] 01/02: Upgrade Spring Boot to version 2.4.1
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-spring-boot-3.7.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 7fe8c9b680be1af0c0704e4623fe263e4ee1 Author: Andrea Cosentino AuthorDate: Mon Dec 14 14:12:10 2020 +0100 Upgrade Spring Boot to version 2.4.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 41c856b..939346c 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ false -2.4.0 +2.4.1 3.7.0-SNAPSHOT
[camel-spring-boot] 02/02: Upgrade Spring Boot version in archetype too to version 2.4.1
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-spring-boot-3.7.x in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 4ff194bffb8cc34bf0ec62d2bf1946366d1b0caf Author: Andrea Cosentino AuthorDate: Mon Dec 14 14:12:43 2020 +0100 Upgrade Spring Boot version in archetype too to version 2.4.1 --- archetypes/camel-archetype-spring-boot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archetypes/camel-archetype-spring-boot/pom.xml b/archetypes/camel-archetype-spring-boot/pom.xml index ce261c8..607c97f 100644 --- a/archetypes/camel-archetype-spring-boot/pom.xml +++ b/archetypes/camel-archetype-spring-boot/pom.xml @@ -34,7 +34,7 @@ maven-archetype - 2.4.0 + 2.4.1 src/test/resources/settings.xml
[camel] branch camel-3.7.x updated (cff2358 -> bb04650)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-3.7.x in repository https://gitbox.apache.org/repos/asf/camel.git. from cff2358 Fix upsert timeouts issues when using the couchbase test-infra (#4764) new f4fa672 Upgrade Spring to version 5.3.2 new bb04650 Sync deps 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: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel] 02/02: Sync deps
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bb046501af1e90a120b7a7228a8043807c6e8f97
Author: Andrea Cosentino
AuthorDate: Mon Dec 14 14:07:19 2020 +0100
Sync deps
---
camel-dependencies/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index bfba9fd..a179781 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -527,7 +527,7 @@
${spring5-version}
[5,6)
3.0.10.RELEASE
-5.3.1
+5.3.2
1.5
3.14.7
1.17.2
[camel] 01/02: Upgrade Spring to version 5.3.2
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f4fa67282460664041ca5b048353c91f1c3dfb29
Author: Andrea Cosentino
AuthorDate: Mon Dec 14 14:06:42 2020 +0100
Upgrade Spring to version 5.3.2
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 32badda..d64eafd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -512,7 +512,7 @@
2.3.3.RELEASE
[5,6)
${spring5-version}
-5.3.1
+5.3.2
5.4.2
3.0.10.RELEASE
1.5
[camel] branch camel-3.7.x updated: Fix upsert timeouts issues when using the couchbase test-infra (#4764)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.7.x by this push:
new cff2358 Fix upsert timeouts issues when using the couchbase
test-infra (#4764)
cff2358 is described below
commit cff23584b5acc3d7e8e2becead80ece108bbc5b0
Author: Otavio Rodolfo Piske
AuthorDate: Tue Dec 15 06:25:10 2020 +0100
Fix upsert timeouts issues when using the couchbase test-infra (#4764)
Ensure other couchbase services use fixed ports otherwise some tests may
throw timeout issues when querying or searching for data
---
.../services/CouchbaseLocalContainerService.java | 22 +-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git
a/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerService.java
b/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerService.java
index 7e799db..dd64ee5 100644
---
a/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerService.java
+++
b/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerService.java
@@ -17,13 +17,14 @@
package org.apache.camel.test.infra.couchbase.services;
+import org.apache.camel.test.infra.common.services.ContainerService;
import org.apache.camel.test.infra.couchbase.common.CouchbaseProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.couchbase.BucketDefinition;
import org.testcontainers.couchbase.CouchbaseContainer;
-public class CouchbaseLocalContainerService implements CouchbaseService {
+public class CouchbaseLocalContainerService implements CouchbaseService,
ContainerService {
/*
* Couchbase container uses a dynamic port for the KV service. The
configuration
@@ -33,8 +34,22 @@ public class CouchbaseLocalContainerService implements
CouchbaseService {
*/
private class CustomCouchbaseContainer extends CouchbaseContainer {
public CustomCouchbaseContainer() {
+super("couchbase/server:6.5.1");
+
final int kvPort = 11210;
addFixedExposedPort(kvPort, kvPort);
+
+final int managementPort = 8091;
+addFixedExposedPort(managementPort, managementPort);
+
+final int viewPort = 8092;
+addFixedExposedPort(viewPort, viewPort);
+
+final int queryPort = 8093;
+addFixedExposedPort(queryPort, queryPort);
+
+final int searchPort = 8094;
+addFixedExposedPort(searchPort, searchPort);
}
}
@@ -97,4 +112,9 @@ public class CouchbaseLocalContainerService implements
CouchbaseService {
public void shutdown() {
container.stop();
}
+
+@Override
+public CouchbaseContainer getContainer() {
+return container;
+}
}
[camel] branch master updated: Fix upsert timeouts issues when using the couchbase test-infra (#4764)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 077cf4a Fix upsert timeouts issues when using the couchbase
test-infra (#4764)
077cf4a is described below
commit 077cf4a93cc92a614c455a423bdf17cdc5e739c4
Author: Otavio Rodolfo Piske
AuthorDate: Tue Dec 15 06:25:10 2020 +0100
Fix upsert timeouts issues when using the couchbase test-infra (#4764)
Ensure other couchbase services use fixed ports otherwise some tests may
throw timeout issues when querying or searching for data
---
.../services/CouchbaseLocalContainerService.java | 22 +-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git
a/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerService.java
b/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerService.java
index 7e799db..dd64ee5 100644
---
a/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerService.java
+++
b/test-infra/camel-test-infra-couchbase/src/test/java/org/apache/camel/test/infra/couchbase/services/CouchbaseLocalContainerService.java
@@ -17,13 +17,14 @@
package org.apache.camel.test.infra.couchbase.services;
+import org.apache.camel.test.infra.common.services.ContainerService;
import org.apache.camel.test.infra.couchbase.common.CouchbaseProperties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.couchbase.BucketDefinition;
import org.testcontainers.couchbase.CouchbaseContainer;
-public class CouchbaseLocalContainerService implements CouchbaseService {
+public class CouchbaseLocalContainerService implements CouchbaseService,
ContainerService {
/*
* Couchbase container uses a dynamic port for the KV service. The
configuration
@@ -33,8 +34,22 @@ public class CouchbaseLocalContainerService implements
CouchbaseService {
*/
private class CustomCouchbaseContainer extends CouchbaseContainer {
public CustomCouchbaseContainer() {
+super("couchbase/server:6.5.1");
+
final int kvPort = 11210;
addFixedExposedPort(kvPort, kvPort);
+
+final int managementPort = 8091;
+addFixedExposedPort(managementPort, managementPort);
+
+final int viewPort = 8092;
+addFixedExposedPort(viewPort, viewPort);
+
+final int queryPort = 8093;
+addFixedExposedPort(queryPort, queryPort);
+
+final int searchPort = 8094;
+addFixedExposedPort(searchPort, searchPort);
}
}
@@ -97,4 +112,9 @@ public class CouchbaseLocalContainerService implements
CouchbaseService {
public void shutdown() {
container.stop();
}
+
+@Override
+public CouchbaseContainer getContainer() {
+return container;
+}
}
[GitHub] [camel] davsclaus merged pull request #4764: Fix upsert timeouts issues when using the couchbase test-infra
davsclaus merged pull request #4764: URL: https://github.com/apache/camel/pull/4764 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-k] tadayosi opened a new pull request #1863: chore(doc): quote inline code blocks in environment trait comment
tadayosi opened a new pull request #1863: URL: https://github.com/apache/camel-k/pull/1863 Tiny doc improvement. **Release Note** ```release-note NONE ``` 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel-quarkus] github-actions[bot] commented on issue #2065: [CI] - Quarkus Master Branch Build Failure
github-actions[bot] commented on issue #2065: URL: https://github.com/apache/camel-quarkus/issues/2065#issuecomment-745012076 The [quarkus-master](https://github.com/apache/camel-quarkus/tree/quarkus-master) branch build is still failing: * Build ID: 44394-236-7a9bf009-30c5-4126-90c8-a87368675726 * Camel Quarkus Commit: a900ba2ddda21a7c2681bd4924c726dabaf31e3e * Quarkus Master Commit: Unknown * Link to build: https://github.com/apache/camel-quarkus/actions/runs/44394 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-quarkus] annotated tag 1.5.0 created (now 25bf536)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to annotated tag 1.5.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. at 25bf536 (tag) tagging c4d0d058dc8ab4447ea525a7b464a0734d371521 (commit) replaces 1.0.0-CR3 by Peter Palaga on Mon Dec 14 21:37:37 2020 +0100 - Log - [maven-release-plugin] copy for tag 1.5.0 --- No new revisions were added by this update.
[camel-quarkus] branch release/1.5.0 created (now c4d0d05)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch release/1.5.0 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. at c4d0d05 [maven-release-plugin] prepare release 1.5.0 This branch includes the following new commits: new c4d0d05 [maven-release-plugin] prepare release 1.5.0 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[camel-k-runtime] branch dependabot/maven/org.codehaus.gmavenplus-gmavenplus-plugin-1.12.0 created (now 7ed84cd)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.gmavenplus-gmavenplus-plugin-1.12.0 in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. at 7ed84cd build(deps): bump gmavenplus-plugin from 1.11.1 to 1.12.0 No new revisions were added by this update.
[GitHub] [camel-k-runtime] dependabot[bot] opened a new pull request #572: build(deps): bump gmavenplus-plugin from 1.11.1 to 1.12.0
dependabot[bot] opened a new pull request #572: URL: https://github.com/apache/camel-k-runtime/pull/572 Bumps [gmavenplus-plugin](https://github.com/groovy/GMavenPlus) from 1.11.1 to 1.12.0. Release notes Sourced from https://github.com/groovy/GMavenPlus/releases;>gmavenplus-plugin's releases. 1.12.0 Bugs https://github-redirect.dependabot.com/groovy/GMavenPlus/issues/183;>#183 The classloader project dependencies are loaded onto is reused between modules, so each module was a superset of all modules that preceded it. Also, the console, execute, and shell mojos didn't pass the classloader to use into the instantiated GroovyConsole/GroovyShell, so it accidentally was using the plugin classloader, even when configured to use PROJECT_ONLY classpath. Enhancements None Potentially breaking changes This should be a non-breaking change (except for unusual situations that were relying on the previous incorrect behavior). However, since it's a significant change, I'm bumping the version by more than just the patch version. Notes None Commits https://github.com/groovy/GMavenPlus/commit/e86b0e56ce6c3e44cf2e2f382bafda968f3ca593;>e86b0e5 [maven-release-plugin] prepare release 1.12.0 https://github.com/groovy/GMavenPlus/commit/3e7363b497c6ffed21721c52e731c300dd287e6b;>3e7363b Move Version to internal package https://github.com/groovy/GMavenPlus/commit/bf6f5b7e507b9542c30c35b0b1717c04e67b53ce;>bf6f5b7 Move Link to model package https://github.com/groovy/GMavenPlus/commit/6e82fd31ed6af736c7e3f40323f67e47973c403e;>6e82fd3 Merge pull request https://github-redirect.dependabot.com/groovy/GMavenPlus/issues/185;>#185 from groovy/183/submodule_classpath_issues https://github.com/groovy/GMavenPlus/commit/fb220e2cf06f393537eaa432428e1f934fcc;>fb220e2 Fix multi-module classpath issues (closes https://github-redirect.dependabot.com/groovy/GMavenPlus/issues/183;>#183) https://github.com/groovy/GMavenPlus/commit/69c9dc37232e380d678a691322e59c96bfcc34bb;>69c9dc3 Merge pull request https://github-redirect.dependabot.com/groovy/GMavenPlus/issues/184;>#184 from groovy/check_log_level_before_string_concat https://github.com/groovy/GMavenPlus/commit/577958d5ef22ca546c8fc9cbce1e6e676d67b2b0;>577958d Check if log level is used before doing string concatenation https://github.com/groovy/GMavenPlus/commit/0e645dec025f3ccc82e6db551c54594169fcf9d7;>0e645de Update test version to 3.0.7 https://github.com/groovy/GMavenPlus/commit/98e295576c652d832fd5e90d3a23d1ce2105fb52;>98e2955 Add 2.4.21, 2.5.14, 3.0.7, and 4.0.0-alpha-2 to test versions https://github.com/groovy/GMavenPlus/commit/df5d34e09d43698968b09f400e97c6e13171f15a;>df5d34e Merge pull request https://github-redirect.dependabot.com/groovy/GMavenPlus/issues/182;>#182 from TobiX/patch-1 Additional commits viewable in https://github.com/groovy/GMavenPlus/compare/1.11.1...1.12.0;>compare view [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (de8fc8a -> afc6fed)
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 de8fc8a Regen for commit b3c62273fa540ab1001827155124dc8035492214 add 3633ff1 CAMEL-15946: Fix endpoint and component dsl to output source with valid javadoc that needs to be XML escaped. add afc6fed CAMEL-15946: Regen No new revisions were added by this update. Summary of changes: .../dsl/AtomixMapComponentBuilderFactory.java | 11 +-- .../AtomixMessagingComponentBuilderFactory.java| 11 +-- .../dsl/AtomixMultimapComponentBuilderFactory.java | 11 +-- .../dsl/AtomixQueueComponentBuilderFactory.java| 11 +-- .../dsl/AtomixSetComponentBuilderFactory.java | 11 +-- .../dsl/AtomixValueComponentBuilderFactory.java| 11 +-- .../dsl/Aws2SesComponentBuilderFactory.java| 6 -- .../dsl/AwsSesComponentBuilderFactory.java | 6 -- .../dsl/AwsSwfComponentBuilderFactory.java | 12 ++-- .../dsl/AzureBlobComponentBuilderFactory.java | 4 ++-- .../dsl/AzureEventhubsComponentBuilderFactory.java | 4 ++-- .../component/dsl/BoxComponentBuilderFactory.java | 4 ++-- .../dsl/CometdComponentBuilderFactory.java | 2 +- .../dsl/CometdsComponentBuilderFactory.java| 2 +- .../dsl/ConsulComponentBuilderFactory.java | 3 ++- .../dsl/CordaComponentBuilderFactory.java | 5 ++--- .../DebeziumMongodbComponentBuilderFactory.java| 6 +++--- .../dsl/DebeziumMysqlComponentBuilderFactory.java | 6 +++--- .../DebeziumPostgresComponentBuilderFactory.java | 6 +++--- .../DebeziumSqlserverComponentBuilderFactory.java | 6 +++--- .../dsl/DockerComponentBuilderFactory.java | 4 ++-- .../dsl/EhcacheComponentBuilderFactory.java| 4 ++-- ...oogleCalendarStreamComponentBuilderFactory.java | 3 ++- .../dsl/GoogleDriveComponentBuilderFactory.java| 3 ++- .../GoogleSheetsStreamComponentBuilderFactory.java | 3 ++- .../dsl/GuavaEventbusComponentBuilderFactory.java | 3 ++- .../dsl/InfinispanComponentBuilderFactory.java | 4 ++-- .../dsl/JcloudsComponentBuilderFactory.java| 6 -- .../dsl/JettyComponentBuilderFactory.java | 16 .../component/dsl/JsltComponentBuilderFactory.java | 2 +- .../dsl/KafkaComponentBuilderFactory.java | 10 +- .../dsl/MiloServerComponentBuilderFactory.java | 2 +- .../component/dsl/MinaComponentBuilderFactory.java | 2 +- .../dsl/NettyComponentBuilderFactory.java | 10 ++ .../dsl/NettyHttpComponentBuilderFactory.java | 10 ++ .../dsl/Olingo2ComponentBuilderFactory.java| 4 ++-- .../dsl/Olingo4ComponentBuilderFactory.java| 4 ++-- .../dsl/RabbitmqComponentBuilderFactory.java | 16 .../dsl/SalesforceComponentBuilderFactory.java | 22 -- .../component/dsl/SedaComponentBuilderFactory.java | 2 +- .../dsl/ServicenowComponentBuilderFactory.java | 12 ++-- .../component/dsl/SmppComponentBuilderFactory.java | 4 ++-- .../dsl/SmppsComponentBuilderFactory.java | 4 ++-- .../component/dsl/StubComponentBuilderFactory.java | 2 +- .../dsl/VertxKafkaComponentBuilderFactory.java | 20 ++-- .../component/dsl/VmComponentBuilderFactory.java | 2 +- .../dsl/Web3jComponentBuilderFactory.java | 6 -- .../dsl/WordpressComponentBuilderFactory.java | 4 ++-- .../component/dsl/XjComponentBuilderFactory.java | 4 ++-- .../XmlsecuritySignComponentBuilderFactory.java| 9 + .../XmlsecurityVerifyComponentBuilderFactory.java | 4 ++-- .../dsl/XqueryComponentBuilderFactory.java | 4 ++-- .../dsl/XsltSaxonComponentBuilderFactory.java | 4 ++-- .../ComponentDslBuilderFactoryGenerator.java | 5 - .../ComponentDslInnerBuilderGenerator.java | 11 +++ .../ComponentsBuilderFactoryGenerator.java | 6 +- 56 files changed, 196 insertions(+), 173 deletions(-)
[camel] branch regen_bot updated (dcac2f0 -> de8fc8a)
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 dcac2f0 Regen for commit b3c62273fa540ab1001827155124dc8035492214 add de8fc8a Regen for commit b3c62273fa540ab1001827155124dc8035492214 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 (dcac2f0) \ N -- N -- N refs/heads/regen_bot (de8fc8a) 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 master updated (de8fc8a -> afc6fed)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from de8fc8a Regen for commit b3c62273fa540ab1001827155124dc8035492214 new 3633ff1 CAMEL-15946: Fix endpoint and component dsl to output source with valid javadoc that needs to be XML escaped. new afc6fed CAMEL-15946: 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: .../dsl/AtomixMapComponentBuilderFactory.java | 11 +-- .../AtomixMessagingComponentBuilderFactory.java| 11 +-- .../dsl/AtomixMultimapComponentBuilderFactory.java | 11 +-- .../dsl/AtomixQueueComponentBuilderFactory.java| 11 +-- .../dsl/AtomixSetComponentBuilderFactory.java | 11 +-- .../dsl/AtomixValueComponentBuilderFactory.java| 11 +-- .../dsl/Aws2SesComponentBuilderFactory.java| 6 -- .../dsl/AwsSesComponentBuilderFactory.java | 6 -- .../dsl/AwsSwfComponentBuilderFactory.java | 12 ++-- .../dsl/AzureBlobComponentBuilderFactory.java | 4 ++-- .../dsl/AzureEventhubsComponentBuilderFactory.java | 4 ++-- .../component/dsl/BoxComponentBuilderFactory.java | 4 ++-- .../dsl/CometdComponentBuilderFactory.java | 2 +- .../dsl/CometdsComponentBuilderFactory.java| 2 +- .../dsl/ConsulComponentBuilderFactory.java | 3 ++- .../dsl/CordaComponentBuilderFactory.java | 5 ++--- .../DebeziumMongodbComponentBuilderFactory.java| 6 +++--- .../dsl/DebeziumMysqlComponentBuilderFactory.java | 6 +++--- .../DebeziumPostgresComponentBuilderFactory.java | 6 +++--- .../DebeziumSqlserverComponentBuilderFactory.java | 6 +++--- .../dsl/DockerComponentBuilderFactory.java | 4 ++-- .../dsl/EhcacheComponentBuilderFactory.java| 4 ++-- ...oogleCalendarStreamComponentBuilderFactory.java | 3 ++- .../dsl/GoogleDriveComponentBuilderFactory.java| 3 ++- .../GoogleSheetsStreamComponentBuilderFactory.java | 3 ++- .../dsl/GuavaEventbusComponentBuilderFactory.java | 3 ++- .../dsl/InfinispanComponentBuilderFactory.java | 4 ++-- .../dsl/JcloudsComponentBuilderFactory.java| 6 -- .../dsl/JettyComponentBuilderFactory.java | 16 .../component/dsl/JsltComponentBuilderFactory.java | 2 +- .../dsl/KafkaComponentBuilderFactory.java | 10 +- .../dsl/MiloServerComponentBuilderFactory.java | 2 +- .../component/dsl/MinaComponentBuilderFactory.java | 2 +- .../dsl/NettyComponentBuilderFactory.java | 10 ++ .../dsl/NettyHttpComponentBuilderFactory.java | 10 ++ .../dsl/Olingo2ComponentBuilderFactory.java| 4 ++-- .../dsl/Olingo4ComponentBuilderFactory.java| 4 ++-- .../dsl/RabbitmqComponentBuilderFactory.java | 16 .../dsl/SalesforceComponentBuilderFactory.java | 22 -- .../component/dsl/SedaComponentBuilderFactory.java | 2 +- .../dsl/ServicenowComponentBuilderFactory.java | 12 ++-- .../component/dsl/SmppComponentBuilderFactory.java | 4 ++-- .../dsl/SmppsComponentBuilderFactory.java | 4 ++-- .../component/dsl/StubComponentBuilderFactory.java | 2 +- .../dsl/VertxKafkaComponentBuilderFactory.java | 20 ++-- .../component/dsl/VmComponentBuilderFactory.java | 2 +- .../dsl/Web3jComponentBuilderFactory.java | 6 -- .../dsl/WordpressComponentBuilderFactory.java | 4 ++-- .../component/dsl/XjComponentBuilderFactory.java | 4 ++-- .../XmlsecuritySignComponentBuilderFactory.java| 9 + .../XmlsecurityVerifyComponentBuilderFactory.java | 4 ++-- .../dsl/XqueryComponentBuilderFactory.java | 4 ++-- .../dsl/XsltSaxonComponentBuilderFactory.java | 4 ++-- .../ComponentDslBuilderFactoryGenerator.java | 5 - .../ComponentDslInnerBuilderGenerator.java | 11 +++ .../ComponentsBuilderFactoryGenerator.java | 6 +- 56 files changed, 196 insertions(+), 173 deletions(-)
[camel] 01/02: CAMEL-15946: Fix endpoint and component dsl to output source with valid javadoc that needs to be XML escaped.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3633ff1bb8390622dc582fdfa475a7aa334a8270
Author: Claus Ibsen
AuthorDate: Mon Dec 14 19:04:13 2020 +0100
CAMEL-15946: Fix endpoint and component dsl to output source with valid
javadoc that needs to be XML escaped.
---
.../dsl/component/ComponentDslBuilderFactoryGenerator.java| 5 -
.../dsl/component/ComponentDslInnerBuilderGenerator.java | 11 +++
.../dsl/component/ComponentsBuilderFactoryGenerator.java | 6 +-
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
index 6640ba1..05d22d3 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
@@ -138,6 +138,9 @@ public final class ComponentDslBuilderFactoryGenerator {
method.addAnnotation(Deprecated.class);
}
-
method.getJavaDoc().setFullText(DslHelper.getMainDescriptionWithoutPathOptions(componentModel));
+String doc =
DslHelper.getMainDescriptionWithoutPathOptions(componentModel);
+// must xml encode description as in some rare cases it contains &
chars which is invalid javadoc
+doc = JavadocHelper.xmlEncode(doc);
+method.getJavaDoc().setText(doc);
}
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGenerator.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGenerator.java
index 5271019..dbb3db1 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGenerator.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGenerator.java
@@ -18,6 +18,7 @@ package org.apache.camel.maven.packaging.dsl.component;
import org.apache.camel.maven.packaging.dsl.DslHelper;
import org.apache.camel.tooling.model.ComponentModel;
+import org.apache.camel.tooling.util.JavadocHelper;
import org.apache.camel.tooling.util.srcgen.JavaClass;
import org.apache.camel.tooling.util.srcgen.Method;
import org.apache.commons.lang3.StringUtils;
@@ -81,24 +82,26 @@ public final class ComponentDslInnerBuilderGenerator {
if (componentOptionModel.isDeprecated()) {
method.addAnnotation(Deprecated.class);
}
-
method.getJavaDoc().setFullText(generateOptionDescription(componentOptionModel));
+
method.getJavaDoc().setText(generateOptionDescription(componentOptionModel));
});
}
private String generateOptionDescription(final
ComponentModel.ComponentOptionModel componentOptionModel) {
-String desc = componentOptionModel.getDescription();
+String desc =
JavadocHelper.xmlEncode(componentOptionModel.getDescription());
if (!desc.endsWith(".")) {
desc += ".";
}
desc += "\n";
-desc += "\nThe option is a: " +
componentOptionModel.getJavaType() + " type.";
+desc += "\nThe option is a: " +
JavadocHelper.xmlEncode(componentOptionModel.getJavaType()) + " type.";
desc += "\n";
if ("parameter".equals(componentOptionModel.getKind()) &&
componentOptionModel.isRequired()) {
desc += "\nRequired: true";
}
// include default value (if any)
if (componentOptionModel.getDefaultValue() != null) {
-desc += "\nDefault: " + componentOptionModel.getDefaultValue();
+// must xml encode description as in some rare cases it contains &
chars which is invalid javadoc
+String text =
JavadocHelper.xmlEncode(componentOptionModel.getDefaultValue().toString());
+desc += "\nDefault: " + text;
}
desc += "\nGroup: " + componentOptionModel.getGroup();
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java
index 64ef599..f420e3d 100644
---
[camel] 02/02: CAMEL-15946: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit afc6fedc4cfce0854ae81252af14b3cb8892d46f
Author: Claus Ibsen
AuthorDate: Mon Dec 14 19:59:22 2020 +0100
CAMEL-15946: Regen
---
.../dsl/AtomixMapComponentBuilderFactory.java | 11 +--
.../AtomixMessagingComponentBuilderFactory.java| 11 +--
.../dsl/AtomixMultimapComponentBuilderFactory.java | 11 +--
.../dsl/AtomixQueueComponentBuilderFactory.java| 11 +--
.../dsl/AtomixSetComponentBuilderFactory.java | 11 +--
.../dsl/AtomixValueComponentBuilderFactory.java| 11 +--
.../dsl/Aws2SesComponentBuilderFactory.java| 6 --
.../dsl/AwsSesComponentBuilderFactory.java | 6 --
.../dsl/AwsSwfComponentBuilderFactory.java | 12 ++--
.../dsl/AzureBlobComponentBuilderFactory.java | 4 ++--
.../dsl/AzureEventhubsComponentBuilderFactory.java | 4 ++--
.../component/dsl/BoxComponentBuilderFactory.java | 4 ++--
.../dsl/CometdComponentBuilderFactory.java | 2 +-
.../dsl/CometdsComponentBuilderFactory.java| 2 +-
.../dsl/ConsulComponentBuilderFactory.java | 3 ++-
.../dsl/CordaComponentBuilderFactory.java | 5 ++---
.../DebeziumMongodbComponentBuilderFactory.java| 6 +++---
.../dsl/DebeziumMysqlComponentBuilderFactory.java | 6 +++---
.../DebeziumPostgresComponentBuilderFactory.java | 6 +++---
.../DebeziumSqlserverComponentBuilderFactory.java | 6 +++---
.../dsl/DockerComponentBuilderFactory.java | 4 ++--
.../dsl/EhcacheComponentBuilderFactory.java| 4 ++--
...oogleCalendarStreamComponentBuilderFactory.java | 3 ++-
.../dsl/GoogleDriveComponentBuilderFactory.java| 3 ++-
.../GoogleSheetsStreamComponentBuilderFactory.java | 3 ++-
.../dsl/GuavaEventbusComponentBuilderFactory.java | 3 ++-
.../dsl/InfinispanComponentBuilderFactory.java | 4 ++--
.../dsl/JcloudsComponentBuilderFactory.java| 6 --
.../dsl/JettyComponentBuilderFactory.java | 16
.../component/dsl/JsltComponentBuilderFactory.java | 2 +-
.../dsl/KafkaComponentBuilderFactory.java | 10 +-
.../dsl/MiloServerComponentBuilderFactory.java | 2 +-
.../component/dsl/MinaComponentBuilderFactory.java | 2 +-
.../dsl/NettyComponentBuilderFactory.java | 10 ++
.../dsl/NettyHttpComponentBuilderFactory.java | 10 ++
.../dsl/Olingo2ComponentBuilderFactory.java| 4 ++--
.../dsl/Olingo4ComponentBuilderFactory.java| 4 ++--
.../dsl/RabbitmqComponentBuilderFactory.java | 16
.../dsl/SalesforceComponentBuilderFactory.java | 22 --
.../component/dsl/SedaComponentBuilderFactory.java | 2 +-
.../dsl/ServicenowComponentBuilderFactory.java | 12 ++--
.../component/dsl/SmppComponentBuilderFactory.java | 4 ++--
.../dsl/SmppsComponentBuilderFactory.java | 4 ++--
.../component/dsl/StubComponentBuilderFactory.java | 2 +-
.../dsl/VertxKafkaComponentBuilderFactory.java | 20 ++--
.../component/dsl/VmComponentBuilderFactory.java | 2 +-
.../dsl/Web3jComponentBuilderFactory.java | 6 --
.../dsl/WordpressComponentBuilderFactory.java | 4 ++--
.../component/dsl/XjComponentBuilderFactory.java | 4 ++--
.../XmlsecuritySignComponentBuilderFactory.java| 9 +
.../XmlsecurityVerifyComponentBuilderFactory.java | 4 ++--
.../dsl/XqueryComponentBuilderFactory.java | 4 ++--
.../dsl/XsltSaxonComponentBuilderFactory.java | 4 ++--
53 files changed, 180 insertions(+), 167 deletions(-)
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMapComponentBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMapComponentBuilderFactory.java
index 766e0d5..dd75013 100644
---
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMapComponentBuilderFactory.java
+++
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMapComponentBuilderFactory.java
@@ -114,8 +114,7 @@ public interface AtomixMapComponentBuilderFactory {
* The nodes the AtomixClient should connect to.
*
* The option is a:
- * java.util.List
- * type.
+ *
java.util.Listio.atomix.catalyst.transport.Address type.
*
* Group: common
*/
@@ -272,8 +271,8 @@ public interface AtomixMapComponentBuilderFactory {
/**
* Cluster wide resources configuration.
*
- * The option is a: java.util.Map type.
+ * The option is a: java.util.Mapjava.lang.String,
+ * java.util.Properties type.
*
* Group:
[camel] 03/03: Regen for commit b3c62273fa540ab1001827155124dc8035492214
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d9f7390dae8603349a612456d3ccd3d21c56b91c
Author: davsclaus
AuthorDate: Mon Dec 14 18:38:11 2020 +
Regen for commit b3c62273fa540ab1001827155124dc8035492214
Signed-off-by: GitHub
---
.../resources/org/apache/camel/catalog/components/dataset.json | 2 +-
.../resources/org/apache/camel/catalog/components/jclouds.json | 2 +-
.../generated/resources/org/apache/camel/catalog/components/sip.json| 2 +-
.../generated/resources/org/apache/camel/catalog/components/sips.json | 2 +-
.../resources/org/apache/camel/catalog/docs/minio-component.adoc| 2 +-
docs/components/modules/ROOT/pages/minio-component.adoc | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataset.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataset.json
index 67f0446..abed52a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataset.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataset.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "dataset",
"title": "Dataset",
-"description": "Provide data for load & soak testing of your Camel
application.",
+"description": "Provide data for load and soak testing of your Camel
application.",
"deprecated": false,
"firstVersion": "1.3.0",
"label": "core,testing",
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jclouds.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jclouds.json
index f28b01b..409466c 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jclouds.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jclouds.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "jclouds",
"title": "JClouds",
-"description": "Interact with jclouds compute & blobstore service.",
+"description": "Interact with jclouds compute and blobstore service.",
"deprecated": false,
"firstVersion": "2.9.0",
"label": "api,cloud,compute",
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sip.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sip.json
index 1f896cd..1a7a05e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sip.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sip.json
@@ -46,7 +46,7 @@
"transport": { "kind": "parameter", "displayName": "Transport", "group":
"common", "label": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "tcp", "udp" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "tcp", "configurationClass":
"org.apache.camel.component.sip.SipConfiguration", "configurationField":
"configuration", "description": "Setting for choice of transport protocol.
Valid choices are tcp or udp." },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a m [...]
"consumer": { "kind": "parameter", "displayName": "Consumer", "group":
"consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.sip.SipConfiguration", "configurationField":
"configuration", "description": "This setting is used to determine whether the
kind of header (FromHeader,ToHeader etc) that needs to be created fo [...]
-"presenceAgent": { "kind": "parameter", "displayName": "Presence Agent",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.sip.SipConfiguration", "configurationField":
"configuration", "description": "This setting is used to distinguish between a
Presence Agent & a consumer. This is due to the fact that [...]
+"presenceAgent": { "kind": "parameter",
[camel] branch camel-3.7.x updated (927e058 -> d9f7390)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-3.7.x in repository https://gitbox.apache.org/repos/asf/camel.git. from 927e058 Regen new 8f321cc CAMEL-15946: Fix endpoint and component dsl to output source with valid javadoc that needs to be XML escaped. new fc33759 CAMEL-15946: Regen new d9f7390 Regen for commit b3c62273fa540ab1001827155124dc8035492214 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: .../apache/camel/catalog/components/dataset.json | 2 +- .../apache/camel/catalog/components/jclouds.json | 2 +- .../org/apache/camel/catalog/components/sip.json | 2 +- .../org/apache/camel/catalog/components/sips.json | 2 +- .../apache/camel/catalog/docs/minio-component.adoc | 2 +- .../dsl/AtomixMapComponentBuilderFactory.java | 11 +-- .../AtomixMessagingComponentBuilderFactory.java| 11 +-- .../dsl/AtomixMultimapComponentBuilderFactory.java | 11 +-- .../dsl/AtomixQueueComponentBuilderFactory.java| 11 +-- .../dsl/AtomixSetComponentBuilderFactory.java | 11 +-- .../dsl/AtomixValueComponentBuilderFactory.java| 11 +-- .../dsl/Aws2SesComponentBuilderFactory.java| 6 -- .../dsl/AwsSesComponentBuilderFactory.java | 6 -- .../dsl/AwsSwfComponentBuilderFactory.java | 12 ++-- .../dsl/AzureBlobComponentBuilderFactory.java | 4 ++-- .../dsl/AzureEventhubsComponentBuilderFactory.java | 4 ++-- .../component/dsl/BoxComponentBuilderFactory.java | 4 ++-- .../dsl/CometdComponentBuilderFactory.java | 2 +- .../dsl/CometdsComponentBuilderFactory.java| 2 +- .../dsl/ConsulComponentBuilderFactory.java | 3 ++- .../dsl/CordaComponentBuilderFactory.java | 5 ++--- .../DebeziumMongodbComponentBuilderFactory.java| 6 +++--- .../dsl/DebeziumMysqlComponentBuilderFactory.java | 6 +++--- .../DebeziumPostgresComponentBuilderFactory.java | 6 +++--- .../DebeziumSqlserverComponentBuilderFactory.java | 6 +++--- .../dsl/DockerComponentBuilderFactory.java | 4 ++-- .../dsl/EhcacheComponentBuilderFactory.java| 4 ++-- ...oogleCalendarStreamComponentBuilderFactory.java | 3 ++- .../dsl/GoogleDriveComponentBuilderFactory.java| 3 ++- .../GoogleSheetsStreamComponentBuilderFactory.java | 3 ++- .../dsl/GuavaEventbusComponentBuilderFactory.java | 3 ++- .../dsl/InfinispanComponentBuilderFactory.java | 4 ++-- .../dsl/JcloudsComponentBuilderFactory.java| 6 -- .../dsl/JettyComponentBuilderFactory.java | 16 .../component/dsl/JsltComponentBuilderFactory.java | 2 +- .../dsl/KafkaComponentBuilderFactory.java | 10 +- .../dsl/MiloServerComponentBuilderFactory.java | 2 +- .../component/dsl/MinaComponentBuilderFactory.java | 2 +- .../dsl/NettyComponentBuilderFactory.java | 10 ++ .../dsl/NettyHttpComponentBuilderFactory.java | 10 ++ .../dsl/Olingo2ComponentBuilderFactory.java| 4 ++-- .../dsl/Olingo4ComponentBuilderFactory.java| 4 ++-- .../dsl/RabbitmqComponentBuilderFactory.java | 16 .../dsl/SalesforceComponentBuilderFactory.java | 22 -- .../component/dsl/SedaComponentBuilderFactory.java | 2 +- .../dsl/ServicenowComponentBuilderFactory.java | 12 ++-- .../component/dsl/SmppComponentBuilderFactory.java | 4 ++-- .../dsl/SmppsComponentBuilderFactory.java | 4 ++-- .../component/dsl/StubComponentBuilderFactory.java | 2 +- .../dsl/VertxKafkaComponentBuilderFactory.java | 20 ++-- .../component/dsl/VmComponentBuilderFactory.java | 2 +- .../dsl/Web3jComponentBuilderFactory.java | 6 -- .../dsl/WordpressComponentBuilderFactory.java | 4 ++-- .../component/dsl/XjComponentBuilderFactory.java | 4 ++-- .../XmlsecuritySignComponentBuilderFactory.java| 9 + .../XmlsecurityVerifyComponentBuilderFactory.java | 4 ++-- .../dsl/XqueryComponentBuilderFactory.java | 4 ++-- .../dsl/XsltSaxonComponentBuilderFactory.java | 4 ++-- .../modules/ROOT/pages/minio-component.adoc| 2 +- .../ComponentDslBuilderFactoryGenerator.java | 5 - .../ComponentDslInnerBuilderGenerator.java | 11 +++ .../ComponentsBuilderFactoryGenerator.java | 6 +- 62 files changed, 202 insertions(+), 179 deletions(-)
[camel] 02/03: CAMEL-15946: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fc3375927815e7f63fbcad6aa0141f1aa81c2fe2
Author: Claus Ibsen
AuthorDate: Mon Dec 14 19:59:22 2020 +0100
CAMEL-15946: Regen
---
.../dsl/AtomixMapComponentBuilderFactory.java | 11 +--
.../AtomixMessagingComponentBuilderFactory.java| 11 +--
.../dsl/AtomixMultimapComponentBuilderFactory.java | 11 +--
.../dsl/AtomixQueueComponentBuilderFactory.java| 11 +--
.../dsl/AtomixSetComponentBuilderFactory.java | 11 +--
.../dsl/AtomixValueComponentBuilderFactory.java| 11 +--
.../dsl/Aws2SesComponentBuilderFactory.java| 6 --
.../dsl/AwsSesComponentBuilderFactory.java | 6 --
.../dsl/AwsSwfComponentBuilderFactory.java | 12 ++--
.../dsl/AzureBlobComponentBuilderFactory.java | 4 ++--
.../dsl/AzureEventhubsComponentBuilderFactory.java | 4 ++--
.../component/dsl/BoxComponentBuilderFactory.java | 4 ++--
.../dsl/CometdComponentBuilderFactory.java | 2 +-
.../dsl/CometdsComponentBuilderFactory.java| 2 +-
.../dsl/ConsulComponentBuilderFactory.java | 3 ++-
.../dsl/CordaComponentBuilderFactory.java | 5 ++---
.../DebeziumMongodbComponentBuilderFactory.java| 6 +++---
.../dsl/DebeziumMysqlComponentBuilderFactory.java | 6 +++---
.../DebeziumPostgresComponentBuilderFactory.java | 6 +++---
.../DebeziumSqlserverComponentBuilderFactory.java | 6 +++---
.../dsl/DockerComponentBuilderFactory.java | 4 ++--
.../dsl/EhcacheComponentBuilderFactory.java| 4 ++--
...oogleCalendarStreamComponentBuilderFactory.java | 3 ++-
.../dsl/GoogleDriveComponentBuilderFactory.java| 3 ++-
.../GoogleSheetsStreamComponentBuilderFactory.java | 3 ++-
.../dsl/GuavaEventbusComponentBuilderFactory.java | 3 ++-
.../dsl/InfinispanComponentBuilderFactory.java | 4 ++--
.../dsl/JcloudsComponentBuilderFactory.java| 6 --
.../dsl/JettyComponentBuilderFactory.java | 16
.../component/dsl/JsltComponentBuilderFactory.java | 2 +-
.../dsl/KafkaComponentBuilderFactory.java | 10 +-
.../dsl/MiloServerComponentBuilderFactory.java | 2 +-
.../component/dsl/MinaComponentBuilderFactory.java | 2 +-
.../dsl/NettyComponentBuilderFactory.java | 10 ++
.../dsl/NettyHttpComponentBuilderFactory.java | 10 ++
.../dsl/Olingo2ComponentBuilderFactory.java| 4 ++--
.../dsl/Olingo4ComponentBuilderFactory.java| 4 ++--
.../dsl/RabbitmqComponentBuilderFactory.java | 16
.../dsl/SalesforceComponentBuilderFactory.java | 22 --
.../component/dsl/SedaComponentBuilderFactory.java | 2 +-
.../dsl/ServicenowComponentBuilderFactory.java | 12 ++--
.../component/dsl/SmppComponentBuilderFactory.java | 4 ++--
.../dsl/SmppsComponentBuilderFactory.java | 4 ++--
.../component/dsl/StubComponentBuilderFactory.java | 2 +-
.../dsl/VertxKafkaComponentBuilderFactory.java | 20 ++--
.../component/dsl/VmComponentBuilderFactory.java | 2 +-
.../dsl/Web3jComponentBuilderFactory.java | 6 --
.../dsl/WordpressComponentBuilderFactory.java | 4 ++--
.../component/dsl/XjComponentBuilderFactory.java | 4 ++--
.../XmlsecuritySignComponentBuilderFactory.java| 9 +
.../XmlsecurityVerifyComponentBuilderFactory.java | 4 ++--
.../dsl/XqueryComponentBuilderFactory.java | 4 ++--
.../dsl/XsltSaxonComponentBuilderFactory.java | 4 ++--
53 files changed, 180 insertions(+), 167 deletions(-)
diff --git
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMapComponentBuilderFactory.java
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMapComponentBuilderFactory.java
index 766e0d5..dd75013 100644
---
a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMapComponentBuilderFactory.java
+++
b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AtomixMapComponentBuilderFactory.java
@@ -114,8 +114,7 @@ public interface AtomixMapComponentBuilderFactory {
* The nodes the AtomixClient should connect to.
*
* The option is a:
- * java.util.List
- * type.
+ *
java.util.Listio.atomix.catalyst.transport.Address type.
*
* Group: common
*/
@@ -272,8 +271,8 @@ public interface AtomixMapComponentBuilderFactory {
/**
* Cluster wide resources configuration.
*
- * The option is a: java.util.Map type.
+ * The option is a: java.util.Mapjava.lang.String,
+ * java.util.Properties type.
*
*
[camel] 01/03: CAMEL-15946: Fix endpoint and component dsl to output source with valid javadoc that needs to be XML escaped.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8f321cc5d8549f34722a55015673651f8f407a57
Author: Claus Ibsen
AuthorDate: Mon Dec 14 19:04:13 2020 +0100
CAMEL-15946: Fix endpoint and component dsl to output source with valid
javadoc that needs to be XML escaped.
---
.../dsl/component/ComponentDslBuilderFactoryGenerator.java| 5 -
.../dsl/component/ComponentDslInnerBuilderGenerator.java | 11 +++
.../dsl/component/ComponentsBuilderFactoryGenerator.java | 6 +-
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
index 6640ba1..05d22d3 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
@@ -138,6 +138,9 @@ public final class ComponentDslBuilderFactoryGenerator {
method.addAnnotation(Deprecated.class);
}
-
method.getJavaDoc().setFullText(DslHelper.getMainDescriptionWithoutPathOptions(componentModel));
+String doc =
DslHelper.getMainDescriptionWithoutPathOptions(componentModel);
+// must xml encode description as in some rare cases it contains &
chars which is invalid javadoc
+doc = JavadocHelper.xmlEncode(doc);
+method.getJavaDoc().setText(doc);
}
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGenerator.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGenerator.java
index 5271019..dbb3db1 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGenerator.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslInnerBuilderGenerator.java
@@ -18,6 +18,7 @@ package org.apache.camel.maven.packaging.dsl.component;
import org.apache.camel.maven.packaging.dsl.DslHelper;
import org.apache.camel.tooling.model.ComponentModel;
+import org.apache.camel.tooling.util.JavadocHelper;
import org.apache.camel.tooling.util.srcgen.JavaClass;
import org.apache.camel.tooling.util.srcgen.Method;
import org.apache.commons.lang3.StringUtils;
@@ -81,24 +82,26 @@ public final class ComponentDslInnerBuilderGenerator {
if (componentOptionModel.isDeprecated()) {
method.addAnnotation(Deprecated.class);
}
-
method.getJavaDoc().setFullText(generateOptionDescription(componentOptionModel));
+
method.getJavaDoc().setText(generateOptionDescription(componentOptionModel));
});
}
private String generateOptionDescription(final
ComponentModel.ComponentOptionModel componentOptionModel) {
-String desc = componentOptionModel.getDescription();
+String desc =
JavadocHelper.xmlEncode(componentOptionModel.getDescription());
if (!desc.endsWith(".")) {
desc += ".";
}
desc += "\n";
-desc += "\nThe option is a: " +
componentOptionModel.getJavaType() + " type.";
+desc += "\nThe option is a: " +
JavadocHelper.xmlEncode(componentOptionModel.getJavaType()) + " type.";
desc += "\n";
if ("parameter".equals(componentOptionModel.getKind()) &&
componentOptionModel.isRequired()) {
desc += "\nRequired: true";
}
// include default value (if any)
if (componentOptionModel.getDefaultValue() != null) {
-desc += "\nDefault: " + componentOptionModel.getDefaultValue();
+// must xml encode description as in some rare cases it contains &
chars which is invalid javadoc
+String text =
JavadocHelper.xmlEncode(componentOptionModel.getDefaultValue().toString());
+desc += "\nDefault: " + text;
}
desc += "\nGroup: " + componentOptionModel.getGroup();
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsBuilderFactoryGenerator.java
index 64ef599..f420e3d 100644
---
[camel] branch master updated: Regen for commit b3c62273fa540ab1001827155124dc8035492214
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new de8fc8a Regen for commit b3c62273fa540ab1001827155124dc8035492214
de8fc8a is described below
commit de8fc8ab43bce47299a9ee92f2f1a2e43ecce855
Author: davsclaus
AuthorDate: Mon Dec 14 18:38:11 2020 +
Regen for commit b3c62273fa540ab1001827155124dc8035492214
Signed-off-by: GitHub
---
.../resources/org/apache/camel/catalog/components/dataset.json | 2 +-
.../resources/org/apache/camel/catalog/components/jclouds.json | 2 +-
.../generated/resources/org/apache/camel/catalog/components/sip.json| 2 +-
.../generated/resources/org/apache/camel/catalog/components/sips.json | 2 +-
.../resources/org/apache/camel/catalog/docs/minio-component.adoc| 2 +-
docs/components/modules/ROOT/pages/minio-component.adoc | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataset.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataset.json
index 67f0446..abed52a 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataset.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/dataset.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "dataset",
"title": "Dataset",
-"description": "Provide data for load & soak testing of your Camel
application.",
+"description": "Provide data for load and soak testing of your Camel
application.",
"deprecated": false,
"firstVersion": "1.3.0",
"label": "core,testing",
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jclouds.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jclouds.json
index f28b01b..409466c 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jclouds.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/jclouds.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "jclouds",
"title": "JClouds",
-"description": "Interact with jclouds compute & blobstore service.",
+"description": "Interact with jclouds compute and blobstore service.",
"deprecated": false,
"firstVersion": "2.9.0",
"label": "api,cloud,compute",
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sip.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sip.json
index 1f896cd..1a7a05e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sip.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/sip.json
@@ -46,7 +46,7 @@
"transport": { "kind": "parameter", "displayName": "Transport", "group":
"common", "label": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "tcp", "udp" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "tcp", "configurationClass":
"org.apache.camel.component.sip.SipConfiguration", "configurationField":
"configuration", "description": "Setting for choice of transport protocol.
Valid choices are tcp or udp." },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a m [...]
"consumer": { "kind": "parameter", "displayName": "Consumer", "group":
"consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.sip.SipConfiguration", "configurationField":
"configuration", "description": "This setting is used to determine whether the
kind of header (FromHeader,ToHeader etc) that needs to be created fo [...]
-"presenceAgent": { "kind": "parameter", "displayName": "Presence Agent",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.sip.SipConfiguration", "configurationField":
"configuration",
[GitHub] [camel] oscerd merged pull request #4765: Generated sources regen
oscerd merged pull request #4765: URL: https://github.com/apache/camel/pull/4765 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch regen_bot updated (41374b2 -> dcac2f0)
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 41374b2 CAMEL-15934: camel-resilience4j - Upgrade to 1.6.x add 58b7dee CAMEL-15945: don't lookup `sObject*` properties... add 0adb227 Upgrade Spring to version 5.3.2 add 5c3fb02 Sync deps add 9ba7298 Upgrade Nitrite to version 3.4.3 add ebf35dc Sync deps add 682eca6 CAMEL-15946: Fix javadoc build error about & sign add f0d8755 CAMEL-15946: Fix javadoc build error about & sign add 351569b CAMEL-15946: Fix endpoint dsl to output default value as valid javadoc add a6ca90c CAMEL-15946: Fix endpoint and component dsl to output source with valid javadoc that needs to be XML escaped. add 481b8c0 CAMEL-15946: Regen add 04b01ca CAMEL-15945: Fixed compile error add b3c6227 Regen add dcac2f0 Regen for commit b3c62273fa540ab1001827155124dc8035492214 No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 4 +- .../apache/camel/catalog/components/dataset.json | 2 +- .../apache/camel/catalog/components/jclouds.json | 2 +- .../org/apache/camel/catalog/components/sip.json | 2 +- .../org/apache/camel/catalog/components/sips.json | 2 +- .../camel/catalog/docs/dataset-component.adoc | 2 +- .../camel/catalog/docs/jclouds-component.adoc | 2 +- .../apache/camel/catalog/docs/sip-component.adoc | 2 +- .../apache/camel/component/dataset/dataset.json| 2 +- .../src/main/docs/dataset-component.adoc | 2 +- .../camel/component/dataset/DataSetEndpoint.java | 2 +- .../apache/camel/component/jclouds/jclouds.json| 2 +- .../src/main/docs/jclouds-component.adoc | 2 +- .../camel/component/jclouds/JcloudsEndpoint.java | 2 +- .../component/salesforce/SalesforceConsumer.java | 31 --- .../org/apache/camel/component/sip/sip.json| 2 +- .../org/apache/camel/component/sip/sips.json | 2 +- .../camel-sip/src/main/docs/sip-component.adoc | 2 +- .../camel/component/sip/SipConfiguration.java | 2 +- .../component/ComponentsBuilderFactory.java| 4 +- .../dsl/DatasetComponentBuilderFactory.java| 4 +- .../dsl/JcloudsComponentBuilderFactory.java| 4 +- .../src/generated/resources/metadata.json | 4 +- .../builder/endpoint/StaticEndpointBuilders.java | 8 ++-- .../dsl/AtlasMapEndpointBuilderFactory.java| 10 ++--- .../dsl/DataSetEndpointBuilderFactory.java | 6 +-- .../dsl/DebeziumMongodbEndpointBuilderFactory.java | 4 +- .../dsl/DebeziumMySqlEndpointBuilderFactory.java | 4 +- .../DebeziumPostgresEndpointBuilderFactory.java| 4 +- .../DebeziumSqlserverEndpointBuilderFactory.java | 4 +- .../dsl/JcloudsEndpointBuilderFactory.java | 6 +-- .../endpoint/dsl/KafkaEndpointBuilderFactory.java | 12 +++--- .../dsl/PlatformHttpEndpointBuilderFactory.java| 4 +- .../endpoint/dsl/RestEndpointBuilderFactory.java | 2 +- .../endpoint/dsl/SipEndpointBuilderFactory.java| 4 +- .../dsl/StringTemplateEndpointBuilderFactory.java | 8 ++-- .../dsl/UndertowEndpointBuilderFactory.java| 4 +- .../dsl/VertxKafkaEndpointBuilderFactory.java | 44 +++--- .../builder/endpoint/EndpointRouteBuilder.java | 2 +- .../modules/ROOT/pages/dataset-component.adoc | 2 +- .../modules/ROOT/pages/jclouds-component.adoc | 2 +- .../modules/ROOT/pages/sip-component.adoc | 2 +- parent/pom.xml | 4 +- .../apache/camel/tooling/util/JavadocHelper.java | 19 ++ .../camel/maven/packaging/EndpointDslMojo.java | 8 +++- .../ComponentDslBuilderFactoryGenerator.java | 3 ++ 46 files changed, 141 insertions(+), 110 deletions(-)
[GitHub] [camel] github-actions[bot] opened a new pull request #4765: Generated sources regen
github-actions[bot] opened a new pull request #4765: URL: https://github.com/apache/camel/pull/4765 Regen bot :robot: found some uncommited changes after running build on :camel: master. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 05/06: CAMEL-15945: Fixed compile error
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 294f6b291aa55f987f3941b6456ba37bc03bbfbc
Author: Claus Ibsen
AuthorDate: Mon Dec 14 18:55:19 2020 +0100
CAMEL-15945: Fixed compile error
---
.../component/salesforce/SalesforceConsumer.java | 35 +++---
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
index e054b6f..5299505 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
@@ -103,30 +103,29 @@ public class SalesforceConsumer extends DefaultConsumer {
rawPayload = endpoint.getConfiguration().isRawPayload();
-if (rawPayload) {
-return;
-}
-
// get sObjectClass to convert to
-final String sObjectName =
endpoint.getConfiguration().getSObjectName();
-if (sObjectName != null) {
-sObjectClass =
endpoint.getComponent().getClassMap().get(sObjectName);
-if (sObjectClass == null) {
-throw new IllegalArgumentException(String.format("SObject
Class not found for %s", sObjectName));
-}
-} else {
-final String className =
endpoint.getConfiguration().getSObjectClass();
-if (className != null) {
-sObjectClass =
endpoint.getComponent().getCamelContext().getClassResolver().resolveClass(className);
+if (!rawPayload) {
+final String sObjectName =
endpoint.getConfiguration().getSObjectName();
+if (sObjectName != null) {
+sObjectClass =
endpoint.getComponent().getClassMap().get(sObjectName);
if (sObjectClass == null) {
-throw new IllegalArgumentException(String.format("SObject
Class not found %s", className));
+throw new IllegalArgumentException(String.format("SObject
Class not found for %s", sObjectName));
}
} else {
-LOG.warn("Property sObjectName or sObjectClass NOT set,
messages will be of type java.lang.Map");
-sObjectClass = null;
+final String className =
endpoint.getConfiguration().getSObjectClass();
+if (className != null) {
+sObjectClass =
endpoint.getComponent().getCamelContext().getClassResolver().resolveClass(className);
+if (sObjectClass == null) {
+throw new
IllegalArgumentException(String.format("SObject Class not found %s",
className));
+}
+} else {
+LOG.warn("Property sObjectName or sObjectClass NOT set,
messages will be of type java.lang.Map");
+sObjectClass = null;
+}
}
+} else {
+sObjectClass = null;
}
-
}
public String getTopicName() {
[camel] 04/06: CAMEL-15946: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1816d7f4d89fb255d3cb5c938b917c454296003b
Author: Claus Ibsen
AuthorDate: Mon Dec 14 18:51:05 2020 +0100
CAMEL-15946: Regen
---
.../dsl/AtlasMapEndpointBuilderFactory.java| 10 ++---
.../dsl/DebeziumMongodbEndpointBuilderFactory.java | 4 +-
.../dsl/DebeziumMySqlEndpointBuilderFactory.java | 4 +-
.../DebeziumPostgresEndpointBuilderFactory.java| 4 +-
.../DebeziumSqlserverEndpointBuilderFactory.java | 4 +-
.../endpoint/dsl/KafkaEndpointBuilderFactory.java | 12 +++---
.../dsl/PlatformHttpEndpointBuilderFactory.java| 4 +-
.../endpoint/dsl/RestEndpointBuilderFactory.java | 2 +-
.../dsl/StringTemplateEndpointBuilderFactory.java | 8 ++--
.../dsl/UndertowEndpointBuilderFactory.java| 4 +-
.../dsl/VertxKafkaEndpointBuilderFactory.java | 44 +++---
11 files changed, 50 insertions(+), 50 deletions(-)
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
index 8111255..4959f0e 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
@@ -139,10 +139,10 @@ public interface AtlasMapEndpointBuilderFactory {
}
/**
* The Exchange property name for a source message map which hold
- * java.util.MapString, Message where the key is AtlasMap
- * Document ID. AtlasMap consumes Message bodies as source documents,
as
- * well as message headers as source properties where the scope equals
- * to Document ID.
+ * java.util.Maplt;String, Messagegt; where the key is
+ * AtlasMap Document ID. AtlasMap consumes Message bodies as source
+ * documents, as well as message headers as source properties where the
+ * scope equals to Document ID.
*
* The option is a: java.lang.String type.
*
@@ -191,7 +191,7 @@ public interface AtlasMapEndpointBuilderFactory {
}
/**
* The Exchange property name for a target document map which hold
- * java.util.MapString, Object where the key is AtlasMap
+ * java.util.Maplt;String, Objectgt; where the key is
AtlasMap
* Document ID. AtlasMap populates multiple target documents into this
* map.
*
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
index 3e68590..9a5abaf 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
@@ -48,7 +48,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
* properties needed by Debezium engine, for example setting
* KafkaOffsetBackingStore), the properties have to be prefixed with
* additionalProperties.. E.g:
- *
additionalProperties.transactional.id=12345=http://localhost:8811/avro.
+ *
additionalProperties.transactional.id=12345additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: java.util.Mapjava.lang.String,
* java.lang.Object type.
@@ -70,7 +70,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
* properties needed by Debezium engine, for example setting
* KafkaOffsetBackingStore), the properties have to be prefixed with
* additionalProperties.. E.g:
- *
additionalProperties.transactional.id=12345=http://localhost:8811/avro.
+ *
additionalProperties.transactional.id=12345additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: java.util.Mapjava.lang.String,
* java.lang.Object type.
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
index e242ce0..73b6987 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
+++
[camel] 06/06: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 927e058a13b3ed67c47407fedc692dd68df5b331
Author: Claus Ibsen
AuthorDate: Mon Dec 14 18:55:29 2020 +0100
Regen
---
.../resources/org/apache/camel/catalog/docs/minio-component.adoc| 2 +-
docs/components/modules/ROOT/pages/minio-component.adoc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
index 69f089f..22c4f5b 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
@@ -506,4 +506,4 @@ Maven users will need to add the following dependency to
their pom.xml.
where `$\{camel-version}` must be replaced by the actual version of Camel.
-include::camel-spring-boot::page$minio-starter.adoc[]
\ No newline at end of file
+include::camel-spring-boot::page$minio-starter.adoc[]
diff --git a/docs/components/modules/ROOT/pages/minio-component.adoc
b/docs/components/modules/ROOT/pages/minio-component.adoc
index 2109582..365473c 100644
--- a/docs/components/modules/ROOT/pages/minio-component.adoc
+++ b/docs/components/modules/ROOT/pages/minio-component.adoc
@@ -508,4 +508,4 @@ Maven users will need to add the following dependency to
their pom.xml.
where `$\{camel-version}` must be replaced by the actual version of Camel.
-include::camel-spring-boot::page$minio-starter.adoc[]
\ No newline at end of file
+include::camel-spring-boot::page$minio-starter.adoc[]
[camel] 03/06: CAMEL-15946: Fix endpoint and component dsl to output source with valid javadoc that needs to be XML escaped.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1e975cb17e7b761af03c585830de1b8354386e7c
Author: Claus Ibsen
AuthorDate: Mon Dec 14 17:00:54 2020 +0100
CAMEL-15946: Fix endpoint and component dsl to output source with valid
javadoc that needs to be XML escaped.
---
.../main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java| 3 +++
.../packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java | 3 +++
2 files changed, 6 insertions(+)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 512806c..1c62a07 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -448,6 +448,9 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
// basic description
String baseDesc = option.getDescription();
if (!Strings.isEmpty(baseDesc)) {
+// must xml encode description as in some rare cases it
contains & chars which is invalid javadoc
+baseDesc = JavadocHelper.xmlEncode(baseDesc);
+
if (!baseDesc.endsWith(".")) {
baseDesc += ".";
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
index 2033648..6640ba1 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
@@ -23,6 +23,7 @@ import javax.annotation.Generated;
import org.apache.camel.maven.packaging.ComponentDslMojo;
import org.apache.camel.maven.packaging.dsl.DslHelper;
import org.apache.camel.tooling.model.ComponentModel;
+import org.apache.camel.tooling.util.JavadocHelper;
import org.apache.camel.tooling.util.srcgen.JavaClass;
import org.apache.camel.tooling.util.srcgen.Method;
@@ -111,6 +112,8 @@ public final class ComponentDslBuilderFactoryGenerator {
if (!componentModel.getDescription().isEmpty()) {
doc = componentModel.getDescription() + "\n\n" + doc;
}
+// must xml encode description as in some rare cases it contains &
chars which is invalid javadoc
+doc = JavadocHelper.xmlEncode(doc);
javaClass.getJavaDoc().setText(doc);
}
[camel] 02/06: CAMEL-15946: Fix endpoint dsl to output default value as valid javadoc
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4da620d12b4099355d238577cdf7370eb37ece4f
Author: Claus Ibsen
AuthorDate: Mon Dec 14 16:52:52 2020 +0100
CAMEL-15946: Fix endpoint dsl to output default value as valid javadoc
---
.../org/apache/camel/tooling/util/JavadocHelper.java | 19 +++
.../apache/camel/maven/packaging/EndpointDslMojo.java | 5 -
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git
a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
index de0ac0c..9a89dcf 100644
---
a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
+++
b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
@@ -118,4 +118,23 @@ public final class JavadocHelper {
s = s.replaceAll("(http:|https:)", "$1");
return s.trim();
}
+
+/**
+ * Encodes the text into safe XML by replacing < > and & with XML tokens
+ *
+ * @param text the text
+ * @return the encoded text
+ */
+public static String xmlEncode(String text) {
+if (text == null) {
+return "";
+}
+// must replace amp first, so we dont replace to amp later
+text = text.replace("&", "");
+text = text.replace("\"", "");
+text = text.replace("<", "");
+text = text.replace(">", "");
+return text;
+}
+
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 8ea9846..512806c 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -48,6 +48,7 @@ import org.apache.camel.spi.UriPath;
import org.apache.camel.tooling.model.ComponentModel;
import org.apache.camel.tooling.model.ComponentModel.EndpointOptionModel;
import org.apache.camel.tooling.model.JsonMapper;
+import org.apache.camel.tooling.util.JavadocHelper;
import org.apache.camel.tooling.util.PackageHelper;
import org.apache.camel.tooling.util.Strings;
import org.apache.camel.tooling.util.srcgen.GenericType;
@@ -466,7 +467,9 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
}
// include default value (if any)
if (option.getDefaultValue() != null) {
-baseDesc += "\nDefault: " + option.getDefaultValue();
+// must xml encode default value so its valid as
javadoc
+String value =
JavadocHelper.xmlEncode(option.getDefaultValue().toString());
+baseDesc += "\nDefault: " + value;
}
baseDesc += "\nGroup: " + option.getGroup();
}
[camel] 01/06: CAMEL-15946: Fix javadoc build error about & sign
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ff353a4ca4a783fb42a7ff9d4383cc2240005f92
Author: Claus Ibsen
AuthorDate: Mon Dec 14 16:43:39 2020 +0100
CAMEL-15946: Fix javadoc build error about & sign
---
.../resources/org/apache/camel/catalog/docs/sip-component.adoc| 2 +-
.../src/generated/resources/org/apache/camel/component/sip/sip.json | 2 +-
.../src/generated/resources/org/apache/camel/component/sip/sips.json | 2 +-
components/camel-sip/src/main/docs/sip-component.adoc | 2 +-
.../main/java/org/apache/camel/component/sip/SipConfiguration.java| 2 +-
.../apache/camel/builder/endpoint/dsl/SipEndpointBuilderFactory.java | 4 ++--
.../java/org/apache/camel/builder/endpoint/EndpointRouteBuilder.java | 2 +-
docs/components/modules/ROOT/pages/sip-component.adoc | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sip-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sip-component.adoc
index 25f3268..74d6a5e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sip-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sip-component.adoc
@@ -136,7 +136,7 @@ with the following path and query parameters:
| *transport* (common) | Setting for choice of transport protocol. Valid
choices are tcp or udp. There are 2 enums and the value can be one of: tcp, udp
| tcp | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled by the routing Error Handler. By default the
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with
exceptions, that will be logged at WARN or ERROR level and ignored. | false |
boolean
| *consumer* (consumer) | This setting is used to determine whether the kind
of header (FromHeader,ToHeader etc) that needs to be created for this endpoint
| false | boolean
-| *presenceAgent* (consumer) | This setting is used to distinguish between a
Presence Agent & a consumer. This is due to the fact that the SIP Camel
component ships with a basic Presence Agent (for testing purposes only).
Consumers have to set this flag to true. | false | boolean
+| *presenceAgent* (consumer) | This setting is used to distinguish between a
Presence Agent and a consumer. This is due to the fact that the SIP Camel
component ships with a basic Presence Agent (for testing purposes only).
Consumers have to set this flag to true. | false | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this
option is not in use. By default the consumer will deal with exceptions, that
will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer
creates an exchange. There are 3 enums and the value can be one of: InOnly,
InOut, InOptionalOut | | ExchangePattern
| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
diff --git
a/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sip.json
b/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sip.json
index 1f896cd..1a7a05e 100644
---
a/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sip.json
+++
b/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sip.json
@@ -46,7 +46,7 @@
"transport": { "kind": "parameter", "displayName": "Transport", "group":
"common", "label": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "tcp", "udp" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "tcp", "configurationClass":
"org.apache.camel.component.sip.SipConfiguration", "configurationField":
"configuration", "description": "Setting for choice of transport protocol.
Valid choices are tcp or udp." },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false,
[camel] branch camel-3.7.x updated (dccad63 -> 927e058)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch camel-3.7.x in repository https://gitbox.apache.org/repos/asf/camel.git. from dccad63 CAMEL-15946: Fix javadoc build error about & sign new ff353a4 CAMEL-15946: Fix javadoc build error about & sign new 4da620d CAMEL-15946: Fix endpoint dsl to output default value as valid javadoc new 1e975cb CAMEL-15946: Fix endpoint and component dsl to output source with valid javadoc that needs to be XML escaped. new 1816d7f CAMEL-15946: Regen new 294f6b2 CAMEL-15945: Fixed compile error new 927e058 Regen The 6 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: .../apache/camel/catalog/docs/minio-component.adoc | 2 +- .../apache/camel/catalog/docs/sip-component.adoc | 2 +- .../component/salesforce/SalesforceConsumer.java | 35 + .../org/apache/camel/component/sip/sip.json| 2 +- .../org/apache/camel/component/sip/sips.json | 2 +- .../camel-sip/src/main/docs/sip-component.adoc | 2 +- .../camel/component/sip/SipConfiguration.java | 2 +- .../dsl/AtlasMapEndpointBuilderFactory.java| 10 ++--- .../dsl/DebeziumMongodbEndpointBuilderFactory.java | 4 +- .../dsl/DebeziumMySqlEndpointBuilderFactory.java | 4 +- .../DebeziumPostgresEndpointBuilderFactory.java| 4 +- .../DebeziumSqlserverEndpointBuilderFactory.java | 4 +- .../endpoint/dsl/KafkaEndpointBuilderFactory.java | 12 +++--- .../dsl/PlatformHttpEndpointBuilderFactory.java| 4 +- .../endpoint/dsl/RestEndpointBuilderFactory.java | 2 +- .../endpoint/dsl/SipEndpointBuilderFactory.java| 4 +- .../dsl/StringTemplateEndpointBuilderFactory.java | 8 ++-- .../dsl/UndertowEndpointBuilderFactory.java| 4 +- .../dsl/VertxKafkaEndpointBuilderFactory.java | 44 +++--- .../builder/endpoint/EndpointRouteBuilder.java | 2 +- .../modules/ROOT/pages/minio-component.adoc| 2 +- .../modules/ROOT/pages/sip-component.adoc | 2 +- .../apache/camel/tooling/util/JavadocHelper.java | 19 ++ .../camel/maven/packaging/EndpointDslMojo.java | 8 +++- .../ComponentDslBuilderFactoryGenerator.java | 3 ++ 25 files changed, 107 insertions(+), 80 deletions(-)
[camel] 01/06: CAMEL-15946: Fix javadoc build error about & sign
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f0d8755bbe1c14aef99f77e65b5fd569867e7427
Author: Claus Ibsen
AuthorDate: Mon Dec 14 16:43:39 2020 +0100
CAMEL-15946: Fix javadoc build error about & sign
---
.../resources/org/apache/camel/catalog/docs/sip-component.adoc| 2 +-
.../src/generated/resources/org/apache/camel/component/sip/sip.json | 2 +-
.../src/generated/resources/org/apache/camel/component/sip/sips.json | 2 +-
components/camel-sip/src/main/docs/sip-component.adoc | 2 +-
.../main/java/org/apache/camel/component/sip/SipConfiguration.java| 2 +-
.../apache/camel/builder/endpoint/dsl/SipEndpointBuilderFactory.java | 4 ++--
.../java/org/apache/camel/builder/endpoint/EndpointRouteBuilder.java | 2 +-
docs/components/modules/ROOT/pages/sip-component.adoc | 2 +-
8 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sip-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sip-component.adoc
index 25f3268..74d6a5e 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sip-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/sip-component.adoc
@@ -136,7 +136,7 @@ with the following path and query parameters:
| *transport* (common) | Setting for choice of transport protocol. Valid
choices are tcp or udp. There are 2 enums and the value can be one of: tcp, udp
| tcp | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled by the routing Error Handler. By default the
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with
exceptions, that will be logged at WARN or ERROR level and ignored. | false |
boolean
| *consumer* (consumer) | This setting is used to determine whether the kind
of header (FromHeader,ToHeader etc) that needs to be created for this endpoint
| false | boolean
-| *presenceAgent* (consumer) | This setting is used to distinguish between a
Presence Agent & a consumer. This is due to the fact that the SIP Camel
component ships with a basic Presence Agent (for testing purposes only).
Consumers have to set this flag to true. | false | boolean
+| *presenceAgent* (consumer) | This setting is used to distinguish between a
Presence Agent and a consumer. This is due to the fact that the SIP Camel
component ships with a basic Presence Agent (for testing purposes only).
Consumers have to set this flag to true. | false | boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this
option is not in use. By default the consumer will deal with exceptions, that
will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer
creates an exchange. There are 3 enums and the value can be one of: InOnly,
InOut, InOptionalOut | | ExchangePattern
| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
diff --git
a/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sip.json
b/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sip.json
index 1f896cd..1a7a05e 100644
---
a/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sip.json
+++
b/components/camel-sip/src/generated/resources/org/apache/camel/component/sip/sip.json
@@ -46,7 +46,7 @@
"transport": { "kind": "parameter", "displayName": "Transport", "group":
"common", "label": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "tcp", "udp" ], "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "tcp", "configurationClass":
"org.apache.camel.component.sip.SipConfiguration", "configurationField":
"configuration", "description": "Setting for choice of transport protocol.
Valid choices are tcp or udp." },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
[camel] 03/06: CAMEL-15946: Fix endpoint and component dsl to output source with valid javadoc that needs to be XML escaped.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a6ca90cf168086f5beec8b8beae4bfe15d645b66
Author: Claus Ibsen
AuthorDate: Mon Dec 14 17:00:54 2020 +0100
CAMEL-15946: Fix endpoint and component dsl to output source with valid
javadoc that needs to be XML escaped.
---
.../main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java| 3 +++
.../packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java | 3 +++
2 files changed, 6 insertions(+)
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 512806c..1c62a07 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -448,6 +448,9 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
// basic description
String baseDesc = option.getDescription();
if (!Strings.isEmpty(baseDesc)) {
+// must xml encode description as in some rare cases it
contains & chars which is invalid javadoc
+baseDesc = JavadocHelper.xmlEncode(baseDesc);
+
if (!baseDesc.endsWith(".")) {
baseDesc += ".";
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
index 2033648..6640ba1 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentDslBuilderFactoryGenerator.java
@@ -23,6 +23,7 @@ import javax.annotation.Generated;
import org.apache.camel.maven.packaging.ComponentDslMojo;
import org.apache.camel.maven.packaging.dsl.DslHelper;
import org.apache.camel.tooling.model.ComponentModel;
+import org.apache.camel.tooling.util.JavadocHelper;
import org.apache.camel.tooling.util.srcgen.JavaClass;
import org.apache.camel.tooling.util.srcgen.Method;
@@ -111,6 +112,8 @@ public final class ComponentDslBuilderFactoryGenerator {
if (!componentModel.getDescription().isEmpty()) {
doc = componentModel.getDescription() + "\n\n" + doc;
}
+// must xml encode description as in some rare cases it contains &
chars which is invalid javadoc
+doc = JavadocHelper.xmlEncode(doc);
javaClass.getJavaDoc().setText(doc);
}
[camel] 06/06: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b3c62273fa540ab1001827155124dc8035492214
Author: Claus Ibsen
AuthorDate: Mon Dec 14 18:55:29 2020 +0100
Regen
---
.../resources/org/apache/camel/catalog/docs/minio-component.adoc| 2 +-
docs/components/modules/ROOT/pages/minio-component.adoc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
index 69f089f..22c4f5b 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/minio-component.adoc
@@ -506,4 +506,4 @@ Maven users will need to add the following dependency to
their pom.xml.
where `$\{camel-version}` must be replaced by the actual version of Camel.
-include::camel-spring-boot::page$minio-starter.adoc[]
\ No newline at end of file
+include::camel-spring-boot::page$minio-starter.adoc[]
diff --git a/docs/components/modules/ROOT/pages/minio-component.adoc
b/docs/components/modules/ROOT/pages/minio-component.adoc
index 2109582..365473c 100644
--- a/docs/components/modules/ROOT/pages/minio-component.adoc
+++ b/docs/components/modules/ROOT/pages/minio-component.adoc
@@ -508,4 +508,4 @@ Maven users will need to add the following dependency to
their pom.xml.
where `$\{camel-version}` must be replaced by the actual version of Camel.
-include::camel-spring-boot::page$minio-starter.adoc[]
\ No newline at end of file
+include::camel-spring-boot::page$minio-starter.adoc[]
[camel] 02/06: CAMEL-15946: Fix endpoint dsl to output default value as valid javadoc
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 351569b4bf29fa819058709df59b967c31f561a7
Author: Claus Ibsen
AuthorDate: Mon Dec 14 16:52:52 2020 +0100
CAMEL-15946: Fix endpoint dsl to output default value as valid javadoc
---
.../org/apache/camel/tooling/util/JavadocHelper.java | 19 +++
.../apache/camel/maven/packaging/EndpointDslMojo.java | 5 -
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git
a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
index de0ac0c..9a89dcf 100644
---
a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
+++
b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
@@ -118,4 +118,23 @@ public final class JavadocHelper {
s = s.replaceAll("(http:|https:)", "$1");
return s.trim();
}
+
+/**
+ * Encodes the text into safe XML by replacing < > and & with XML tokens
+ *
+ * @param text the text
+ * @return the encoded text
+ */
+public static String xmlEncode(String text) {
+if (text == null) {
+return "";
+}
+// must replace amp first, so we dont replace to amp later
+text = text.replace("&", "");
+text = text.replace("\"", "");
+text = text.replace("<", "");
+text = text.replace(">", "");
+return text;
+}
+
}
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index 8ea9846..512806c 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -48,6 +48,7 @@ import org.apache.camel.spi.UriPath;
import org.apache.camel.tooling.model.ComponentModel;
import org.apache.camel.tooling.model.ComponentModel.EndpointOptionModel;
import org.apache.camel.tooling.model.JsonMapper;
+import org.apache.camel.tooling.util.JavadocHelper;
import org.apache.camel.tooling.util.PackageHelper;
import org.apache.camel.tooling.util.Strings;
import org.apache.camel.tooling.util.srcgen.GenericType;
@@ -466,7 +467,9 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
}
// include default value (if any)
if (option.getDefaultValue() != null) {
-baseDesc += "\nDefault: " + option.getDefaultValue();
+// must xml encode default value so its valid as
javadoc
+String value =
JavadocHelper.xmlEncode(option.getDefaultValue().toString());
+baseDesc += "\nDefault: " + value;
}
baseDesc += "\nGroup: " + option.getGroup();
}
[camel] 05/06: CAMEL-15945: Fixed compile error
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 04b01caad141065a5bf85a2546cad1282557d9dd
Author: Claus Ibsen
AuthorDate: Mon Dec 14 18:55:19 2020 +0100
CAMEL-15945: Fixed compile error
---
.../component/salesforce/SalesforceConsumer.java | 35 +++---
1 file changed, 17 insertions(+), 18 deletions(-)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
index e054b6f..5299505 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
@@ -103,30 +103,29 @@ public class SalesforceConsumer extends DefaultConsumer {
rawPayload = endpoint.getConfiguration().isRawPayload();
-if (rawPayload) {
-return;
-}
-
// get sObjectClass to convert to
-final String sObjectName =
endpoint.getConfiguration().getSObjectName();
-if (sObjectName != null) {
-sObjectClass =
endpoint.getComponent().getClassMap().get(sObjectName);
-if (sObjectClass == null) {
-throw new IllegalArgumentException(String.format("SObject
Class not found for %s", sObjectName));
-}
-} else {
-final String className =
endpoint.getConfiguration().getSObjectClass();
-if (className != null) {
-sObjectClass =
endpoint.getComponent().getCamelContext().getClassResolver().resolveClass(className);
+if (!rawPayload) {
+final String sObjectName =
endpoint.getConfiguration().getSObjectName();
+if (sObjectName != null) {
+sObjectClass =
endpoint.getComponent().getClassMap().get(sObjectName);
if (sObjectClass == null) {
-throw new IllegalArgumentException(String.format("SObject
Class not found %s", className));
+throw new IllegalArgumentException(String.format("SObject
Class not found for %s", sObjectName));
}
} else {
-LOG.warn("Property sObjectName or sObjectClass NOT set,
messages will be of type java.lang.Map");
-sObjectClass = null;
+final String className =
endpoint.getConfiguration().getSObjectClass();
+if (className != null) {
+sObjectClass =
endpoint.getComponent().getCamelContext().getClassResolver().resolveClass(className);
+if (sObjectClass == null) {
+throw new
IllegalArgumentException(String.format("SObject Class not found %s",
className));
+}
+} else {
+LOG.warn("Property sObjectName or sObjectClass NOT set,
messages will be of type java.lang.Map");
+sObjectClass = null;
+}
}
+} else {
+sObjectClass = null;
}
-
}
public String getTopicName() {
[camel] 04/06: CAMEL-15946: Regen
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 481b8c0bfc0e33933f5ebc08af3618798d293e96
Author: Claus Ibsen
AuthorDate: Mon Dec 14 18:51:05 2020 +0100
CAMEL-15946: Regen
---
.../dsl/AtlasMapEndpointBuilderFactory.java| 10 ++---
.../dsl/DebeziumMongodbEndpointBuilderFactory.java | 4 +-
.../dsl/DebeziumMySqlEndpointBuilderFactory.java | 4 +-
.../DebeziumPostgresEndpointBuilderFactory.java| 4 +-
.../DebeziumSqlserverEndpointBuilderFactory.java | 4 +-
.../endpoint/dsl/KafkaEndpointBuilderFactory.java | 12 +++---
.../dsl/PlatformHttpEndpointBuilderFactory.java| 4 +-
.../endpoint/dsl/RestEndpointBuilderFactory.java | 2 +-
.../dsl/StringTemplateEndpointBuilderFactory.java | 8 ++--
.../dsl/UndertowEndpointBuilderFactory.java| 4 +-
.../dsl/VertxKafkaEndpointBuilderFactory.java | 44 +++---
11 files changed, 50 insertions(+), 50 deletions(-)
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
index 8111255..4959f0e 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtlasMapEndpointBuilderFactory.java
@@ -139,10 +139,10 @@ public interface AtlasMapEndpointBuilderFactory {
}
/**
* The Exchange property name for a source message map which hold
- * java.util.MapString, Message where the key is AtlasMap
- * Document ID. AtlasMap consumes Message bodies as source documents,
as
- * well as message headers as source properties where the scope equals
- * to Document ID.
+ * java.util.Maplt;String, Messagegt; where the key is
+ * AtlasMap Document ID. AtlasMap consumes Message bodies as source
+ * documents, as well as message headers as source properties where the
+ * scope equals to Document ID.
*
* The option is a: java.lang.String type.
*
@@ -191,7 +191,7 @@ public interface AtlasMapEndpointBuilderFactory {
}
/**
* The Exchange property name for a target document map which hold
- * java.util.MapString, Object where the key is AtlasMap
+ * java.util.Maplt;String, Objectgt; where the key is
AtlasMap
* Document ID. AtlasMap populates multiple target documents into this
* map.
*
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
index 3e68590..9a5abaf 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMongodbEndpointBuilderFactory.java
@@ -48,7 +48,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
* properties needed by Debezium engine, for example setting
* KafkaOffsetBackingStore), the properties have to be prefixed with
* additionalProperties.. E.g:
- *
additionalProperties.transactional.id=12345=http://localhost:8811/avro.
+ *
additionalProperties.transactional.id=12345additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: java.util.Mapjava.lang.String,
* java.lang.Object type.
@@ -70,7 +70,7 @@ public interface DebeziumMongodbEndpointBuilderFactory {
* properties needed by Debezium engine, for example setting
* KafkaOffsetBackingStore), the properties have to be prefixed with
* additionalProperties.. E.g:
- *
additionalProperties.transactional.id=12345=http://localhost:8811/avro.
+ *
additionalProperties.transactional.id=12345additionalProperties.schema.registry.url=http://localhost:8811/avro.
*
* The option is a: java.util.Mapjava.lang.String,
* java.lang.Object type.
diff --git
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
index e242ce0..73b6987 100644
---
a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DebeziumMySqlEndpointBuilderFactory.java
+++
[camel] branch master updated (682eca6 -> b3c6227)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 682eca6 CAMEL-15946: Fix javadoc build error about & sign new f0d8755 CAMEL-15946: Fix javadoc build error about & sign new 351569b CAMEL-15946: Fix endpoint dsl to output default value as valid javadoc new a6ca90c CAMEL-15946: Fix endpoint and component dsl to output source with valid javadoc that needs to be XML escaped. new 481b8c0 CAMEL-15946: Regen new 04b01ca CAMEL-15945: Fixed compile error new b3c6227 Regen The 6 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: .../apache/camel/catalog/docs/minio-component.adoc | 2 +- .../apache/camel/catalog/docs/sip-component.adoc | 2 +- .../component/salesforce/SalesforceConsumer.java | 35 + .../org/apache/camel/component/sip/sip.json| 2 +- .../org/apache/camel/component/sip/sips.json | 2 +- .../camel-sip/src/main/docs/sip-component.adoc | 2 +- .../camel/component/sip/SipConfiguration.java | 2 +- .../dsl/AtlasMapEndpointBuilderFactory.java| 10 ++--- .../dsl/DebeziumMongodbEndpointBuilderFactory.java | 4 +- .../dsl/DebeziumMySqlEndpointBuilderFactory.java | 4 +- .../DebeziumPostgresEndpointBuilderFactory.java| 4 +- .../DebeziumSqlserverEndpointBuilderFactory.java | 4 +- .../endpoint/dsl/KafkaEndpointBuilderFactory.java | 12 +++--- .../dsl/PlatformHttpEndpointBuilderFactory.java| 4 +- .../endpoint/dsl/RestEndpointBuilderFactory.java | 2 +- .../endpoint/dsl/SipEndpointBuilderFactory.java| 4 +- .../dsl/StringTemplateEndpointBuilderFactory.java | 8 ++-- .../dsl/UndertowEndpointBuilderFactory.java| 4 +- .../dsl/VertxKafkaEndpointBuilderFactory.java | 44 +++--- .../builder/endpoint/EndpointRouteBuilder.java | 2 +- .../modules/ROOT/pages/minio-component.adoc| 2 +- .../modules/ROOT/pages/sip-component.adoc | 2 +- .../apache/camel/tooling/util/JavadocHelper.java | 19 ++ .../camel/maven/packaging/EndpointDslMojo.java | 8 +++- .../ComponentDslBuilderFactoryGenerator.java | 3 ++ 25 files changed, 107 insertions(+), 80 deletions(-)
[camel] branch camel-3.7.x updated: CAMEL-15946: Fix javadoc build error about & sign
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch camel-3.7.x in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/camel-3.7.x by this push: new dccad63 CAMEL-15946: Fix javadoc build error about & sign dccad63 is described below commit dccad6324bb218b8fc94f5383b39546307cdd6dd Author: Claus Ibsen AuthorDate: Mon Dec 14 16:37:40 2020 +0100 CAMEL-15946: Fix javadoc build error about & sign --- .../org/apache/camel/catalog/docs/dataset-component.adoc | 2 +- .../org/apache/camel/catalog/docs/jclouds-component.adoc | 2 +- .../resources/org/apache/camel/component/dataset/dataset.json | 2 +- components/camel-dataset/src/main/docs/dataset-component.adoc | 2 +- .../java/org/apache/camel/component/dataset/DataSetEndpoint.java | 2 +- .../resources/org/apache/camel/component/jclouds/jclouds.json | 2 +- components/camel-jclouds/src/main/docs/jclouds-component.adoc | 2 +- .../java/org/apache/camel/component/jclouds/JcloudsEndpoint.java | 2 +- .../apache/camel/builder/component/ComponentsBuilderFactory.java | 4 ++-- .../builder/component/dsl/DatasetComponentBuilderFactory.java | 4 ++-- .../builder/component/dsl/JcloudsComponentBuilderFactory.java | 4 ++-- core/camel-componentdsl/src/generated/resources/metadata.json | 4 ++-- .../org/apache/camel/builder/endpoint/StaticEndpointBuilders.java | 8 .../camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java | 6 +++--- .../camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java | 6 +++--- docs/components/modules/ROOT/pages/dataset-component.adoc | 2 +- docs/components/modules/ROOT/pages/jclouds-component.adoc | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/dataset-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/dataset-component.adoc index ecf3954..35fc7e0 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/dataset-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/dataset-component.adoc @@ -2,7 +2,7 @@ = Dataset Component :docTitle: Dataset :artifactId: camel-dataset -:description: Provide data for load & soak testing of your Camel application. +:description: Provide data for load and soak testing of your Camel application. :since: 1.3 :supportLevel: Stable :component-header: Both producer and consumer are supported diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jclouds-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jclouds-component.adoc index d438db0..954b79c 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jclouds-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jclouds-component.adoc @@ -2,7 +2,7 @@ = JClouds Component :docTitle: JClouds :artifactId: camel-jclouds -:description: Interact with jclouds compute & blobstore service. +:description: Interact with jclouds compute and blobstore service. :since: 2.9 :supportLevel: Stable :component-header: Both producer and consumer are supported diff --git a/components/camel-dataset/src/generated/resources/org/apache/camel/component/dataset/dataset.json b/components/camel-dataset/src/generated/resources/org/apache/camel/component/dataset/dataset.json index 67f0446..abed52a 100644 --- a/components/camel-dataset/src/generated/resources/org/apache/camel/component/dataset/dataset.json +++ b/components/camel-dataset/src/generated/resources/org/apache/camel/component/dataset/dataset.json @@ -3,7 +3,7 @@ "kind": "component", "name": "dataset", "title": "Dataset", -"description": "Provide data for load & soak testing of your Camel application.", +"description": "Provide data for load and soak testing of your Camel application.", "deprecated": false, "firstVersion": "1.3.0", "label": "core,testing", diff --git a/components/camel-dataset/src/main/docs/dataset-component.adoc b/components/camel-dataset/src/main/docs/dataset-component.adoc index ecf3954..35fc7e0 100644 --- a/components/camel-dataset/src/main/docs/dataset-component.adoc +++ b/components/camel-dataset/src/main/docs/dataset-component.adoc @@ -2,7 +2,7 @@ = Dataset Component :docTitle: Dataset :artifactId: camel-dataset -:description: Provide data for load & soak testing of your Camel application. +:description: Provide data for load and soak testing of your Camel application. :since: 1.3 :supportLevel: Stable :component-header: Both producer and consumer are supported diff --git a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
[camel] branch master updated: CAMEL-15946: Fix javadoc build error about & sign
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 682eca6 CAMEL-15946: Fix javadoc build error about & sign 682eca6 is described below commit 682eca69fb2c774c21c3caa4e9d4312f498d5a83 Author: Claus Ibsen AuthorDate: Mon Dec 14 16:37:40 2020 +0100 CAMEL-15946: Fix javadoc build error about & sign --- .../org/apache/camel/catalog/docs/dataset-component.adoc | 2 +- .../org/apache/camel/catalog/docs/jclouds-component.adoc | 2 +- .../resources/org/apache/camel/component/dataset/dataset.json | 2 +- components/camel-dataset/src/main/docs/dataset-component.adoc | 2 +- .../java/org/apache/camel/component/dataset/DataSetEndpoint.java | 2 +- .../resources/org/apache/camel/component/jclouds/jclouds.json | 2 +- components/camel-jclouds/src/main/docs/jclouds-component.adoc | 2 +- .../java/org/apache/camel/component/jclouds/JcloudsEndpoint.java | 2 +- .../apache/camel/builder/component/ComponentsBuilderFactory.java | 4 ++-- .../builder/component/dsl/DatasetComponentBuilderFactory.java | 4 ++-- .../builder/component/dsl/JcloudsComponentBuilderFactory.java | 4 ++-- core/camel-componentdsl/src/generated/resources/metadata.json | 4 ++-- .../org/apache/camel/builder/endpoint/StaticEndpointBuilders.java | 8 .../camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java | 6 +++--- .../camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java | 6 +++--- docs/components/modules/ROOT/pages/dataset-component.adoc | 2 +- docs/components/modules/ROOT/pages/jclouds-component.adoc | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/dataset-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/dataset-component.adoc index ecf3954..35fc7e0 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/dataset-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/dataset-component.adoc @@ -2,7 +2,7 @@ = Dataset Component :docTitle: Dataset :artifactId: camel-dataset -:description: Provide data for load & soak testing of your Camel application. +:description: Provide data for load and soak testing of your Camel application. :since: 1.3 :supportLevel: Stable :component-header: Both producer and consumer are supported diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jclouds-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jclouds-component.adoc index d438db0..954b79c 100644 --- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jclouds-component.adoc +++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jclouds-component.adoc @@ -2,7 +2,7 @@ = JClouds Component :docTitle: JClouds :artifactId: camel-jclouds -:description: Interact with jclouds compute & blobstore service. +:description: Interact with jclouds compute and blobstore service. :since: 2.9 :supportLevel: Stable :component-header: Both producer and consumer are supported diff --git a/components/camel-dataset/src/generated/resources/org/apache/camel/component/dataset/dataset.json b/components/camel-dataset/src/generated/resources/org/apache/camel/component/dataset/dataset.json index 67f0446..abed52a 100644 --- a/components/camel-dataset/src/generated/resources/org/apache/camel/component/dataset/dataset.json +++ b/components/camel-dataset/src/generated/resources/org/apache/camel/component/dataset/dataset.json @@ -3,7 +3,7 @@ "kind": "component", "name": "dataset", "title": "Dataset", -"description": "Provide data for load & soak testing of your Camel application.", +"description": "Provide data for load and soak testing of your Camel application.", "deprecated": false, "firstVersion": "1.3.0", "label": "core,testing", diff --git a/components/camel-dataset/src/main/docs/dataset-component.adoc b/components/camel-dataset/src/main/docs/dataset-component.adoc index ecf3954..35fc7e0 100644 --- a/components/camel-dataset/src/main/docs/dataset-component.adoc +++ b/components/camel-dataset/src/main/docs/dataset-component.adoc @@ -2,7 +2,7 @@ = Dataset Component :docTitle: Dataset :artifactId: camel-dataset -:description: Provide data for load & soak testing of your Camel application. +:description: Provide data for load and soak testing of your Camel application. :since: 1.3 :supportLevel: Stable :component-header: Both producer and consumer are supported diff --git a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
[camel-k-runtime] 01/02: api(SourceLoader): remove dependency on org.apache.camel.k.Runtime
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit 8d7322356ba1b0bf038907b6d0a84bf119d1ffaf
Author: Luca Burgazzoli
AuthorDate: Mon Dec 14 14:34:47 2020 +0100
api(SourceLoader): remove dependency on org.apache.camel.k.Runtime
---
.../main/java/org/apache/camel/k/SourceLoader.java | 9
.../org/apache/camel/k/support/SourcesSupport.java | 2 +-
.../java/org/apache/camel/k/cron/CronTest.java | 2 +-
.../k/loader/groovy/GroovySourceLoader.groovy | 6 +++---
.../camel/k/loader/java/JavaSourceLoader.java | 24 ++
.../camel/k/loader/js/JavaScriptSourceLoader.java | 7 +++
.../camel/k/loader/kotlin/KotlinSourceLoader.kt| 6 +++---
.../apache/camel/k/loader/xml/XmlSourceLoader.java | 14 ++---
.../camel/k/loader/yaml/YamlSourceLoader.java | 8
.../camel/k/loader/yaml/support/TestSupport.groovy | 5 ++---
.../k/quarkus/cron/deployment/Application.java | 2 +-
.../camel/k/quarkus/it/webhook/Application.java| 2 +-
.../camel/k/loader/support/LoaderSupport.java | 2 +-
13 files changed, 43 insertions(+), 46 deletions(-)
diff --git
a/camel-k-core/api/src/main/java/org/apache/camel/k/SourceLoader.java
b/camel-k-core/api/src/main/java/org/apache/camel/k/SourceLoader.java
index 602de98..a7c0045 100644
--- a/camel-k-core/api/src/main/java/org/apache/camel/k/SourceLoader.java
+++ b/camel-k-core/api/src/main/java/org/apache/camel/k/SourceLoader.java
@@ -16,8 +16,9 @@
*/
package org.apache.camel.k;
-import java.util.List;
+import java.util.Collection;
+import org.apache.camel.CamelContext;
import org.apache.camel.RoutesBuilder;
public interface SourceLoader {
@@ -26,16 +27,16 @@ public interface SourceLoader {
*
* @return the supported languages.
*/
-List getSupportedLanguages();
+Collection getSupportedLanguages();
/**
* Creates a camel {@link RoutesBuilder} from the given resource.
*
- * @param runtime the runtime.
+ * @param camelContext the runtime.
* @param source the source to load.
* @return the RoutesBuilder.
*/
-RoutesBuilder load(Runtime runtime, Source source);
+RoutesBuilder load(CamelContext camelContext, Source source);
/**
* Define some entry point to intercept the creation fo routes from a
{@link Source}
diff --git
a/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java
b/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java
index 968ff95..34215d4 100644
---
a/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java
+++
b/camel-k-core/support/src/main/java/org/apache/camel/k/support/SourcesSupport.java
@@ -100,7 +100,7 @@ public final class SourcesSupport {
interceptor.beforeLoad(loader, source);
}
-RoutesBuilder result = loader.load(runtime, source);
+RoutesBuilder result = loader.load(runtime.getCamelContext(),
source);
for (SourceLoader.Interceptor interceptor: interceptors) {
result = interceptor.afterLoad(loader, source, result);
diff --git
a/camel-k-cron/impl/src/test/java/org/apache/camel/k/cron/CronTest.java
b/camel-k-cron/impl/src/test/java/org/apache/camel/k/cron/CronTest.java
index 1be90e4..83c9d09 100644
--- a/camel-k-cron/impl/src/test/java/org/apache/camel/k/cron/CronTest.java
+++ b/camel-k-cron/impl/src/test/java/org/apache/camel/k/cron/CronTest.java
@@ -53,7 +53,7 @@ public class CronTest {
RoutesBuilder builder = interceptor.afterLoad(
loader,
source,
-loader.load(runtime, source));
+loader.load(runtime.getCamelContext(), source));
runtime.getCamelContext().addRoutes(builder);
diff --git
a/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoader.groovy
b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoader.groovy
index d5b09aa..a635ab7 100644
---
a/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoader.groovy
+++
b/camel-k-loader-groovy/impl/src/main/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoader.groovy
@@ -16,8 +16,8 @@
*/
package org.apache.camel.k.loader.groovy
+import org.apache.camel.CamelContext
import org.apache.camel.RoutesBuilder
-import org.apache.camel.k.Runtime
import org.apache.camel.k.Source
import org.apache.camel.k.SourceLoader
import org.apache.camel.k.loader.groovy.dsl.IntegrationConfiguration
@@ -27,12 +27,12 @@ import
org.codehaus.groovy.control.customizers.ImportCustomizer
class GroovySourceLoader implements SourceLoader {
@Override
-List getSupportedLanguages() {
+Collection getSupportedLanguages() {
return
[camel-k-runtime] 02/02: loader(kotlin): remove unused logger
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit ac426116a0fa77fa2171c0f2ebb820b27e6a6a8b
Author: Luca Burgazzoli
AuthorDate: Mon Dec 14 14:41:24 2020 +0100
loader(kotlin): remove unused logger
---
.../org/apache/camel/k/loader/kotlin/dsl/ComponentsConfiguration.kt | 6 --
1 file changed, 6 deletions(-)
diff --git
a/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/ComponentsConfiguration.kt
b/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/ComponentsConfiguration.kt
index 5aa5b97..cd3aece 100644
---
a/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/ComponentsConfiguration.kt
+++
b/camel-k-loader-kotlin/impl/src/main/kotlin/org/apache/camel/k/loader/kotlin/dsl/ComponentsConfiguration.kt
@@ -18,14 +18,8 @@ package org.apache.camel.k.loader.kotlin.dsl
import org.apache.camel.CamelContext
import org.apache.camel.Component
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
class ComponentsConfiguration(val context: CamelContext) {
-companion object {
-val LOGGER: Logger =
LoggerFactory.getLogger(ComponentsConfiguration::class.java)
-}
-
inline fun component(name: String, block: T.() ->
Unit) : T {
var target = context.getComponent(name, true, false)
var bind = false
[camel-k-runtime] branch master updated (ead725e -> ac42611)
This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git. from ead725e Updated CHANGELOG.md new 8d73223 api(SourceLoader): remove dependency on org.apache.camel.k.Runtime new ac42611 loader(kotlin): remove unused logger 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: .../main/java/org/apache/camel/k/SourceLoader.java | 9 .../org/apache/camel/k/support/SourcesSupport.java | 2 +- .../java/org/apache/camel/k/cron/CronTest.java | 2 +- .../k/loader/groovy/GroovySourceLoader.groovy | 6 +++--- .../camel/k/loader/java/JavaSourceLoader.java | 24 ++ .../camel/k/loader/js/JavaScriptSourceLoader.java | 7 +++ .../camel/k/loader/kotlin/KotlinSourceLoader.kt| 6 +++--- .../k/loader/kotlin/dsl/ComponentsConfiguration.kt | 6 -- .../apache/camel/k/loader/xml/XmlSourceLoader.java | 14 ++--- .../camel/k/loader/yaml/YamlSourceLoader.java | 8 .../camel/k/loader/yaml/support/TestSupport.groovy | 5 ++--- .../k/quarkus/cron/deployment/Application.java | 2 +- .../camel/k/quarkus/it/webhook/Application.java| 2 +- .../camel/k/loader/support/LoaderSupport.java | 2 +- 14 files changed, 43 insertions(+), 52 deletions(-)
[GitHub] [camel-k-runtime] lburgazzoli merged pull request #571: Cleanup
lburgazzoli merged pull request #571: URL: https://github.com/apache/camel-k-runtime/pull/571 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] 01/04: Upgrade Spring to version 5.3.2
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0adb227ee969ae6598b7466cb0c1614fea2146c2
Author: Andrea Cosentino
AuthorDate: Mon Dec 14 14:06:42 2020 +0100
Upgrade Spring to version 5.3.2
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 194dd09..b29a6fa 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -512,7 +512,7 @@
2.3.3.RELEASE
[5,6)
${spring5-version}
-5.3.1
+5.3.2
5.4.2
3.0.10.RELEASE
1.5
[camel] 02/04: Sync deps
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5c3fb02c977eb6b13613a42b3c0649166d9fbf97
Author: Andrea Cosentino
AuthorDate: Mon Dec 14 14:07:19 2020 +0100
Sync deps
---
camel-dependencies/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index dcfcaed..0a2d90d 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -527,7 +527,7 @@
${spring5-version}
[5,6)
3.0.10.RELEASE
-5.3.1
+5.3.2
1.5
3.14.7
1.17.2
[camel] 04/04: Sync deps
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit ebf35dc73c1377b1f87df79cf19be73bea11dd58 Author: Andrea Cosentino AuthorDate: Mon Dec 14 15:12:44 2020 +0100 Sync deps --- camel-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 0a2d90d..cb40b70 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -441,7 +441,7 @@ 3.10.6.Final 1.0.45 8.9 -3.4.2 +3.4.3 1.0.0.RC4 3.1.12 3.14.9
[camel] branch master updated (58b7dee -> ebf35dc)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 58b7dee CAMEL-15945: don't lookup `sObject*` properties... new 0adb227 Upgrade Spring to version 5.3.2 new 5c3fb02 Sync deps new 9ba7298 Upgrade Nitrite to version 3.4.3 new ebf35dc Sync deps The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: camel-dependencies/pom.xml | 4 ++-- parent/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
[camel] 03/04: Upgrade Nitrite to version 3.4.3
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 9ba729868b5e03be3713bae4dd482e99ebf527bd Author: Andrea Cosentino AuthorDate: Mon Dec 14 14:59:28 2020 +0100 Upgrade Nitrite to version 3.4.3 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index b29a6fa..68409ea 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -428,7 +428,7 @@ 2.0.4 1.0.45 8.9 -3.4.2 +3.4.3 1.2.7 1.7.3
[camel-quarkus] branch camel-master updated (cf1fe7d -> 900c787)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard cf1fe7d Enable Camel 3.7.0 staging repository temporarily new 900c787 Enable Camel 3.7.0 staging repository temporarily 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 (cf1fe7d) \ N -- N -- N refs/heads/camel-master (900c787) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/ci-build.yaml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
[camel-quarkus] 01/01: Enable Camel 3.7.0 staging repository temporarily
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit 900c7879b6bd46bed0390073b5e974e799da9c1a Author: Peter Palaga AuthorDate: Mon Dec 14 11:13:47 2020 +0100 Enable Camel 3.7.0 staging repository temporarily --- .github/workflows/ci-build.yaml | 12 +++ .github/workflows/pr-validate.yml | 2 +- settings-camel-3.7.0.xml | 69 +++ 3 files changed, 76 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index a75abb2..3893d1a 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -65,7 +65,7 @@ jobs: - name: Setup apache-snapshots profile if: github.ref == 'refs/heads/camel-master' || github.base_ref == 'camel-master' run: | - echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV + echo "BRANCH_OPTIONS=-s "$(pwd)"/settings-camel-3.7.0.xml" >> $GITHUB_ENV - name: Setup oss-snapshots profile if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master' run: | @@ -122,7 +122,7 @@ jobs: - name: Setup apache-snapshots profile if: github.ref == 'refs/heads/camel-master' || github.base_ref == 'camel-master' run: | - echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV + echo "BRANCH_OPTIONS=-s "$(pwd)"/settings-camel-3.7.0.xml" >> $GITHUB_ENV - name: Setup oss-snapshots profile if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master' run: | @@ -192,7 +192,7 @@ jobs: - name: Setup apache-snapshots profile if: github.ref == 'refs/heads/camel-master' || github.base_ref == 'camel-master' run: | - echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV + echo "BRANCH_OPTIONS=-s "$(pwd)"/settings-camel-3.7.0.xml" >> $GITHUB_ENV - name: Setup oss-snapshots profile if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master' run: | @@ -245,7 +245,7 @@ jobs: - name: Setup apache-snapshots profile if: github.ref == 'refs/heads/camel-master' || github.base_ref == 'camel-master' run: | - echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV + echo "BRANCH_OPTIONS=-s "$(pwd)"/settings-camel-3.7.0.xml" >> $GITHUB_ENV - name: Setup oss-snapshots profile if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master' run: | @@ -287,7 +287,7 @@ jobs: - name: Setup apache-snapshots profile if: github.ref == 'refs/heads/camel-master' || github.base_ref == 'camel-master' run: | - echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV + echo "BRANCH_OPTIONS=-s "$(pwd)"/settings-camel-3.7.0.xml" >> $GITHUB_ENV - name: Setup oss-snapshots profile if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master' run: | @@ -327,7 +327,7 @@ jobs: - name: Setup apache-snapshots profile if: github.ref == 'refs/heads/camel-master' || github.base_ref == 'camel-master' run: | - echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV + echo "BRANCH_OPTIONS=-s "$(pwd)"/settings-camel-3.7.0.xml" >> $GITHUB_ENV - name: Setup oss-snapshots profile if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master' run: | diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml index bc42ec1..8720230 100644 --- a/.github/workflows/pr-validate.yml +++ b/.github/workflows/pr-validate.yml @@ -44,7 +44,7 @@ jobs: - name: Setup apache-snapshots profile if: github.base_ref == 'camel-master' run: | -echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV +echo "BRANCH_OPTIONS='-s '$(pwd)'/settings-camel-3.7.0.xml'" >> $GITHUB_ENV - name: Setup oss-snapshots profile if: github.base_ref == 'quarkus-master' run: | diff --git a/settings-camel-3.7.0.xml b/settings-camel-3.7.0.xml new file mode 100644 index 000..715130d --- /dev/null +++ b/settings-camel-3.7.0.xml @@ -0,0 +1,69 @@ + + +http://maven.apache.org/SETTINGS/1.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 + http://maven.apache.org/xsd/settings-1.0.0.xsd;> + + + + + camel-3.7.0-staging-repo + + + camel-3.7.0 + +true +always +warn + + +false +never +fail + + https://repository.apache.org/content/repositories/orgapachecamel-1263 +
[GitHub] [camel-k-runtime] lburgazzoli opened a new pull request #571: Cleanup
lburgazzoli opened a new pull request #571: URL: https://github.com/apache/camel-k-runtime/pull/571 **Release Note** ```release-note NONE ``` 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-spring-boot] 02/03: Upgrade Spring Boot version in archetype too to version 2.4.1
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit 2f3489a8fd5f64bddc450ba054a251a467289c6e Author: Andrea Cosentino AuthorDate: Mon Dec 14 14:12:43 2020 +0100 Upgrade Spring Boot version in archetype too to version 2.4.1 --- archetypes/camel-archetype-spring-boot/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archetypes/camel-archetype-spring-boot/pom.xml b/archetypes/camel-archetype-spring-boot/pom.xml index ce261c8..607c97f 100644 --- a/archetypes/camel-archetype-spring-boot/pom.xml +++ b/archetypes/camel-archetype-spring-boot/pom.xml @@ -34,7 +34,7 @@ maven-archetype - 2.4.0 + 2.4.1 src/test/resources/settings.xml
[camel-spring-boot] 01/03: Upgrade Spring Boot to version 2.4.1
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git commit e4159e0dcb16b2773fd9b48ea16f7dd6ec31bd82 Author: Andrea Cosentino AuthorDate: Mon Dec 14 14:12:10 2020 +0100 Upgrade Spring Boot to version 2.4.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 41c856b..939346c 100644 --- a/pom.xml +++ b/pom.xml @@ -109,7 +109,7 @@ false -2.4.0 +2.4.1 3.7.0-SNAPSHOT
[camel-spring-boot] 03/03: Regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 3118a795eb54a267465e85cdc3b5ffd463cacf9b
Author: Andrea Cosentino
AuthorDate: Mon Dec 14 14:17:41 2020 +0100
Regen
---
components-starter/camel-corda-starter/pom.xml | 8
components-starter/camel-iota-starter/pom.xml | 12
tooling/camel-spring-boot-dependencies/pom.xml | 24
3 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 5ad677a..252daab 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -41,6 +41,14 @@
+ ch.qos.logback
+ logback-classic
+
+
+ ch.qos.logback
+ logback-core
+
+
org.apache.logging.log4j
log4j-core
diff --git a/components-starter/camel-iota-starter/pom.xml
b/components-starter/camel-iota-starter/pom.xml
index a8484cc..0f60048 100644
--- a/components-starter/camel-iota-starter/pom.xml
+++ b/components-starter/camel-iota-starter/pom.xml
@@ -38,6 +38,18 @@
org.apache.camel
camel-iota
${camel-version}
+
+
+
+ ch.qos.logback
+ logback-classic
+
+
+ ch.qos.logback
+ logback-core
+
+
+
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 9239cb3..031fdb4 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -4588,62 +4588,62 @@
org.testcontainers
cassandra
-1.15.0
+1.15.1
org.testcontainers
couchbase
-1.15.0
+1.15.1
org.testcontainers
elasticsearch
-1.15.0
+1.15.1
org.testcontainers
jdbc
-1.15.0
+1.15.1
org.testcontainers
junit-jupiter
-1.15.0
+1.15.1
org.testcontainers
kafka
-1.15.0
+1.15.1
org.testcontainers
localstack
-1.15.0
+1.15.1
org.testcontainers
mongodb
-1.15.0
+1.15.1
org.testcontainers
postgresql
-1.15.0
+1.15.1
org.testcontainers
pulsar
-1.15.0
+1.15.1
org.testcontainers
rabbitmq
-1.15.0
+1.15.1
org.testcontainers
testcontainers
-1.15.0
+1.15.1
rhino
[camel-spring-boot] branch master updated (977e2d8 -> 3118a79)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git. from 977e2d8 Polished new e4159e0 Upgrade Spring Boot to version 2.4.1 new 2f3489a Upgrade Spring Boot version in archetype too to version 2.4.1 new 3118a79 Regen 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: archetypes/camel-archetype-spring-boot/pom.xml | 2 +- components-starter/camel-corda-starter/pom.xml | 8 components-starter/camel-iota-starter/pom.xml | 12 pom.xml| 2 +- tooling/camel-spring-boot-dependencies/pom.xml | 24 5 files changed, 34 insertions(+), 14 deletions(-)
[GitHub] [camel-kafka-connector] oscerd merged pull request #785: AWS2-S3 aggregation strategy OOTB
oscerd merged pull request #785: URL: https://github.com/apache/camel-kafka-connector/pull/785 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel-kafka-connector] 02/04: Regen aws2-s3 catalog part
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git commit d0d36646407cf8189d9e3712f23b3e0deee5b4f3 Author: Andrea Cosentino AuthorDate: Mon Dec 14 11:31:34 2020 +0100 Regen aws2-s3 catalog part --- .../generated/resources/connectors/camel-aws2-s3-sink.json| 3 +++ .../generated/resources/connectors/camel-aws2-s3-source.json | 3 +++ .../src/generated/resources/camel-aws2-s3-sink.json | 3 +++ .../src/generated/resources/camel-aws2-s3-source.json | 3 +++ .../src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc | 11 ++- .../src/main/docs/camel-aws2-s3-kafka-source-connector.adoc | 11 ++- docs/modules/ROOT/pages/connectors.adoc | 5 - .../pages/connectors/camel-aws2-s3-kafka-sink-connector.adoc | 11 ++- .../connectors/camel-aws2-s3-kafka-source-connector.adoc | 11 ++- 9 files changed, 56 insertions(+), 5 deletions(-) diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json index 6507b7b..2dcf058 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-sink.json @@ -436,5 +436,8 @@ ], "transforms": [ "org.apache.camel.kafkaconnector.aws2s3.transformers.S3ObjectTransforms" + ], + "aggregationStrategies": [ + "org.apache.camel.kafkaconnector.aws2s3.aggregation.NewlineAggregationStrategy" ] } \ No newline at end of file diff --git a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json index 5d8c025..8797cfa 100644 --- a/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json +++ b/camel-kafka-connector-catalog/src/generated/resources/connectors/camel-aws2-s3-source.json @@ -596,5 +596,8 @@ ], "transforms": [ "org.apache.camel.kafkaconnector.aws2s3.transformers.S3ObjectTransforms" + ], + "aggregationStrategies": [ + "org.apache.camel.kafkaconnector.aws2s3.aggregation.NewlineAggregationStrategy" ] } \ No newline at end of file diff --git a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-sink.json b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-sink.json index 6507b7b..2dcf058 100644 --- a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-sink.json +++ b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-sink.json @@ -436,5 +436,8 @@ ], "transforms": [ "org.apache.camel.kafkaconnector.aws2s3.transformers.S3ObjectTransforms" + ], + "aggregationStrategies": [ + "org.apache.camel.kafkaconnector.aws2s3.aggregation.NewlineAggregationStrategy" ] } \ No newline at end of file diff --git a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-source.json b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-source.json index 5d8c025..8797cfa 100644 --- a/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-source.json +++ b/connectors/camel-aws2-s3-kafka-connector/src/generated/resources/camel-aws2-s3-source.json @@ -596,5 +596,8 @@ ], "transforms": [ "org.apache.camel.kafkaconnector.aws2s3.transformers.S3ObjectTransforms" + ], + "aggregationStrategies": [ + "org.apache.camel.kafkaconnector.aws2s3.aggregation.NewlineAggregationStrategy" ] } \ No newline at end of file diff --git a/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc b/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc index a2196ba..3e0820d 100644 --- a/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc +++ b/connectors/camel-aws2-s3-kafka-connector/src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc @@ -120,5 +120,14 @@ org.apache.camel.kafkaconnector.aws2s3.transformers.S3ObjectTransforms -The camel-aws2-s3 sink connector has no aggregation strategies out of the box. +The camel-aws2-s3 sink connector supports 1 aggregation strategies out of the box, which are listed below. + + + +[source,java] + + +org.apache.camel.kafkaconnector.aws2s3.aggregation.NewlineAggregationStrategy + + // kafka-connector options: END diff --git
[camel-kafka-connector] branch master updated (7a8c793 -> ad1f17e)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from 7a8c793 Updated CHANGELOG.md new 71c04c7 Camel-AWS2-S3 connector: Add out of the box specific Aggregation Strategies, added NewlineAggregationStrategy new d0d3664 Regen aws2-s3 catalog part new 242da5d Fixed AWS2-S3 Test new ad1f17e AWS2-S3 Catalog: Fixed test The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../generated/resources/connectors/camel-aws2-s3-sink.json| 3 +++ .../generated/resources/connectors/camel-aws2-s3-source.json | 3 +++ .../catalog/CamelKafkaConnectorCatalogTest.java | 2 +- .../src/generated/resources/camel-aws2-s3-sink.json | 3 +++ .../src/generated/resources/camel-aws2-s3-source.json | 3 +++ .../src/main/docs/camel-aws2-s3-kafka-sink-connector.adoc | 11 ++- .../src/main/docs/camel-aws2-s3-kafka-source-connector.adoc | 11 ++- .../aws2s3/aggregation/NewlineAggregationStrategy.java| 4 ++-- docs/modules/ROOT/pages/connectors.adoc | 5 - .../pages/connectors/camel-aws2-s3-kafka-sink-connector.adoc | 11 ++- .../connectors/camel-aws2-s3-kafka-source-connector.adoc | 11 ++- 11 files changed, 59 insertions(+), 8 deletions(-) copy core/src/main/java/org/apache/camel/kafkaconnector/aggregator/StringAggregator.java => connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/aggregation/NewlineAggregationStrategy.java (91%)
[camel-kafka-connector] 03/04: Fixed AWS2-S3 Test
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 242da5d9f6dafffd225f1b8b8ade6d3c0da8fd80
Author: Andrea Cosentino
AuthorDate: Mon Dec 14 13:24:52 2020 +0100
Fixed AWS2-S3 Test
---
.../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index b429291..c341658 100644
---
a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++
b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -65,7 +65,7 @@ class CamelKafkaConnectorCatalogTest {
assertEquals("camel.sink.endpoint.autoCreateBucket",
model.getOptions().get(2).getName());
assertEquals(1, model.getConverters().size());
assertEquals(1, model.getTransforms().size());
-assertNull(model.getAggregationStrategies());
+assertEquals(1, model.getAggregationStrategies());
}
@Test
[camel-kafka-connector] 01/04: Camel-AWS2-S3 connector: Add out of the box specific Aggregation Strategies, added NewlineAggregationStrategy
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 71c04c7b78988af3801e3c2a2d1db6948e58e468
Author: Andrea Cosentino
AuthorDate: Mon Dec 14 11:12:57 2020 +0100
Camel-AWS2-S3 connector: Add out of the box specific Aggregation
Strategies, added NewlineAggregationStrategy
---
.../aggregation/NewlineAggregationStrategy.java| 44 ++
1 file changed, 44 insertions(+)
diff --git
a/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/aggregation/NewlineAggregationStrategy.java
b/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/aggregation/NewlineAggregationStrategy.java
new file mode 100644
index 000..9c61218
--- /dev/null
+++
b/connectors/camel-aws2-s3-kafka-connector/src/main/java/org/apache/camel/kafkaconnector/aws2s3/aggregation/NewlineAggregationStrategy.java
@@ -0,0 +1,44 @@
+/*
+ * 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.kafkaconnector.aws2s3.aggregation;
+
+import org.apache.camel.AggregationStrategy;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+
+public class NewlineAggregationStrategy implements AggregationStrategy {
+
+@Override
+public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
+// lets append the old body to the new body
+if (oldExchange == null) {
+return newExchange;
+}
+
+String body = oldExchange.getIn().getBody(String.class);
+if (body != null) {
+Message newIn = newExchange.getIn();
+String newBody = newIn.getBody(String.class);
+if (newBody != null) {
+body += System.lineSeparator() + newBody;
+}
+
+newIn.setBody(body);
+}
+return newExchange;
+}
+}
[camel-kafka-connector] 04/04: AWS2-S3 Catalog: Fixed test
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit ad1f17e9f349127ca275020fde3f3c9a0df606f4
Author: Andrea Cosentino
AuthorDate: Mon Dec 14 13:50:41 2020 +0100
AWS2-S3 Catalog: Fixed test
---
.../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
index c341658..5b50c43 100644
---
a/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
+++
b/camel-kafka-connector-catalog/src/test/java/org/apache/camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java
@@ -65,7 +65,7 @@ class CamelKafkaConnectorCatalogTest {
assertEquals("camel.sink.endpoint.autoCreateBucket",
model.getOptions().get(2).getName());
assertEquals(1, model.getConverters().size());
assertEquals(1, model.getTransforms().size());
-assertEquals(1, model.getAggregationStrategies());
+assertEquals(1, model.getAggregationStrategies().size());
}
@Test
[GitHub] [camel] orpiske opened a new pull request #4764: Fix upsert timeouts issues when using the couchbase test-infra
orpiske opened a new pull request #4764: URL: https://github.com/apache/camel/pull/4764 Ensure other couchbase services use fixed ports otherwise some tests may throw timeout issues when querying or searching for data - [x] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for the change (usually before you start working on it). Trivial changes like typos do not require a JIRA issue. Your pull request should address just this issue, without pulling in other changes. - [x] Each commit in the pull request should have a meaningful subject line and body. - [x] If you're unsure, you can format the pull request title like `[CAMEL-XXX] Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the appropriate JIRA issue. - [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why. - [x] Run `mvn clean install -Psourcecheck` in your module with source check enabled to make sure basic checks pass and there are no checkstyle violations. A more thorough check will be performed on your pull request automatically. Below are the contribution guidelines: https://github.com/apache/camel/blob/master/CONTRIBUTING.md 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[GitHub] [camel] zregvart commented on pull request #4761: change ? to
zregvart commented on pull request #4761: URL: https://github.com/apache/camel/pull/4761#issuecomment-744421449 @itotx if you wish you can now redo this by going to the website and clicking the edit this page on the Telegram component, you should be taken to https://github.com/apache/camel/edit/master/components/camel-telegram/src/main/docs/telegram-component.adoc which is the correct source material for the webpage. The file you edited here will be overwritten with the content in `components/camel-telegram/src/main/docs/telegram-component.adoc`, so your changes here will be lost. 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
[camel] branch issue/CAMEL-12871 created (now ea67b38)
This is an automated email from the ASF dual-hosted git repository. zregvart pushed a change to branch issue/CAMEL-12871 in repository https://gitbox.apache.org/repos/asf/camel.git. at ea67b38 TEMP BACK OUT: Fiddler workaround This branch includes the following new commits: new 99e1f82 CAMEL-12871: stub server and test new a5d16c0 CAMEL-12871: release resources on stop (WIP) new ea67b38 TEMP BACK OUT: Fiddler workaround 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.
[camel] 01/03: CAMEL-12871: stub server and test
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch issue/CAMEL-12871
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 99e1f82bd41d2285f5c25628f9980c431998946e
Author: Zoran Regvart
AuthorDate: Mon Dec 14 13:39:09 2020 +0100
CAMEL-12871: stub server and test
Adds a stub server implemented in Jetty, as it is already pulled in as a
dependency, and a integration test for the testing streaming resiliency.
Two cases are added in the integration test: server closing the
TCP connection (e.g. in a abrupt server shutdown), and restarting the
`SubscriptionHelper` service (e.g. when route is restarted).
---
.../salesforce/internal/streaming/StubServer.java | 268
.../SubscriptionHelperIntegrationTest.java | 351 +
2 files changed, 619 insertions(+)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/streaming/StubServer.java
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/streaming/StubServer.java
new file mode 100644
index 000..e10674a
--- /dev/null
+++
b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/internal/streaming/StubServer.java
@@ -0,0 +1,268 @@
+/**
+ * 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.component.salesforce.internal.streaming;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.camel.util.IOHelper;
+import org.eclipse.jetty.io.EndPoint;
+import org.eclipse.jetty.server.AbstractNetworkConnector;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.AbstractHandler;
+
+class StubServer {
+
+private final Server server;
+
+private final List stubs = new ArrayList<>();
+
+class StubHandler extends AbstractHandler {
+
+@Override
+public void handle(final String target, final Request baseRequest,
final HttpServletRequest request, final HttpServletResponse response)
+throws IOException, ServletException {
+final String body;
+try (Reader bodyReader = request.getReader()) {
+body = IOHelper.toString(bodyReader);
+}
+
+final StubResponse stub = stubFor(request, body);
+
+if (stub == null) {
+System.err.println("Stub not found for " + request.getMethod()
+ " " + request.getRequestURI());
+response.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED);
+return;
+}
+
+response.setStatus(stub.responseStatus);
+response.setContentType("application/json;charset=UTF-8");
+
+final String id = messageIdFrom(body);
+
+try (Writer out = response.getWriter()) {
+stub.writeTo(id, out);
+}
+}
+
+private StubResponse stubFor(final HttpServletRequest request, final
String body) throws IOException {
+for (final StubResponse stub : stubs) {
+if (stub.matches(request, body)) {
+return stub;
+}
+}
+
+return null;
+}
+
+}
+
+final class StubResponse {
+
+private Predicate requestCondition;
+
+private final String requestMethod;
+
+private final String requestPath;
+
+private BlockingQueue responseMessages;
+
+private final int responseStatus;
+
+private String responseString;
+
+public StubResponse(final String requestMethod, final String
requestPath, final int responseStatus, final Predicate requestCondition,
+
[camel] 03/03: TEMP BACK OUT: Fiddler workaround
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch issue/CAMEL-12871
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ea67b383303ba381e85baf26f3f421e457cd0143
Author: Zoran Regvart
AuthorDate: Mon Dec 14 13:52:20 2020 +0100
TEMP BACK OUT: Fiddler workaround
This allows proxying HTTPS via HTTP proxy tunneling (`CONNECT`) with
Fiddler. Fiddler is sending `Connection: close` which closes the tunnel
and abruptly terminates the proxy tunnel connection. This removes the
`Connection: close` header in that case.
This change needs to be backed out, and not merged to mainline.
---
.../component/salesforce/SalesforceHttpClient.java | 3 +-
.../SalesforceHttpClientTransportOverHTTP.java | 77 ++
2 files changed, 78 insertions(+), 2 deletions(-)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
index 0fce4bb..293d4c2 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClient.java
@@ -30,7 +30,6 @@ import org.eclipse.jetty.client.HttpConversation;
import org.eclipse.jetty.client.HttpRequest;
import org.eclipse.jetty.client.ProtocolHandler;
import org.eclipse.jetty.client.api.Request;
-import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
import org.eclipse.jetty.util.ssl.SslContextFactory;
import static java.util.Optional.ofNullable;
@@ -64,7 +63,7 @@ public class SalesforceHttpClient extends HttpClient {
}
public SalesforceHttpClient(HttpClientTransport transport,
SslContextFactory sslContextFactory) {
-super(ofNullable(transport).orElse(new HttpClientTransportOverHTTP()),
sslContextFactory);
+super(ofNullable(transport).orElse(new
SalesforceHttpClientTransportOverHTTP()), sslContextFactory);
// Jetty 9.3, as opposed to 9.2 the way to add ProtocolHandler to
// HttpClient changed in 9.2 HttpClient::getProtocolHandlers returned
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClientTransportOverHTTP.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClientTransportOverHTTP.java
new file mode 100644
index 000..f3a4456
--- /dev/null
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceHttpClientTransportOverHTTP.java
@@ -0,0 +1,77 @@
+/*
+ * 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.component.salesforce;
+
+import org.eclipse.jetty.client.HttpDestination;
+import org.eclipse.jetty.client.HttpExchange;
+import org.eclipse.jetty.client.HttpRequest;
+import org.eclipse.jetty.client.api.Connection;
+import org.eclipse.jetty.client.api.Response;
+import org.eclipse.jetty.client.api.Result;
+import org.eclipse.jetty.client.http.HttpChannelOverHTTP;
+import org.eclipse.jetty.client.http.HttpClientTransportOverHTTP;
+import org.eclipse.jetty.client.http.HttpConnectionOverHTTP;
+import org.eclipse.jetty.http.HttpFields;
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.http.HttpMethod;
+import org.eclipse.jetty.http.HttpVersion;
+import org.eclipse.jetty.io.EndPoint;
+import org.eclipse.jetty.util.Promise;
+
+/**
+ * A workaround for Fiddler sending Connection: close on HTTPS
proxy tunneling via CONNECT.
+ */
+public class SalesforceHttpClientTransportOverHTTP extends
HttpClientTransportOverHTTP {
+
+public class SalesforceHttpChannelOverHTTP extends HttpChannelOverHTTP {
+
+public SalesforceHttpChannelOverHTTP(final HttpConnectionOverHTTP
connection) {
+super(connection);
+}
+
+@Override
+public
[camel] 02/03: CAMEL-12871: release resources on stop (WIP)
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch issue/CAMEL-12871
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a5d16c02c9c77a65945258a4b5576262323cfd8b
Author: Zoran Regvart
AuthorDate: Mon Dec 14 13:53:50 2020 +0100
CAMEL-12871: release resources on stop (WIP)
When SubscriptionHelper is stopped we need to remove all listeners and
close channels this helper is listening on.
---
.../internal/streaming/SubscriptionHelper.java | 21 ++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
index 625b2f2..e8c3360 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/streaming/SubscriptionHelper.java
@@ -36,6 +36,7 @@ import
org.apache.camel.component.salesforce.internal.SalesforceSession;
import org.apache.camel.support.service.ServiceSupport;
import org.cometd.bayeux.Message;
import org.cometd.bayeux.client.ClientSessionChannel;
+import org.cometd.bayeux.client.ClientSessionChannel.MessageListener;
import org.cometd.client.BayeuxClient;
import org.cometd.client.BayeuxClient.State;
import org.cometd.client.transport.ClientTransport;
@@ -320,11 +321,25 @@ public class SubscriptionHelper extends ServiceSupport {
return exception;
}
+private void closeChannel(final String name, MessageListener listener) {
+final ClientSessionChannel channel = client.getChannel(name);
+channel.removeListener(listener);
+channel.release();
+}
+
@Override
protected void doStop() throws Exception {
-client.getChannel(META_DISCONNECT).removeListener(disconnectListener);
-client.getChannel(META_CONNECT).removeListener(connectListener);
-client.getChannel(META_HANDSHAKE).removeListener(handshakeListener);
+closeChannel(META_DISCONNECT, disconnectListener);
+closeChannel(META_CONNECT, connectListener);
+closeChannel(META_HANDSHAKE, handshakeListener);
+
+for (Map.Entry entry :
listenerMap.entrySet()) {
+final SalesforceConsumer consumer = entry.getKey();
+final String topic = consumer.getTopicName();
+
+final MessageListener listener = entry.getValue();
+closeChannel(getChannelName(topic), listener);
+}
client.disconnect();
boolean disconnected = client.waitFor(timeout, State.DISCONNECTED);
[camel-kafka-connector] branch aggrStratAWS2S3 updated (1ae6c47 -> e71f024)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch aggrStratAWS2S3 in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git. from 1ae6c47 Fixed AWS2-S3 Test add e71f024 AWS2-S3 Catalog: Fixed test No new revisions were added by this update. Summary of changes: .../camel/kafkaconnector/catalog/CamelKafkaConnectorCatalogTest.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[camel-quarkus] 01/01: Enable Camel 3.7.0 staging repository temporarily
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git commit cf1fe7d06dc607d053c71754f3999140fbc58e50 Author: Peter Palaga AuthorDate: Mon Dec 14 11:13:47 2020 +0100 Enable Camel 3.7.0 staging repository temporarily --- .github/workflows/ci-build.yaml | 12 +++ .github/workflows/pr-validate.yml | 2 +- settings-camel-3.7.0.xml | 69 +++ 3 files changed, 76 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-build.yaml b/.github/workflows/ci-build.yaml index a75abb2..44811d2 100644 --- a/.github/workflows/ci-build.yaml +++ b/.github/workflows/ci-build.yaml @@ -65,7 +65,7 @@ jobs: - name: Setup apache-snapshots profile if: github.ref == 'refs/heads/camel-master' || github.base_ref == 'camel-master' run: | - echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV + echo "BRANCH_OPTIONS=\"-s "$(pwd)"/settings-camel-3.7.0.xml\"" >> $GITHUB_ENV - name: Setup oss-snapshots profile if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master' run: | @@ -122,7 +122,7 @@ jobs: - name: Setup apache-snapshots profile if: github.ref == 'refs/heads/camel-master' || github.base_ref == 'camel-master' run: | - echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV + echo "BRANCH_OPTIONS=\"-s "$(pwd)"/settings-camel-3.7.0.xml\"" >> $GITHUB_ENV - name: Setup oss-snapshots profile if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master' run: | @@ -192,7 +192,7 @@ jobs: - name: Setup apache-snapshots profile if: github.ref == 'refs/heads/camel-master' || github.base_ref == 'camel-master' run: | - echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV + echo "BRANCH_OPTIONS=\"-s "$(pwd)"/settings-camel-3.7.0.xml\"" >> $GITHUB_ENV - name: Setup oss-snapshots profile if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master' run: | @@ -245,7 +245,7 @@ jobs: - name: Setup apache-snapshots profile if: github.ref == 'refs/heads/camel-master' || github.base_ref == 'camel-master' run: | - echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV + echo "BRANCH_OPTIONS=\"-s "$(pwd)"/settings-camel-3.7.0.xml\"" >> $GITHUB_ENV - name: Setup oss-snapshots profile if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master' run: | @@ -287,7 +287,7 @@ jobs: - name: Setup apache-snapshots profile if: github.ref == 'refs/heads/camel-master' || github.base_ref == 'camel-master' run: | - echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV + echo "BRANCH_OPTIONS=\"-s "$(pwd)"/settings-camel-3.7.0.xml\"" >> $GITHUB_ENV - name: Setup oss-snapshots profile if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master' run: | @@ -327,7 +327,7 @@ jobs: - name: Setup apache-snapshots profile if: github.ref == 'refs/heads/camel-master' || github.base_ref == 'camel-master' run: | - echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV + echo "BRANCH_OPTIONS=\"-s "$(pwd)"/settings-camel-3.7.0.xml\"" >> $GITHUB_ENV - name: Setup oss-snapshots profile if: github.ref == 'refs/heads/quarkus-master' || github.base_ref == 'quarkus-master' run: | diff --git a/.github/workflows/pr-validate.yml b/.github/workflows/pr-validate.yml index bc42ec1..8720230 100644 --- a/.github/workflows/pr-validate.yml +++ b/.github/workflows/pr-validate.yml @@ -44,7 +44,7 @@ jobs: - name: Setup apache-snapshots profile if: github.base_ref == 'camel-master' run: | -echo "BRANCH_OPTIONS=-Papache-snapshots" >> $GITHUB_ENV +echo "BRANCH_OPTIONS='-s '$(pwd)'/settings-camel-3.7.0.xml'" >> $GITHUB_ENV - name: Setup oss-snapshots profile if: github.base_ref == 'quarkus-master' run: | diff --git a/settings-camel-3.7.0.xml b/settings-camel-3.7.0.xml new file mode 100644 index 000..715130d --- /dev/null +++ b/settings-camel-3.7.0.xml @@ -0,0 +1,69 @@ + + +http://maven.apache.org/SETTINGS/1.0.0; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; + xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 + http://maven.apache.org/xsd/settings-1.0.0.xsd;> + + + + + camel-3.7.0-staging-repo + + + camel-3.7.0 + +true +always +warn + + +false +never +fail + +
[camel-quarkus] branch camel-master updated (43e848b -> cf1fe7d)
This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a change to branch camel-master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git. discard 43e848b Enable Camel 3.7.0 staging repository temporarily new cf1fe7d Enable Camel 3.7.0 staging repository temporarily 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 (43e848b) \ N -- N -- N refs/heads/camel-master (cf1fe7d) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .github/workflows/ci-build.yaml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-)
[camel] branch camel-3.7.x updated: CAMEL-15945: don't lookup `sObject*` properties...
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.7.x by this push:
new 7b91225 CAMEL-15945: don't lookup `sObject*` properties...
7b91225 is described below
commit 7b912259644ad160f0a5126f66ca505f5d8fd46c
Author: Zoran Regvart
AuthorDate: Mon Dec 14 13:44:28 2020 +0100
CAMEL-15945: don't lookup `sObject*` properties...
... with `rawPayload`.
(cherry picked from commit 58b7deee13c45472a8f14930f47490e6fc3edc2b)
---
.../org/apache/camel/component/salesforce/SalesforceConsumer.java | 4
1 file changed, 4 insertions(+)
diff --git
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
index 04427e5..e054b6f 100644
---
a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
+++
b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/SalesforceConsumer.java
@@ -103,6 +103,10 @@ public class SalesforceConsumer extends DefaultConsumer {
rawPayload = endpoint.getConfiguration().isRawPayload();
+if (rawPayload) {
+return;
+}
+
// get sObjectClass to convert to
final String sObjectName =
endpoint.getConfiguration().getSObjectName();
if (sObjectName != null) {
[camel] branch regen_bot updated (5c1efa7 -> 41374b2)
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 5c1efa7 CAMEL-15941: Upgrade to apache flink 1.12.0 add 41374b2 CAMEL-15934: camel-resilience4j - Upgrade to 1.6.x No new revisions were added by this update. Summary of changes: camel-dependencies/pom.xml | 2 +- parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[camel-website] branch asf-site updated (47b6145 -> f157cb4)
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a change to branch asf-site in repository https://gitbox.apache.org/repos/asf/camel-website.git. discard 47b6145 Website updated to 356a46ded9709b6fecca9ff1f25a69dcba075592 discard 15fffc9 Updated the website to b19baea new 1e4d99a Updated the website to b19baea new f157cb4 Website updated to ea734720f24e655510b7b26f494ee86f8bb05713 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 (47b6145) \ N -- N -- N refs/heads/asf-site (f157cb4) 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 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: camel-karaf/3.4.x/blueprint.html |2 +- camel-karaf/3.4.x/eventadmin-component.html|2 +- camel-karaf/3.4.x/kura.html|2 +- camel-karaf/3.4.x/osgi-activator.html |2 +- camel-karaf/3.4.x/paxlogging-component.html|2 +- camel-karaf/latest/blueprint.html |2 +- camel-karaf/latest/eventadmin-component.html |2 +- camel-karaf/latest/kura.html |2 +- camel-karaf/latest/osgi-activator.html |2 +- camel-karaf/latest/paxlogging-component.html |2 +- components/2.x/ahc-component.html |2 +- components/2.x/ahc-ws-component.html |2 +- components/2.x/amqp-component.html |2 +- components/2.x/apns-component.html |2 +- components/2.x/as2-component.html |2 +- components/2.x/asterisk-component.html |2 +- components/2.x/atmos-component.html|2 +- components/2.x/atmosphere-websocket-component.html |2 +- components/2.x/atom-component.html |2 +- components/2.x/atomix-map-component.html |2 +- components/2.x/atomix-messaging-component.html |2 +- components/2.x/atomix-multimap-component.html |2 +- components/2.x/atomix-queue-component.html |2 +- components/2.x/atomix-set-component.html |2 +- components/2.x/atomix-value-component.html |2 +- components/2.x/avro-component.html |2 +- components/2.x/aws-cw-component.html |2 +- components/2.x/aws-ddb-component.html |2 +- components/2.x/aws-ddbstream-component.html|2 +- components/2.x/aws-ec2-component.html |2 +- components/2.x/aws-iam-component.html |2 +- components/2.x/aws-kinesis-component.html |2 +- components/2.x/aws-kinesis-firehose-component.html |2 +- components/2.x/aws-kms-component.html |2 +- components/2.x/aws-lambda-component.html |2 +- components/2.x/aws-mq-component.html |2 +- components/2.x/aws-s3-component.html |2 +- components/2.x/aws-sdb-component.html |2 +- components/2.x/aws-ses-component.html |2 +- components/2.x/aws-sns-component.html |2 +- components/2.x/aws-sqs-component.html |2 +- components/2.x/aws-summary.html|2 +- components/2.x/aws-swf-component.html |2 +- components/2.x/azure-blob-component.html |2 +- components/2.x/azure-queue-component.html |2 +- components/2.x/azure-summary.html |2 +- components/2.x/bean-validator-component.html |2 +- components/2.x/beanstalk-component.html|2 +- components/2.x/bonita-component.html |2 +- components/2.x/box-component.html |2 +- components/2.x/braintree-component.html|2 +- components/2.x/cache-component.html|2 +- components/2.x/caffeine-cache-component.html |2 +- components/2.x/caffeine-loadcache-component.html |2 +- components/2.x/chronicle-engine-component.html |2 +- components/2.x/chunk-component.html|2 +- components/2.x/cmis-component.html |2 +- components/2.x/coap-component.html |2 +-
