diff --git a/README.adoc b/README.adoc index 2f98a244..6a2d00b0 100644 --- a/README.adoc +++ b/README.adoc @@ -38,22 +38,22 @@ The following are the four major components of this repository. |link:functions/function/object-detection-function/README.adoc[Object Detection(Tensorflow)] |link:functions/supplier/jms-supplier/README.adoc[JMS] |link:functions/consumer/jdbc-consumer/README.adoc[JDBC] -|link:functions/function/spel-function/README.adoc[SpEL] +|link:functions/function/semantic-segmentation-function/README.adoc[Semantic Segmentation(Tensorflow)] |link:functions/supplier/mongodb-supplier/README.adoc[MongoDB] |link:functions/consumer/log-consumer/README.adoc[Log] -|link:functions/function/splitter-function/README.adoc[Splitter] +|link:functions/function/spel-function/README.adoc[SpEL] |link:functions/supplier/mqtt-supplier/README.adoc[MQTT] |link:functions/consumer/mongodb-consumer/README.adoc[MongoDB] -|link:functions/function/task-launch-request-function/README.adoc[Task Launch Request] +|link:functions/function/splitter-function/README.adoc[Splitter] |link:functions/supplier/rabbit-supplier/README.adoc[RabbitMQ] |link:functions/consumer/mqtt-consumer/README.adoc[MQTT] -|link:functions/function/tasklauncher-function/README.adoc[Task Launcher] +|link:functions/function/task-launch-request-function/README.adoc[Task Launch Request] |link:functions/supplier/s3-supplier/README.adoc[AWS S3] |link:functions/consumer/rabbit-consumer/README.adoc[RabbitMQ] -|link:functions/function/twitter-function/README.adoc[Twitter] +|link:functions/function/tasklauncher-function/README.adoc[Task Launcher] |link:functions/supplier/tcp-supplier/README.adoc[TCP] |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/consumer/s3-consumer/README.adoc[AWS S3] | @@ -99,19 +99,19 @@ The following are the four major components of this repository. |link:applications/processor/object-detection-processor/README.adoc[Object Detection(Tensorflow)] |link:applications/source/mongodb-source/README.adoc[MongoDB] |link:applications/sink/mongodb-sink/README.adoc[MongoDB] -|link:applications/processor/script-processor/README.adoc[Script] +|link:applications/processor/semantic-segmentation-processor/README.adoc[Object Detection(Tensorflow)] |link:applications/source/mqtt-source/README.adoc[MQTT] |link:applications/sink/mqtt-sink/README.adoc[MQTT] -|link:applications/processor/splitter-processor/README.adoc[Splitter] +|link:applications/processor/script-processor/README.adoc[Script] |link:applications/source/rabbit-source/README.adoc[RabbitMQ] |link:applications/sink/rabbit-sink/README.adoc[RabbitMQ] -|link:applications/processor/transform-processor/README.adoc[Transform] +|link:applications/processor/splitter-processor/README.adoc[Splitter] |link:applications/source/s3-source/README.adoc[AWS S3] |link:applications/sink/redis-sink/README.adoc[Redis] -|link:applications/processor/twitter-trend-processor/README.adoc[Twitter Trend] +|link:applications/processor/transform-processor/README.adoc[Transform] |link:applications/source/tcp-source/README.adoc[TCP] |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/sink/sftp-sink/README.adoc[SFTP] | diff --git a/applications/stream-applications-build/pom.xml b/applications/stream-applications-build/pom.xml index 880896e4..cc0d7939 100644 --- a/applications/stream-applications-build/pom.xml +++ b/applications/stream-applications-build/pom.xml @@ -61,6 +61,8 @@ 3.0.0-SNAPSHOT 3.0.0-SNAPSHOT 3.0.0-SNAPSHOT + 3.0.0-SNAPSHOT + 3.0.0-SNAPSHOT 3.0.0-SNAPSHOT 3.0.0-SNAPSHOT 3.0.0-SNAPSHOT diff --git a/applications/stream-applications-build/stream-applications-descriptor/pom.xml b/applications/stream-applications-build/stream-applications-descriptor/pom.xml index 12211d10..e9cf5a6d 100644 --- a/applications/stream-applications-build/stream-applications-descriptor/pom.xml +++ b/applications/stream-applications-build/stream-applications-descriptor/pom.xml @@ -127,6 +127,12 @@ "${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['image-recognition-processor-docker.tag']= + "${image-recognition-processor.version}".contains('SNAPSHOT') ? 'latest' : "${image-recognition-processor.version}" + pom.properties['object-detection-processor-docker.tag']= + "${object-detection-processor.version}".contains('SNAPSHOT') ? 'latest' : "${object-detection-processor.version}" + pom.properties['semantic-segmentation-processor-docker.tag']= + "${semantic-segmentation-processor.version}".contains('SNAPSHOT') ? 'latest' : "${semantic-segmentation-processor.version}" pom.properties['script-processor-docker.tag']= "${script-processor.version}".contains('SNAPSHOT') ? 'latest' : "${script-processor.version}" pom.properties['splitter-processor-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 d1f82a74..5a3755a2 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 @@ -40,6 +40,9 @@ processor.filter=docker:springcloudstream/filter-processor-kafka:@filter-process 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.image-recognition=docker:springcloudstream/image-recognition-processor-kafka:@image-recognition-processor-docker.tag@ +processor.object-detection=docker:springcloudstream/object-detection-processor-kafka:@object-detection-processor-docker.tag@ +processor.semantic-segmentation=docker:springcloudstream/semantic-segmentation-processor-kafka:@semantic-segmentation-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 d9a46ce0..f628347e 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 @@ -82,6 +82,12 @@ processor.header-enricher=https://@repo-spring-io@/org/springframework/cloud/str 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.image-recognition=https://@repo-spring-io@/org/springframework/cloud/stream/app/image-recognition-processor-kafka/@image-recognition-processor.version@/image-recognition-processor-kafka-@image-recognition-processor.version@.jar +processor.image-recognition.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/image-recognition-processor-kafka/@image-recognition-processor.version@/image-recognition-processor-kafka-@image-recognition-processor.version@-metadata.jar +processor.object-detection=https://@repo-spring-io@/org/springframework/cloud/stream/app/object-detection-processor-kafka/@object-detection-processor.version@/object-detection-processor-kafka-@object-detection-processor.version@.jar +processor.object-detection.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/object-detection-processor-kafka/@object-detection-processor.version@/object-detection-processor-kafka-@object-detection-processor.version@-metadata.jar +processor.semantic-segmentation=https://@repo-spring-io@/org/springframework/cloud/stream/app/semantic-segmentation-processor-kafka/@semantic-segmentation-processor.version@/semantic-segmentation-processor-kafka-@semantic-segmentation-processor.version@.jar +processor.semantic-segmentation.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/semantic-segmentation-processor-kafka/@semantic-segmentation-processor.version@/semantic-segmentation-processor-kafka-@semantic-segmentation-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 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 105c02ad..4e35a2b3 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 @@ -82,6 +82,12 @@ processor.header-enricher=maven://org.springframework.cloud.stream.app:header-en 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.image-recognition=maven://org.springframework.cloud.stream.app:image-recognition-processor-kafka:@image-recognition-processor.version@ +processor.image-recognition.metadata=maven://org.springframework.cloud.stream.app:image-recognition-processor-kafka:jar:metadata:@image-recognition-processor.version@ +processor.object-detection=maven://org.springframework.cloud.stream.app:object-detection-processor-kafka:@object-detection-processor.version@ +processor.object-detection.metadata=maven://org.springframework.cloud.stream.app:object-detection-processor-kafka:jar:metadata:@object-detection-processor.version@ +processor.semantic-segmentation=maven://org.springframework.cloud.stream.app:semantic-segmentation-processor-kafka:@semantic-segmentation-processor.version@ +processor.semantic-segmentation.metadata=maven://org.springframework.cloud.stream.app:semantic-segmentation-processor-kafka:jar:metadata:@semantic-segmentation-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@ 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 118e08a3..1f22e8e8 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 @@ -40,6 +40,9 @@ processor.filter=docker:springcloudstream/filter-processor-rabbit:@filter-proces 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.image-recognition=docker:springcloudstream/image-recognition-processor-rabbit:@image-recognition-processor-docker.tag@ +processor.object-detection=docker:springcloudstream/object-detection-processor-rabbit:@object-detection-processor-docker.tag@ +processor.semantic-segmentation=docker:springcloudstream/semantic-segmentation-processor-rabbit:@semantic-segmentation-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 6d4b0e36..96b2b0cb 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 @@ -82,6 +82,12 @@ processor.header-enricher=https://@repo-spring-io@/org/springframework/cloud/str 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.image-recognition=https://@repo-spring-io@/org/springframework/cloud/stream/app/image-recognition-processor-rabbit/@image-recognition-processor.version@/image-recognition-processor-rabbit-@image-recognition-processor.version@.jar +processor.image-recognition.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/image-recognition-processor-rabbit/@image-recognition-processor.version@/image-recognition-processor-rabbit-@image-recognition-processor.version@-metadata.jar +processor.object-detection=https://@repo-spring-io@/org/springframework/cloud/stream/app/object-detection-processor-rabbit/@object-detection-processor.version@/object-detection-processor-rabbit-@object-detection-processor.version@.jar +processor.object-detection.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/object-detection-processor-rabbit/@object-detection-processor.version@/object-detection-processor-rabbit-@object-detection-processor.version@-metadata.jar +processor.semantic-segmentation=https://@repo-spring-io@/org/springframework/cloud/stream/app/semantic-segmentation-processor-rabbit/@semantic-segmentation-processor.version@/semantic-segmentation-processor-rabbit-@semantic-segmentation-processor.version@.jar +processor.semantic-segmentation.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/semantic-segmentation-processor-rabbit/@semantic-segmentation-processor.version@/semantic-segmentation-processor-rabbit-@semantic-segmentation-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 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 d0518d22..64125e0a 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 @@ -82,6 +82,10 @@ processor.header-enricher=maven://org.springframework.cloud.stream.app:header-en 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.object-detection=maven://org.springframework.cloud.stream.app:object-detection-processor-rabbit:@object-detection-processor.version@ +processor.object-detection.metadata=maven://org.springframework.cloud.stream.app:object-detection-processor-rabbit:jar:metadata:@object-detection-processor.version@ +processor.semantic-segmentation=maven://org.springframework.cloud.stream.app:semantic-segmentation-processor-rabbit:@semantic-segmentation-processor.version@ +processor.semantic-segmentation.metadata=maven://org.springframework.cloud.stream.app:semantic-segmentation-processor-rabbit:jar:metadata:@semantic-segmentation-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@ diff --git a/applications/stream-applications-build/stream-applications-docs/pom.xml b/applications/stream-applications-build/stream-applications-docs/pom.xml index d3518de8..174c04a1 100644 --- a/applications/stream-applications-build/stream-applications-docs/pom.xml +++ b/applications/stream-applications-build/stream-applications-docs/pom.xml @@ -224,6 +224,16 @@ http-request-function ${java-functions.version} + + org.springframework.cloud.fn + image-recognition-function + ${java-functions.version} + + + org.springframework.cloud.fn + object-detection-function + ${java-functions.version} + org.springframework.cloud.fn spel-function 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 f64e670c..cb3699da 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 @@ -18,6 +18,12 @@ include::{stream-apps-root}/{branch}/applications/processor/header-enricher-proc [[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-image-recognition-processor]] +include::{stream-apps-root}/{branch}/applications/processor/image-recognition-processor/README.adoc[tags=ref-doc] + +[[spring-cloud-stream-modules-object-detection-processor]] +include::{stream-apps-root}/{branch}/applications/processor/object-detection-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] @@ -27,8 +33,8 @@ include::{stream-apps-root}/{branch}/applications/processor/splitter-processor/R [[spring-cloud-stream-modules-transform-processor]] include::{stream-apps-root}/{branch}/applications/processor/transform-processor/README.adoc[tags=ref-doc] -[[spring-cloud-stream-modules-transform-processor]] -include::{stream-apps-root}/{branch}/applications/processor/transform-processor/README.adoc[tags=ref-doc] +[[spring-cloud-stream-modules-twitter-trend-processor]] +include::{stream-apps-root}/{branch}/applications/processor/twitter-trend-processor/README.adoc[tags=ref-doc] :leveloffset: -2