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 2017/03/26 07:58:15 UTC
[1/3] camel git commit: CAMEL-11064: Add activemq-amqp to parent POM
Repository: camel
Updated Branches:
refs/heads/camel-2.18.x ac5f22e7b -> 1a59b2cc7
refs/heads/master afca0b700 -> 233e6a87f
CAMEL-11064: Add activemq-amqp to parent POM
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/078a707d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/078a707d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/078a707d
Branch: refs/heads/master
Commit: 078a707d41eeac60300367bef2fe7cc157672906
Parents: afca0b7
Author: James Netherton <ja...@gmail.com>
Authored: Fri Mar 24 13:34:08 2017 +0000
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 26 09:07:19 2017 +0200
----------------------------------------------------------------------
components/camel-amqp/pom.xml | 1 -
parent/pom.xml | 5 +++++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/078a707d/components/camel-amqp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 3077fc3..323b62e 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -97,7 +97,6 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-amqp</artifactId>
- <version>${activemq-version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/078a707d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 6c27006..97b35e4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -3688,6 +3688,11 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-amqp</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-openwire-legacy</artifactId>
<version>${activemq-version}</version>
</dependency>
[3/3] camel git commit: CAMEL-11064: Add activemq-amqp to parent POM
Posted by da...@apache.org.
CAMEL-11064: Add activemq-amqp to parent POM
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1a59b2cc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1a59b2cc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1a59b2cc
Branch: refs/heads/camel-2.18.x
Commit: 1a59b2cc72a6d2f909a96deb5adff6c0ca0c96f4
Parents: ac5f22e
Author: James Netherton <ja...@gmail.com>
Authored: Fri Mar 24 13:34:08 2017 +0000
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 26 09:58:08 2017 +0200
----------------------------------------------------------------------
components/camel-amqp/pom.xml | 1 -
parent/pom.xml | 5 +++++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/1a59b2cc/components/camel-amqp/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 9b2143a..f7c97de 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -67,7 +67,6 @@
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-amqp</artifactId>
- <version>${activemq-version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/1a59b2cc/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index de28ed2..c3c52d1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -3456,6 +3456,11 @@
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-amqp</artifactId>
+ <version>${activemq-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
<artifactId>activemq-openwire-legacy</artifactId>
<version>${activemq-version}</version>
</dependency>
[2/3] camel git commit: Upgrade RX
Posted by da...@apache.org.
Upgrade RX
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/233e6a87
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/233e6a87
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/233e6a87
Branch: refs/heads/master
Commit: 233e6a87fcbdd1a960e84b14f5c502493a124b4e
Parents: 078a707
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Mar 26 09:57:35 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Mar 26 09:57:35 2017 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/233e6a87/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 97b35e4..2343e09 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -539,7 +539,7 @@
<roaster-version>2.20.0.Final</roaster-version>
<rome-bundle-version>1.0_3</rome-bundle-version>
<rome-version>1.0</rome-version>
- <rxjava-version>1.2.7</rxjava-version>
+ <rxjava-version>1.2.9</rxjava-version>
<rxjava2-version>2.0.7</rxjava2-version>
<saaj-impl-version>1.3.2_2</saaj-impl-version>
<saxon-bundle-version>9.7.0-15_1</saxon-bundle-version>