This is an automated email from the ASF dual-hosted git repository. lburgazzoli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push: new b09abc7 Upgrade rxjava to version 2.1.15 b09abc7 is described below commit b09abc72691d315027e268a2d1c254a6c9b1c1c5 Author: lburgazzoli <lburgazz...@gmail.com> AuthorDate: Sat Jun 23 00:12:55 2018 +0200 Upgrade rxjava to version 2.1.15 --- components/camel-rxjava2/pom.xml | 6 ------ .../apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java | 2 +- parent/pom.xml | 3 +-- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/components/camel-rxjava2/pom.xml b/components/camel-rxjava2/pom.xml index 8585f10..32f5246 100644 --- a/components/camel-rxjava2/pom.xml +++ b/components/camel-rxjava2/pom.xml @@ -60,12 +60,6 @@ <artifactId>rxjava</artifactId> <version>${rxjava2-version}</version> </dependency> - <dependency> - <!-- See https://github.com/ReactiveX/RxJava/issues/5999 --> - <groupId>com.github.akarnokd</groupId> - <artifactId>rxjava2-extensions</artifactId> - <version>${rxjava2-extensions-version}</version> - </dependency> <!-- test dependencies --> <dependency> diff --git a/components/camel-rxjava2/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java b/components/camel-rxjava2/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java index adb4de1..9a8d352 100644 --- a/components/camel-rxjava2/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java +++ b/components/camel-rxjava2/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java @@ -21,11 +21,11 @@ import java.io.IOException; import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; -import hu.akarnokd.rxjava2.processors.MulticastProcessor; import io.reactivex.BackpressureStrategy; import io.reactivex.Flowable; import io.reactivex.FlowableEmitter; import io.reactivex.processors.FlowableProcessor; +import io.reactivex.processors.MulticastProcessor; import org.apache.camel.Exchange; import org.apache.camel.component.reactive.streams.ReactiveStreamsBackpressureStrategy; import org.apache.camel.component.reactive.streams.ReactiveStreamsDiscardedException; diff --git a/parent/pom.xml b/parent/pom.xml index 9324929..2104284 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -599,8 +599,7 @@ <rome-bundle-version>1.0_3</rome-bundle-version> <rome-version>1.0</rome-version> <rxjava-version>1.3.8</rxjava-version> - <rxjava2-version>2.1.14</rxjava2-version> - <rxjava2-extensions-version>0.19.0</rxjava2-extensions-version> + <rxjava2-version>2.1.15</rxjava2-version> <saaj-impl-version>1.3.2_2</saaj-impl-version> <saxon-bundle-version>9.8.0-12_1</saxon-bundle-version> <saxon-version>9.8.0-12</saxon-version>