Release train changes for 2020.0.0-M4

pom.xml

@@ -13,6 +13,6 @@
         <module>stream-applications-build</module>
         <module>functions</module>
         <module>applications</module>
-        <module>release-train</module>
+        <module>stream-applications-release-train</module>
 	</modules>
 </project>

release-train/pom.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.springframework.cloud.stream.app</groupId>
-    <artifactId>release-train</artifactId>
-    <version>3.0.0-SNAPSHOT</version>
-    <name>release train</name>
-    <description>Release train for stream applications</description>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>stream-applications-release-train</module>
-    </modules>
-
-</project>

stream-applications-release-train/pom.xml

@@ -9,8 +9,8 @@
     <parent>
         <groupId>org.springframework.cloud.stream.app</groupId>
         <artifactId>stream-applications-core</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-        <relativePath>../../applications/stream-applications-core/pom.xml</relativePath>
+        <version>3.0.0-M4</version>
+        <relativePath>../applications/stream-applications-core/pom.xml</relativePath>
     </parent>
 
     <modules>
@@ -19,8 +19,8 @@
     </modules>
 
     <properties>
-        <revision>2020.0.0-SNAPSHOT</revision>
-        <apps.version>3.0.0-SNAPSHOT</apps.version>
+        <revision>2020.0.0-M4</revision>
+        <apps.version>3.0.0-M4</apps.version>
         <cdc-debezium-source.version>${apps.version}</cdc-debezium-source.version>
         <file-source.version>${apps.version}</file-source.version>
         <ftp-source.version>${apps.version}</ftp-source.version>
@@ -44,6 +44,7 @@
         <websocket-source.version>${apps.version}</websocket-source.version>
         <cassandra-sink.version>${apps.version}</cassandra-sink.version>
         <analytics-sink.version>${apps.version}</analytics-sink.version>
+        <elasticsearch-sink.version>${apps.version}</elasticsearch-sink.version>
         <file-sink.version>${apps.version}</file-sink.version>
         <ftp-sink.version>${apps.version}</ftp-sink.version>
         <geode-sink.version>${apps.version}</geode-sink.version>

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']=

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@

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

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@

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@

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

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@

stream-applications-release-train/stream-applications-docs/pom.xml

@@ -173,6 +173,11 @@
 			<artifactId>wavefront-consumer</artifactId>
 			<version>${java-functions.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>elasticsearch-consumer</artifactId>
+			<version>${java-functions.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.fn</groupId>
 			<artifactId>file-consumer</artifactId>

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]