You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/09/01 04:53:14 UTC

[camel] branch master updated (f0b4f6f -> 10a26b5)

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 f0b4f6f  Add a Jenkins pipeline for daily deploy
     new 2efcbf1  Regen
     new 10a26b5  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:
 camel-dependencies/pom.xml                     |  8 ++++----
 core/camel-main/src/main/docs/main.adoc        | 17 ++++++++++-------
 docs/components/modules/others/pages/main.adoc | 17 +++++++----------
 3 files changed, 21 insertions(+), 21 deletions(-)


[camel] 02/02: Regen

Posted by da...@apache.org.
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 10a26b5ca695f096a06911d2b62dd7aa31fa1eba
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Sep 1 06:52:44 2020 +0200

    Regen
---
 core/camel-main/src/main/docs/main.adoc        | 17 ++++++++++-------
 docs/components/modules/others/pages/main.adoc | 17 +++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/core/camel-main/src/main/docs/main.adoc b/core/camel-main/src/main/docs/main.adoc
index ca16c36..cf563e1 100644
--- a/core/camel-main/src/main/docs/main.adoc
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -360,12 +360,13 @@ Maps have a special syntax with brackets as shown below:
 
 [source,properties]
 ----
-camel.beans.company[name] = Acme
-camel.beans.company[country] = USA
-camel.beans.company[zip] = 92010
+camel.beans.mymap[table] = 12
+camel.beans.mymap[food] = Big Burger
+camel.beans.mymap[cheese] = yes
+camel.beans.mymap[quantity] = 1
 ----
 
-The Map is registered in the Camel Registry with the name `company`.
+The Map is registered in the Camel Registry with the name `mymap`.
 
 == Defining a List bean
 
@@ -373,11 +374,13 @@ This is similar to Map bean where the key is the index, eg 0, 1, 2, etc:
 
 [source,properties]
 ----
-camel.beans.projects[0] = Camel
-camel.beans.projects[1] = Kafka
-camel.beans.projects[2] = Quarkus
+camel.beans.myprojects[0] = Camel
+camel.beans.myprojects[1] = Kafka
+camel.beans.myprojects[2] = Quarkus
 ----
 
+The List is registered in the Camel Registry with the name `myprojects`.
+
 == Examples
 
 You can find a set of examples using `camel-main` in https://github.com/apache/camel-examples[Camel Examples]
diff --git a/docs/components/modules/others/pages/main.adoc b/docs/components/modules/others/pages/main.adoc
index 490d1dc..5b7ff5f 100644
--- a/docs/components/modules/others/pages/main.adoc
+++ b/docs/components/modules/others/pages/main.adoc
@@ -362,13 +362,12 @@ Maps have a special syntax with brackets as shown below:
 
 [source,properties]
 ----
-camel.beans.mymap[table] = 12
-camel.beans.mymap[food] = Big Burger
-camel.beans.mymap[cheese] = yes
-camel.beans.mymap[quantity] = 1
+camel.beans.company[name] = Acme
+camel.beans.company[country] = USA
+camel.beans.company[zip] = 92010
 ----
 
-The Map is registered in the Camel Registry with the name `mymap`.
+The Map is registered in the Camel Registry with the name `company`.
 
 == Defining a List bean
 
@@ -376,13 +375,11 @@ This is similar to Map bean where the key is the index, eg 0, 1, 2, etc:
 
 [source,properties]
 ----
-camel.beans.myprojects[0] = Camel
-camel.beans.myprojects[1] = Kafka
-camel.beans.myprojects[2] = Quarkus
+camel.beans.projects[0] = Camel
+camel.beans.projects[1] = Kafka
+camel.beans.projects[2] = Quarkus
 ----
 
-The List is registered in the Camel Registry with the name `myprojects`.
-
 == Examples
 
 You can find a set of examples using `camel-main` in https://github.com/apache/camel-examples[Camel Examples]


[camel] 01/02: Regen

Posted by da...@apache.org.
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 2efcbf1394c9fdbbec43a6df7fe7f38317f49095
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Sep 1 06:51:18 2020 +0200

    Regen
---
 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 7518a0b..3d1d61c 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -56,12 +56,12 @@
     <arquillian-weld-embedded-version>2.0.0.Final</arquillian-weld-embedded-version>
     <asm-version>8.0.1</asm-version>
     <aspectj-version>1.9.6</aspectj-version>
-    <assertj-version>3.17.0</assertj-version>
+    <assertj-version>3.17.1</assertj-version>
     <asterisk-java-version>1.0.0-final</asterisk-java-version>
     <atlassian-fugue-version>3.0.0</atlassian-fugue-version>
     <atmos-client-version>3.1.0</atmos-client-version>
-    <atmosphere-version>2.5.15</atmosphere-version>
-    <atmosphere-version-range>[2.5,3.0)</atmosphere-version-range>
+    <atmosphere-version>2.6.1</atmosphere-version>
+    <atmosphere-version-range>[2.6,3.0)</atmosphere-version-range>
     <atomix-catalyst-version>1.2.1</atomix-catalyst-version>
     <atomix-version>1.0.8</atomix-version>
     <avalon-version>4.3.1</avalon-version>
@@ -83,7 +83,7 @@
     <beanstalkd-client-version>1.4.6</beanstalkd-client-version>
     <bouncycastle-version>1.66</bouncycastle-version>
     <box-java-sdk-version>2.50.1</box-java-sdk-version>
-    <braintree-gateway-version>2.109.0</braintree-gateway-version>
+    <braintree-gateway-version>3.1.0</braintree-gateway-version>
     <brave-zipkin-version>5.12.0</brave-zipkin-version>
     <build-helper-maven-plugin-version>3.1.0</build-helper-maven-plugin-version>
     <c3p0-version>0.9.5.5</c3p0-version>