camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [4/4] git commit: upgrade camel-rx to use the latest version of rxjava
Date Mon, 02 Sep 2013 10:33:03 GMT
upgrade camel-rx to use the latest version of rxjava


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/20b60b70
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/20b60b70
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/20b60b70

Branch: refs/heads/camel-2.12.x
Commit: 20b60b7024a499955eaeb3d78cdf3e540bdb65a6
Parents: 4b9979e
Author: James Strachan <james.strachan@gmail.com>
Authored: Mon Sep 2 11:27:14 2013 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Sep 2 12:32:42 2013 +0200

----------------------------------------------------------------------
 .../camel-rx/src/test/java/org/apache/camel/rx/SendToTest.java     | 2 +-
 parent/pom.xml                                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/20b60b70/components/camel-rx/src/test/java/org/apache/camel/rx/SendToTest.java
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/test/java/org/apache/camel/rx/SendToTest.java b/components/camel-rx/src/test/java/org/apache/camel/rx/SendToTest.java
index 818c550..83de696 100644
--- a/components/camel-rx/src/test/java/org/apache/camel/rx/SendToTest.java
+++ b/components/camel-rx/src/test/java/org/apache/camel/rx/SendToTest.java
@@ -27,7 +27,7 @@ public class SendToTest extends RxTestSupport {
     @Test
     public void testSendObservableToEndpoint() throws Exception {
         Order[] expectedBodies = {new Order("o1", 1.10), new Order("o2", 2.20), new Order("o3",
3.30)};
-        Observable<Order> someObservable = Observable.toObservable(expectedBodies);
+        Observable<Order> someObservable = Observable.from(expectedBodies);
 
         final MockEndpoint mockEndpoint = camelContext.getEndpoint("mock:results", MockEndpoint.class);
         mockEndpoint.expectedBodiesReceived(expectedBodies);

http://git-wip-us.apache.org/repos/asf/camel/blob/20b60b70/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3ea957c..3f2d432 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -332,7 +332,7 @@
     <rhino-version>1.7R2</rhino-version>
     <rome-bundle-version>1.0_3</rome-bundle-version>
     <rome-version>1.0</rome-version>
-    <rxjava-version>0.10.1</rxjava-version>
+    <rxjava-version>0.11.1</rxjava-version>
     <saaj-impl-version>1.3.2_2</saaj-impl-version>
     <saxon-bundle-version>9.5.0.2_1</saxon-bundle-version>
     <saxon-version>9.5.0.2</saxon-version>


Mime
View raw message