diff --git a/applications/stream-applications-build/pom.xml b/applications/stream-applications-build/pom.xml
index 542c8a51..538fe0b2 100644
--- a/applications/stream-applications-build/pom.xml
+++ b/applications/stream-applications-build/pom.xml
@@ -18,6 +18,41 @@
         <module>stream-applications-descriptor</module>
     </modules>
 
+    <properties>
+        <file-source.version>3.0.0-SNAPSHOT</file-source.version>
+        <geode-source.version>3.0.0-SNAPSHOT</geode-source.version>
+        <http-source.version>3.0.0-SNAPSHOT</http-source.version>
+        <jdbc-source.version>3.0.0-SNAPSHOT</jdbc-source.version>
+        <load-generator-source.version>3.0.0-SNAPSHOT</load-generator-source.version>
+        <mongodb-source.version>3.0.0-SNAPSHOT</mongodb-source.version>
+        <mqtt-source.version>3.0.0-SNAPSHOT</mqtt-source.version>
+        <rabbit-source.version>3.0.0-SNAPSHOT</rabbit-source.version>
+        <tcp-source.version>3.0.0-SNAPSHOT</tcp-source.version>
+        <time-source.version>3.0.0-SNAPSHOT</time-source.version>
+        <cassandra-sink.version>3.0.0-SNAPSHOT</cassandra-sink.version>
+        <counter-sink.version>3.0.0-SNAPSHOT</counter-sink.version>
+        <file-sink.version>3.0.0-SNAPSHOT</file-sink.version>
+        <ftp-sink.version>3.0.0-SNAPSHOT</ftp-sink.version>
+        <geode-sink.version>3.0.0-SNAPSHOT</geode-sink.version>
+        <jdbc-sink.version>3.0.0-SNAPSHOT</jdbc-sink.version>
+        <log-sink.version>3.0.0-SNAPSHOT</log-sink.version>
+        <mongodb-sink.version>3.0.0-SNAPSHOT</mongodb-sink.version>
+        <mqtt-sink.version>3.0.0-SNAPSHOT</mqtt-sink.version>
+        <rabbit-sink.version>3.0.0-SNAPSHOT</rabbit-sink.version>
+        <redis-sink.version>3.0.0-SNAPSHOT</redis-sink.version>
+        <router-sink.version>3.0.0-SNAPSHOT</router-sink.version>
+        <sftp-sink.version>3.0.0-SNAPSHOT</sftp-sink.version>
+        <throughput-sink.version>3.0.0-SNAPSHOT</throughput-sink.version>
+        <bridge-processor.version>3.0.0-SNAPSHOT</bridge-processor.version>
+        <filter-processor.version>3.0.0-SNAPSHOT</filter-processor.version>
+        <groovy-processor.version>3.0.0-SNAPSHOT</groovy-processor.version>
+        <header-enricher-processor.version>3.0.0-SNAPSHOT</header-enricher-processor.version>
+        <http-request-processor.version>3.0.0-SNAPSHOT</http-request-processor.version>
+        <script-processor.version>3.0.0-SNAPSHOT</script-processor.version>
+        <splitter-processor.version>3.0.0-SNAPSHOT</splitter-processor.version>
+        <transform-processor.version>3.0.0-SNAPSHOT</transform-processor.version>
+    </properties>
+
     <profiles>
         <profile>
             <id>spring</id>
diff --git a/applications/stream-applications-build/stream-applications-descriptor/pom.xml b/applications/stream-applications-build/stream-applications-descriptor/pom.xml
index f45c1933..9ad0219b 100644
--- a/applications/stream-applications-build/stream-applications-descriptor/pom.xml
+++ b/applications/stream-applications-build/stream-applications-descriptor/pom.xml
@@ -11,30 +11,6 @@
     <name>stream-applications-descriptor</name>
     <packaging>jar</packaging>
 
-    <properties>
-        <cassandra-sink.version>3.0.0-SNAPSHOT</cassandra-sink.version>
-        <counter-sink.version>3.0.0-SNAPSHOT</counter-sink.version>
-        <file-sink.version>3.0.0-SNAPSHOT</file-sink.version>
-        <ftp-sink.version>3.0.0-SNAPSHOT</ftp-sink.version>
-        <jdbc-sink.version>3.0.0-SNAPSHOT</jdbc-sink.version>
-        <log-sink.version>3.0.0-SNAPSHOT</log-sink.version>
-        <mongodb-sink.version>3.0.0-SNAPSHOT</mongodb-sink.version>
-        <rabbit-sink.version>3.0.0-SNAPSHOT</rabbit-sink.version>
-        <redis-sink.version>3.0.0-SNAPSHOT</redis-sink.version>
-        <sftp-sink.version>3.0.0-SNAPSHOT</sftp-sink.version>
-        <file-source.version>3.0.0-SNAPSHOT</file-source.version>
-        <http-source.version>3.0.0-SNAPSHOT</http-source.version>
-        <jdbc-source.version>3.0.0-SNAPSHOT</jdbc-source.version>
-        <mongodb-source.version>3.0.0-SNAPSHOT</mongodb-source.version>
-        <time-source.version>3.0.0-SNAPSHOT</time-source.version>
-        <bridge-processor.version>3.0.0-SNAPSHOT</bridge-processor.version>
-        <filter-processor.version>3.0.0-SNAPSHOT</filter-processor.version>
-        <header-enricher-processor.version>3.0.0-SNAPSHOT</header-enricher-processor.version>
-        <splitter-processor.version>3.0.0-SNAPSHOT</splitter-processor.version>
-        <transform-processor.version>3.0.0-SNAPSHOT</transform-processor.version>
-        <groovy-transform-processor.version>3.0.0-SNAPSHOT</groovy-transform-processor.version>
-    </properties>
-
     <build>
         <resources>
             <resource>
@@ -66,50 +42,75 @@
                             <source><![CDATA[
         pom.properties['repo-spring-io']=
                 "${jdbc-source.version}".contains('SNAPSHOT') ? 'repo.spring.io/snapshot' :
-                        "${jdbc-source.version}".contains('-') ? 'repo.spring.io/milestone' : 'repo.spring.io/release';
-
-        pom.properties['cassandra-sink-docker.tag']=
-                "${cassandra-sink.version}".contains('SNAPSHOT') ? 'latest' : "${cassandra-sink.version}";
-        pom.properties['counter-sink-docker.tag']=
-                "${counter-sink.version}".contains('SNAPSHOT') ? 'latest' : "${counter-sink.version}";
-        pom.properties['file-sink-docker.tag']=
-                "${file-sink.version}".contains('SNAPSHOT') ? 'latest' : "${file-sink.version}";
-        pom.properties['ftp-sink-docker.tag']=
-                "${ftp-sink.version}".contains('SNAPSHOT') ? 'latest' : "${ftp-sink.version}";
-        pom.properties['jdbc-sink-docker.tag']=
-                "${jdbc-sink.version}".contains('SNAPSHOT') ? 'latest' : "${jdbc-sink.version}";
-        pom.properties['log-sink-docker.tag']=
-                "${log-sink.version}".contains('SNAPSHOT') ? 'latest' : "${log-sink.version}";
-        pom.properties['mongodb-sink-docker.tag']=
-                "${mongodb-sink.version}".contains('SNAPSHOT') ? 'latest' : "${mongodb-sink.version}";
-        pom.properties['rabbit-sink-docker.tag']=
-                "${rabbit-sink.version}".contains('SNAPSHOT') ? 'latest' : "${rabbit-sink.version}";
-        pom.properties['redis-sink-docker.tag']=
-                "${redis-sink.version}".contains('SNAPSHOT') ? 'latest' : "${redis-sink.version}";
-        pom.properties['sftp-sink-docker.tag']=
-                "${sftp-sink.version}".contains('SNAPSHOT') ? 'latest' : "${sftp-sink.version}";
+                        "${jdbc-source.version}".contains('-') ? 'repo.spring.io/milestone' : 'repo.spring.io/release'
         pom.properties['file-source-docker.tag']=
-                "${file-source.version}".contains('SNAPSHOT') ? 'latest' : "${file-source.version}";
+                "${file-source.version}".contains('SNAPSHOT') ? 'latest' : "${file-source.version}"
+        pom.properties['geode-source-docker.tag']=
+                "${geode-source.version}".contains('SNAPSHOT') ? 'latest' : "${geode-source.version}"
         pom.properties['http-source-docker.tag']=
-                "${http-source.version}".contains('SNAPSHOT') ? 'latest' : "${http-source.version}";
+                "${http-source.version}".contains('SNAPSHOT') ? 'latest' : "${http-source.version}"
         pom.properties['jdbc-source-docker.tag']=
-                "${jdbc-source.version}".contains('SNAPSHOT') ? 'latest' : "${jdbc-source.version}";
+                "${jdbc-source.version}".contains('SNAPSHOT') ? 'latest' : "${jdbc-source.version}"
+        pom.properties['load-generator-source-docker.tag']=
+                "${load-generator-source.version}".contains('SNAPSHOT') ? 'latest' : "${load-generator-source.version}"
         pom.properties['mongodb-source-docker.tag']=
-                "${mongodb-source.version}".contains('SNAPSHOT') ? 'latest' : "${mongodb-source.version}";
+                "${mongodb-source.version}".contains('SNAPSHOT') ? 'latest' : "${mongodb-source.version}"
+        pom.properties['mqtt-source-docker.tag']=
+                "${mqtt-source.version}".contains('SNAPSHOT') ? 'latest' : "${mqtt-source.version}"
+        pom.properties['rabbit-source-docker.tag']=
+                "${rabbit-source.version}".contains('SNAPSHOT') ? 'latest' : "${rabbit-source.version}"
+        pom.properties['tcp-source-docker.tag']=
+                "${tcp-source.version}".contains('SNAPSHOT') ? 'latest' : "${tcp-source.version}"
         pom.properties['time-source-docker.tag']=
-                "${time-source.version}".contains('SNAPSHOT') ? 'latest' : "${time-source.version}";
+                "${time-source.version}".contains('SNAPSHOT') ? 'latest' : "${time-source.version}"
+        pom.properties['cassandra-sink-docker.tag']=
+                "${cassandra-sink.version}".contains('SNAPSHOT') ? 'latest' : "${cassandra-sink.version}"
+        pom.properties['counter-sink-docker.tag']=
+                "${counter-sink.version}".contains('SNAPSHOT') ? 'latest' : "${counter-sink.version}"
+        pom.properties['file-sink-docker.tag']=
+                "${file-sink.version}".contains('SNAPSHOT') ? 'latest' : "${file-sink.version}"
+        pom.properties['ftp-sink-docker.tag']=
+                "${ftp-sink.version}".contains('SNAPSHOT') ? 'latest' : "${ftp-sink.version}"
+        pom.properties['geode-sink-docker.tag']=
+                "${geode-sink.version}".contains('SNAPSHOT') ? 'latest' : "${geode-sink.version}"
+        pom.properties['jdbc-sink-docker.tag']=
+                "${jdbc-sink.version}".contains('SNAPSHOT') ? 'latest' : "${jdbc-sink.version}"
+        pom.properties['log-sink-docker.tag']=
+                "${log-sink.version}".contains('SNAPSHOT') ? 'latest' : "${log-sink.version}"
+        pom.properties['mongodb-sink-docker.tag']=
+                "${mongodb-sink.version}".contains('SNAPSHOT') ? 'latest' : "${mongodb-sink.version}"
+        pom.properties['mqtt-sink-docker.tag']=
+                "${mqtt-sink.version}".contains('SNAPSHOT') ? 'latest' : "${mqtt-sink.version}"
+        pom.properties['rabbit-sink-docker.tag']=
+                "${rabbit-sink.version}".contains('SNAPSHOT') ? 'latest' : "${rabbit-sink.version}"
+        pom.properties['redis-sink-docker.tag']=
+                "${redis-sink.version}".contains('SNAPSHOT') ? 'latest' : "${redis-sink.version}"
+        pom.properties['router-sink-docker.tag']=
+                "${router-sink.version}".contains('SNAPSHOT') ? 'latest' : "${router-sink.version}"
+        pom.properties['sftp-sink-docker.tag']=
+                "${sftp-sink.version}".contains('SNAPSHOT') ? 'latest' : "${sftp-sink.version}"
+        pom.properties['tcp-sink-docker.tag']=
+                "${tcp-sink.version}".contains('SNAPSHOT') ? 'latest' : "${tcp-sink.version}"
+        pom.properties['throughput-sink-docker.tag']=
+                "${throughput-sink.version}".contains('SNAPSHOT') ? 'latest' : "${throughput-sink.version}"
         pom.properties['bridge-processor-docker.tag']=
-                "${bridge-processor.version}".contains('SNAPSHOT') ? 'latest' : "${bridge-processor.version}";
+                "${bridge-processor.version}".contains('SNAPSHOT') ? 'latest' : "${bridge-processor.version}"
         pom.properties['filter-processor-docker.tag']=
-                "${filter-processor.version}".contains('SNAPSHOT') ? 'latest' : "${filter-processor.version}";
-        pom.properties['groovy-transform-processor-docker.tag']=
-                "${groovy-transform-processor.version}".contains('SNAPSHOT') ? 'latest' : "${groovy-transform-processor.version}";
+                "${filter-processor.version}".contains('SNAPSHOT') ? 'latest' : "${filter-processor.version}"
+        pom.properties['groovy-processor-docker.tag']=
+                "${groovy-processor.version}".contains('SNAPSHOT') ? 'latest' : "${groovy-processor.version}"
+        pom.properties['groovy-processor-docker.tag']=
+                "${groovy-processor.version}".contains('SNAPSHOT') ? 'latest' : "${groovy-processor.version}"
         pom.properties['header-enricher-processor-docker.tag']=
-                "${header-enricher-processor.version}".contains('SNAPSHOT') ? 'latest' : "${header-enricher-processor.version}";
+                "${header-enricher-processor.version}".contains('SNAPSHOT') ? 'latest' : "${header-enricher-processor.version}"
+        pom.properties['http-request-processor-docker.tag']=
+                "${http-request-processor.version}".contains('SNAPSHOT') ? 'latest' : "${http-request-processor.version}"
+        pom.properties['script-processor-docker.tag']=
+                "${scrirpt-processor.version}".contains('SNAPSHOT') ? 'latest' : "${script-processor.version}"
         pom.properties['splitter-processor-docker.tag']=
-                "${splitter-processor.version}".contains('SNAPSHOT') ? 'latest' : "${splitter-processor.version}";
+                "${splitter-processor.version}".contains('SNAPSHOT') ? 'latest' : "${splitter-processor.version}"
         pom.properties['transform-processor-docker.tag']=
-                "${transform-processor.version}".contains('SNAPSHOT') ? 'latest' : "${transform-processor.version}";
+                "${transform-processor.version}".contains('SNAPSHOT') ? 'latest' : "${transform-processor.version}"
                                 ]]></source>
                         </configuration>
                     </execution>
diff --git a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties
index e570c069..6f933406 100644
--- a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties
+++ b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties
@@ -1,21 +1,33 @@
+source.file=docker:springcloudstream/file-source-kafka:@file-source-docker.tag@
+source.geode=docker:springcloudstream/geode-source-kafka:@geode-source-docker.tag@
+source.http=docker:springcloudstream/http-source-kafka:@http-source-docker.tag@
+source.jdbc=docker:springcloudstream/jdbc-source-kafka:@jdbc-source-docker.tag@
+source.load-generator=docker:springcloudstream/load-generator-source-kafka:@load-generator-source-docker.tag@
+source.mongodb=docker:springcloudstream/mongodb-source-kafka:@mongodb-source-docker.tag@
+source.mqtt=docker:springcloudstream/mqtt-source-kafka:@mqtt-source-docker.tag@
+source.rabbit=docker:springcloudstream/rabbit-source-kafka:@rabbit-source-docker.tag@
+source.tcp=docker:springcloudstream/tcp-source-kafka:@tcp-source-docker.tag@
+source.time=docker:springcloudstream/time-source-kafka:@time-source-docker.tag@
 sink.cassandra=docker:springcloudstream/cassandra-sink-kafka:@cassandra-sink-docker.tag@
 sink.counter=docker:springcloudstream/counter-sink-kafka:@counter-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@
+sink.geode=docker:springcloudstream/geode-sink-kafka:@geode-sink-docker.tag@
 sink.jdbc=docker:springcloudstream/jdbc-sink-kafka:@jdbc-sink-docker.tag@
 sink.log=docker:springcloudstream/log-sink-kafka:@log-sink-docker.tag@
 sink.mongodb=docker:springcloudstream/mongodb-sink-kafka:@mongodb-sink-docker.tag@
+sink.mqtt=docker:springcloudstream/mqtt-sink-kafka:@mqtt-sink-docker.tag@
 sink.rabbit=docker:springcloudstream/rabbit-sink-kafka:@rabbit-sink-docker.tag@
 sink.redis=docker:springcloudstream/redis-sink-kafka:@redis-sink-docker.tag@
+sink.router=docker:springcloudstream/router-sink-kafka:@router-sink-docker.tag@
 sink.sftp=docker:springcloudstream/sftp-sink-kafka:@sftp-sink-docker.tag@
-source.file=docker:springcloudstream/file-source-kafka:@file-source-docker.tag@
-source.http=docker:springcloudstream/http-source-kafka:@http-source-docker.tag@
-source.jdbc=docker:springcloudstream/jdbc-source-kafka:@jdbc-source-docker.tag@
-source.mongodb=docker:springcloudstream/mongodb-source-kafka:@mongodb-source-docker.tag@
-source.time=docker:springcloudstream/time-source-kafka:@time-source-docker.tag@
+sink.tcp=docker:springcloudstream/tcp-sink-kafka:@tcp-sink-docker.tag@
+sink.throughput=docker:springcloudstream/throughput-sink-kafka:@throughput-sink-docker.tag@
 processor.bridge=docker:springcloudstream/bridge-processor-kafka:@bridge-processor-docker.tag@
 processor.filter=docker:springcloudstream/filter-processor-kafka:@filter-processor-docker.tag@
-processor.groovy-transform=docker:springcloudstream/groovy-transform-processor-kafka:@groovy-transform-processor-docker.tag@
+processor.groovy=docker:springcloudstream/groovy-processor-kafka:@groovy-processor-docker.tag@
 processor.header-enricher=docker:springcloudstream/header-enricher-processor-kafka:@header-enricher-processor-docker.tag@
+processor.http-request=docker:springcloudstream/http-request-processor-kafka:@http-request-processor-docker.tag@
+processor.script=docker:springcloudstream/script-processor-kafka:@script-processor-docker.tag@
 processor.splitter=docker:springcloudstream/splitter-processor-kafka:@splitter-processor-docker.tag@
 processor.transform=docker:springcloudstream/transform-processor-kafka:@transform-processor-docker.tag@
diff --git a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties
index 64c434bd..90160408 100644
--- a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties
+++ b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties
@@ -1,3 +1,23 @@
+source.file=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-source-kafka/@file-source.version@/file-source-kafka-@file-source.version@.jar
+source.file.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-source-kafka/@file-source.version@/file-source-kafka-@file-source.version@-metadata.jar
+source.geode=https://@repo-spring-io@/org/springframework/cloud/stream/app/geode-source-kafka/@geode-source.version@/geode-source-kafka-@geode-source.version@.jar
+source.geode.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/geode-source-kafka/@geode-source.version@/geode-source-kafka-@geode-source.version@-metadata.jar
+source.http=https://@repo-spring-io@/org/springframework/cloud/stream/app/http-source-kafka/@http-source.version@/http-source-kafka-@http-source.version@.jar
+source.http.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/http-source-kafka/@http-source.version@/http-source-kafka-@http-source.version@-metadata.jar
+source.jdbc=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-source-kafka/@jdb-source.version@/jdbc-source-kafka-@jdbc-source.version@.jar
+source.jdbc.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-source-kafka/@jdb-source.version@/jdbc-source-kafka-@jdbc-source.version@-metadata.jar
+source.load-generator=https://@repo-spring-io@/org/springframework/cloud/stream/app/load-generator-source-kafka/@load-generator-source.version@/load-generator-source-kafka-@load-generator-source.version@.jar
+source.load-generator.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/load-generator-source-kafka/@load-generator-source.version@/load-generator-source-kafka-@load-generator-source.version@-metadata.jar
+source.mongodb=https://@repo-spring-io@/org/springframework/cloud/stream/app/mongodb-source-kafka/@mongodb-source.version@/mongodb-source-kafka-@mongodb-source.version@.jar
+source.mongodb.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/mongodb-source-kafka/@mongodb-source.version@/mongodb-source-kafka-@mongodb-source.version@-metadata.jar
+source.mqtt=https://@repo-spring-io@/org/springframework/cloud/stream/app/mqtt-source-kafka/@mqtt-source.version@/mqtt-source-kafka-@mqtt-source.version@.jar
+source.mqtt.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/mqtt-source-kafka/@mqtt-source.version@/mqtt-source-kafka-@mqtt-source.version@-metadata.jar
+source.rabbit=https://@repo-spring-io@/org/springframework/cloud/stream/app/rabbit-source-kafka/@rabbit-source.version@/rabbit-source-kafka-@rabbit-source.version@.jar
+source.rabbit.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/rabbit-source-kafka/@rabbit-source.version@/rabbit-source-kafka-@rabbit-source.version@-metadata.jar
+source.tcp=https://@repo-spring-io@/org/springframework/cloud/stream/app/tcp-source-kafka/@tcp-source.version@/tcp-source-kafka-@tcp-source.version@.jar
+source.tcp.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/tcp-source-kafka/@tcp-source.version@/tcp-source-kafka-@tcp-source.version@-metadata.jar
+source.time=https://@repo-spring-io@/org/springframework/cloud/stream/app/time-source-kafka/@time-source.version@/time-source-kafka-@time-source.version@.jar
+source.time.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/time-source-kafka/@time-source.version@/time-source-kafka-@time-source.version@-metadata.jar
 sink.cassandra=https://@repo-spring-io@/org/springframework/cloud/stream/app/cassandra-sink-kafka/@cassandra-sink.version@/cassandra-sink-kafka-@cassandra-sink.version@.jar
 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.counter=https://@repo-spring-io@/org/springframework/cloud/stream/app/counter-sink-kafka/@counter-sink.version@/counter-sink-kafka-@counter-sink.version@.jar
@@ -6,36 +26,40 @@ sink.file=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-sin
 sink.file.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-sink-kafka/@file-sink.version@/file-sink-kafka-@file-sink.version@-metadata.jar
 sink.ftp=https://@repo-spring-io@/org/springframework/cloud/stream/app/ftp-sink-kafka/@ftp-sink.version@/ftp-sink-kafka-@ftp-sink.version@.jar
 sink.ftp.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/ftp-sink-kafka/@ftp-sink.version@/ftp-sink-kafka-@ftp-sink.version@-metadata.jar
+sink.geode=https://@repo-spring-io@/org/springframework/cloud/stream/app/geode-sink-kafka/@geode-sink.version@/geode-sink-kafka-@geode-sink.version@.jar
+sink.geode.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/geode-sink-kafka/@geode-sink.version@/geode-sink-kafka-@geode-sink.version@-metadata.jar
 sink.jdbc=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-sink-kafka/@jdbc-sink.version@/jdbc-sink-kafka-@jdbc-sink.version@.jar
 sink.jdbc.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-sink-kafka/@jdbc-sink.version@/jdbc-sink-kafka-@jdbc-sink.version@-metadata.jar
 sink.log=https://@repo-spring-io@/org/springframework/cloud/stream/app/log-sink-kafka/@log-sink.version@/log-sink-kafka-@log-sink.version@.jar
 sink.log.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/log-sink-kafka/@log-sink.version@/log-sink-kafka-@log-sink.version@-metadata.jar
 sink.mongodb=https://@repo-spring-io@/org/springframework/cloud/stream/app/mongodb-sink-kafka/@mongodb-sink.version@/mongodb-sink-kafka-@mongodb-sink.version@.jar
 sink.mongodb.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/mongodb-sink-kafka/@mongodb-sink.version@/mongodb-sink-kafka-@mongodb-sink.version@-metadata.jar
+sink.mqtt=https://@repo-spring-io@/org/springframework/cloud/stream/app/mqtt-sink-kafka/@mqtt-sink.version@/mqtt-sink-kafka-@mqtt-sink.version@.jar
+sink.mqtt.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/mqtt-sink-kafka/@mqtt-sink.version@/mqtt-sink-kafka-@mqtt-sink.version@-metadata.jar
 sink.rabbit=https://@repo-spring-io@/org/springframework/cloud/stream/app/rabbit-sink-kafka/@rabbit-sink.version@/rabbit-sink-kafka-@rabbit-sink.version@.jar
 sink.rabbit.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/rabbit-sink-kafka/@rabbit-sink.version@/rabbit-sink-kafka-@rabbit-sink.version@-metadata.jar
 sink.redis=https://@repo-spring-io@/org/springframework/cloud/stream/app/redis-sink-kafka/@redis-sink.version@/redis-sink-kafka-@redis-sink.version@.jar
 sink.redis.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/redis-sink-kafka/@redis-sink.version@/redis-sink-kafka-@redis-sink.version@-metadata.jar
+sink.router=https://@repo-spring-io@/org/springframework/cloud/stream/app/router-sink-kafka/@router-sink.version@/router-sink-kafka-@router-sink.version@.jar
+sink.router.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/router-sink-kafka/@router-sink.version@/router-sink-kafka-@router-sink.version@-metadata.jar
 sink.sftp=https://@repo-spring-io@/org/springframework/cloud/stream/app/sftp-sink-kafka/@sftp-sink.version@/sftp-sink-kafka-@sftp-sink.version@.jar
 sink.sftp.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/sftp-sink-kafka/@sftp-sink.version@/sftp-sink-kafka-@sftp-sink.version@-metadata.jar
-source.file=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-source-kafka/@file-source.version@/file-source-kafka-@file-source.version@.jar
-source.file.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-source-kafka/@file-source.version@/file-source-kafka-@file-source.version@-metadata.jar
-source.http=https://@repo-spring-io@/org/springframework/cloud/stream/app/http-source-kafka/@http-source.version@/http-source-kafka-@http-source.version@.jar
-source.http.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/http-source-kafka/@http-source.version@/http-source-kafka-@http-source.version@-metadata.jar
-source.jdbc=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-source-kafka/@jdb-source.version@/jdbc-source-kafka-@jdbc-source.version@.jar
-source.jdbc.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-source-kafka/@jdb-source.version@/jdbc-source-kafka-@jdbc-source.version@-metadata.jar
-source.mongodb=https://@repo-spring-io@/org/springframework/cloud/stream/app/mongodb-source-kafka/@mongodb-source.version@/mongodb-source-kafka-@mongodb-source.version@.jar
-source.mongodb.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/mongodb-source-kafka/@mongodb-source.version@/mongodb-source-kafka-@mongodb-source.version@-metadata.jar
-source.time=https://@repo-spring-io@/org/springframework/cloud/stream/app/time-source-kafka/@time-source.version@/time-source-kafka-@time-source.version@.jar
-source.time.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/time-source-kafka/@time-source.version@/time-source-kafka-@time-source.version@-metadata.jar
+sink.tcp=https://@repo-spring-io@/org/springframework/cloud/stream/app/tcp-sink-kafka/@tcp-sink.version@/tcp-sink-kafka-@sftp-sink.version@.jar
+sink.tcp.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/tcp-sink-kafka/@tcp-sink.version@/tcp-sink-kafka-@tcp-sink.version@-metadata.jar
+sink.throughput=https://@repo-spring-io@/org/springframework/cloud/stream/app/throughput-sink-kafka/@throughput-sink.version@/throughput-sink-kafka-@throughput-sink.version@.jar
+sink.throughput.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/throughput-sink-kafka/@throughput-sink.version@/throughput-sink-kafka-@throughput-sink.version@-metadata.jar
 processor.bridge=https://@repo-spring-io@/org/springframework/cloud/stream/app/bridge-processor-kafka/@bridge-processor.version@/bridge-processor-kafka-@bridge-processor.version@.jar
 processor.bridge.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/bridge-processor-kafka/@bridge-processor.version@/bridge-processor-kafka-@bridge-processor.version@-metadata.jar
 processor.filter=https://@repo-spring-io@/org/springframework/cloud/stream/app/filter-processor-kafka/@filter-processor.version@/filter-processor-kafka-@filter-processor.version@.jar
 processor.filter.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/filter-processor-kafka/@filter-processor.version@/filter-processor-kafka-@filter-processor.version@-metadata.jar
-processor.groovy-transform=https://@repo-spring-io@/org/springframework/cloud/stream/app/groovy-transform-processor-kafka/@groovy-transform-processor.version@/groovy-transform-processor-kafka-@groovy-transform-processor.version@.jar
-processor.groovy-transform.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/groovy-transform-processor-kafka/@groovy-transform-processor.version@/groovy-transform-processor-kafka-@groovy-transform-processor.version@-metadata.jar
+processor.groovy=https://@repo-spring-io@/org/springframework/cloud/stream/app/groovy-processor-kafka/@groovy-processor.version@/groovy-processor-kafka-@groovy-processor.version@.jar
+processor.groovy.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/groovy-processor-kafka/@groovy-processor.version@/groovy-processor-kafka-@groovy-processor.version@-metadata.jar
 processor.header-enricher=https://@repo-spring-io@/org/springframework/cloud/stream/app/header-enricher-processor-kafka/@header-enricher-processor.version@/header-enricher-processor-kafka-@header-enricher-processor.version@.jar
 processor.header-enricher.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/header-enricher-processor-kafka/@header-enricher-processor.version@/header-enricher-processor-kafka-@header-enricher-processor.version@-metadata.jar
+processor.http-request=https://@repo-spring-io@/org/springframework/cloud/stream/app/http-request-processor-kafka/@http-request-processor.version@/http-request-processor-kafka-@http-request-processor.version@.jar
+processor.http-request.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/http-request-processor-kafka/@http-request-processor.version@/http-request-processor-kafka-@http-request-processor.version@-metadata.jar
+processor.script=https://@repo-spring-io@/org/springframework/cloud/stream/app/script-processor-kafka/@script-processor.version@/script-processor-kafka-@script-processor.version@.jar
+processor.script.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/script-processor-kafka/@script-processor.version@/script-processor-kafka-@script-processor.version@-metadata.jar
 processor.splitter=https://@repo-spring-io@/org/springframework/cloud/stream/app/splitter-processor-kafka/@splitter-processor.version@/splitter-processor-kafka-@splitter-processor.version@.jar
 processor.splitter.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/splitter-processor-kafka/@splitter-processor.version@/splitter-processor-kafka-@splitter-processor.version@-metadata.jar
 processor.transform=https://@repo-spring-io@/org/springframework/cloud/stream/app/transform-processor-kafka/@transform-processor.version@/transform-processor-kafka-@transform-processor.version@.jar
diff --git a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties
index eadddf7e..b5ddbb86 100644
--- a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties
+++ b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties
@@ -1,3 +1,23 @@
+source.file=maven://org.springframework.cloud.stream.app:file-source-kafka:@file-source.version@
+source.file.metadata=maven://org.springframework.cloud.stream.app:file-source-kafka:jar:metadata:@file-source.version@
+source.geode=maven://org.springframework.cloud.stream.app:geode-source-kafka:@geode-source.version@
+source.geode.metadata=maven://org.springframework.cloud.stream.app:geode-source-kafka:jar:metadata:@geode-source.version@
+source.http=maven://org.springframework.cloud.stream.app:http-source-kafka:@http-source.version@
+source.http.metadata=maven://org.springframework.cloud.stream.app:http-source-kafka:jar:metadata:@http-source.version@
+source.jdbc=maven://org.springframework.cloud.stream.app:jdbc-source-kafka:@jdbc-source.version@
+source.jdbc.metadata=maven://org.springframework.cloud.stream.app:jdbc-source-kafka:jar:metadata:@jdbc-source.version@
+source.load-generator=maven://org.springframework.cloud.stream.app:load-generator-source-kafka:@load-generator-source.version@
+source.load-generator.metadata=maven://org.springframework.cloud.stream.app:load-generator-source-kafka:jar:metadata:@load-generator-source.version@
+source.mongodb=maven://org.springframework.cloud.stream.app:mongodb-source-kafka:@mongodb-source.version@
+source.mongodb.metadata=maven://org.springframework.cloud.stream.app:mongodb-source-kafka:jar:metadata:@mongodb-source.version@
+source.mqtt=maven://org.springframework.cloud.stream.app:mqtt-source-kafka:@mqtt-source.version@
+source.mqtt.metadata=maven://org.springframework.cloud.stream.app:mqtt-source-kafka:jar:metadata:@mqtt-source.version@
+source.rabbit=maven://org.springframework.cloud.stream.app:rabbit-source-kafka:@rabbit-source.version@
+source.rabbit.metadata=maven://org.springframework.cloud.stream.app:rabbit-source-kafka:jar:metadata:@rabbit-source.version@
+source.tcp=maven://org.springframework.cloud.stream.app:tcp-source-kafka:@tcp-source.version@
+source.tcp.metadata=maven://org.springframework.cloud.stream.app:tcp-source-kafka:jar:metadata:@tcp-source.version@
+source.time=maven://org.springframework.cloud.stream.app:time-source-kafka:@time-source.version@
+source.time.metadata=maven://org.springframework.cloud.stream.app:time-source-kafka:jar:metadata:@time-source.version@
 sink.cassandra=maven://org.springframework.cloud.stream.app:cassandra-sink-kafka:@cassandra-sink.version@
 sink.cassandra.metadata=maven://org.springframework.cloud.stream.app:cassandra-sink-kafka:jar:metadata:@cassandra-sink.version@
 sink.counter=maven://org.springframework.cloud.stream.app:counter-sink-kafka:@counter-sink.version@
@@ -6,36 +26,40 @@ sink.file=maven://org.springframework.cloud.stream.app:file-sink-kafka:@file-sin
 sink.file.metadata=maven://org.springframework.cloud.stream.app:file-sink-kafka:jar:metadata:@file-sink.version@
 sink.ftp=maven://org.springframework.cloud.stream.app:ftp-sink-kafka:@ftp-sink.version@
 sink.ftp.metadata=maven://org.springframework.cloud.stream.app:ftp-sink-kafka:jar:metadata:@ftp-sink.version@
+sink.geode=maven://org.springframework.cloud.stream.app:geode-sink-kafka:@geode-sink.version@
+sink.geode.metadata=maven://org.springframework.cloud.stream.app:geode-sink-kafka:jar:metadata:@geode-sink.version@
 sink.jdbc=maven://org.springframework.cloud.stream.app:jdbc-sink-kafka:@jdbc-sink.version@
 sink.jdbc.metadata=maven://org.springframework.cloud.stream.app:jdbc-sink-kafka:jar:metadata:@jdbc-sink.version@
 sink.log=maven://org.springframework.cloud.stream.app:log-sink-kafka:@log-sink.version@
 sink.log.metadata=maven://org.springframework.cloud.stream.app:log-sink-kafka:jar:metadata:@log-sink.version@
 sink.mongodb=maven://org.springframework.cloud.stream.app:mongodb-sink-kafka:@mongodb-sink.version@
 sink.mongodb.metadata=maven://org.springframework.cloud.stream.app:mongodb-sink-kafka:jar:metadata:@mongodb-sink.version@
+sink.mqtt=maven://org.springframework.cloud.stream.app:mqtt-sink-kafka:@mqtt-sink.version@
+sink.mqtt.metadata=maven://org.springframework.cloud.stream.app:mqtt-sink-kafka:jar:metadata:@mqtt-sink.version@
 sink.rabbit=maven://org.springframework.cloud.stream.app:rabbit-sink-kafka:@rabbit-sink.version@
 sink.rabbit.metadata=maven://org.springframework.cloud.stream.app:rabbit-sink-kafka:jar:metadata:@rabbit-sink.version@
 sink.redis=maven://org.springframework.cloud.stream.app:redis-sink-kafka:@redis-sink.version@
 sink.redis.metadata=maven://org.springframework.cloud.stream.app:redis-sink-kafka:jar:metadata:@redis-sink.version@
+sink.router=maven://org.springframework.cloud.stream.app:router-sink-kafka:@router-sink.version@
+sink.router.metadata=maven://org.springframework.cloud.stream.app:router-sink-kafka:jar:metadata:@router-sink.version@
 sink.sftp=maven://org.springframework.cloud.stream.app:sftp-sink-kafka:@sftp-sink.version@
 sink.sftp.metadata=maven://org.springframework.cloud.stream.app:sftp-sink-kafka:jar:metadata:@sftp-sink.version@
-source.file=maven://org.springframework.cloud.stream.app:file-source-kafka:@file-source.version@
-source.file.metadata=maven://org.springframework.cloud.stream.app:file-source-kafka:jar:metadata:@file-source.version@
-source.http=maven://org.springframework.cloud.stream.app:http-source-kafka:@http-source.version@
-source.http.metadata=maven://org.springframework.cloud.stream.app:http-source-kafka:jar:metadata:@http-source.version@
-source.jdbc=maven://org.springframework.cloud.stream.app:jdbc-source-kafka:@jdbc-source.version@
-source.jdbc.metadata=maven://org.springframework.cloud.stream.app:jdbc-source-kafka:jar:metadata:@jdbc-source.version@
-source.mongodb=maven://org.springframework.cloud.stream.app:mongodb-source-kafka:@mongodb-source.version@
-source.mongodb.metadata=maven://org.springframework.cloud.stream.app:mongodb-source-kafka:jar:metadata:@mongodb-source.version@
-source.time=maven://org.springframework.cloud.stream.app:time-source-kafka:@time-source.version@
-source.time.metadata=maven://org.springframework.cloud.stream.app:time-source-kafka:jar:metadata:@time-source.version@
+sink.tcp=maven://org.springframework.cloud.stream.app:tcp-sink-kafka:@tcp-sink.version@
+sink.tcp.metadata=maven://org.springframework.cloud.stream.app:tcp-sink-kafka:jar:metadata:@tcp-sink.version@
+sink.throughput=maven://org.springframework.cloud.stream.app:throughput-sink-kafka:@throughput-sink.version@
+sink.throughput.metadata=maven://org.springframework.cloud.stream.app:throughput-sink-kafka:jar:metadata:@throughput-sink.version@
 processor.bridge=maven://org.springframework.cloud.stream.app:bridge-processor-kafka:@bridge-processor.version@
 processor.bridge.metadata=maven://org.springframework.cloud.stream.app:bridge-processor-kafka:jar:metadata:@bridge-processor.version@
 processor.filter=maven://org.springframework.cloud.stream.app:filter-processor-kafka:@filter-processor.version@
 processor.filter.metadata=maven://org.springframework.cloud.stream.app:filter-processor-kafka:jar:metadata:@filter-processor.version@
-processor.groovy-transform=maven://org.springframework.cloud.stream.app:groovy-transform-processor-kafka:@groovy-transform-processor.version@
-processor.groovy-transform.metadata=maven://org.springframework.cloud.stream.app:groovy-transform-processor-kafka:jar:metadata:@groovy-transform-processor.version@
+processor.groovy=maven://org.springframework.cloud.stream.app:groovy-processor-kafka:@groovy-processor.version@
+processor.groovy.metadata=maven://org.springframework.cloud.stream.app:groovy-processor-kafka:jar:metadata:@groovy-processor.version@
 processor.header-enricher=maven://org.springframework.cloud.stream.app:header-enricher-processor-kafka:@header-enricher-processor.version@
 processor.header-enricher.metadata=maven://org.springframework.cloud.stream.app:header-enricher-processor-kafka:jar:metadata:@header-enricher-processor.version@
+processor.http-request=maven://org.springframework.cloud.stream.app:http-request-processor-kafka:@http-request-processor.version@
+processor.http-request.metadata=maven://org.springframework.cloud.stream.app:http-request-processor-kafka:jar:metadata:@http-request-processor.version@
+processor.script=maven://org.springframework.cloud.stream.app:script-processor-kafka:@script-processor.version@
+processor.script.metadata=maven://org.springframework.cloud.stream.app:script-processor-kafka:jar:metadata:@script-processor.version@
 processor.splitter=maven://org.springframework.cloud.stream.app:splitter-processor-kafka:@splitter-processor.version@
 processor.splitter.metadata=maven://org.springframework.cloud.stream.app:splitter-processor-kafka:jar:metadata:@splitter-processor.version@
 processor.transform=maven://org.springframework.cloud.stream.app:transform-processor-kafka:@transform-processor.version@
diff --git a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties
index 8bb93eeb..032aa10d 100644
--- a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties
+++ b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties
@@ -1,21 +1,33 @@
+source.file=docker:springcloudstream/file-source-rabbit:@file-source-docker.tag@
+source.geode=docker:springcloudstream/geode-source-rabbit:@geode-source-docker.tag@
+source.http=docker:springcloudstream/http-source-rabbit:@http-source-docker.tag@
+source.jdbc=docker:springcloudstream/jdbc-source-rabbit:@jdbc-source-docker.tag@
+source.load-generator=docker:springcloudstream/load-generator-source-rabbit:@load-generator-source-docker.tag@
+source.mongodb=docker:springcloudstream/mongodb-source-rabbit:@mongodb-source-docker.tag@
+source.mqtt=docker:springcloudstream/mqtt-source-rabbit:@mqtt-source-docker.tag@
+source.rabbit=docker:springcloudstream/rabbit-source-rabbit:@rabbit-source-docker.tag@
+source.tcp=docker:springcloudstream/tcp-source-rabbit:@tcp-source-docker.tag@
+source.time=docker:springcloudstream/time-source-rabbit:@time-source-docker.tag@
 sink.cassandra=docker:springcloudstream/cassandra-sink-rabbit:@cassandra-sink-docker.tag@
 sink.counter=docker:springcloudstream/counter-sink-rabbit:@counter-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@
+sink.geode=docker:springcloudstream/geode-sink-rabbit:@geode-sink-docker.tag@
 sink.jdbc=docker:springcloudstream/jdbc-sink-rabbit:@jdbc-sink-docker.tag@
 sink.log=docker:springcloudstream/log-sink-rabbit:@log-sink-docker.tag@
 sink.mongodb=docker:springcloudstream/mongodb-sink-rabbit:@mongodb-sink-docker.tag@
+sink.mqtt=docker:springcloudstream/mqtt-sink-rabbit:@mqtt-sink-docker.tag@
 sink.rabbit=docker:springcloudstream/rabbit-sink-rabbit:@rabbit-sink-docker.tag@
 sink.redis=docker:springcloudstream/redis-sink-rabbit:@redis-sink-docker.tag@
+sink.router=docker:springcloudstream/router-sink-rabbit:@router-sink-docker.tag@
 sink.sftp=docker:springcloudstream/sftp-sink-rabbit:@sftp-sink-docker.tag@
-source.file=docker:springcloudstream/file-source-rabbit:@file-source-docker.tag@
-source.http=docker:springcloudstream/http-source-rabbit:@http-source-docker.tag@
-source.jdbc=docker:springcloudstream/jdbc-source-rabbit:@jdbc-source-docker.tag@
-source.mongodb=docker:springcloudstream/mongodb-source-rabbit:@mongodb-source-docker.tag@
-source.time=docker:springcloudstream/time-source-rabbit:@time-source-docker.tag@
+sink.tcp=docker:springcloudstream/tcp-sink-rabbit:@tcp-sink-docker.tag@
+sink.throughput=docker:springcloudstream/throughput-sink-rabbit:@throughput-sink-docker.tag@
 processor.bridge=docker:springcloudstream/bridge-processor-rabbit:@bridge-processor-docker.tag@
 processor.filter=docker:springcloudstream/filter-processor-rabbit:@filter-processor-docker.tag@
-processor.groovy-transform=docker:springcloudstream/groovy-transform-processor-rabbit:@groovy-transform-processor-docker.tag@
+processor.groovy=docker:springcloudstream/groovy-processor-rabbit:@groovy-processor-docker.tag@
 processor.header-enricher=docker:springcloudstream/header-enricher-processor-rabbit:@header-enricher-processor-docker.tag@
+processor.http-request=docker:springcloudstream/http-request-processor-rabbit:@http-request-processor-docker.tag@
+processor.script=docker:springcloudstream/script-processor-rabbit:@script-processor-docker.tag@
 processor.splitter=docker:springcloudstream/splitter-processor-rabbit:@splitter-processor-docker.tag@
 processor.transform=docker:springcloudstream/transform-processor-rabbit:@transform-processor-docker.tag@
diff --git a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties
index d6c3fade..b64b93da 100644
--- a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties
+++ b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties
@@ -1,3 +1,23 @@
+source.file=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-source-rabbit/@file-source.version@/file-source-rabbit-@file-source.version@.jar
+source.file.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-source-rabbit/@file-source.version@/file-source-rabbit-@file-source.version@-metadata.jar
+source.geode=https://@repo-spring-io@/org/springframework/cloud/stream/app/geode-source-rabbit/@geode-source.version@/geode-source-rabbit-@geode-source.version@.jar
+source.geode.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/geode-source-rabbit/@geode-source.version@/geode-source-rabbit-@geode-source.version@-metadata.jar
+source.http=https://@repo-spring-io@/org/springframework/cloud/stream/app/http-source-rabbit/@http-source.version@/http-source-rabbit-@http-source.version@.jar
+source.http.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/http-source-rabbit/@http-source.version@/http-source-rabbit-@http-source.version@-metadata.jar
+source.jdbc=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-source-rabbit/@jdb-source.version@/jdbc-source-rabbit-@jdbc-source.version@.jar
+source.jdbc.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-source-rabbit/@jdb-source.version@/jdbc-source-rabbit-@jdbc-source.version@-metadata.jar
+source.load-generator=https://@repo-spring-io@/org/springframework/cloud/stream/app/load-generator-source-rabbit/@load-generator-source.version@/load-generator-source-rabbit-@load-generator-source.version@.jar
+source.load-generator.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/load-generator-source-rabbit/@load-generator-source.version@/load-generator-source-rabbit-@load-generator-source.version@-metadata.jar
+source.mongodb=https://@repo-spring-io@/org/springframework/cloud/stream/app/mongodb-source-rabbit/@mongodb-source.version@/mongodb-source-rabbit-@mongodb-source.version@.jar
+source.mongodb.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/mongodb-source-rabbit/@mongodb-source.version@/mongodb-source-rabbit-@mongodb-source.version@-metadata.jar
+source.mqtt=https://@repo-spring-io@/org/springframework/cloud/stream/app/mqtt-source-rabbit/@mqtt-source.version@/mqtt-source-rabbit-@mqtt-source.version@.jar
+source.mqtt.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/mqtt-source-rabbit/@mqtt-source.version@/mqtt-source-rabbit-@mqtt-source.version@-metadata.jar
+source.rabbit=https://@repo-spring-io@/org/springframework/cloud/stream/app/rabbit-source-rabbit/@rabbit-source.version@/rabbit-source-rabbit-@rabbit-source.version@.jar
+source.rabbit.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/rabbit-source-rabbit/@rabbit-source.version@/rabbit-source-rabbit-@rabbit-source.version@-metadata.jar
+source.tcp=https://@repo-spring-io@/org/springframework/cloud/stream/app/tcp-source-rabbit/@tcp-source.version@/tcp-source-rabbit-@tcp-source.version@.jar
+source.tcp.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/tcp-source-rabbit/@tcp-source.version@/tcp-source-rabbit-@tcp-source.version@-metadata.jar
+source.time=https://@repo-spring-io@/org/springframework/cloud/stream/app/time-source-rabbit/@time-source.version@/time-source-rabbit-@time-source.version@.jar
+source.time.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/time-source-rabbit/@time-source.version@/time-source-rabbit-@time-source.version@-metadata.jar
 sink.cassandra=https://@repo-spring-io@/org/springframework/cloud/stream/app/cassandra-sink-rabbit/@cassandra-sink.version@/cassandra-sink-rabbit-@cassandra-sink.version@.jar
 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.counter=https://@repo-spring-io@/org/springframework/cloud/stream/app/counter-sink-rabbit/@counter-sink.version@/counter-sink-rabbit-@counter-sink.version@.jar
@@ -6,36 +26,40 @@ sink.file=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-sin
 sink.file.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-sink-rabbit/@file-sink.version@/file-sink-rabbit-@file-sink.version@-metadata.jar
 sink.ftp=https://@repo-spring-io@/org/springframework/cloud/stream/app/ftp-sink-rabbit/@ftp-sink.version@/ftp-sink-rabbit-@ftp-sink.version@.jar
 sink.ftp.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/ftp-sink-rabbit/@ftp-sink.version@/ftp-sink-rabbit-@ftp-sink.version@-metadata.jar
+sink.geode=https://@repo-spring-io@/org/springframework/cloud/stream/app/geode-sink-rabbit/@geode-sink.version@/geode-sink-rabbit-@geode-sink.version@.jar
+sink.geode.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/geode-sink-rabbit/@geode-sink.version@/geode-sink-rabbit-@geode-sink.version@-metadata.jar
 sink.jdbc=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-sink-rabbit/@jdbc-sink.version@/jdbc-sink-rabbit-@jdbc-sink.version@.jar
 sink.jdbc.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-sink-rabbit/@jdbc-sink.version@/jdbc-sink-rabbit-@jdbc-sink.version@-metadata.jar
 sink.log=https://@repo-spring-io@/org/springframework/cloud/stream/app/log-sink-rabbit/@log-sink.version@/log-sink-rabbit-@log-sink.version@.jar
 sink.log.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/log-sink-rabbit/@log-sink.version@/log-sink-rabbit-@log-sink.version@-metadata.jar
 sink.mongodb=https://@repo-spring-io@/org/springframework/cloud/stream/app/mongodb-sink-rabbit/@mongodb-sink.version@/mongodb-sink-rabbit-@mongodb-sink.version@.jar
 sink.mongodb.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/mongodb-sink-rabbit/@mongodb-sink.version@/mongodb-sink-rabbit-@mongodb-sink.version@-metadata.jar
+sink.mqtt=https://@repo-spring-io@/org/springframework/cloud/stream/app/mqtt-sink-rabbit/@mqtt-sink.version@/mqtt-sink-rabbit-@mqtt-sink.version@.jar
+sink.mqtt.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/mqtt-sink-rabbit/@mqtt-sink.version@/mqtt-sink-rabbit-@mqtt-sink.version@-metadata.jar
 sink.rabbit=https://@repo-spring-io@/org/springframework/cloud/stream/app/rabbit-sink-rabbit/@rabbit-sink.version@/rabbit-sink-rabbit-@rabbit-sink.version@.jar
 sink.rabbit.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/rabbit-sink-rabbit/@rabbit-sink.version@/rabbit-sink-rabbit-@rabbit-sink.version@-metadata.jar
 sink.redis=https://@repo-spring-io@/org/springframework/cloud/stream/app/redis-sink-rabbit/@redis-sink.version@/redis-sink-rabbit-@redis-sink.version@.jar
 sink.redis.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/redis-sink-rabbit/@redis-sink.version@/redis-sink-rabbit-@redis-sink.version@-metadata.jar
+sink.router=https://@repo-spring-io@/org/springframework/cloud/stream/app/router-sink-rabbit/@router-sink.version@/router-sink-rabbit-@router-sink.version@.jar
+sink.router.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/router-sink-rabbit/@router-sink.version@/router-sink-rabbit-@router-sink.version@-metadata.jar
 sink.sftp=https://@repo-spring-io@/org/springframework/cloud/stream/app/sftp-sink-rabbit/@sftp-sink.version@/sftp-sink-rabbit-@sftp-sink.version@.jar
 sink.sftp.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/sftp-sink-rabbit/@sftp-sink.version@/sftp-sink-rabbit-@sftp-sink.version@-metadata.jar
-source.file=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-source-rabbit/@file-source.version@/file-source-rabbit-@file-source.version@.jar
-source.file.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-source-rabbit/@file-source.version@/file-source-rabbit-@file-source.version@-metadata.jar
-source.http=https://@repo-spring-io@/org/springframework/cloud/stream/app/http-source-rabbit/@http-source.version@/http-source-rabbit-@http-source.version@.jar
-source.http.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/http-source-rabbit/@http-source.version@/http-source-rabbit-@http-source.version@-metadata.jar
-source.jdbc=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-source-rabbit/@jdb-source.version@/jdbc-source-rabbit-@jdbc-source.version@.jar
-source.jdbc.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-source-rabbit/@jdb-source.version@/jdbc-source-rabbit-@jdbc-source.version@-metadata.jar
-source.mongodb=https://@repo-spring-io@/org/springframework/cloud/stream/app/mongodb-source-rabbit/@mongodb-source.version@/mongodb-source-rabbit-@mongodb-source.version@.jar
-source.mongodb.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/mongodb-source-rabbit/@mongodb-source.version@/mongodb-source-rabbit-@mongodb-source.version@-metadata.jar
-source.time=https://@repo-spring-io@/org/springframework/cloud/stream/app/time-source-rabbit/@time-source.version@/time-source-rabbit-@time-source.version@.jar
-source.time.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/time-source-rabbit/@time-source.version@/time-source-rabbit-@time-source.version@-metadata.jar
+sink.tcp=https://@repo-spring-io@/org/springframework/cloud/stream/app/tcp-sink-rabbit/@tcp-sink.version@/tcp-sink-rabbit-@sftp-sink.version@.jar
+sink.tcp.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/tcp-sink-rabbit/@tcp-sink.version@/tcp-sink-rabbit-@tcp-sink.version@-metadata.jar
+sink.throughput=https://@repo-spring-io@/org/springframework/cloud/stream/app/throughput-sink-rabbit/@throughput-sink.version@/throughput-sink-rabbit-@throughput-sink.version@.jar
+sink.throughput.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/throughput-sink-rabbit/@throughput-sink.version@/throughput-sink-rabbit-@throughput-sink.version@-metadata.jar
 processor.bridge=https://@repo-spring-io@/org/springframework/cloud/stream/app/bridge-processor-rabbit/@bridge-processor.version@/bridge-processor-rabbit-@bridge-processor.version@.jar
 processor.bridge.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/bridge-processor-rabbit/@bridge-processor.version@/bridge-processor-rabbit-@bridge-processor.version@-metadata.jar
 processor.filter=https://@repo-spring-io@/org/springframework/cloud/stream/app/filter-processor-rabbit/@filter-processor.version@/filter-processor-rabbit-@filter-processor.version@.jar
 processor.filter.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/filter-processor-rabbit/@filter-processor.version@/filter-processor-rabbit-@filter-processor.version@-metadata.jar
-processor.groovy-transform=https://@repo-spring-io@/org/springframework/cloud/stream/app/groovy-transform-processor-rabbit/@groovy-transform-processor.version@/groovy-transform-processor-rabbit-@groovy-transform-processor.version@.jar
-processor.groovy-transform.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/groovy-transform-processor-rabbit/@groovy-transform-processor.version@/groovy-transform-processor-rabbit-@groovy-transform-processor.version@-metadata.jar
+processor.groovy=https://@repo-spring-io@/org/springframework/cloud/stream/app/groovy-processor-rabbit/@groovy-processor.version@/groovy-processor-rabbit-@groovy-processor.version@.jar
+processor.groovy.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/groovy-processor-rabbit/@groovy-processor.version@/groovy-processor-rabbit-@groovy-processor.version@-metadata.jar
 processor.header-enricher=https://@repo-spring-io@/org/springframework/cloud/stream/app/header-enricher-processor-rabbit/@header-enricher-processor.version@/header-enricher-processor-rabbit-@header-enricher-processor.version@.jar
 processor.header-enricher.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/header-enricher-processor-rabbit/@header-enricher-processor.version@/header-enricher-processor-rabbit-@header-enricher-processor.version@-metadata.jar
+processor.http-request=https://@repo-spring-io@/org/springframework/cloud/stream/app/http-request-processor-rabbit/@http-request-processor.version@/http-request-processor-rabbit-@http-request-processor.version@.jar
+processor.http-request.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/http-request-processor-rabbit/@http-request-processor.version@/http-request-processor-rabbit-@http-request-processor.version@-metadata.jar
+processor.script=https://@repo-spring-io@/org/springframework/cloud/stream/app/script-processor-rabbit/@script-processor.version@/script-processor-rabbit-@script-processor.version@.jar
+processor.script.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/script-processor-rabbit/@script-processor.version@/script-processor-rabbit-@script-processor.version@-metadata.jar
 processor.splitter=https://@repo-spring-io@/org/springframework/cloud/stream/app/splitter-processor-rabbit/@splitter-processor.version@/splitter-processor-rabbit-@splitter-processor.version@.jar
 processor.splitter.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/splitter-processor-rabbit/@splitter-processor.version@/splitter-processor-rabbit-@splitter-processor.version@-metadata.jar
 processor.transform=https://@repo-spring-io@/org/springframework/cloud/stream/app/transform-processor-rabbit/@transform-processor.version@/transform-processor-rabbit-@transform-processor.version@.jar
diff --git a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties
index 4d27b21d..bc8f1865 100644
--- a/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties
+++ b/applications/stream-applications-build/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties
@@ -1,3 +1,23 @@
+source.file=maven://org.springframework.cloud.stream.app:file-source-rabbit:@file-source.version@
+source.file.metadata=maven://org.springframework.cloud.stream.app:file-source-rabbit:jar:metadata:@file-source.version@
+source.geode=maven://org.springframework.cloud.stream.app:geode-source-rabbit:@geode-source.version@
+source.geode.metadata=maven://org.springframework.cloud.stream.app:geode-source-rabbit:jar:metadata:@geode-source.version@
+source.http=maven://org.springframework.cloud.stream.app:http-source-rabbit:@http-source.version@
+source.http.metadata=maven://org.springframework.cloud.stream.app:http-source-rabbit:jar:metadata:@http-source.version@
+source.jdbc=maven://org.springframework.cloud.stream.app:jdbc-source-rabbit:@jdbc-source.version@
+source.jdbc.metadata=maven://org.springframework.cloud.stream.app:jdbc-source-rabbit:jar:metadata:@jdbc-source.version@
+source.load-generator=maven://org.springframework.cloud.stream.app:load-generator-source-rabbit:@load-generator-source.version@
+source.load-generator.metadata=maven://org.springframework.cloud.stream.app:load-generator-source-rabbit:jar:metadata:@load-generator-source.version@
+source.mongodb=maven://org.springframework.cloud.stream.app:mongodb-source-rabbit:@mongodb-source.version@
+source.mongodb.metadata=maven://org.springframework.cloud.stream.app:mongodb-source-rabbit:jar:metadata:@mongodb-source.version@
+source.mqtt=maven://org.springframework.cloud.stream.app:mqtt-source-rabbit:@mqtt-source.version@
+source.mqtt.metadata=maven://org.springframework.cloud.stream.app:mqtt-source-rabbit:jar:metadata:@mqtt-source.version@
+source.rabbit=maven://org.springframework.cloud.stream.app:rabbit-source-rabbit:@rabbit-source.version@
+source.rabbit.metadata=maven://org.springframework.cloud.stream.app:rabbit-source-rabbit:jar:metadata:@rabbit-source.version@
+source.tcp=maven://org.springframework.cloud.stream.app:tcp-source-rabbit:@tcp-source.version@
+source.tcp.metadata=maven://org.springframework.cloud.stream.app:tcp-source-rabbit:jar:metadata:@tcp-source.version@
+source.time=maven://org.springframework.cloud.stream.app:time-source-rabbit:@time-source.version@
+source.time.metadata=maven://org.springframework.cloud.stream.app:time-source-rabbit:jar:metadata:@time-source.version@
 sink.cassandra=maven://org.springframework.cloud.stream.app:cassandra-sink-rabbit:@cassandra-sink.version@
 sink.cassandra.metadata=maven://org.springframework.cloud.stream.app:cassandra-sink-rabbit:jar:metadata:@cassandra-sink.version@
 sink.counter=maven://org.springframework.cloud.stream.app:counter-sink-rabbit:@counter-sink.version@
@@ -6,36 +26,40 @@ sink.file=maven://org.springframework.cloud.stream.app:file-sink-rabbit:@file-si
 sink.file.metadata=maven://org.springframework.cloud.stream.app:file-sink-rabbit:jar:metadata:@file-sink.version@
 sink.ftp=maven://org.springframework.cloud.stream.app:ftp-sink-rabbit:@ftp-sink.version@
 sink.ftp.metadata=maven://org.springframework.cloud.stream.app:ftp-sink-rabbit:jar:metadata:@ftp-sink.version@
+sink.geode=maven://org.springframework.cloud.stream.app:geode-sink-rabbit:@geode-sink.version@
+sink.geode.metadata=maven://org.springframework.cloud.stream.app:geode-sink-rabbit:jar:metadata:@geode-sink.version@
 sink.jdbc=maven://org.springframework.cloud.stream.app:jdbc-sink-rabbit:@jdbc-sink.version@
 sink.jdbc.metadata=maven://org.springframework.cloud.stream.app:jdbc-sink-rabbit:jar:metadata:@jdbc-sink.version@
 sink.log=maven://org.springframework.cloud.stream.app:log-sink-rabbit:@log-sink.version@
 sink.log.metadata=maven://org.springframework.cloud.stream.app:log-sink-rabbit:jar:metadata:@log-sink.version@
 sink.mongodb=maven://org.springframework.cloud.stream.app:mongodb-sink-rabbit:@mongodb-sink.version@
 sink.mongodb.metadata=maven://org.springframework.cloud.stream.app:mongodb-sink-rabbit:jar:metadata:@mongodb-sink.version@
+sink.mqtt=maven://org.springframework.cloud.stream.app:mqtt-sink-rabbit:@mqtt-sink.version@
+sink.mqtt.metadata=maven://org.springframework.cloud.stream.app:mqtt-sink-rabbit:jar:metadata:@mqtt-sink.version@
 sink.rabbit=maven://org.springframework.cloud.stream.app:rabbit-sink-rabbit:@rabbit-sink.version@
 sink.rabbit.metadata=maven://org.springframework.cloud.stream.app:rabbit-sink-rabbit:jar:metadata:@rabbit-sink.version@
 sink.redis=maven://org.springframework.cloud.stream.app:redis-sink-rabbit:@redis-sink.version@
 sink.redis.metadata=maven://org.springframework.cloud.stream.app:redis-sink-rabbit:jar:metadata:@redis-sink.version@
+sink.router=maven://org.springframework.cloud.stream.app:router-sink-rabbit:@router-sink.version@
+sink.router.metadata=maven://org.springframework.cloud.stream.app:router-sink-rabbit:jar:metadata:@router-sink.version@
 sink.sftp=maven://org.springframework.cloud.stream.app:sftp-sink-rabbit:@sftp-sink.version@
 sink.sftp.metadata=maven://org.springframework.cloud.stream.app:sftp-sink-rabbit:jar:metadata:@sftp-sink.version@
-source.file=maven://org.springframework.cloud.stream.app:file-source-rabbit:@file-source.version@
-source.file.metadata=maven://org.springframework.cloud.stream.app:file-source-rabbit:jar:metadata:@file-source.version@
-source.http=maven://org.springframework.cloud.stream.app:http-source-rabbit:@http-source.version@
-source.http.metadata=maven://org.springframework.cloud.stream.app:http-source-rabbit:jar:metadata:@http-source.version@
-source.jdbc=maven://org.springframework.cloud.stream.app:jdbc-source-rabbit:@jdbc-source.version@
-source.jdbc.metadata=maven://org.springframework.cloud.stream.app:jdbc-source-rabbit:jar:metadata:@jdbc-source.version@
-source.mongodb=maven://org.springframework.cloud.stream.app:mongodb-source-rabbit:@mongodb-source.version@
-source.mongodb.metadata=maven://org.springframework.cloud.stream.app:mongodb-source-rabbit:jar:metadata:@mongodb-source.version@
-source.time=maven://org.springframework.cloud.stream.app:time-source-rabbit:@time-source.version@
-source.time.metadata=maven://org.springframework.cloud.stream.app:time-source-rabbit:jar:metadata:@time-source.version@
+sink.tcp=maven://org.springframework.cloud.stream.app:tcp-sink-rabbit:@tcp-sink.version@
+sink.tcp.metadata=maven://org.springframework.cloud.stream.app:tcp-sink-rabbit:jar:metadata:@tcp-sink.version@
+sink.throughput=maven://org.springframework.cloud.stream.app:throughput-sink-rabbit:@throughput-sink.version@
+sink.throughput.metadata=maven://org.springframework.cloud.stream.app:throughput-sink-rabbit:jar:metadata:@throughput-sink.version@
 processor.bridge=maven://org.springframework.cloud.stream.app:bridge-processor-rabbit:@bridge-processor.version@
 processor.bridge.metadata=maven://org.springframework.cloud.stream.app:bridge-processor-rabbit:jar:metadata:@bridge-processor.version@
 processor.filter=maven://org.springframework.cloud.stream.app:filter-processor-rabbit:@filter-processor.version@
 processor.filter.metadata=maven://org.springframework.cloud.stream.app:filter-processor-rabbit:jar:metadata:@filter-processor.version@
-processor.groovy-transform=maven://org.springframework.cloud.stream.app:groovy-transform-processor-rabbit:@groovy-transform-processor.version@
-processor.groovy-transform.metadata=maven://org.springframework.cloud.stream.app:groovy-transform-processor-rabbit:jar:metadata:@groovy-transform-processor.version@
+processor.groovy=maven://org.springframework.cloud.stream.app:groovy-processor-rabbit:@groovy-processor.version@
+processor.groovy.metadata=maven://org.springframework.cloud.stream.app:groovy-processor-rabbit:jar:metadata:@groovy-processor.version@
 processor.header-enricher=maven://org.springframework.cloud.stream.app:header-enricher-processor-rabbit:@header-enricher-processor.version@
 processor.header-enricher.metadata=maven://org.springframework.cloud.stream.app:header-enricher-processor-rabbit:jar:metadata:@header-enricher-processor.version@
+processor.http-request=maven://org.springframework.cloud.stream.app:http-request-processor-rabbit:@http-request-processor.version@
+processor.http-request.metadata=maven://org.springframework.cloud.stream.app:http-request-processor-rabbit:jar:metadata:@http-request-processor.version@
+processor.script=maven://org.springframework.cloud.stream.app:script-processor-rabbit:@script-processor.version@
+processor.script.metadata=maven://org.springframework.cloud.stream.app:script-processor-rabbit:jar:metadata:@script-processor.version@
 processor.splitter=maven://org.springframework.cloud.stream.app:splitter-processor-rabbit:@splitter-processor.version@
 processor.splitter.metadata=maven://org.springframework.cloud.stream.app:splitter-processor-rabbit:jar:metadata:@splitter-processor.version@
 processor.transform=maven://org.springframework.cloud.stream.app:transform-processor-rabbit:@transform-processor.version@
diff --git a/applications/stream-applications-build/stream-applications-docs/pom.xml b/applications/stream-applications-build/stream-applications-docs/pom.xml
index 502dfaf3..d065481d 100644
--- a/applications/stream-applications-build/stream-applications-docs/pom.xml
+++ b/applications/stream-applications-build/stream-applications-docs/pom.xml
@@ -22,19 +22,58 @@
 			<type>zip</type>
 			<optional>true</optional>
 		</dependency>
+		<!-- Any modules whose javadocs need to be published must be listed here.
+		Modules with @ConfigurationProperties.
+		-->
 		<dependency>
 			<groupId>org.springframework.cloud.fn</groupId>
-			<artifactId>splitter-function</artifactId>
+			<artifactId>file-supplier</artifactId>
 			<version>${java-functions.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.fn</groupId>
-			<artifactId>spel-function</artifactId>
+			<artifactId>geode-supplier</artifactId>
 			<version>${java-functions.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.fn</groupId>
-			<artifactId>header-enricher-function</artifactId>
+			<artifactId>http-supplier</artifactId>
+			<version>${java-functions.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>jdbc-supplier</artifactId>
+			<version>${java-functions.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>mongodb-supplier</artifactId>
+			<version>${java-functions.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>mqtt-supplier</artifactId>
+			<version>${java-functions.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>rabbit-supplier</artifactId>
+			<version>${java-functions.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>tcp-supplier</artifactId>
+			<version>${java-functions.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>time-supplier</artifactId>
+			<version>${java-functions.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>cassandra-consumer</artifactId>
 			<version>${java-functions.version}</version>
 		</dependency>
 		<dependency>
@@ -47,31 +86,21 @@
 			<artifactId>file-consumer</artifactId>
 			<version>${java-functions.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>ftp-consumer</artifactId>
+			<version>${java-functions.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>geode-consumer</artifactId>
+			<version>${java-functions.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.fn</groupId>
 			<artifactId>jdbc-consumer</artifactId>
 			<version>${java-functions.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud.fn</groupId>
-			<artifactId>redis-consumer</artifactId>
-			<version>${java-functions.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud.fn</groupId>
-			<artifactId>mongodb-consumer</artifactId>
-			<version>${java-functions.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud.fn</groupId>
-			<artifactId>cassandra-consumer</artifactId>
-			<version>${java-functions.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud.fn</groupId>
-			<artifactId>rabbit-consumer</artifactId>
-			<version>${java-functions.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.fn</groupId>
 			<artifactId>log-consumer</artifactId>
@@ -79,38 +108,28 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.fn</groupId>
-			<artifactId>time-supplier</artifactId>
+			<artifactId>mongodb-consumer</artifactId>
 			<version>${java-functions.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.fn</groupId>
-			<artifactId>file-supplier</artifactId>
+			<artifactId>mqtt-consumer</artifactId>
 			<version>${java-functions.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.fn</groupId>
-			<artifactId>jdbc-supplier</artifactId>
+			<artifactId>rabbit-consumer</artifactId>
 			<version>${java-functions.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.fn</groupId>
-			<artifactId>http-supplier</artifactId>
-			<version>${java-functions.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud.fn</groupId>
-			<artifactId>mongodb-supplier</artifactId>
+			<artifactId>redis-consumer</artifactId>
 			<version>${java-functions.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.stream.app</groupId>
-			<artifactId>bridge-processor</artifactId>
-			<version>3.0.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud.stream.app</groupId>
-			<artifactId>groovy-transform-processor</artifactId>
-			<version>3.0.0-SNAPSHOT</version>
+			<artifactId>router-sink</artifactId>
+			<version>${router-sink.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.fn</groupId>
@@ -119,9 +138,50 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud.fn</groupId>
-			<artifactId>ftp-consumer</artifactId>
+			<artifactId>tcp-consumer</artifactId>
 			<version>${java-functions.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>header-enricher-function</artifactId>
+			<version>${java-functions.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>http-request-function</artifactId>
+			<version>${java-functions.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>spel-function</artifactId>
+			<version>${java-functions.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.fn</groupId>
+			<artifactId>splitter-function</artifactId>
+			<version>${java-functions.version}</version>
+		</dependency>
+		<!-- Apps don't use external functions as baseline, but contain @ConfigurationProperties -->
+		<dependency>
+			<groupId>org.springframework.cloud.stream.app</groupId>
+			<artifactId>load-generator-source</artifactId>
+			<version>${load-generator-source.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.stream.app</groupId>
+			<artifactId>throughput-sink</artifactId>
+			<version>${throughput-sink.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.stream.app</groupId>
+			<artifactId>groovy-processor</artifactId>
+			<version>${groovy-processor.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud.stream.app</groupId>
+			<artifactId>script-processor</artifactId>
+			<version>${script-processor.version}</version>
+		</dependency>
 	</dependencies>
 	<profiles>
 		<profile>
diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/processors.adoc b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/processors.adoc
index c0f5a3fa..37ab8d1e 100644
--- a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/processors.adoc
+++ b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/processors.adoc
@@ -3,17 +3,28 @@
 
 :leveloffset: +2
 
-[[spring-cloud-stream-modules-bridge]]
+[[spring-cloud-stream-modules-bridge-processor]]
 include::{stream-apps-root}/{branch}/applications/processor/bridge-processor/README.adoc[tags=ref-doc]
-[[spring-cloud-stream-modules-filter]]
+
+[[spring-cloud-stream-modules-filter-processor]]
 include::{stream-apps-root}/{branch}/applications/processor/filter-processor/README.adoc[tags=ref-doc]
-[[spring-cloud-stream-modules-groovy-transform]]
-include::{stream-apps-root}/{branch}/applications/processor/groovy-transform-processor/README.adoc[tags=ref-doc]
-[[spring-cloud-stream-modules-header-enricher]]
+
+[[spring-cloud-stream-modules-groovy-processor]]
+include::{stream-apps-root}/{branch}/applications/processor/groovy-processor/README.adoc[tags=ref-doc]
+
+[[spring-cloud-stream-modules-header-enricher-processor]]
 include::{stream-apps-root}/{branch}/applications/processor/header-enricher-processor/README.adoc[tags=ref-doc]
-[[spring-cloud-stream-modules-splitter]]
+
+[[spring-cloud-stream-modules-http-request-processor]]
+include::{stream-apps-root}/{branch}/applications/processor/http-request-processor/README.adoc[tags=ref-doc]
+
+[[spring-cloud-stream-modules-script-processor]]
+include::{stream-apps-root}/{branch}/applications/processor/script-processor/README.adoc[tags=ref-doc]
+
+[[spring-cloud-stream-modules-splitter-processor]]
 include::{stream-apps-root}/{branch}/applications/processor/splitter-processor/README.adoc[tags=ref-doc]
-[[spring-cloud-stream-modules-transform]]
+
+[[spring-cloud-stream-modules-transform-processor]]
 include::{stream-apps-root}/{branch}/applications/processor/transform-processor/README.adoc[tags=ref-doc]
 
 :leveloffset: -2
diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/sinks.adoc b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/sinks.adoc
index 3b01c25c..f32c0247 100644
--- a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/sinks.adoc
+++ b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/sinks.adoc
@@ -5,21 +5,47 @@
 
 [[spring-cloud-stream-modules-cassandra-sink]]
 include::{stream-apps-root}/{branch}/applications/sink/cassandra-sink/README.adoc[tags=ref-doc]
+
 [[spring-cloud-stream-modules-counter-sink]]
 include::{stream-apps-root}/{branch}/applications/sink/counter-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]
+
 [[spring-cloud-stream-modules-ftp-sink]]
 include::{stream-apps-root}/{branch}/applications/sink/ftp-sink/README.adoc[tags=ref-doc]
+
+[[spring-cloud-stream-modules-geode-sink]]
+include::{stream-apps-root}/{branch}/applications/sink/geode-sink/README.adoc[tags=ref-doc]
+
 [[spring-cloud-stream-modules-jdbc-sink]]
 include::{stream-apps-root}/{branch}/applications/sink/jdbc-sink/README.adoc[tags=ref-doc]
+
 [[spring-cloud-stream-modules-log-sink]]
 include::{stream-apps-root}/{branch}/applications/sink/log-sink/README.adoc[tags=ref-doc]
+
 [[spring-cloud-stream-modules-mongodb-sink]]
 include::{stream-apps-root}/{branch}/applications/sink/mongodb-sink/README.adoc[tags=ref-doc]
+
+[[spring-cloud-stream-modules-mqtt-sink]]
+include::{stream-apps-root}/{branch}/applications/sink/mqtt-sink/README.adoc[tags=ref-doc]
+
 [[spring-cloud-stream-modules-rabbit-sink]]
 include::{stream-apps-root}/{branch}/applications/sink/rabbit-sink/README.adoc[tags=ref-doc]
+
 [[spring-cloud-stream-modules-redis-sink]]
 include::{stream-apps-root}/{branch}/applications/sink/redis-sink/README.adoc[tags=ref-doc]
+
+[[spring-cloud-stream-modules-router-sink]]
+include::{stream-apps-root}/{branch}/applications/sink/router-sink/README.adoc[tags=ref-doc]
+
 [[spring-cloud-stream-modules-sftp-sink]]
 include::{stream-apps-root}/{branch}/applications/sink/sftp-sink/README.adoc[tags=ref-doc]
 
+[[spring-cloud-stream-modules-tcp-sink]]
+include::{stream-apps-root}/{branch}/applications/sink/tcp-sink/README.adoc[tags=ref-doc]
+
+[[spring-cloud-stream-modules-throughput-sink]]
+include::{stream-apps-root}/{branch}/applications/sink/throughput-sink/README.adoc[tags=ref-doc]
+
 :leveloffset: -2
diff --git a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/sources.adoc b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/sources.adoc
index 9e9561d1..5ab97d9b 100644
--- a/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/sources.adoc
+++ b/applications/stream-applications-build/stream-applications-docs/src/main/asciidoc/sources.adoc
@@ -3,15 +3,33 @@
 
 :leveloffset: +2
 
+[[spring-cloud-stream-modules-file-source]]
+include::{stream-apps-root}/{branch}/applications/source/file-source/README.adoc[tags=ref-doc]
+
+[[spring-cloud-stream-modules-geode-source]]
+include::{stream-apps-root}/{branch}/applications/source/geode-source/README.adoc[tags=ref-doc]
+
 [[spring-cloud-stream-modules-http-source]]
 include::{stream-apps-root}/{branch}/applications/source/http-source/README.adoc[tags=ref-doc]
 
 [[spring-cloud-stream-modules-jdbc-source]]
 include::{stream-apps-root}/{branch}/applications/source/jdbc-source/README.adoc[tags=ref-doc]
 
+[[spring-cloud-stream-modules-load-generator-source]]
+include::{stream-apps-root}/{branch}/applications/source/load-generator-source/README.adoc[tags=ref-doc]
+
 [[spring-cloud-stream-modules-mongodb-source]]
 include::{stream-apps-root}/{branch}/applications/source/mongodb-source/README.adoc[tags=ref-doc]
 
+[[spring-cloud-stream-modules-mqtt-source]]
+include::{stream-apps-root}/{branch}/applications/source/mqtt-source/README.adoc[tags=ref-doc]
+
+[[spring-cloud-stream-modules-rabbit-source]]
+include::{stream-apps-root}/{branch}/applications/source/rabbit-source/README.adoc[tags=ref-doc]
+
+[[spring-cloud-stream-modules-tcp-source]]
+include::{stream-apps-root}/{branch}/applications/source/tcp-source/README.adoc[tags=ref-doc]
+
 [[spring-cloud-stream-modules-time-source]]
 include::{stream-apps-root}/{branch}/applications/source/time-source/README.adoc[tags=ref-doc]