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 2014/06/10 13:59:24 UTC
[1/6] git commit: Upgrade AWS
Repository: camel
Updated Branches:
refs/heads/camel-2.13.x e7c6a8e1e -> 0bc742b63
refs/heads/master 86797a341 -> dbc6dcce9
Upgrade AWS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/631860c9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/631860c9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/631860c9
Branch: refs/heads/master
Commit: 631860c9b5b28879d212432b9cfeeefb8a123187
Parents: 86797a3
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 10 13:35:47 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 10 13:35:47 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/631860c9/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 21c9748..36bd447 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -60,8 +60,8 @@
<avalon-version>4.3.1</avalon-version>
<avro-version>1.7.6</avro-version>
<avro-bundle-version>1.7.6_1</avro-bundle-version>
- <aws-java-sdk-bundle-version>1.7.5_1</aws-java-sdk-bundle-version>
- <aws-java-sdk-version>1.7.5</aws-java-sdk-version>
+ <aws-java-sdk-bundle-version>1.7.12_1</aws-java-sdk-bundle-version>
+ <aws-java-sdk-version>1.7.12</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>
[3/6] git commit: Upgraded mustache
Posted by da...@apache.org.
Upgraded mustache
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/23496f39
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/23496f39
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/23496f39
Branch: refs/heads/master
Commit: 23496f395b333960e847f01b6b8fb9a543c14485
Parents: e403ba1
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 10 13:40:00 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 10 13:40:00 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/23496f39/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 09792b7..9c4bd60 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -302,8 +302,8 @@
<mongo-java-driver-version>2.12.0</mongo-java-driver-version>
<mqtt-client-version>1.10</mqtt-client-version>
<msv-version>20050913</msv-version>
- <mustache-java-version>0.8.13</mustache-java-version>
- <mustache-bundle-version>0.8.13_1/</mustache-bundle-version>
+ <mustache-java-version>0.8.15</mustache-java-version>
+ <mustache-bundle-version>0.8.15_1/</mustache-bundle-version>
<mvel-version>2.1.7.Final</mvel-version>
<mybatis-version>3.2.7</mybatis-version>
<neethi-bundle-version>3.0.1</neethi-bundle-version>
[6/6] git commit: Upgraded mustache
Posted by da...@apache.org.
Upgraded mustache
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0bc742b6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0bc742b6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0bc742b6
Branch: refs/heads/camel-2.13.x
Commit: 0bc742b63cf72c12ea1bbf9ba59657ef55dcc125
Parents: 7bcf45e
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 10 13:40:00 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 10 13:58:57 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0bc742b6/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a107097..cb6cfed 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -307,8 +307,8 @@
<mongo-java-driver-version>2.11.4</mongo-java-driver-version>
<mqtt-client-version>1.10</mqtt-client-version>
<msv-version>20050913</msv-version>
- <mustache-java-version>0.8.13</mustache-java-version>
- <mustache-bundle-version>0.8.13_1/</mustache-bundle-version>
+ <mustache-java-version>0.8.15</mustache-java-version>
+ <mustache-bundle-version>0.8.15_1/</mustache-bundle-version>
<mvel-version>2.1.7.Final</mvel-version>
<mybatis-version>3.2.7</mybatis-version>
<neethi-bundle-version>3.0.1</neethi-bundle-version>
[4/6] git commit: Upgraded apid
Posted by da...@apache.org.
Upgraded apid
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dbc6dcce
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dbc6dcce
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dbc6dcce
Branch: refs/heads/master
Commit: dbc6dcce931860dc4b9f3d2c4de3c32259c609d7
Parents: 23496f3
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 10 13:57:36 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 10 13:57:36 2014 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/component/amqp/AMQPComponent.java | 4 ++--
.../test/java/org/apache/camel/component/amqp/AMQPRouteTest.java | 3 ++-
parent/pom.xml | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/dbc6dcce/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
index 710158e..e889a85 100644
--- a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
+++ b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPComponent.java
@@ -30,8 +30,6 @@ import org.apache.qpid.client.AMQConnectionFactory;
/**
* This component supports the AMQP protocol using the Client API of the Apache Qpid project.
- *
- * @version
*/
public class AMQPComponent extends JmsComponent {
@@ -56,9 +54,11 @@ public class AMQPComponent extends JmsComponent {
}
return new AMQPComponent(ConnectionFactoryImpl.createFromURL(uri));
}
+
public static Component amqpComponentOld(String uri) throws URISyntaxException {
return new AMQPComponent(new AMQConnectionFactory(uri));
}
+
public static Component amqpComponent(String uri) throws MalformedURLException {
return new AMQPComponent(ConnectionFactoryImpl.createFromURL(uri));
}
http://git-wip-us.apache.org/repos/asf/camel/blob/dbc6dcce/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
index 952ea7f..b388698 100644
--- a/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
+++ b/components/camel-amqp/src/test/java/org/apache/camel/component/amqp/AMQPRouteTest.java
@@ -74,7 +74,7 @@ public class AMQPRouteTest extends CamelTestSupport {
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
camelContext.addComponent("amqp0-9", amqpComponent("amqp://guest:guest@/test?brokerlist='tcp://localhost:5672'", true));
- camelContext.addComponent("amqp1-0", amqpComponent("amqp://guest:guest@/test?brokerlist='tcp://localhost:5672'", false));
+ camelContext.addComponent("amqp1-0", amqpComponent("amqp://guest:guest@localhost:5672?remote-host=test", false));
return camelContext;
}
@@ -84,6 +84,7 @@ public class AMQPRouteTest extends CamelTestSupport {
from("amqp0-9:queue:ping")
.to("log:routing")
.to("mock:result");
+
from("amqp1-0:queue:ping")
.to("log:routing")
.to("mock:result");
http://git-wip-us.apache.org/repos/asf/camel/blob/dbc6dcce/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 9c4bd60..8acc316 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -333,8 +333,8 @@
<pojosr-version>0.2.1</pojosr-version>
<powermock-version>1.5.1</powermock-version>
<protobuf-version>2.5.0</protobuf-version>
- <qpid-bundle-version>0.26_1</qpid-bundle-version>
- <qpid-version>0.26</qpid-version>
+ <qpid-bundle-version>0.28_1</qpid-bundle-version>
+ <qpid-version>0.28</qpid-version>
<quartz-bundle-version>1.8.6_1</quartz-bundle-version>
<quartz-version>1.8.6</quartz-version>
<quartz-version-range>[1.8,2)</quartz-version-range>
[2/6] git commit: Upgraded splunk
Posted by da...@apache.org.
Upgraded splunk
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e403ba1d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e403ba1d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e403ba1d
Branch: refs/heads/master
Commit: e403ba1d878caeffee7c663b69966d0cd15be6e4
Parents: 631860c
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 10 13:38:05 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 10 13:38:05 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e403ba1d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 36bd447..09792b7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -372,7 +372,7 @@
<solr-bundle-version>4.6.1_1</solr-bundle-version>
<solr-version>4.6.1</solr-version>
<solr-version-range>[4.5,5)</solr-version-range>
- <splunk-version>1.2.0_1</splunk-version>
+ <splunk-version>1.3.0_1</splunk-version>
<spring-batch-version>2.2.5.RELEASE</spring-batch-version>
<spring-castor-bundle-version>1.2.0</spring-castor-bundle-version>
<spring-data-commons-version>1.5.0.RELEASE</spring-data-commons-version>
[5/6] git commit: Upgrade AWS
Posted by da...@apache.org.
Upgrade AWS
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7bcf45ef
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7bcf45ef
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7bcf45ef
Branch: refs/heads/camel-2.13.x
Commit: 7bcf45efc6ea34d5aac0161522f2cc8c36f9095a
Parents: e7c6a8e
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Jun 10 13:35:47 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Jun 10 13:58:39 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7bcf45ef/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5914b59..a107097 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -59,8 +59,8 @@
<avalon-version>4.3.1</avalon-version>
<avro-version>1.7.6</avro-version>
<avro-bundle-version>1.7.6_1</avro-bundle-version>
- <aws-java-sdk-bundle-version>1.7.1_1</aws-java-sdk-bundle-version>
- <aws-java-sdk-version>1.7.1</aws-java-sdk-version>
+ <aws-java-sdk-bundle-version>1.7.12_1</aws-java-sdk-bundle-version>
+ <aws-java-sdk-version>1.7.12</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>