From e319c10b3c7eee60acb0bd42f4fefa6a698450db Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Fri, 13 Nov 2020 12:11:33 -0500 Subject: [PATCH] Release train changes for 2020.0.0-M4 --- pom.xml | 2 +- release-train/pom.xml | 15 --------------- .../CODE_OF_CONDUCT.adoc | 0 .../LICENSE | 0 .../pom.xml | 9 +++++---- .../release-tools/core-tag-next-version.sh | 0 .../release-tools/core-version-check.sh | 0 .../release-tools/core-version-upgrade.sh | 0 .../stream-applications-descriptor/pom.xml | 2 ++ .../META-INF/kafka-apps-docker.properties | 1 + .../kafka-apps-maven-repo-url.properties | 2 ++ .../META-INF/kafka-apps-maven.properties | 2 ++ .../META-INF/rabbit-apps-docker.properties | 1 + .../rabbit-apps-maven-repo-url.properties | 2 ++ .../META-INF/rabbit-apps-maven.properties | 2 ++ .../stream-applications-docs/pom.xml | 5 +++++ .../src/main/asciidoc/.gitignore | 0 .../src/main/asciidoc/Guardfile | 0 .../src/main/asciidoc/appendix.adoc | 0 .../src/main/asciidoc/contributing.adoc | 0 .../images/app-starter-naming-conventions.png | Bin .../src/main/asciidoc/images/logo.png | Bin .../images/starters-pom-dependencies.png | Bin .../src/main/asciidoc/index-docinfo.xml | 0 .../src/main/asciidoc/index.adoc | 0 .../src/main/asciidoc/overview.adoc | 0 .../src/main/asciidoc/pom-dependencies.adoc | 0 .../src/main/asciidoc/processors.adoc | 0 .../src/main/asciidoc/sinks.adoc | 3 +++ .../src/main/asciidoc/sources.adoc | 0 .../src/main/javadoc/spring-javadoc.css | 0 31 files changed, 26 insertions(+), 20 deletions(-) delete mode 100644 release-train/pom.xml rename {release-train/stream-applications-release-train => stream-applications-release-train}/CODE_OF_CONDUCT.adoc (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/LICENSE (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/pom.xml (96%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/release-tools/core-tag-next-version.sh (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/release-tools/core-version-check.sh (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/release-tools/core-version-upgrade.sh (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-descriptor/pom.xml (98%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties (98%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties (98%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties (98%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties (98%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties (98%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties (98%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-docs/pom.xml (99%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-docs/src/main/asciidoc/.gitignore (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-docs/src/main/asciidoc/Guardfile (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-docs/src/main/asciidoc/appendix.adoc (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-docs/src/main/asciidoc/contributing.adoc (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-docs/src/main/asciidoc/images/app-starter-naming-conventions.png (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-docs/src/main/asciidoc/images/logo.png (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-docs/src/main/asciidoc/images/starters-pom-dependencies.png (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-docs/src/main/asciidoc/index-docinfo.xml (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-docs/src/main/asciidoc/index.adoc (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-docs/src/main/asciidoc/overview.adoc (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-docs/src/main/asciidoc/pom-dependencies.adoc (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-docs/src/main/asciidoc/processors.adoc (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-docs/src/main/asciidoc/sinks.adoc (95%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-docs/src/main/asciidoc/sources.adoc (100%) rename {release-train/stream-applications-release-train => stream-applications-release-train}/stream-applications-docs/src/main/javadoc/spring-javadoc.css (100%) diff --git a/pom.xml b/pom.xml index b7736d3f..054ee4c4 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,6 @@ stream-applications-build functions applications - release-train + stream-applications-release-train diff --git a/release-train/pom.xml b/release-train/pom.xml deleted file mode 100644 index 991b33bb..00000000 --- a/release-train/pom.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - org.springframework.cloud.stream.app - release-train - 3.0.0-SNAPSHOT - release train - Release train for stream applications - pom - - - stream-applications-release-train - - - diff --git a/release-train/stream-applications-release-train/CODE_OF_CONDUCT.adoc b/stream-applications-release-train/CODE_OF_CONDUCT.adoc similarity index 100% rename from release-train/stream-applications-release-train/CODE_OF_CONDUCT.adoc rename to stream-applications-release-train/CODE_OF_CONDUCT.adoc diff --git a/release-train/stream-applications-release-train/LICENSE b/stream-applications-release-train/LICENSE similarity index 100% rename from release-train/stream-applications-release-train/LICENSE rename to stream-applications-release-train/LICENSE diff --git a/release-train/stream-applications-release-train/pom.xml b/stream-applications-release-train/pom.xml similarity index 96% rename from release-train/stream-applications-release-train/pom.xml rename to stream-applications-release-train/pom.xml index 67e3ad43..125694db 100644 --- a/release-train/stream-applications-release-train/pom.xml +++ b/stream-applications-release-train/pom.xml @@ -9,8 +9,8 @@ org.springframework.cloud.stream.app stream-applications-core - 3.0.0-SNAPSHOT - ../../applications/stream-applications-core/pom.xml + 3.0.0-M4 + ../applications/stream-applications-core/pom.xml @@ -19,8 +19,8 @@ - 2020.0.0-SNAPSHOT - 3.0.0-SNAPSHOT + 2020.0.0-M4 + 3.0.0-M4 ${apps.version} ${apps.version} ${apps.version} @@ -44,6 +44,7 @@ ${apps.version} ${apps.version} ${apps.version} + ${apps.version} ${apps.version} ${apps.version} ${apps.version} diff --git a/release-train/stream-applications-release-train/release-tools/core-tag-next-version.sh b/stream-applications-release-train/release-tools/core-tag-next-version.sh similarity index 100% rename from release-train/stream-applications-release-train/release-tools/core-tag-next-version.sh rename to stream-applications-release-train/release-tools/core-tag-next-version.sh diff --git a/release-train/stream-applications-release-train/release-tools/core-version-check.sh b/stream-applications-release-train/release-tools/core-version-check.sh similarity index 100% rename from release-train/stream-applications-release-train/release-tools/core-version-check.sh rename to stream-applications-release-train/release-tools/core-version-check.sh diff --git a/release-train/stream-applications-release-train/release-tools/core-version-upgrade.sh b/stream-applications-release-train/release-tools/core-version-upgrade.sh similarity index 100% rename from release-train/stream-applications-release-train/release-tools/core-version-upgrade.sh rename to stream-applications-release-train/release-tools/core-version-upgrade.sh diff --git a/release-train/stream-applications-release-train/stream-applications-descriptor/pom.xml b/stream-applications-release-train/stream-applications-descriptor/pom.xml similarity index 98% rename from release-train/stream-applications-release-train/stream-applications-descriptor/pom.xml rename to stream-applications-release-train/stream-applications-descriptor/pom.xml index 6c837f77..b0350287 100644 --- a/release-train/stream-applications-release-train/stream-applications-descriptor/pom.xml +++ b/stream-applications-release-train/stream-applications-descriptor/pom.xml @@ -89,6 +89,8 @@ "${cassandra-sink.version}".contains('SNAPSHOT') ? 'latest' : "${cassandra-sink.version}" pom.properties['analytics-sink-docker.tag']= "${analytics-sink.version}".contains('SNAPSHOT') ? 'latest' : "${analytics-sink.version}" + pom.properties['elasticsearch-sink-docker.tag']= + "${elasticsearch-sink.version}".contains('SNAPSHOT') ? 'latest' : "${elasticsearch-sink.version}" pom.properties['wavefront-sink-docker.tag']= "${wavefront-sink.version}".contains('SNAPSHOT') ? 'latest' : "${wavefront-sink.version}" pom.properties['file-sink-docker.tag']= diff --git a/release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties similarity index 98% rename from release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties rename to stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties index 1cd78290..932e30a7 100644 --- a/release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties +++ b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties @@ -21,6 +21,7 @@ source.twitter-stream=docker:springcloudstream/twitter-stream-source-kafka:@twit source.websocket=docker:springcloudstream/websocket-source-kafka:@websocket-source-docker.tag@ sink.cassandra=docker:springcloudstream/cassandra-sink-kafka:@cassandra-sink-docker.tag@ sink.analytics=docker:springcloudstream/analytics-sink-kafka:@analytics-sink-docker.tag@ +sink.elasticsearch=docker:springcloudstream/elasticsearch-sink-kafka:@elasticsearch-sink-docker.tag@ sink.wavefront=docker:springcloudstream/wavefront-sink-kafka:@wavefront-sink-docker.tag@ sink.file=docker:springcloudstream/file-sink-kafka:@file-sink-docker.tag@ sink.ftp=docker:springcloudstream/ftp-sink-kafka:@ftp-sink-docker.tag@ diff --git a/release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties similarity index 98% rename from release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties rename to stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties index 7f754642..226087ae 100644 --- a/release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties +++ b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties @@ -44,6 +44,8 @@ sink.cassandra=https://@repo-spring-io@/org/springframework/cloud/stream/app/cas sink.cassandra.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/cassandra-sink-kafka/@cassandra-sink.version@/cassandra-sink-kafka-@cassandra-sink.version@-metadata.jar sink.analytics=https://@repo-spring-io@/org/springframework/cloud/stream/app/analytics-sink-kafka/@analytics-sink.version@/analytics-sink-kafka-@analytics-sink.version@.jar sink.analytics.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/analytics-sink-kafka/@analytics-sink.version@/analytics-sink-kafka-@analytics-sink.version@-metadata.jar +sink.elasticsearch=https://@repo-spring-io@/org/springframework/cloud/stream/app/elasticsearch-sink-kafka/@elasticsearch-sink.version@/elasticsearch-sink-kafka-@elasticsearch-sink.version@.jar +sink.elasticsearch.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/elasticsearch-sink-kafka/@elasticsearch-sink.version@/elasticsearch-sink-kafka-@elasticsearch-sink.version@-metadata.jar sink.wavefront=https://@repo-spring-io@/org/springframework/cloud/stream/app/wavefront-sink-kafka/@wavefront-sink.version@/wavefront-sink-kafka-@wavefront-sink.version@.jar sink.wavefront.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/wavefront-sink-kafka/@wavefront-sink.version@/wavefront-sink-kafka-@wavefront-sink.version@-metadata.jar sink.file=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-sink-kafka/@file-sink.version@/file-sink-kafka-@file-sink.version@.jar diff --git a/release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties similarity index 98% rename from release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties rename to stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties index 0e95dc37..b4243ef2 100644 --- a/release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties +++ b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties @@ -44,6 +44,8 @@ sink.cassandra=maven://org.springframework.cloud.stream.app:cassandra-sink-kafka sink.cassandra.metadata=maven://org.springframework.cloud.stream.app:cassandra-sink-kafka:jar:metadata:@cassandra-sink.version@ sink.analytics=maven://org.springframework.cloud.stream.app:analytics-sink-kafka:@analytics-sink.version@ sink.analytics.metadata=maven://org.springframework.cloud.stream.app:analytics-sink-kafka:jar:metadata:@analytics-sink.version@ +sink.elasticsearch=maven://org.springframework.cloud.stream.app:elasticsearch-sink-kafka:@elasticsearch-sink.version@ +sink.elasticsearch.metadata=maven://org.springframework.cloud.stream.app:elasticsearch-sink-kafka:jar:metadata:@elasticsearch-sink.version@ sink.wavefront=maven://org.springframework.cloud.stream.app:wavefront-sink-kafka:@wavefront-sink.version@ sink.wavefront.metadata=maven://org.springframework.cloud.stream.app:wavefront-sink-kafka:jar:metadata:@wavefront-sink.version@ sink.file=maven://org.springframework.cloud.stream.app:file-sink-kafka:@file-sink.version@ diff --git a/release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties similarity index 98% rename from release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties rename to stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties index 55fc8eba..3b50a2e9 100644 --- a/release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties +++ b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties @@ -21,6 +21,7 @@ source.twitter-stream=docker:springcloudstream/twitter-stream-source-rabbit:@twi source.websocket=docker:springcloudstream/websocket-source-rabbit:@websocket-source-docker.tag@ sink.cassandra=docker:springcloudstream/cassandra-sink-rabbit:@cassandra-sink-docker.tag@ sink.analytics=docker:springcloudstream/analytics-sink-rabbit:@analytics-sink-docker.tag@ +sink.elasticsearch=docker:springcloudstream/elasticsearch-sink-rabbit:@elasticsearch-sink-docker.tag@ sink.wavefront=docker:springcloudstream/wavefront-sink-rabbit:@wavefront-sink-docker.tag@ sink.file=docker:springcloudstream/file-sink-rabbit:@file-sink-docker.tag@ sink.ftp=docker:springcloudstream/ftp-sink-rabbit:@ftp-sink-docker.tag@ diff --git a/release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties similarity index 98% rename from release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties rename to stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties index 1c3ce33e..00dcedb0 100644 --- a/release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties +++ b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties @@ -44,6 +44,8 @@ sink.cassandra=https://@repo-spring-io@/org/springframework/cloud/stream/app/cas sink.cassandra.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/cassandra-sink-rabbit/@cassandra-sink.version@/cassandra-sink-rabbit-@cassandra-sink.version@-metadata.jar sink.analytics=https://@repo-spring-io@/org/springframework/cloud/stream/app/analytics-sink-rabbit/@analytics-sink.version@/analytics-sink-rabbit-@analytics-sink.version@.jar sink.analytics.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/analytics-sink-rabbit/@analytics-sink.version@/analytics-sink-rabbit-@analytics-sink.version@-metadata.jar +sink.elasticsearch=https://@repo-spring-io@/org/springframework/cloud/stream/app/elasticsearch-sink-rabbit/@elasticsearch-sink.version@/elasticsearch-sink-rabbit-@elasticsearch-sink.version@.jar +sink.elasticsearch.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/elasticsearch-sink-rabbit/@elasticsearch-sink.version@/elasticsearch-sink-rabbit-@elasticsearch-sink.version@-metadata.jar sink.wavefront=https://@repo-spring-io@/org/springframework/cloud/stream/app/wavefront-sink-rabbit/@wavefront-sink.version@/wavefront-sink-rabbit-@wavefront-sink.version@.jar sink.wavefront.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/wavefront-sink-rabbit/@wavefront-sink.version@/wavefront-sink-rabbit-@wavefront-sink.version@-metadata.jar sink.file=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-sink-rabbit/@file-sink.version@/file-sink-rabbit-@file-sink.version@.jar diff --git a/release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties similarity index 98% rename from release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties rename to stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties index 6b7ad14b..89235e8a 100644 --- a/release-train/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties +++ b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties @@ -44,6 +44,8 @@ sink.cassandra=maven://org.springframework.cloud.stream.app:cassandra-sink-rabbi sink.cassandra.metadata=maven://org.springframework.cloud.stream.app:cassandra-sink-rabbit:jar:metadata:@cassandra-sink.version@ sink.analytics=maven://org.springframework.cloud.stream.app:analytics-sink-rabbit:@analytics-sink.version@ sink.analytics.metadata=maven://org.springframework.cloud.stream.app:analytics-sink-rabbit:jar:metadata:@analytics-sink.version@ +sink.elasticsearch=maven://org.springframework.cloud.stream.app:elasticsearch-sink-rabbit:@elasticsearch-sink.version@ +sink.elasticsearch.metadata=maven://org.springframework.cloud.stream.app:elasticsearch-sink-rabbit:jar:metadata:@elasticsearch-sink.version@ sink.wavefront=maven://org.springframework.cloud.stream.app:wavefront-sink-rabbit:@wavefront-sink.version@ sink.wavefront.metadata=maven://org.springframework.cloud.stream.app:wavefront-sink-rabbit:jar:metadata:@wavefront-sink.version@ sink.file=maven://org.springframework.cloud.stream.app:file-sink-rabbit:@file-sink.version@ diff --git a/release-train/stream-applications-release-train/stream-applications-docs/pom.xml b/stream-applications-release-train/stream-applications-docs/pom.xml similarity index 99% rename from release-train/stream-applications-release-train/stream-applications-docs/pom.xml rename to stream-applications-release-train/stream-applications-docs/pom.xml index b572872b..6b823bd0 100644 --- a/release-train/stream-applications-release-train/stream-applications-docs/pom.xml +++ b/stream-applications-release-train/stream-applications-docs/pom.xml @@ -173,6 +173,11 @@ wavefront-consumer ${java-functions.version} + + org.springframework.cloud.fn + elasticsearch-consumer + ${java-functions.version} + org.springframework.cloud.fn file-consumer diff --git a/release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/.gitignore b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/.gitignore similarity index 100% rename from release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/.gitignore rename to stream-applications-release-train/stream-applications-docs/src/main/asciidoc/.gitignore diff --git a/release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/Guardfile b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/Guardfile similarity index 100% rename from release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/Guardfile rename to stream-applications-release-train/stream-applications-docs/src/main/asciidoc/Guardfile diff --git a/release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/appendix.adoc b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/appendix.adoc similarity index 100% rename from release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/appendix.adoc rename to stream-applications-release-train/stream-applications-docs/src/main/asciidoc/appendix.adoc diff --git a/release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/contributing.adoc b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/contributing.adoc similarity index 100% rename from release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/contributing.adoc rename to stream-applications-release-train/stream-applications-docs/src/main/asciidoc/contributing.adoc diff --git a/release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/images/app-starter-naming-conventions.png b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/images/app-starter-naming-conventions.png similarity index 100% rename from release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/images/app-starter-naming-conventions.png rename to stream-applications-release-train/stream-applications-docs/src/main/asciidoc/images/app-starter-naming-conventions.png diff --git a/release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/images/logo.png b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/images/logo.png similarity index 100% rename from release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/images/logo.png rename to stream-applications-release-train/stream-applications-docs/src/main/asciidoc/images/logo.png diff --git a/release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/images/starters-pom-dependencies.png b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/images/starters-pom-dependencies.png similarity index 100% rename from release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/images/starters-pom-dependencies.png rename to stream-applications-release-train/stream-applications-docs/src/main/asciidoc/images/starters-pom-dependencies.png diff --git a/release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/index-docinfo.xml b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/index-docinfo.xml similarity index 100% rename from release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/index-docinfo.xml rename to stream-applications-release-train/stream-applications-docs/src/main/asciidoc/index-docinfo.xml diff --git a/release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/index.adoc b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/index.adoc similarity index 100% rename from release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/index.adoc rename to stream-applications-release-train/stream-applications-docs/src/main/asciidoc/index.adoc diff --git a/release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/overview.adoc b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/overview.adoc similarity index 100% rename from release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/overview.adoc rename to stream-applications-release-train/stream-applications-docs/src/main/asciidoc/overview.adoc diff --git a/release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/pom-dependencies.adoc b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/pom-dependencies.adoc similarity index 100% rename from release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/pom-dependencies.adoc rename to stream-applications-release-train/stream-applications-docs/src/main/asciidoc/pom-dependencies.adoc diff --git a/release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/processors.adoc b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/processors.adoc similarity index 100% rename from release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/processors.adoc rename to stream-applications-release-train/stream-applications-docs/src/main/asciidoc/processors.adoc diff --git a/release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sinks.adoc b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sinks.adoc similarity index 95% rename from release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sinks.adoc rename to stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sinks.adoc index e8b4365b..c8b6d964 100644 --- a/release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sinks.adoc +++ b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sinks.adoc @@ -9,6 +9,9 @@ include::{stream-apps-root}/{branch}/applications/sink/cassandra-sink/README.ado [[spring-cloud-stream-modules-analytics-sink]] include::{stream-apps-root}/{branch}/applications/sink/analytics-sink/README.adoc[tags=ref-doc] +[[spring-cloud-stream-modules-elasticsearch-sink]] +include::{stream-apps-root}/{branch}/applications/sink/elasticsearch-sink/README.adoc[tags=ref-doc] + [[spring-cloud-stream-modules-file-sink]] include::{stream-apps-root}/{branch}/applications/sink/file-sink/README.adoc[tags=ref-doc] diff --git a/release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sources.adoc b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sources.adoc similarity index 100% rename from release-train/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sources.adoc rename to stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sources.adoc diff --git a/release-train/stream-applications-release-train/stream-applications-docs/src/main/javadoc/spring-javadoc.css b/stream-applications-release-train/stream-applications-docs/src/main/javadoc/spring-javadoc.css similarity index 100% rename from release-train/stream-applications-release-train/stream-applications-docs/src/main/javadoc/spring-javadoc.css rename to stream-applications-release-train/stream-applications-docs/src/main/javadoc/spring-javadoc.css