From adfcb781a6b364fb8f22c300db47d8894592c5fa Mon Sep 17 00:00:00 2001 From: Marius Bogoevici Date: Tue, 23 Aug 2016 11:46:34 -0400 Subject: [PATCH] Change parent, add aggregate document --- spring-cloud-stream-docs/pom.xml | 28 ++----------------- .../src/main/asciidoc/index.adoc | 14 ++-------- .../spring-cloud-stream-aggregate.adoc | 11 ++++++++ 3 files changed, 15 insertions(+), 38 deletions(-) create mode 100644 spring-cloud-stream-docs/src/main/asciidoc/spring-cloud-stream-aggregate.adoc diff --git a/spring-cloud-stream-docs/pom.xml b/spring-cloud-stream-docs/pom.xml index efa6b0136..57a040226 100644 --- a/spring-cloud-stream-docs/pom.xml +++ b/spring-cloud-stream-docs/pom.xml @@ -3,8 +3,8 @@ 4.0.0 org.springframework.cloud - spring-cloud-stream-parent - 1.1.0.BUILD-SNAPSHOT + spring-cloud-build + 1.1.2.BUILD-SNAPSHOT spring-cloud-stream-docs spring-cloud-stream-docs @@ -13,30 +13,6 @@ ${basedir}/.. - - - org.springframework.cloud - spring-cloud-stream - - - org.springframework.cloud - spring-cloud-stream-codec - - - org.springframework.cloud - spring-cloud-stream-rxjava - - - org.springframework.cloud - spring-cloud-stream-binder-kafka - 1.1.0.BUILD-SNAPSHOT - - - org.springframework.cloud - spring-cloud-stream-binder-rabbit - 1.1.0.BUILD-SNAPSHOT - - full diff --git a/spring-cloud-stream-docs/src/main/asciidoc/index.adoc b/spring-cloud-stream-docs/src/main/asciidoc/index.adoc index ce8333f68..da39cb0c8 100644 --- a/spring-cloud-stream-docs/src/main/asciidoc/index.adoc +++ b/spring-cloud-stream-docs/src/main/asciidoc/index.adoc @@ -1,7 +1,6 @@ [[spring-cloud-stream-reference]] = Spring Cloud Stream Reference Guide Sabby Anandan, Marius Bogoevici, Eric Bottard, Mark Fisher, Ilayaperumal Gopinathan, Gunnar Hillert, Mark Pollack, Patrick Peralta, Glenn Renfro, Thomas Risberg, Dave Syer, David Turanski, Janne Valkealahti, Benjamin Klein -:basedir: ../../.. :doctype: book :toc: :toclevels: 4 @@ -23,17 +22,8 @@ Sabby Anandan, Marius Bogoevici, Eric Bottard, Mark Fisher, Ilayaperumal Gopinat // ====================================================================================== = Spring Cloud Stream Core -include::{basedir}/core/spring-cloud-stream-core-docs/src/main/asciidoc/spring-cloud-stream-overview.adoc[] - -= Binder Implementations - -== Apache Kafka Binder - -include::{basedir}/kafka/spring-cloud-stream-binder-kafka-docs/src/main/asciidoc/overview.adoc[leveloffset=+1] - -== RabbitMQ Binder - -include::{basedir}/rabbit/spring-cloud-stream-binder-rabbit-docs/src/main/asciidoc/overview.adoc[leveloffset=+1] +:stream-docs-basedir: ../../.. +include::spring-cloud-stream-aggregate.adoc[] = Appendices [appendix] diff --git a/spring-cloud-stream-docs/src/main/asciidoc/spring-cloud-stream-aggregate.adoc b/spring-cloud-stream-docs/src/main/asciidoc/spring-cloud-stream-aggregate.adoc new file mode 100644 index 000000000..31a455bf5 --- /dev/null +++ b/spring-cloud-stream-docs/src/main/asciidoc/spring-cloud-stream-aggregate.adoc @@ -0,0 +1,11 @@ +include::{stream-docs-basedir}/core/spring-cloud-stream-core-docs/src/main/asciidoc/spring-cloud-stream-overview.adoc[] + += Binder Implementations + +== Apache Kafka Binder + +include::{stream-docs-basedir}/kafka/spring-cloud-stream-binder-kafka-docs/src/main/asciidoc/overview.adoc[leveloffset=+1] + +== RabbitMQ Binder + +include::{stream-docs-basedir}/rabbit/spring-cloud-stream-binder-rabbit-docs/src/main/asciidoc/overview.adoc[leveloffset=+1]