You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2013/09/02 12:27:38 UTC
git commit: upgrade camel-rx to use the latest version of rxjava
Updated Branches:
refs/heads/master 0bdf8431d -> d3265079a
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/d3265079
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d3265079
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d3265079
Branch: refs/heads/master
Commit: d3265079ad4c4a2e8d1bb2efa2fa3cca660f39a3
Parents: 0bdf843
Author: James Strachan <ja...@gmail.com>
Authored: Mon Sep 2 11:27:14 2013 +0100
Committer: James Strachan <ja...@gmail.com>
Committed: Mon Sep 2 11:27:14 2013 +0100
----------------------------------------------------------------------
.../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/d3265079/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/d3265079/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 3da331c..9823794 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>