You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2016/08/29 08:13:25 UTC
[1/5] camel git commit: Upgrade Cometd Server and client to version
3.0.10
Repository: camel
Updated Branches:
refs/heads/master d1af05a2f -> 07c129507
Upgrade Cometd Server and client to version 3.0.10
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/656add79
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/656add79
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/656add79
Branch: refs/heads/master
Commit: 656add790e09fd01325fda714dca71ade0eb0175
Parents: d1af05a
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Aug 29 09:32:57 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Aug 29 09:33:18 2016 +0200
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/656add79/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 28fd90c..d6003b2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -110,9 +110,9 @@
<classmate-version>1.3.1</classmate-version>
<cmis-version>0.13.0</cmis-version>
<cometd-bayeux-version>6.1.11</cometd-bayeux-version>
- <cometd-java-client-version>3.0.9</cometd-java-client-version>
+ <cometd-java-client-version>3.0.10</cometd-java-client-version>
<cometd-java-server-bundle-version>2.3.1_2</cometd-java-server-bundle-version>
- <cometd-java-server>3.0.9</cometd-java-server>
+ <cometd-java-server>3.0.10</cometd-java-server>
<commons-beanutils-bundle-version>1.8.3_1</commons-beanutils-bundle-version>
<commons-codec-version>1.10</commons-codec-version>
<commons-collections-version>3.2.2</commons-collections-version>
[2/5] camel git commit: Added automatic docs generations to barcode
Dataformat docs
Posted by ac...@apache.org.
Added automatic docs generations to barcode Dataformat docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e2e0f300
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e2e0f300
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e2e0f300
Branch: refs/heads/master
Commit: e2e0f30078b43a4761f4bfd2aaec04baa40d7574
Parents: 656add7
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Aug 29 09:57:15 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Aug 29 09:57:15 2016 +0200
----------------------------------------------------------------------
.../src/main/docs/barcode-dataformat.adoc | 21 ++++++++++++++++++++
1 file changed, 21 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e2e0f300/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
----------------------------------------------------------------------
diff --git a/components/camel-barcode/src/main/docs/barcode-dataformat.adoc b/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
index 72c4b87..86888cb 100644
--- a/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
+++ b/components/camel-barcode/src/main/docs/barcode-dataformat.adoc
@@ -30,6 +30,27 @@ link:download.html[the download page for the latest versions]).
</dependency>
----------------------------------------
+[[Barcode-Options]]
+Barcode Options
+^^^^^^^^^^^^^^^
+
+// dataformat options: START
+The Barcode dataformat supports 4 options which are listed below.
+
+
+
+{% raw %}
+[width="100%",cols="2s,1m,1m,6",options="header"]
+|=======================================================================
+| Name | Default | Java Type | Description
+| width | | Integer | Width of the barcode
+| height | | Integer | Height of the barcode
+| imageType | | String | Image type of the barcode such as png
+| barcodeFormat | | String | Barcode format such as QR-Code
+|=======================================================================
+{% endraw %}
+// dataformat options: END
+
[[BarcodeDataFormat-UsingtheJavaDSL]]
Using the Java DSL
^^^^^^^^^^^^^^^^^^
[4/5] camel git commit: Upgrade Consul Client and related bundle to
version 0.12.4
Posted by ac...@apache.org.
Upgrade Consul Client and related bundle to version 0.12.4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c540e7a4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c540e7a4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c540e7a4
Branch: refs/heads/master
Commit: c540e7a4cbae037cc1eaaff86d7b3c023f6f6505
Parents: 8aa3b29
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Aug 29 10:06:41 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Aug 29 10:06:41 2016 +0200
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c540e7a4/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f86d077..4b20b50 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -140,8 +140,8 @@
<commons-pool2-version>2.4.2</commons-pool2-version>
<commons-vfs2-version>2.0</commons-vfs2-version>
<compress-lzf-version>1.0.3</compress-lzf-version>
- <consul-client-version>0.12.2</consul-client-version>
- <consul-client-bundle-version>0.12.0_1</consul-client-bundle-version>
+ <consul-client-version>0.12.4</consul-client-version>
+ <consul-client-bundle-version>0.12.4_1</consul-client-bundle-version>
<cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
<cxf-version>3.1.7</cxf-version>
<cxf-version-range>[3.0,4.0)</cxf-version-range>
[5/5] camel git commit: Removed @ignore annotation on Camel-Consul
Karaf Integration Test and fixed the Camel-Consul Karaf feature
Posted by ac...@apache.org.
Removed @ignore annotation on Camel-Consul Karaf Integration Test and fixed the Camel-Consul Karaf feature
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/07c12950
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/07c12950
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/07c12950
Branch: refs/heads/master
Commit: 07c12950700cf15fe008b3163c0cd2916ef3a4ae
Parents: c540e7a
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Aug 29 10:11:52 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Aug 29 10:11:52 2016 +0200
----------------------------------------------------------------------
platforms/karaf/features/src/main/resources/features.xml | 2 ++
.../test/java/org/apache/camel/itest/karaf/CamelConsulTest.java | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/07c12950/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index a403007..08826ef 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -360,6 +360,8 @@
<feature name='camel-consul' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-core</feature>
<bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
+ <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+ <bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.orbitz-consul-client/${consul-client-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-consul/${project.version}</bundle>
</feature>
http://git-wip-us.apache.org/repos/asf/camel/blob/07c12950/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelConsulTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelConsulTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelConsulTest.java
index ef3b555..99d7cdc 100644
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelConsulTest.java
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelConsulTest.java
@@ -22,7 +22,6 @@ import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
-@Ignore("OSGi bundle not released yet")
public class CamelConsulTest extends BaseKarafTest {
public static final String COMPONENT = extractName(CamelConsulTest.class);
@@ -32,4 +31,4 @@ public class CamelConsulTest extends BaseKarafTest {
testComponent(COMPONENT);
}
-}
\ No newline at end of file
+}
[3/5] camel git commit: Upgrade Hazelcast to version 3.6.5
Posted by ac...@apache.org.
Upgrade Hazelcast to version 3.6.5
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8aa3b29d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8aa3b29d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8aa3b29d
Branch: refs/heads/master
Commit: 8aa3b29dd3862711e7fd831f6d96c330727a1403
Parents: e2e0f30
Author: Andrea Cosentino <an...@gmail.com>
Authored: Mon Aug 29 10:02:39 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Mon Aug 29 10:02:39 2016 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8aa3b29d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d6003b2..f86d077 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -240,7 +240,7 @@
<hawtbuf-version>1.11</hawtbuf-version>
<hawtdb-version>1.6</hawtdb-version>
<hawtdispatch-version>1.22</hawtdispatch-version>
- <hazelcast-version>3.6.4</hazelcast-version>
+ <hazelcast-version>3.6.5</hazelcast-version>
<hbase-version>1.2.1</hbase-version>
<hessian-version>4.0.38</hessian-version>
<hibernate-validator-version>5.2.4.Final</hibernate-validator-version>