diff --git a/README.adoc b/README.adoc index 6768cf5d..f24f15e1 100644 --- a/README.adoc +++ b/README.adoc @@ -51,19 +51,19 @@ The following are the four major components of this repository. |link:functions/supplier/s3-supplier/README.adoc[AWS S3] |link:functions/consumer/rabbit-consumer/README.adoc[RabbitMQ] |link:functions/function/tasklauncher-function/README.adoc[Task Launcher] -|link:functions/supplier/tcp-supplier/README.adoc[TCP] +|link:functions/supplier/sftp-supplier/README.adoc[SFTP] |link:functions/consumer/redis-consumer/README.adoc[Redis] |link:functions/function/twitter-function/README.adoc[Twitter] -|link:functions/supplier/time-supplier/README.adoc[Time] +|link:functions/supplier/tcp-supplier/README.adoc[TCP] |link:functions/consumer/s3-consumer/README.adoc[AWS S3] | -|link:functions/supplier/twitter-supplier/README.adoc[Twitter] +|link:functions/supplier/time-supplier/README.adoc[Time] |link:functions/consumer/sftp-consumer/README.adoc[SFTP] | -|link:functions/supplier/websocket-supplier/README.adoc[Websocket] +|link:functions/supplier/twitter-supplier/README.adoc[Twitter] |link:functions/consumer/tcp-consumer/README.adoc[TCP] | -| +|link:functions/supplier/websocket-supplier/README.adoc[Websocket] |link:functions/consumer/twitter-consumer/README.adoc[Twitter] | | @@ -112,25 +112,25 @@ The following are the four major components of this repository. |link:applications/source/s3-source/README.adoc[AWS S3] |link:applications/sink/redis-sink/README.adoc[Redis] |link:applications/processor/transform-processor/README.adoc[Transform] -|link:applications/source/tcp-source/README.adoc[TCP] +|link:applications/source/sftp-source/README.adoc[SFTP] |link:applications/sink/router-sink/README.adoc[Router] |link:applications/processor/twitter-trend-processor/README.adoc[Twitter Trend] -|link:applications/source/time-source/README.adoc[Time] +|link:applications/source/tcp-source/README.adoc[TCP] |link:applications/sink/sftp-sink/README.adoc[SFTP] | -|link:applications/source/twitter-message-source/README.adoc[Twitter Message] +|link:applications/source/time-source/README.adoc[Time] |link:applications/sink/tasklauncher-sink/README.adoc[Task Launcher] | -|link:applications/source/twitter-search-source/README.adoc[Twitter Search] +|link:applications/source/twitter-message-source/README.adoc[Twitter Message] |link:applications/sink/tcp-sink/README.adoc[TCP] | -|link:applications/source/twitter-stream-source/README.adoc[Twitter Stream] +|link:applications/source/twitter-search-source/README.adoc[Twitter Search] |link:applications/sink/throughput-sink/README.adoc[Throughput] | -|link:applications/source/websocket-source/README.adoc[Websocket] +|link:applications/source/twitter-stream-source/README.adoc[Twitter Stream] |link:applications/sink/twitter-message-sink/README.adoc[Twitter Message] | -| +|link:applications/source/websocket-source/README.adoc[Websocket] |link:applications/sink/twitter-update-sink/README.adoc[Twitter Update] | |link:applications/sink/wavefront-sink/README.adoc[Wavefront] diff --git a/applications/stream-applications-build/pom.xml b/applications/stream-applications-build/pom.xml index 07a735ae..4d1a16ac 100644 --- a/applications/stream-applications-build/pom.xml +++ b/applications/stream-applications-build/pom.xml @@ -31,6 +31,7 @@ ${apps.version} ${apps.version} ${apps.version} + ${apps.version} ${apps.version} ${apps.version} ${apps.version} diff --git a/applications/stream-applications-build/stream-applications-descriptor/pom.xml b/applications/stream-applications-build/stream-applications-descriptor/pom.xml index f4e18a97..ae266e76 100644 --- a/applications/stream-applications-build/stream-applications-descriptor/pom.xml +++ b/applications/stream-applications-build/stream-applications-descriptor/pom.xml @@ -65,6 +65,8 @@ "${rabbit-source.version}".contains('SNAPSHOT') ? 'latest' : "${rabbit-source.version}" pom.properties['s3-source-docker.tag']= "${s3-source.version}".contains('SNAPSHOT') ? 'latest' : "${s3-source.version}" + pom.properties['sftp-source-docker.tag']= + "${sftp-source.version}".contains('SNAPSHOT') ? 'latest' : "${sftp-source.version}" pom.properties['tcp-source-docker.tag']= "${tcp-source.version}".contains('SNAPSHOT') ? 'latest' : "${tcp-source.version}" pom.properties['time-source-docker.tag']= 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 910e9f5e..f43797b1 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 @@ -9,6 +9,7 @@ source.mongodb=docker:springcloudstream/mongodb-source-kafka:@mongodb-source-doc source.mqtt=docker:springcloudstream/mqtt-source-kafka:@mqtt-source-docker.tag@ source.rabbit=docker:springcloudstream/rabbit-source-kafka:@rabbit-source-docker.tag@ source.s3=docker:springcloudstream/s3-source-kafka:@s3-source-docker.tag@ +source.sftp=docker:springcloudstream/sftp-source-kafka:@sftp-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@ source.twitter-message=docker:springcloudstream/twitter-message-source-kafka:@twitter-message-source-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 9af2088d..823f8252 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 @@ -20,6 +20,8 @@ source.rabbit=https://@repo-spring-io@/org/springframework/cloud/stream/app/rabb 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.s3=https://@repo-spring-io@/org/springframework/cloud/stream/app/s3-source-kafka/@s3-source.version@/s3-source-kafka-@s3-source.version@.jar source.s3.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/s3-source-kafka/@s3-source.version@/s3-source-kafka-@s3-source.version@-metadata.jar +source.sftp=https://@repo-spring-io@/org/springframework/cloud/stream/app/sftp-source-kafka/@sftp-source.version@/sftp-source-kafka-@sftp-source.version@.jar +source.sftp.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/sftp-source-kafka/@sftp-source.version@/sftp-source-kafka-@sftp-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 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 22767f0a..64d4a23d 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 @@ -20,6 +20,8 @@ source.rabbit=maven://org.springframework.cloud.stream.app:rabbit-source-kafka:@ source.rabbit.metadata=maven://org.springframework.cloud.stream.app:rabbit-source-kafka:jar:metadata:@rabbit-source.version@ source.s3=maven://org.springframework.cloud.stream.app:s3-source-kafka:@s3-source.version@ source.s3.metadata=maven://org.springframework.cloud.stream.app:s3-source-kafka:jar:metadata:@s3-source.version@ +source.sftp=maven://org.springframework.cloud.stream.app:sftp-source-kafka:@sftp-source.version@ +source.sftp.metadata=maven://org.springframework.cloud.stream.app:sftp-source-kafka:jar:metadata:@sftp-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@ 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 bdc4cb70..4eaeb5b9 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 @@ -9,6 +9,7 @@ source.mongodb=docker:springcloudstream/mongodb-source-rabbit:@mongodb-source-do source.mqtt=docker:springcloudstream/mqtt-source-rabbit:@mqtt-source-docker.tag@ source.rabbit=docker:springcloudstream/rabbit-source-rabbit:@rabbit-source-docker.tag@ source.s3=docker:springcloudstream/s3-source-rabbit:@s3-source-docker.tag@ +source.sftp=docker:springcloudstream/sftp-source-rabbit:@sftp-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@ source.twitter-message=docker:springcloudstream/twitter-message-source-rabbit:@twitter-message-source-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 864cc218..c11e39db 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 @@ -20,6 +20,8 @@ source.rabbit=https://@repo-spring-io@/org/springframework/cloud/stream/app/rabb 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.s3=https://@repo-spring-io@/org/springframework/cloud/stream/app/s3-source-rabbit/@s3-source.version@/s3-source-rabbit-@s3-source.version@.jar source.s3.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/s3-source-rabbit/@s3-source.version@/s3-source-rabbit-@s3-source.version@-metadata.jar +source.sftp=https://@repo-spring-io@/org/springframework/cloud/stream/app/sftp-source-rabbit/@sftp-source.version@/sftp-source-rabbit-@sftp-source.version@.jar +source.sftp.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/sftp-source-rabbit/@sftp-source.version@/sftp-source-rabbit-@sftp-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 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 9b4c6179..500004f9 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 @@ -20,6 +20,8 @@ source.rabbit=maven://org.springframework.cloud.stream.app:rabbit-source-rabbit: source.rabbit.metadata=maven://org.springframework.cloud.stream.app:rabbit-source-rabbit:jar:metadata:@rabbit-source.version@ source.s3=maven://org.springframework.cloud.stream.app:s3-source-rabbit:@s3-source.version@ source.s3.metadata=maven://org.springframework.cloud.stream.app:s3-source-rabbit:jar:metadata:@s3-source.version@ +source.sftp=maven://org.springframework.cloud.stream.app:sftp-source-rabbit:@sftp-source.version@ +source.sftp.metadata=maven://org.springframework.cloud.stream.app:sftp-source-rabbit:jar:metadata:@sftp-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@ diff --git a/applications/stream-applications-build/stream-applications-docs/pom.xml b/applications/stream-applications-build/stream-applications-docs/pom.xml index b5f39952..1f02b423 100644 --- a/applications/stream-applications-build/stream-applications-docs/pom.xml +++ b/applications/stream-applications-build/stream-applications-docs/pom.xml @@ -112,6 +112,11 @@ s3-supplier ${java-functions.version} + + org.springframework.cloud.fn + sftp-supplier + ${java-functions.version} + org.springframework.cloud.fn tcp-supplier 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 288f2729..5cdaa5b0 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 @@ -36,6 +36,9 @@ include::{stream-apps-root}/{branch}/applications/source/rabbit-source/README.ad [[spring-cloud-stream-modules-s3-source]] include::{stream-apps-root}/{branch}/applications/source/s3-source/README.adoc[tags=ref-doc] +[[spring-cloud-stream-modules-sftp-source]] +include::{stream-apps-root}/{branch}/applications/source/sftp-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]