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 2015/12/04 12:20:58 UTC
[1/8] camel git commit: Upgrade AWS SDK and related bundle to version
1.10.37
Repository: camel
Updated Branches:
refs/heads/master b46392c25 -> 614a87add
Upgrade AWS SDK and related bundle to version 1.10.37
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b051fb54
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b051fb54
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b051fb54
Branch: refs/heads/master
Commit: b051fb5492907f9b02c78715ab42437601320bfe
Parents: b46392c
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Dec 4 09:37:18 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Dec 4 12:11:15 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b051fb54/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5b1e59b..972cfa0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -65,8 +65,8 @@
<avro-bundle-version>1.7.7_1</avro-bundle-version>
<avro-ipc-bundle-version>1.7.7_1</avro-ipc-bundle-version>
<awaitility.version>1.7.0</awaitility.version>
- <aws-java-sdk-bundle-version>1.10.29_1</aws-java-sdk-bundle-version>
- <aws-java-sdk-version>1.10.29</aws-java-sdk-version>
+ <aws-java-sdk-bundle-version>1.10.37_1</aws-java-sdk-bundle-version>
+ <aws-java-sdk-version>1.10.37</aws-java-sdk-version>
<axiom-version>1.2.14</axiom-version>
<backport-util-concurrent-version>3.1</backport-util-concurrent-version>
<bcel-bundle-version>5.2_4</bcel-bundle-version>
[4/8] camel git commit: Upgrade Jt400 and related bundle to version
8.7
Posted by ac...@apache.org.
Upgrade Jt400 and related bundle to version 8.7
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e7f02fe6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e7f02fe6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e7f02fe6
Branch: refs/heads/master
Commit: e7f02fe6f92a88147f6887230ee4ec631fa950d6
Parents: a7a653a
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Dec 4 11:04:31 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Dec 4 12:11:27 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e7f02fe6/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 7eef3f6..906ad20 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -312,8 +312,8 @@
<jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>
<jsr311-api-version>1.1.1</jsr311-api-version>
<jsmpp-bundle-version>2.1.0_4</jsmpp-bundle-version>
- <jt400-version>8.6</jt400-version>
- <jt400-bundle-version>8.6_1</jt400-bundle-version>
+ <jt400-version>8.7</jt400-version>
+ <jt400-bundle-version>8.7_1</jt400-bundle-version>
<juel-bundle-version>2.1.3_1</juel-bundle-version>
<juel-version>2.1.3</juel-version>
<!-- camel-itest-karaf doesn't work with JUnit 4.12 at present -->
[6/8] camel git commit: Upgrade Olingo2 and related bundle to version
2.0.5
Posted by ac...@apache.org.
Upgrade Olingo2 and related bundle to version 2.0.5
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/64c350bf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/64c350bf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/64c350bf
Branch: refs/heads/master
Commit: 64c350bf27b76b3fabd0f5fdc288e0834cbbe1a2
Parents: 0c0efb7
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Dec 4 11:41:37 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Dec 4 12:11:28 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/64c350bf/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 868afed..722430d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -390,8 +390,8 @@
<!-- should be in-sync with deltaspike -->
<openwebbeans-version>1.2.0</openwebbeans-version>
<oauth-provider-bundle-version>20100527_1</oauth-provider-bundle-version>
- <olingo2-version>2.0.4</olingo2-version>
- <olingo-odata2-core-bundle-version>2.0.4_1</olingo-odata2-core-bundle-version>
+ <olingo2-version>2.0.5</olingo2-version>
+ <olingo-odata2-core-bundle-version>2.0.5_1</olingo-odata2-core-bundle-version>
<ognl-version>3.1.1</ognl-version>
<ognl-bundle-version>3.1.1_1</ognl-bundle-version>
<oncrpc-version>1.1.2</oncrpc-version>
[2/8] camel git commit: Upgrade Google App Engine and related bundle
to version 1.9.28
Posted by ac...@apache.org.
Upgrade Google App Engine and related bundle to version 1.9.28
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a7a653a4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a7a653a4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a7a653a4
Branch: refs/heads/master
Commit: a7a653a4c870104ed9ff39f9deada413aa198b63
Parents: d1574f8
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Dec 4 10:40:15 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Dec 4 12:11:27 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a7a653a4/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b4e0a67..7eef3f6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -185,8 +185,8 @@
<geronimo-ws-metadata-spec-version>1.1.3</geronimo-ws-metadata-spec-version>
<gmaven-plugin-version>1.4</gmaven-plugin-version>
<gmetric4j-version>1.0.10</gmetric4j-version>
- <google-app-engine-version>1.9.27</google-app-engine-version>
- <google-app-engine-bundle-version>1.9.27_1</google-app-engine-bundle-version>
+ <google-app-engine-version>1.9.28</google-app-engine-version>
+ <google-app-engine-bundle-version>1.9.28_1</google-app-engine-bundle-version>
<google-gdata-version>1.41.5.w1</google-gdata-version>
<google-gdata-bundle-version>1.41.1_1</google-gdata-bundle-version>
<google-guava-version>18.0</google-guava-version>
[8/8] camel git commit: Upgrade Chunk-templates to version 3.1.2
Posted by ac...@apache.org.
Upgrade Chunk-templates to version 3.1.2
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/614a87ad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/614a87ad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/614a87ad
Branch: refs/heads/master
Commit: 614a87add37f3d1a4e45b6176a9e48c18ff8a0ff
Parents: 9addd56
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Dec 4 12:08:12 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Dec 4 12:11:29 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/614a87ad/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8dae204..96a2445 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -89,7 +89,7 @@
<cdi-api-version>1.1</cdi-api-version>
<cglib-bundle-version>3.2.0_1</cglib-bundle-version>
<cglib-version>3.2.0</cglib-version>
- <chunk-templates-version>3.1.1</chunk-templates-version>
+ <chunk-templates-version>3.1.2</chunk-templates-version>
<classmate-version>1.3.1</classmate-version>
<cmis-version>0.13.0</cmis-version>
<cometd-bayeux-version>6.1.11</cometd-bayeux-version>
[7/8] camel git commit: [CAMEL-9361] Upgrade kafka to 0.9.0.0
Posted by ac...@apache.org.
[CAMEL-9361] Upgrade kafka to 0.9.0.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9addd564
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9addd564
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9addd564
Branch: refs/heads/master
Commit: 9addd5640e2dfaa7b7ce89b334e0e05ddb0c36ea
Parents: 64c350b
Author: James Netherton <ja...@gmail.com>
Authored: Thu Nov 26 13:59:48 2015 +0000
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Dec 4 12:11:29 2015 +0100
----------------------------------------------------------------------
.../component/kafka/embedded/EmbeddedKafkaCluster.java | 11 ++++++-----
parent/pom.xml | 6 +++---
2 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9addd564/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 f23dd46..24a80a2 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
@@ -26,7 +26,8 @@ import java.util.Properties;
import kafka.admin.AdminUtils;
import kafka.server.KafkaConfig;
import kafka.server.KafkaServer;
-import org.I0Itec.zkclient.ZkClient;
+import kafka.utils.ZkUtils;
+import scala.Option;
public class EmbeddedKafkaCluster {
private final List<Integer> ports;
@@ -56,16 +57,16 @@ public class EmbeddedKafkaCluster {
this.brokerList = constructBrokerList(this.ports);
}
- public ZkClient getZkClient() {
+ public ZkUtils getZkUtils() {
for (KafkaServer server : brokers) {
- return server.zkClient();
+ return server.zkUtils();
}
return null;
}
public void createTopics(String...topics) {
for (String topic : topics) {
- AdminUtils.createTopic(getZkClient(), topic, 2, 1, new Properties());
+ AdminUtils.createTopic(getZkUtils(), topic, 2, 1, new Properties());
}
}
@@ -121,7 +122,7 @@ public class EmbeddedKafkaCluster {
private KafkaServer startBroker(Properties props) {
- KafkaServer server = new KafkaServer(new KafkaConfig(props), new SystemTime());
+ KafkaServer server = new KafkaServer(new KafkaConfig(props), new SystemTime(), Option.<String>empty());
server.startup();
return server;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9addd564/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 722430d..8dae204 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -321,9 +321,9 @@
<junit-version>4.11</junit-version>
<jython-version>2.5.3</jython-version>
<jzlib-version>1.1.3</jzlib-version>
- <kafka-version>0.8.2.2</kafka-version>
- <kafka-bundle-version>0.8.2.2_1</kafka-bundle-version>
- <kafka-clients-bundle-version>0.8.2.2_1</kafka-clients-bundle-version>
+ <kafka-version>0.9.0.0</kafka-version>
+ <kafka-bundle-version>0.9.0.0_1</kafka-bundle-version>
+ <kafka-clients-bundle-version>0.9.0.0_1</kafka-clients-bundle-version>
<karaf-version>2.4.3</karaf-version>
<karaf3-version>3.0.2</karaf3-version>
<kie-version>6.3.0.Final</kie-version>
[3/8] camel git commit: Upgrade Cglib and related bundle to version
3.2.0
Posted by ac...@apache.org.
Upgrade Cglib and related bundle to version 3.2.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d1574f88
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d1574f88
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d1574f88
Branch: refs/heads/master
Commit: d1574f88646e5a098faa4c19539e5c38ed5ba9cd
Parents: b051fb5
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Dec 4 10:25:09 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Dec 4 12:11:27 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d1574f88/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 972cfa0..b4e0a67 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -87,8 +87,8 @@
<castor-version>1.3.3</castor-version>
<castor-bundle-version>1.3.3_1</castor-bundle-version>
<cdi-api-version>1.1</cdi-api-version>
- <cglib-bundle-version>3.1_1</cglib-bundle-version>
- <cglib-version>3.1</cglib-version>
+ <cglib-bundle-version>3.2.0_1</cglib-bundle-version>
+ <cglib-version>3.2.0</cglib-version>
<chunk-templates-version>3.1.1</chunk-templates-version>
<classmate-version>1.3.1</classmate-version>
<cmis-version>0.13.0</cmis-version>
[5/8] camel git commit: Upgrade Ognl and related bundle to version
3.1.1
Posted by ac...@apache.org.
Upgrade Ognl and related bundle to version 3.1.1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0c0efb71
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0c0efb71
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0c0efb71
Branch: refs/heads/master
Commit: 0c0efb7153df8414d1c8f56aa216482caae1e911
Parents: e7f02fe
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Dec 4 11:33:37 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Dec 4 12:11:28 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0c0efb71/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 906ad20..868afed 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -392,8 +392,8 @@
<oauth-provider-bundle-version>20100527_1</oauth-provider-bundle-version>
<olingo2-version>2.0.4</olingo2-version>
<olingo-odata2-core-bundle-version>2.0.4_1</olingo-odata2-core-bundle-version>
- <ognl-version>3.1</ognl-version>
- <ognl-bundle-version>3.1_1</ognl-bundle-version>
+ <ognl-version>3.1.1</ognl-version>
+ <ognl-bundle-version>3.1.1_1</ognl-bundle-version>
<oncrpc-version>1.1.2</oncrpc-version>
<openejb-version>4.7.2</openejb-version>
<openjpa-version>2.4.0</openjpa-version>