diff --git a/README.adoc b/README.adoc index 6ef2677a..3a6d752c 100644 --- a/README.adoc +++ b/README.adoc @@ -37,7 +37,6 @@ The following are the various components of this repository. |link:functions/function/header-enricher-function/README.adoc[Header-Enricher] |link:functions/consumer/elasticsearch-consumer/README.adoc[Elasticsearch] | -//|link:functions/supplier/geode-supplier/README.adoc[Geode] |link:functions/function/http-request-function/README.adoc[HTTP Request] |link:functions/consumer/file-consumer/README.adoc[File] |link:functions/supplier/http-supplier/README.adoc[HTTP] @@ -46,7 +45,6 @@ The following are the various components of this repository. |link:functions/supplier/jdbc-supplier/README.adoc[JDBC] |link:functions/function/object-detection-function/README.adoc[Object Detection(Tensorflow)] | -//|link:functions/consumer/geode-consumer/README.adoc[Geode] |link:functions/supplier/jms-supplier/README.adoc[JMS] |link:functions/function/semantic-segmentation-function/README.adoc[Semantic Segmentation(Tensorflow)] |link:functions/consumer/jdbc-consumer/README.adoc[JDBC] @@ -104,7 +102,6 @@ The following are the various components of this repository. |link:applications/source/ftp-source/README.adoc[FTP] |link:applications/processor/filter-processor/README.adoc[Filter] |link:applications/sink/elasticsearch-sink/README.adoc[Elasticsearch] -|link:applications/source/geode-source/README.adoc[Geode] |link:applications/processor/groovy-processor/README.adoc[Groovy] |link:applications/sink/file-sink/README.adoc[Fiile] |link:applications/source/http-source/README.adoc[HTTP] @@ -112,7 +109,6 @@ The following are the various components of this repository. |link:applications/sink/ftp-sink/README.adoc[FTP] |link:applications/source/jdbc-source/README.adoc[JDBC] |link:applications/processor/http-request-processor/README.adoc[HTTP Request] -|link:applications/sink/geode-sink/README.adoc[Geode] |link:applications/source/jms-source/README.adoc[JMS] |link:applications/processor/image-recognition-processor/README.adoc[Image Recognition(Tensorflow)] |link:applications/sink/jdbc-sink/README.adoc[JDBC] diff --git a/applications/processor/aggregator-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties b/applications/processor/aggregator-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties index 0a125844..aad0e15a 100644 --- a/applications/processor/aggregator-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties +++ b/applications/processor/aggregator-processor/src/main/resources/META-INF/dataflow-configuration-metadata-whitelist.properties @@ -2,7 +2,4 @@ configuration-properties.classes=org.springframework.cloud.fn.aggregator.Aggrega org.springframework.boot.autoconfigure.mongo.MongoProperties,\ org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoProperties,\ org.springframework.boot.autoconfigure.data.redis.RedisProperties,\ - org.springframework.boot.autoconfigure.jdbc.DataSourceProperties,\ - org.springframework.geode.boot.autoconfigure.configuration.GemFireProperties - - + org.springframework.boot.autoconfigure.jdbc.DataSourceProperties diff --git a/applications/processor/aggregator-processor/src/main/resources/META-INF/dataflow-configuration-metadata.properties b/applications/processor/aggregator-processor/src/main/resources/META-INF/dataflow-configuration-metadata.properties index 02e64b4c..aad0e15a 100644 --- a/applications/processor/aggregator-processor/src/main/resources/META-INF/dataflow-configuration-metadata.properties +++ b/applications/processor/aggregator-processor/src/main/resources/META-INF/dataflow-configuration-metadata.properties @@ -2,6 +2,4 @@ configuration-properties.classes=org.springframework.cloud.fn.aggregator.Aggrega org.springframework.boot.autoconfigure.mongo.MongoProperties,\ org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoProperties,\ org.springframework.boot.autoconfigure.data.redis.RedisProperties,\ - org.springframework.boot.autoconfigure.jdbc.DataSourceProperties,\ - org.springframework.geode.boot.autoconfigure.configuration.GemFireProperties - + org.springframework.boot.autoconfigure.jdbc.DataSourceProperties diff --git a/applications/stream-applications-integration-tests/src/test/resources/geode-test/Dockerfile b/applications/stream-applications-integration-tests/src/test/resources/geode-test/Dockerfile deleted file mode 100644 index e116ea06..00000000 --- a/applications/stream-applications-integration-tests/src/test/resources/geode-test/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM apachegeode/geode:1.14.3 - -ARG CACHE_SERVER_PORT=40404 -ARG LOCATOR_PORT=10334 - -EXPOSE ${LOCATOR_PORT} ${CACHE_SERVER_PORT} \ No newline at end of file diff --git a/functions/common/function-test-support/src/main/resources/geode/Dockerfile b/functions/common/function-test-support/src/main/resources/geode/Dockerfile deleted file mode 100644 index 0df57ed6..00000000 --- a/functions/common/function-test-support/src/main/resources/geode/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM apachegeode/geode:1.13.0 - -ARG CACHE_SERVER_PORT=40404 -ARG LOCATOR_PORT=10334 - -EXPOSE ${LOCATOR_PORT} ${CACHE_SERVER_PORT} diff --git a/functions/common/metadata-store-common/README.adoc b/functions/common/metadata-store-common/README.adoc index 1adaa540..249ae33e 100644 --- a/functions/common/metadata-store-common/README.adoc +++ b/functions/common/metadata-store-common/README.adoc @@ -47,48 +47,6 @@ Additional configuration property for `MongoDbMetadataStore` is: $$metadata.store.mongo-db.collection$$:: $$MongoDB collection name for metadata.$$ *($$String$$, default: `$$metadataStore$$`)* -==== Pivotal Gemfire / Apache Geode - -The `GemfireMetadataStore` requires these dependencies for auto-configuration: - -[source,xml] ----- - - org.springframework.integration - spring-integration-gemfire - ----- - -or when your environment is based on the Open Source https://geode.apache.org/[Apache Geode]: - -[source,xml] ----- - - org.springframework.integration - spring-integration-gemfire - - - org.springframework.data - spring-data-gemfire - - - - - org.springframework.data - spring-data-geode - ----- - -You also can consider to use https://github.com/spring-projects/spring-boot-data-geode[Spring Boot Data Geode] instead for automatic dependency management and proper Spring Boot auto-configuration for Pivotal Gemfire/Apache Geode. - -Additional configuration property for `GemfireMetadataStore` is: - -$$metadata.store.gemfire.region$$:: $$Gemfire region name for metadata.$$ *($$String$$, default: `$$MetaData$$`)* - -In addition, for the `GemfireMetadataStore`, a `MetadataStoreListener` bean can be configured in the application context to react to the `MetadataStore` events. - -A default auto-configured `ClientRegionFactoryBean`, based on the auto-configured `GemFireCache`, bean can be overridden in the target application. - ==== Hazelcast The `HazelcastMetadataStore` requires regular Spring Boot auto-configuration for https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#boot-features-caching-provider-hazelcast[Hazelcast] and minimal set of dependencies is like this: diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml index 02319dc5..8f93af6f 100644 --- a/stream-applications-build/pom.xml +++ b/stream-applications-build/pom.xml @@ -38,7 +38,7 @@ 3.0.0-SNAPSHOT 3.0.0-SNAPSHOT 6.0.0-SNAPSHOT - 1.6.7 + 2022.0.0-SNAPSHOT 4.0.0-SNAPSHOT 4.0.0-SNAPSHOT @@ -91,13 +91,6 @@ pom import - - org.springframework.geode - spring-geode-bom - ${spring-geode.version} - import - pom - org.apache.groovy groovy-bom diff --git a/stream-applications-release-train/pom.xml b/stream-applications-release-train/pom.xml index bf7f2549..c8d0dfb8 100644 --- a/stream-applications-release-train/pom.xml +++ b/stream-applications-release-train/pom.xml @@ -24,36 +24,6 @@ ${apps.version} - - - - org.codehaus.mojo - flatten-maven-plugin - 1.2.5 - - true - resolveCiFriendliesOnly - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - - - - spring-snapshots diff --git a/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties index 80e59996..502fd19a 100644 --- a/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties +++ b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-docker.properties @@ -1,7 +1,6 @@ source.cdc-debezium=docker:springcloudstream/cdc-debezium-source-kafka:@apps.docker.tag@ source.file=docker:springcloudstream/file-source-kafka:@apps.docker.tag@ source.ftp=docker:springcloudstream/ftp-source-kafka:@apps.docker.tag@ -source.geode=docker:springcloudstream/geode-source-kafka:@apps.docker.tag@ source.http=docker:springcloudstream/http-source-kafka:@apps.docker.tag@ source.jdbc=docker:springcloudstream/jdbc-source-kafka:@apps.docker.tag@ source.jms=docker:springcloudstream/jms-source-kafka:@apps.docker.tag@ @@ -26,7 +25,6 @@ sink.elasticsearch=docker:springcloudstream/elasticsearch-sink-kafka:@apps.docke sink.wavefront=docker:springcloudstream/wavefront-sink-kafka:@apps.docker.tag@ sink.file=docker:springcloudstream/file-sink-kafka:@apps.docker.tag@ sink.ftp=docker:springcloudstream/ftp-sink-kafka:@apps.docker.tag@ -sink.geode=docker:springcloudstream/geode-sink-kafka:@apps.docker.tag@ sink.jdbc=docker:springcloudstream/jdbc-sink-kafka:@apps.docker.tag@ sink.log=docker:springcloudstream/log-sink-kafka:@apps.docker.tag@ sink.mongodb=docker:springcloudstream/mongodb-sink-kafka:@apps.docker.tag@ diff --git a/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-harbor.properties b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-harbor.properties index b8d02374..150079be 100644 --- a/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-harbor.properties +++ b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-harbor.properties @@ -1,7 +1,6 @@ source.cdc-debezium=docker:projects.registry.vmware.com/springcloudstream/cdc-debezium-source-kafka:@apps.harbor.version@ source.file=docker:projects.registry.vmware.com/springcloudstream/file-source-kafka:@apps.harbor.version@ source.ftp=docker:projects.registry.vmware.com/springcloudstream/ftp-source-kafka:@apps.harbor.version@ -source.geode=docker:projects.registry.vmware.com/springcloudstream/geode-source-kafka:@apps.harbor.version@ source.http=docker:projects.registry.vmware.com/springcloudstream/http-source-kafka:@apps.harbor.version@ source.jdbc=docker:projects.registry.vmware.com/springcloudstream/jdbc-source-kafka:@apps.harbor.version@ source.jms=docker:projects.registry.vmware.com/springcloudstream/jms-source-kafka:@apps.harbor.version@ @@ -26,7 +25,6 @@ sink.elasticsearch=docker:projects.registry.vmware.com/springcloudstream/elastic sink.wavefront=docker:projects.registry.vmware.com/springcloudstream/wavefront-sink-kafka:@apps.harbor.version@ sink.file=docker:projects.registry.vmware.com/springcloudstream/file-sink-kafka:@apps.harbor.version@ sink.ftp=docker:projects.registry.vmware.com/springcloudstream/ftp-sink-kafka:@apps.harbor.version@ -sink.geode=docker:projects.registry.vmware.com/springcloudstream/geode-sink-kafka:@apps.harbor.version@ sink.jdbc=docker:projects.registry.vmware.com/springcloudstream/jdbc-sink-kafka:@apps.harbor.version@ sink.log=docker:projects.registry.vmware.com/springcloudstream/log-sink-kafka:@apps.harbor.version@ sink.mongodb=docker:projects.registry.vmware.com/springcloudstream/mongodb-sink-kafka:@apps.harbor.version@ diff --git a/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties index 582949fc..13a7939c 100644 --- a/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties +++ b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven-repo-url.properties @@ -4,8 +4,6 @@ source.file=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-s source.file.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-source-kafka/@apps.version@/file-source-kafka-@apps.version@-metadata.jar source.ftp=https://@repo-spring-io@/org/springframework/cloud/stream/app/ftp-source-kafka/@apps.version@/ftp-source-kafka-@apps.version@.jar source.ftp.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/ftp-source-kafka/@apps.version@/ftp-source-kafka-@apps.version@-metadata.jar -source.geode=https://@repo-spring-io@/org/springframework/cloud/stream/app/geode-source-kafka/@apps.version@/geode-source-kafka-@apps.version@.jar -source.geode.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/geode-source-kafka/@apps.version@/geode-source-kafka-@apps.version@-metadata.jar source.http=https://@repo-spring-io@/org/springframework/cloud/stream/app/http-source-kafka/@apps.version@/http-source-kafka-@apps.version@.jar source.http.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/http-source-kafka/@apps.version@/http-source-kafka-@apps.version@-metadata.jar source.jdbc=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-source-kafka/@apps.version@/jdbc-source-kafka-@apps.version@.jar @@ -54,8 +52,6 @@ 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/@apps.version@/file-sink-kafka-@apps.version@-metadata.jar sink.ftp=https://@repo-spring-io@/org/springframework/cloud/stream/app/ftp-sink-kafka/@apps.version@/ftp-sink-kafka-@apps.version@.jar sink.ftp.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/ftp-sink-kafka/@apps.version@/ftp-sink-kafka-@apps.version@-metadata.jar -sink.geode=https://@repo-spring-io@/org/springframework/cloud/stream/app/geode-sink-kafka/@apps.version@/geode-sink-kafka-@apps.version@.jar -sink.geode.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/geode-sink-kafka/@apps.version@/geode-sink-kafka-@apps.version@-metadata.jar sink.jdbc=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-sink-kafka/@apps.version@/jdbc-sink-kafka-@apps.version@.jar sink.jdbc.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-sink-kafka/@apps.version@/jdbc-sink-kafka-@apps.version@-metadata.jar sink.log=https://@repo-spring-io@/org/springframework/cloud/stream/app/log-sink-kafka/@apps.version@/log-sink-kafka-@apps.version@.jar diff --git a/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties index 82af0301..042682ab 100644 --- a/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties +++ b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/kafka-apps-maven.properties @@ -4,8 +4,6 @@ source.file=maven://org.springframework.cloud.stream.app:file-source-kafka:@apps source.file.metadata=maven://org.springframework.cloud.stream.app:file-source-kafka:jar:metadata:@apps.version@ source.ftp=maven://org.springframework.cloud.stream.app:ftp-source-kafka:@apps.version@ source.ftp.metadata=maven://org.springframework.cloud.stream.app:ftp-source-kafka:jar:metadata:@apps.version@ -source.geode=maven://org.springframework.cloud.stream.app:geode-source-kafka:@apps.version@ -source.geode.metadata=maven://org.springframework.cloud.stream.app:geode-source-kafka:jar:metadata:@apps.version@ source.http=maven://org.springframework.cloud.stream.app:http-source-kafka:@apps.version@ source.http.metadata=maven://org.springframework.cloud.stream.app:http-source-kafka:jar:metadata:@apps.version@ source.jdbc=maven://org.springframework.cloud.stream.app:jdbc-source-kafka:@apps.version@ @@ -54,8 +52,6 @@ sink.file=maven://org.springframework.cloud.stream.app:file-sink-kafka:@apps.ver sink.file.metadata=maven://org.springframework.cloud.stream.app:file-sink-kafka:jar:metadata:@apps.version@ sink.ftp=maven://org.springframework.cloud.stream.app:ftp-sink-kafka:@apps.version@ sink.ftp.metadata=maven://org.springframework.cloud.stream.app:ftp-sink-kafka:jar:metadata:@apps.version@ -sink.geode=maven://org.springframework.cloud.stream.app:geode-sink-kafka:@apps.version@ -sink.geode.metadata=maven://org.springframework.cloud.stream.app:geode-sink-kafka:jar:metadata:@apps.version@ sink.jdbc=maven://org.springframework.cloud.stream.app:jdbc-sink-kafka:@apps.version@ sink.jdbc.metadata=maven://org.springframework.cloud.stream.app:jdbc-sink-kafka:jar:metadata:@apps.version@ sink.log=maven://org.springframework.cloud.stream.app:log-sink-kafka:@apps.version@ diff --git a/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties index fa6186a0..c07d1eb2 100644 --- a/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties +++ b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-docker.properties @@ -1,7 +1,6 @@ source.cdc-debezium=docker:springcloudstream/cdc-debezium-source-rabbit:@apps.docker.tag@ source.file=docker:springcloudstream/file-source-rabbit:@apps.docker.tag@ source.ftp=docker:springcloudstream/ftp-source-rabbit:@apps.docker.tag@ -source.geode=docker:springcloudstream/geode-source-rabbit:@apps.docker.tag@ source.http=docker:springcloudstream/http-source-rabbit:@apps.docker.tag@ source.jdbc=docker:springcloudstream/jdbc-source-rabbit:@apps.docker.tag@ source.jms=docker:springcloudstream/jms-source-rabbit:@apps.docker.tag@ @@ -26,7 +25,6 @@ sink.elasticsearch=docker:springcloudstream/elasticsearch-sink-rabbit:@apps.dock sink.wavefront=docker:springcloudstream/wavefront-sink-rabbit:@apps.docker.tag@ sink.file=docker:springcloudstream/file-sink-rabbit:@apps.docker.tag@ sink.ftp=docker:springcloudstream/ftp-sink-rabbit:@apps.docker.tag@ -sink.geode=docker:springcloudstream/geode-sink-rabbit:@apps.docker.tag@ sink.jdbc=docker:springcloudstream/jdbc-sink-rabbit:@apps.docker.tag@ sink.log=docker:springcloudstream/log-sink-rabbit:@apps.docker.tag@ sink.mongodb=docker:springcloudstream/mongodb-sink-rabbit:@apps.docker.tag@ diff --git a/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-harbor.properties b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-harbor.properties index aeb49916..095913d9 100644 --- a/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-harbor.properties +++ b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-harbor.properties @@ -1,7 +1,6 @@ source.cdc-debezium=docker:projects.registry.vmware.com/springcloudstream/cdc-debezium-source-rabbit:@apps.harbor.version@ source.file=docker:projects.registry.vmware.com/springcloudstream/file-source-rabbit:@apps.harbor.version@ source.ftp=docker:projects.registry.vmware.com/springcloudstream/ftp-source-rabbit:@apps.harbor.version@ -source.geode=docker:projects.registry.vmware.com/springcloudstream/geode-source-rabbit:@apps.harbor.version@ source.http=docker:projects.registry.vmware.com/springcloudstream/http-source-rabbit:@apps.harbor.version@ source.jdbc=docker:projects.registry.vmware.com/springcloudstream/jdbc-source-rabbit:@apps.harbor.version@ source.jms=docker:projects.registry.vmware.com/springcloudstream/jms-source-rabbit:@apps.harbor.version@ @@ -26,7 +25,6 @@ sink.elasticsearch=docker:projects.registry.vmware.com/springcloudstream/elastic sink.wavefront=docker:projects.registry.vmware.com/springcloudstream/wavefront-sink-rabbit:@apps.harbor.version@ sink.file=docker:projects.registry.vmware.com/springcloudstream/file-sink-rabbit:@apps.harbor.version@ sink.ftp=docker:projects.registry.vmware.com/springcloudstream/ftp-sink-rabbit:@apps.harbor.version@ -sink.geode=docker:projects.registry.vmware.com/springcloudstream/geode-sink-rabbit:@apps.harbor.version@ sink.jdbc=docker:projects.registry.vmware.com/springcloudstream/jdbc-sink-rabbit:@apps.harbor.version@ sink.log=docker:projects.registry.vmware.com/springcloudstream/log-sink-rabbit:@apps.harbor.version@ sink.mongodb=docker:projects.registry.vmware.com/springcloudstream/mongodb-sink-rabbit:@apps.harbor.version@ diff --git a/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties index 75e1c1bf..f53029a9 100644 --- a/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties +++ b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven-repo-url.properties @@ -4,8 +4,6 @@ source.file=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-s source.file.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/file-source-rabbit/@apps.version@/file-source-rabbit-@apps.version@-metadata.jar source.ftp=https://@repo-spring-io@/org/springframework/cloud/stream/app/ftp-source-rabbit/@apps.version@/ftp-source-rabbit-@apps.version@.jar source.ftp.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/ftp-source-rabbit/@apps.version@/ftp-source-rabbit-@apps.version@-metadata.jar -source.geode=https://@repo-spring-io@/org/springframework/cloud/stream/app/geode-source-rabbit/@apps.version@/geode-source-rabbit-@apps.version@.jar -source.geode.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/geode-source-rabbit/@apps.version@/geode-source-rabbit-@apps.version@-metadata.jar source.http=https://@repo-spring-io@/org/springframework/cloud/stream/app/http-source-rabbit/@apps.version@/http-source-rabbit-@apps.version@.jar source.http.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/http-source-rabbit/@apps.version@/http-source-rabbit-@apps.version@-metadata.jar source.jdbc=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-source-rabbit/@apps.version@/jdbc-source-rabbit-@apps.version@.jar @@ -54,8 +52,6 @@ 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/@apps.version@/file-sink-rabbit-@apps.version@-metadata.jar sink.ftp=https://@repo-spring-io@/org/springframework/cloud/stream/app/ftp-sink-rabbit/@apps.version@/ftp-sink-rabbit-@apps.version@.jar sink.ftp.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/ftp-sink-rabbit/@apps.version@/ftp-sink-rabbit-@apps.version@-metadata.jar -sink.geode=https://@repo-spring-io@/org/springframework/cloud/stream/app/geode-sink-rabbit/@apps.version@/geode-sink-rabbit-@apps.version@.jar -sink.geode.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/geode-sink-rabbit/@apps.version@/geode-sink-rabbit-@apps.version@-metadata.jar sink.jdbc=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-sink-rabbit/@apps.version@/jdbc-sink-rabbit-@apps.version@.jar sink.jdbc.metadata=https://@repo-spring-io@/org/springframework/cloud/stream/app/jdbc-sink-rabbit/@apps.version@/jdbc-sink-rabbit-@apps.version@-metadata.jar sink.log=https://@repo-spring-io@/org/springframework/cloud/stream/app/log-sink-rabbit/@apps.version@/log-sink-rabbit-@apps.version@.jar diff --git a/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties index f13cfe88..59e76a5e 100644 --- a/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties +++ b/stream-applications-release-train/stream-applications-descriptor/src/main/resources/META-INF/rabbit-apps-maven.properties @@ -4,8 +4,6 @@ source.file=maven://org.springframework.cloud.stream.app:file-source-rabbit:@app source.file.metadata=maven://org.springframework.cloud.stream.app:file-source-rabbit:jar:metadata:@apps.version@ source.ftp=maven://org.springframework.cloud.stream.app:ftp-source-rabbit:@apps.version@ source.ftp.metadata=maven://org.springframework.cloud.stream.app:ftp-source-rabbit:jar:metadata:@apps.version@ -source.geode=maven://org.springframework.cloud.stream.app:geode-source-rabbit:@apps.version@ -source.geode.metadata=maven://org.springframework.cloud.stream.app:geode-source-rabbit:jar:metadata:@apps.version@ source.http=maven://org.springframework.cloud.stream.app:http-source-rabbit:@apps.version@ source.http.metadata=maven://org.springframework.cloud.stream.app:http-source-rabbit:jar:metadata:@apps.version@ source.jdbc=maven://org.springframework.cloud.stream.app:jdbc-source-rabbit:@apps.version@ @@ -54,8 +52,6 @@ sink.file=maven://org.springframework.cloud.stream.app:file-sink-rabbit:@apps.ve sink.file.metadata=maven://org.springframework.cloud.stream.app:file-sink-rabbit:jar:metadata:@apps.version@ sink.ftp=maven://org.springframework.cloud.stream.app:ftp-sink-rabbit:@apps.version@ sink.ftp.metadata=maven://org.springframework.cloud.stream.app:ftp-sink-rabbit:jar:metadata:@apps.version@ -sink.geode=maven://org.springframework.cloud.stream.app:geode-sink-rabbit:@apps.version@ -sink.geode.metadata=maven://org.springframework.cloud.stream.app:geode-sink-rabbit:jar:metadata:@apps.version@ sink.jdbc=maven://org.springframework.cloud.stream.app:jdbc-sink-rabbit:@apps.version@ sink.jdbc.metadata=maven://org.springframework.cloud.stream.app:jdbc-sink-rabbit:jar:metadata:@apps.version@ sink.log=maven://org.springframework.cloud.stream.app:log-sink-rabbit:@apps.version@ diff --git a/stream-applications-release-train/stream-applications-docs/pom.xml b/stream-applications-release-train/stream-applications-docs/pom.xml index b8d1845b..7b19a8e0 100644 --- a/stream-applications-release-train/stream-applications-docs/pom.xml +++ b/stream-applications-release-train/stream-applications-docs/pom.xml @@ -41,12 +41,6 @@ ftp-common ${java-functions.version} - - org.springframework.cloud.fn - geode-common - - 1.2.1 - org.springframework.cloud.fn metadata-store-common @@ -83,11 +77,6 @@ ftp-supplier ${java-functions.version} - - - - - org.springframework.cloud.fn http-supplier @@ -194,11 +183,6 @@ ftp-consumer ${java-functions.version} - - - - - org.springframework.cloud.fn jdbc-consumer diff --git a/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sinks.adoc b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sinks.adoc index d571122b..db77f9e2 100644 --- a/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sinks.adoc +++ b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sinks.adoc @@ -18,9 +18,6 @@ include::{stream-apps-root}/{branch}/applications/sink/file-sink/README.adoc[tag [[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] diff --git a/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sources.adoc b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sources.adoc index 9543b9ac..312e1672 100644 --- a/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sources.adoc +++ b/stream-applications-release-train/stream-applications-docs/src/main/asciidoc/sources.adoc @@ -12,9 +12,6 @@ include::{stream-apps-root}/{branch}/applications/source/file-source/README.adoc [[spring-cloud-stream-modules-ftp-source]] include::{stream-apps-root}/{branch}/applications/source/ftp-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] @@ -70,4 +67,3 @@ include::{stream-apps-root}/{branch}/applications/source/websocket-source/README include::{stream-apps-root}/{branch}/applications/source/zeromq-source/README.adoc[tags=ref-doc] :leveloffset: -2 -