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 d8c1180dddf7f441fef82e58b81350ca6d28553b Author: Andrea Cosentino <[email protected]> AuthorDate: Mon Aug 5 13:21:46 2019 +0200 CAMEL-13792 - Rename components to default names, Camel-rxjava2 to camel-rxjava - Updated docs link and regen --- components/readme.adoc | 2 +- docs/components/modules/ROOT/nav.adoc | 2 +- docs/components/modules/ROOT/pages/rxjava2.adoc | 20 -------------------- docs/user-manual/modules/ROOT/pages/index.adoc | 2 +- .../camel-spring-boot-dependencies/pom.xml | 4 ++-- 5 files changed, 5 insertions(+), 25 deletions(-) diff --git a/components/readme.adoc b/components/readme.adoc index 442597a..333eba1 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -1085,7 +1085,7 @@ Number of Miscellaneous Components: 33 in 33 JAR artifacts (0 deprecated) | link:camel-ribbon/src/main/docs/ribbon.adoc[Ribbon] (camel-ribbon) | 2.18 | Using Netflix Ribbon for client side load balancing -| link:camel-rxjava2/src/main/docs/rxjava2.adoc[Rxjava2] (camel-rxjava2) | 2.22 | RxJava2 based back-end for Camel's reactive streams component +| link:camel-rxjava/src/main/docs/rxjava.adoc[Rxjava] (camel-rxjava) | 2.22 | RxJava2 based back-end for Camel's reactive streams component | link:camel-shiro/src/main/docs/shiro.adoc[Shiro] (camel-shiro) | 2.5 | Security using Shiro diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc index c602e3c..204a2b7 100644 --- a/docs/components/modules/ROOT/nav.adoc +++ b/docs/components/modules/ROOT/nav.adoc @@ -286,7 +286,7 @@ * xref:ribbon.adoc[Ribbon Component] * xref:rss-component.adoc[RSS Component] * xref:rss-dataformat.adoc[RSS DataFormat] -* xref:rxjava2.adoc[RxJava2 Component] +* xref:rxjava.adoc[RxJava Component] * xref:saga-component.adoc[Saga Component] * xref:salesforce-component.adoc[Salesforce Component] * xref:sap-netweaver-component.adoc[SAP NetWeaver Component] diff --git a/docs/components/modules/ROOT/pages/rxjava2.adoc b/docs/components/modules/ROOT/pages/rxjava2.adoc deleted file mode 100644 index ad080e9..0000000 --- a/docs/components/modules/ROOT/pages/rxjava2.adoc +++ /dev/null @@ -1,20 +0,0 @@ -= RxJava2 Component - -*Available as of Camel version 2.22* - -RxJava2 based back-end for Camel's reactive streams component. - -See more details in the camel-streams-component documentation. - -Maven users will need to add the following dependency to their `pom.xml` -for this component: - -[source,xml] ------------------------------------------------------------- -<dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-rxjava2</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/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc index 353487e..84e80b3 100644 --- a/docs/user-manual/modules/ROOT/pages/index.adoc +++ b/docs/user-manual/modules/ROOT/pages/index.adoc @@ -443,7 +443,7 @@ camel routes without them knowing ** xref:components::opentracing.adoc[OpenTracing] ** xref:components::reactor-component.adoc[Reactor] ** xref:components::ribbon.adoc[Ribbon] -** xref:components::rxjava2.adoc[Rxjava2] +** xref:components::rxjava.adoc[Rxjava] ** xref:components::shiro.adoc[Shiro] ** xref:components::spring-boot.adoc[Spring Boot] ** xref:components::spring-cloud.adoc[Spring Cloud] 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 d3e7368..a05920e 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 @@ -2565,12 +2565,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>
