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/11/08 08:52:14 UTC
[1/6] camel git commit: Upgrade Kafka and related bundle to version
0.10.1.0
Repository: camel
Updated Branches:
refs/heads/master d62b0c7e6 -> 7e355e0d0
Upgrade Kafka and related bundle to version 0.10.1.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cff262bf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cff262bf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cff262bf
Branch: refs/heads/master
Commit: cff262bfadef572383d2f54bba407d75187580ae
Parents: d62b0c7
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Nov 8 08:26:08 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Nov 8 08:26:08 2016 +0100
----------------------------------------------------------------------
.../camel/component/kafka/embedded/EmbeddedKafkaCluster.java | 7 ++++++-
.../org/apache/camel/component/kafka/embedded/SystemTime.java | 5 +++++
parent/pom.xml | 4 ++--
3 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/cff262bf/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaCluster.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaCluster.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaCluster.java
index 37f3b21..ca0d68a 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaCluster.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/EmbeddedKafkaCluster.java
@@ -25,10 +25,13 @@ import java.util.Properties;
import kafka.admin.AdminUtils;
import kafka.admin.RackAwareMode;
+import kafka.metrics.KafkaMetricsReporter;
import kafka.server.KafkaConfig;
import kafka.server.KafkaServer;
import kafka.utils.ZkUtils;
import scala.Option;
+import scala.collection.Seq;
+import scala.collection.mutable.Buffer;
public class EmbeddedKafkaCluster {
private final List<Integer> ports;
@@ -123,7 +126,9 @@ public class EmbeddedKafkaCluster {
private KafkaServer startBroker(Properties props) {
- KafkaServer server = new KafkaServer(new KafkaConfig(props), new SystemTime(), Option.<String>empty());
+ List<KafkaMetricsReporter> kmrList = new ArrayList<>();
+ Buffer<KafkaMetricsReporter> metricsList = scala.collection.JavaConversions.asScalaBuffer(kmrList);
+ KafkaServer server = new KafkaServer(new KafkaConfig(props), new SystemTime(), Option.<String>empty(), metricsList);
server.startup();
return server;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/cff262bf/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/SystemTime.java
----------------------------------------------------------------------
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/SystemTime.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/SystemTime.java
index 7ad4965..2a9793a 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/SystemTime.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/embedded/SystemTime.java
@@ -34,4 +34,9 @@ class SystemTime implements Time {
// Ignore
}
}
+
+ @Override
+ public long hiResClockMs() {
+ return 0;
+ }
}
http://git-wip-us.apache.org/repos/asf/camel/blob/cff262bf/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 951daee..8262a2d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -373,8 +373,8 @@
<jython-version>2.5.3</jython-version>
<jzlib-version>1.1.3</jzlib-version>
<jzlib-bundle-version>1.1.3_2</jzlib-bundle-version>
- <kafka-version>0.10.0.1</kafka-version>
- <kafka-bundle-version>0.10.0.1_1</kafka-bundle-version>
+ <kafka-version>0.10.1.0</kafka-version>
+ <kafka-bundle-version>0.10.1.0_1</kafka-bundle-version>
<karaf-version>2.4.4</karaf-version>
<karaf3-version>3.0.8</karaf3-version>
<karaf4-version>4.0.7</karaf4-version>
[2/6] camel git commit: Upgrade Mustache and related bundle to
version 0.9.4
Posted by ac...@apache.org.
Upgrade Mustache and related bundle to version 0.9.4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ab9efd9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ab9efd9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ab9efd9
Branch: refs/heads/master
Commit: 2ab9efd96709208e48781d3c22406bbc8eac8dc6
Parents: cff262b
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Nov 8 08:28:52 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Nov 8 08:28:52 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2ab9efd9/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8262a2d..6a9e98a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -439,9 +439,9 @@
<mongo-hadoop-version>1.5.0</mongo-hadoop-version>
<mqtt-client-version>1.14</mqtt-client-version>
<msv-version>2013.6.1</msv-version>
- <mustache-java-version>0.9.3</mustache-java-version>
+ <mustache-java-version>0.9.4</mustache-java-version>
<mustache-guava-version>16.0</mustache-guava-version>
- <mustache-bundle-version>0.9.3_1</mustache-bundle-version>
+ <mustache-bundle-version>0.9.4_1</mustache-bundle-version>
<mvel-version>2.3.1.Final</mvel-version>
<mybatis-version>3.4.1</mybatis-version>
<narayana-version>5.3.5.Final</narayana-version>
[3/6] camel git commit: Upgrade Ognl and related bundle to version
3.1.12
Posted by ac...@apache.org.
Upgrade Ognl and related bundle to version 3.1.12
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/053ae338
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/053ae338
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/053ae338
Branch: refs/heads/master
Commit: 053ae33806d9129578eab54f5eccfc398bb4e943
Parents: 2ab9efd
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Nov 8 08:32:41 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Nov 8 08:32:41 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/053ae338/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6a9e98a..f525a95 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -458,8 +458,8 @@
<olingo2-version>2.0.6</olingo2-version>
<olingo-odata2-core-bundle-version>2.0.6_1</olingo-odata2-core-bundle-version>
<olingo2-gson-version>2.4</olingo2-gson-version>
- <ognl-version>3.1.10</ognl-version>
- <ognl-bundle-version>3.1.10_1</ognl-bundle-version>
+ <ognl-version>3.1.12</ognl-version>
+ <ognl-bundle-version>3.1.12_1</ognl-bundle-version>
<oncrpc-version>1.1.3</oncrpc-version>
<openejb-version>4.7.4</openejb-version>
<openhft-affinity-version>3.0.6</openhft-affinity-version>
[5/6] camel git commit: Upgrade Consul client and related bundle to
version 0.13.2
Posted by ac...@apache.org.
Upgrade Consul client and related bundle to version 0.13.2
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c15f2d29
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c15f2d29
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c15f2d29
Branch: refs/heads/master
Commit: c15f2d295d565601504bee6bebd8da3046470a3c
Parents: 2ebb214
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Nov 8 09:09:58 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Nov 8 09:09:58 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 5 +++--
platforms/karaf/features/src/main/resources/features.xml | 8 ++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c15f2d29/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 30a2acb..5cf5495 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -144,8 +144,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.7</consul-client-version>
- <consul-client-bundle-version>0.12.7_1</consul-client-bundle-version>
+ <consul-client-version>0.13.2</consul-client-version>
+ <consul-client-bundle-version>0.13.2_1</consul-client-bundle-version>
<cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
<curator-version>2.11.0</curator-version>
<cxf-version>3.1.8</cxf-version>
@@ -580,6 +580,7 @@
<squareup-okio-version>1.9.0</squareup-okio-version>
<squareup-okio-bundle-version>1.9.0_1</squareup-okio-bundle-version>
<squareup-retrofit-bundle-version>1.9.0_1</squareup-retrofit-bundle-version>
+ <squareup-retrofit2-bundle-version>2.1.0_1</squareup-retrofit2-bundle-version>
<sshd-version>0.14.0</sshd-version>
<stompjms-version>1.19</stompjms-version>
<swagger-scala-version>1.3.12</swagger-scala-version>
http://git-wip-us.apache.org/repos/asf/camel/blob/c15f2d29/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 d44e6dc..3fd9548 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -375,7 +375,15 @@
<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:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-guava/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/${okclient-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/${squareup-okio-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.retrofit/${squareup-retrofit2-bundle-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>
[4/6] camel git commit: Upgrade Olingo and related bundles to version
2.0.7
Posted by ac...@apache.org.
Upgrade Olingo and related bundles to version 2.0.7
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2ebb2142
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2ebb2142
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2ebb2142
Branch: refs/heads/master
Commit: 2ebb214230e2f29acb9e9cd0d6408d9919a302e9
Parents: 053ae33
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Nov 8 08:36:41 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Nov 8 08:36:41 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2ebb2142/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f525a95..30a2acb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -455,8 +455,8 @@
<oauth-provider-bundle-version>20100527_1</oauth-provider-bundle-version>
<okclient-version>3.4.1</okclient-version>
<okclient-bundle-version>3.4.1_1</okclient-bundle-version>
- <olingo2-version>2.0.6</olingo2-version>
- <olingo-odata2-core-bundle-version>2.0.6_1</olingo-odata2-core-bundle-version>
+ <olingo2-version>2.0.7</olingo2-version>
+ <olingo-odata2-core-bundle-version>2.0.7_1</olingo-odata2-core-bundle-version>
<olingo2-gson-version>2.4</olingo2-gson-version>
<ognl-version>3.1.12</ognl-version>
<ognl-bundle-version>3.1.12_1</ognl-bundle-version>
[6/6] camel git commit: Upgrade Saxon and related bundle to version
9.7.0-10
Posted by ac...@apache.org.
Upgrade Saxon and related bundle to version 9.7.0-10
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7e355e0d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7e355e0d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7e355e0d
Branch: refs/heads/master
Commit: 7e355e0d081b3b697b34d742376b8f9a27afd582
Parents: c15f2d2
Author: Andrea Cosentino <an...@gmail.com>
Authored: Tue Nov 8 09:16:33 2016 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Nov 8 09:16:33 2016 +0100
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7e355e0d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5cf5495..a505d6d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -508,8 +508,8 @@
<rome-version>1.0</rome-version>
<rxjava-version>1.2.2</rxjava-version>
<saaj-impl-version>1.3.2_2</saaj-impl-version>
- <saxon-bundle-version>9.7.0-8_1</saxon-bundle-version>
- <saxon-version>9.7.0-8</saxon-version>
+ <saxon-bundle-version>9.7.0-10_1</saxon-bundle-version>
+ <saxon-version>9.7.0-10</saxon-version>
<scala-version>2.11.7</scala-version>
<scala-2.10-version>2.10.6</scala-2.10-version>
<scala-maven-plugin-version>3.2.2</scala-maven-plugin-version>