camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [3/3] camel git commit: Upgrade to RX 1.0.0
Date Wed, 19 Nov 2014 07:03:27 GMT
Upgrade to RX 1.0.0


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

Branch: refs/heads/master
Commit: add89cef0724f10937b82464dc19146fac6ea953
Parents: b5507ce
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Nov 19 08:02:15 2014 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Nov 19 08:03:18 2014 +0100

----------------------------------------------------------------------
 components/camel-rx/pom.xml                             | 4 ++--
 components/camel-rx/src/test/resources/log4j.properties | 6 +++---
 parent/pom.xml                                          | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/add89cef/components/camel-rx/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-rx/pom.xml b/components/camel-rx/pom.xml
index 791bb9d..5d71877 100644
--- a/components/camel-rx/pom.xml
+++ b/components/camel-rx/pom.xml
@@ -41,8 +41,8 @@
     </dependency>
 
     <dependency>
-      <groupId>com.netflix.rxjava</groupId>
-      <artifactId>rxjava-core</artifactId>
+      <groupId>io.reactivex</groupId>
+      <artifactId>rxjava</artifactId>
       <version>${rxjava-version}</version>
     </dependency>
 

http://git-wip-us.apache.org/repos/asf/camel/blob/add89cef/components/camel-rx/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/components/camel-rx/src/test/resources/log4j.properties b/components/camel-rx/src/test/resources/log4j.properties
index 52eb0db..747baca 100644
--- a/components/camel-rx/src/test/resources/log4j.properties
+++ b/components/camel-rx/src/test/resources/log4j.properties
@@ -16,11 +16,11 @@
 ## ------------------------------------------------------------------------
 
 #
-# The logging properties used for eclipse testing, We want to see debug output on the console.
+# The logging properties used for testing.
 #
 log4j.rootLogger=INFO, file
 
-#log4j.logger.org.apache.camel=DEBUG
+#log4j.logger.org.apache.camel.rx=DEBUG
 
 # CONSOLE appender not used by default
 log4j.appender.out=org.apache.log4j.ConsoleAppender
@@ -32,5 +32,5 @@ log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
 log4j.appender.file=org.apache.log4j.FileAppender
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.file.file=target/test.log
+log4j.appender.file.file=target/camel-tx-test.log
 log4j.appender.file.append=true

http://git-wip-us.apache.org/repos/asf/camel/blob/add89cef/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1583d11..de2b60a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -379,7 +379,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.20.6</rxjava-version>
+    <rxjava-version>1.0.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>


Mime
View raw message