You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/05 11:35:27 UTC
[camel] 03/06: CAMEL-13792 - Rename components to default names,
Camel-rxjava2 to camel-rxjava - updated references
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 03cb34fbc0b06d9ef3797f962b102a056169b17a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 12:47:20 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-rxjava2 to camel-rxjava - updated references
---
apache-camel/pom.xml | 4 ++--
apache-camel/src/main/descriptors/common-bin.xml | 4 ++--
bom/camel-bom/pom.xml | 4 ++--
.../camel-rxjava/src/main/docs/{rxjava2.adoc => rxjava.adoc} | 8 ++++----
components/pom.xml | 2 +-
parent/pom.xml | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index df4ab2b..bf322aa 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -1209,7 +1209,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2</artifactId>
+ <artifactId>camel-rxjava</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -2698,7 +2698,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2-starter</artifactId>
+ <artifactId>camel-rxjava-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 131e951..9bcdafa 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -262,7 +262,7 @@
<include>org.apache.camel:camel-restlet</include>
<include>org.apache.camel:camel-ribbon</include>
<include>org.apache.camel:camel-rss</include>
- <include>org.apache.camel:camel-rxjava2</include>
+ <include>org.apache.camel:camel-rxjava</include>
<include>org.apache.camel:camel-saga</include>
<include>org.apache.camel:camel-salesforce</include>
<include>org.apache.camel:camel-sap-netweaver</include>
@@ -599,7 +599,7 @@
<include>org.apache.camel:camel-restlet-starter</include>
<include>org.apache.camel:camel-ribbon-starter</include>
<include>org.apache.camel:camel-rss-starter</include>
- <include>org.apache.camel:camel-rxjava2-starter</include>
+ <include>org.apache.camel:camel-rxjava-starter</include>
<include>org.apache.camel:camel-saga-starter</include>
<include>org.apache.camel:camel-salesforce-starter</include>
<include>org.apache.camel:camel-sap-netweaver-starter</include>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 7033723..39c28f9 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2340,12 +2340,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2</artifactId>
+ <artifactId>camel-rxjava</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2-starter</artifactId>
+ <artifactId>camel-rxjava-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/components/camel-rxjava/src/main/docs/rxjava2.adoc b/components/camel-rxjava/src/main/docs/rxjava.adoc
similarity index 69%
rename from components/camel-rxjava/src/main/docs/rxjava2.adoc
rename to components/camel-rxjava/src/main/docs/rxjava.adoc
index ad080e9..daf3c5a 100644
--- a/components/camel-rxjava/src/main/docs/rxjava2.adoc
+++ b/components/camel-rxjava/src/main/docs/rxjava.adoc
@@ -1,8 +1,8 @@
-= RxJava2 Component
+= RxJava Component
*Available as of Camel version 2.22*
-RxJava2 based back-end for Camel's reactive streams component.
+RxJava based back-end for Camel's reactive streams component.
See more details in the camel-streams-component documentation.
@@ -13,8 +13,8 @@ for this component:
------------------------------------------------------------
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2</artifactId>
+ <artifactId>camel-rxjava</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Camel core version -->
</dependency>
-------------------------------------------------------------
\ No newline at end of file
+------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index b6c2da4..18773aa 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -273,7 +273,7 @@
<module>camel-rest-swagger</module>
<module>camel-restlet</module>
<module>camel-rss</module>
- <module>camel-rxjava2</module>
+ <module>camel-rxjava</module>
<module>camel-saga</module>
<module>camel-sap-netweaver</module>
<module>camel-saxon</module>
diff --git a/parent/pom.xml b/parent/pom.xml
index 08bacbf..65fe4b6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1934,7 +1934,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2</artifactId>
+ <artifactId>camel-rxjava</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -3443,7 +3443,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2-starter</artifactId>
+ <artifactId>camel-rxjava-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>