You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2015/12/06 13:14:31 UTC
camel git commit: upgrade to rxjava 1.1.0 and rest-assured 2.7.0
Repository: camel
Updated Branches:
refs/heads/master 2b67dce34 -> e839adea9
upgrade to rxjava 1.1.0 and rest-assured 2.7.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e839adea
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e839adea
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e839adea
Branch: refs/heads/master
Commit: e839adea9fa7fd9dce0f8f6f43105d3eaa21f9a3
Parents: 2b67dce
Author: Babak Vahdat <bv...@apache.org>
Authored: Sun Dec 6 13:13:56 2015 +0100
Committer: Babak Vahdat <bv...@apache.org>
Committed: Sun Dec 6 13:13:56 2015 +0100
----------------------------------------------------------------------
components/camel-rx/pom.xml | 2 +-
.../src/test/java/org/apache/camel/rx/CamelOperatorTest.java | 1 -
parent/pom.xml | 3 ++-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e839adea/components/camel-rx/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-rx/pom.xml b/components/camel-rx/pom.xml
index 4ff1820..bef0e27 100644
--- a/components/camel-rx/pom.xml
+++ b/components/camel-rx/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>com.jayway.restassured</groupId>
<artifactId>rest-assured</artifactId>
- <version>2.3.0</version>
+ <version>${rest-assured-version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/e839adea/components/camel-rx/src/test/java/org/apache/camel/rx/CamelOperatorTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/CamelOperatorTest.java b/components/camel-rx/src/test/java/org/apache/camel/rx/CamelOperatorTest.java
index f9e30d9..4597f23 100644
--- a/components/camel-rx/src/test/java/org/apache/camel/rx/CamelOperatorTest.java
+++ b/components/camel-rx/src/test/java/org/apache/camel/rx/CamelOperatorTest.java
@@ -33,7 +33,6 @@ import static org.hamcrest.Matchers.containsString;
/**
*/
public class CamelOperatorTest extends RxTestSupport {
- private static final Logger LOG = LoggerFactory.getLogger(CamelOperatorTest.class);
@Test
public void testCamelOperator() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/e839adea/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 96a2445..ba10216 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -424,12 +424,13 @@
<rabbitmq-amqp-client-version>3.5.6</rabbitmq-amqp-client-version>
<reflections-bundle-version>0.9.10_3</reflections-bundle-version>
<regexp-bundle-version>1.4_1</regexp-bundle-version>
+ <rest-assured-version>2.7.0</rest-assured-version>
<restlet-version>2.3.1</restlet-version>
<rhino-bundle-version>1.7R2_3</rhino-bundle-version>
<rhino-version>1.7R2</rhino-version>
<rome-bundle-version>1.0_3</rome-bundle-version>
<rome-version>1.0</rome-version>
- <rxjava-version>1.0.16</rxjava-version>
+ <rxjava-version>1.1.0</rxjava-version>
<saaj-impl-version>1.3.2_2</saaj-impl-version>
<saxon-bundle-version>9.5.1-5_1</saxon-bundle-version>
<saxon-version>9.5.1-5</saxon-version>