You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2015/04/06 09:39:10 UTC
[2/2] camel git commit: CAMEL-7833 clean up the pom file of camel-rx
CAMEL-7833 clean up the pom file of camel-rx
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9020df3b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9020df3b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9020df3b
Branch: refs/heads/master
Commit: 9020df3be5a0e66e95ca82441b91b9575581c54a
Parents: 33ebe71
Author: Willem Jiang <wi...@gmail.com>
Authored: Mon Apr 6 15:37:43 2015 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Mon Apr 6 15:38:56 2015 +0800
----------------------------------------------------------------------
components/camel-rx/pom.xml | 11 ++++++-----
.../test/java/org/apache/camel/rx/CamelOperatorTest.java | 4 ++--
2 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9020df3b/components/camel-rx/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-rx/pom.xml b/components/camel-rx/pom.xml
index 63baf5f..29f42dd 100644
--- a/components/camel-rx/pom.xml
+++ b/components/camel-rx/pom.xml
@@ -39,11 +39,7 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-restlet</artifactId>
- </dependency>
-
+
<dependency>
<groupId>io.reactivex</groupId>
<artifactId>rxjava</artifactId>
@@ -53,6 +49,10 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-restlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
@@ -70,6 +70,7 @@
<groupId>com.jayway.restassured</groupId>
<artifactId>rest-assured</artifactId>
<version>2.3.0</version>
+ <scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/camel/blob/9020df3b/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 8d09858..f9e30d9 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
@@ -27,8 +27,8 @@ import rx.Subscription;
import rx.functions.Func1;
import rx.observables.ConnectableObservable;
-import static com.jayway.restassured.RestAssured.*;
-import static org.hamcrest.Matchers.*;
+import static com.jayway.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.containsString;
/**
*/