You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/02/07 13:07:27 UTC
[03/24] camel git commit: CAMEL-10612: added reactive-streams to BOM
CAMEL-10612: added reactive-streams to BOM
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/91926c2b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/91926c2b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/91926c2b
Branch: refs/heads/mention
Commit: 91926c2bd4ad212f0e30cd430d2006a5fd9ea560
Parents: 44766f5
Author: Nicola Ferraro <ni...@gmail.com>
Authored: Mon Feb 6 09:48:48 2017 +0100
Committer: Nicola Ferraro <ni...@gmail.com>
Committed: Mon Feb 6 10:49:28 2017 +0100
----------------------------------------------------------------------
apache-camel/src/main/descriptors/common-bin.xml | 2 ++
.../src/main/docs/reactive-streams-component.adoc | 2 +-
examples/camel-example-reactive-streams/pom.xml | 1 -
parent/pom.xml | 10 ++++++++++
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 10 ++++++++++
5 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/91926c2b/apache-camel/src/main/descriptors/common-bin.xml
----------------------------------------------------------------------
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 2691281..9e0857b 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -191,6 +191,7 @@
<include>org.apache.camel:camel-quartz2</include>
<include>org.apache.camel:camel-quickfix</include>
<include>org.apache.camel:camel-rabbitmq</include>
+ <include>org.apache.camel:camel-reactive-streams</include>
<include>org.apache.camel:camel-restlet</include>
<include>org.apache.camel:camel-ribbon</include>
<include>org.apache.camel:camel-rmi</include>
@@ -457,6 +458,7 @@
<include>org.apache.camel:camel-quartz2-starter</include>
<include>org.apache.camel:camel-quickfix-starter</include>
<include>org.apache.camel:camel-rabbitmq-starter</include>
+ <include>org.apache.camel:camel-reactive-streams-starter</include>
<include>org.apache.camel:camel-restlet-starter</include>
<include>org.apache.camel:camel-ribbon-starter</include>
<include>org.apache.camel:camel-rmi-starter</include>
http://git-wip-us.apache.org/repos/asf/camel/blob/91926c2b/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc b/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc
index b351017..6a034f2 100644
--- a/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc
+++ b/components/camel-reactive-streams/src/main/docs/reactive-streams-component.adoc
@@ -15,7 +15,7 @@ outgoing streams within Camel routes, and a direct client API that allows using
Camel uses an internal implementation of the reactive streams
_Publisher_ and _Subscriber_, so it's not tied to any specific framework.
-The following reactive frameworks have been used in the integration tests: https://github.com/ReactiveX/RxJava[RxJava2], https://github.com/reactor/reactor-core[reactor-core].
+The following reactive frameworks have been used in the integration tests: https://github.com/reactor/reactor-core[Reactor Core 3], https://github.com/ReactiveX/RxJava[RxJava 2].
Maven users will need to add the following dependency to their `pom.xml`
for this component:
http://git-wip-us.apache.org/repos/asf/camel/blob/91926c2b/examples/camel-example-reactive-streams/pom.xml
----------------------------------------------------------------------
diff --git a/examples/camel-example-reactive-streams/pom.xml b/examples/camel-example-reactive-streams/pom.xml
index 10c1a23..de9e4a7 100644
--- a/examples/camel-example-reactive-streams/pom.xml
+++ b/examples/camel-example-reactive-streams/pom.xml
@@ -45,7 +45,6 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-reactive-streams-starter</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
http://git-wip-us.apache.org/repos/asf/camel/blob/91926c2b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 53baa2c..c21abeb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1614,6 +1614,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-reactive-streams</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-restlet</artifactId>
<version>${project.version}</version>
</dependency>
@@ -2866,6 +2871,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-reactive-streams-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-restlet-starter</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/91926c2b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index d065f9a..be64097 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -1934,6 +1934,16 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-reactive-streams</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-reactive-streams-starter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-restlet</artifactId>
<version>${project.version}</version>
</dependency>