GH-475: Add some missed nested props for apps (#476)

Fixes https://github.com/spring-cloud/stream-applications/issues/475 * Fix JDBC props for limited listed number of them
2023-06-13 00:35:10 -04:00
parent 546eb0b2c9
commit a841beba15
31 changed files with 257 additions and 97 deletions
--- a/applications/processor/aggregator-processor/README.adoc
+++ b/applications/processor/aggregator-processor/README.adoc
@@ -30,48 +30,30 @@ $$release$$:: $$SpEL expression for release strategy. Default is based on the se

 === spring.data.mongodb

+$$additional-hosts$$:: $$Additional server hosts. Cannot be set with URI or if 'host' is not specified. Additional hosts will use the default mongo port of 27017. If you want to use a different port you can use the "host:port" syntax.$$ *($$List<String>$$, default: `$$<none>$$`)*
 $$authentication-database$$:: $$Authentication database name.$$ *($$String$$, default: `$$<none>$$`)*
 $$auto-index-creation$$:: $$Whether to enable auto-index creation.$$ *($$Boolean$$, default: `$$<none>$$`)*
 $$database$$:: $$Database name.$$ *($$String$$, default: `$$<none>$$`)*
 $$field-naming-strategy$$:: $$Fully qualified name of the FieldNamingStrategy to use.$$ *($$Class<?>$$, default: `$$<none>$$`)*
-$$grid-fs-database$$:: $$<documentation missing>$$ *($$String$$, default: `$$<none>$$`)*
 $$host$$:: $$Mongo server host. Cannot be set with URI.$$ *($$String$$, default: `$$<none>$$`)*
 $$password$$:: $$Login password of the mongo server. Cannot be set with URI.$$ *($$Character[]$$, default: `$$<none>$$`)*
 $$port$$:: $$Mongo server port. Cannot be set with URI.$$ *($$Integer$$, default: `$$<none>$$`)*
 $$replica-set-name$$:: $$Required replica set name for the cluster. Cannot be set with URI.$$ *($$String$$, default: `$$<none>$$`)*
-$$uri$$:: $$Mongo database URI. Cannot be set with host, port, credentials and replica set name.$$ *($$String$$, default: `$$mongodb://localhost/test$$`)*
+$$uri$$:: $$Mongo database URI. Overrides host, port, username, password, and database.$$ *($$String$$, default: `$$mongodb://localhost/test$$`)*
 $$username$$:: $$Login user of the mongo server. Cannot be set with URI.$$ *($$String$$, default: `$$<none>$$`)*
 $$uuid-representation$$:: $$Representation to use when converting a UUID to a BSON binary value.$$ *($$UuidRepresentation$$, default: `$$java-legacy$$`, possible values: `UNSPECIFIED`,`STANDARD`,`C_SHARP_LEGACY`,`JAVA_LEGACY`,`PYTHON_LEGACY`)*

-=== spring.datasource
+=== spring.data.mongodb.gridfs

-$$continue-on-error$$:: $$Whether to stop if an error occurs while initializing the database.$$ *($$Boolean$$, default: `$$false$$`)*
-$$data$$:: $$Data (DML) script resource references.$$ *($$List<String>$$, default: `$$<none>$$`)*
-$$data-password$$:: $$Password of the database to execute DML scripts (if different).$$ *($$String$$, default: `$$<none>$$`)*
-$$data-username$$:: $$Username of the database to execute DML scripts (if different).$$ *($$String$$, default: `$$<none>$$`)*
-$$driver-class-name$$:: $$Fully qualified name of the JDBC driver. Auto-detected based on the URL by default.$$ *($$String$$, default: `$$<none>$$`)*
-$$embedded-database-connection$$:: $$Connection details for an embedded database. Defaults to the most suitable embedded database that is available on the classpath.$$ *($$EmbeddedDatabaseConnection$$, default: `$$<none>$$`, possible values: `NONE`,`H2`,`DERBY`,`HSQL`,`HSQLDB`)*
-$$generate-unique-name$$:: $$Whether to generate a random datasource name.$$ *($$Boolean$$, default: `$$true$$`)*
-$$initialization-mode$$:: $$Mode to apply when determining if DataSource initialization should be performed using the available DDL and DML scripts.$$ *($$DataSourceInitializationMode$$, default: `$$embedded$$`, possible values: `ALWAYS`,`EMBEDDED`,`NEVER`)*
-$$jndi-name$$:: $$JNDI location of the datasource. Class, url, username and password are ignored when set.$$ *($$String$$, default: `$$<none>$$`)*
-$$name$$:: $$Datasource name to use if "generate-unique-name" is false. Defaults to "testdb" when using an embedded database, otherwise null.$$ *($$String$$, default: `$$<none>$$`)*
-$$password$$:: $$Login password of the database.$$ *($$String$$, default: `$$<none>$$`)*
-$$platform$$:: $$Platform to use in the DDL or DML scripts (such as schema-${platform}.sql or data-${platform}.sql).$$ *($$String$$, default: `$$all$$`)*
-$$schema$$:: $$Schema (DDL) script resource references.$$ *($$List<String>$$, default: `$$<none>$$`)*
-$$schema-password$$:: $$Password of the database to execute DDL scripts (if different).$$ *($$String$$, default: `$$<none>$$`)*
-$$schema-username$$:: $$Username of the database to execute DDL scripts (if different).$$ *($$String$$, default: `$$<none>$$`)*
-$$separator$$:: $$Statement separator in SQL initialization scripts.$$ *($$String$$, default: `$$;$$`)*
-$$sql-script-encoding$$:: $$SQL scripts encoding.$$ *($$Charset$$, default: `$$<none>$$`)*
-$$type$$:: $$Fully qualified name of the connection pool implementation to use. By default, it is auto-detected from the classpath.$$ *($$Class<DataSource>$$, default: `$$<none>$$`)*
-$$url$$:: $$JDBC URL of the database.$$ *($$String$$, default: `$$<none>$$`)*
-$$username$$:: $$Login username of the database.$$ *($$String$$, default: `$$<none>$$`)*
+$$bucket$$:: $$GridFS bucket name.$$ *($$String$$, default: `$$<none>$$`)*
+$$database$$:: $$GridFS database name.$$ *($$String$$, default: `$$<none>$$`)*

-=== spring.mongodb.embedded
+=== spring.data.mongodb.ssl

-$$features$$:: $$Comma-separated list of features to enable. Uses the defaults of the configured version by default.$$ *($$Set<Feature>$$, default: `$$[sync_delay]$$`)*
-$$version$$:: $$Version of Mongo to use.$$ *($$String$$, default: `$$3.5.5$$`)*
+$$bundle$$:: $$SSL bundle name.$$ *($$String$$, default: `$$<none>$$`)*
+$$enabled$$:: $$Whether to enable SSL support. Enabled automatically if "bundle" is provided unless specified otherwise.$$ *($$Boolean$$, default: `$$<none>$$`)*

-=== spring.redis
+=== spring.data.redis

 $$client-name$$:: $$Client name to be set on connections with CLIENT SETNAME.$$ *($$String$$, default: `$$<none>$$`)*
 $$client-type$$:: $$Type of client to use. By default, auto-detected according to the classpath.$$ *($$ClientType$$, default: `$$<none>$$`, possible values: `LETTUCE`,`JEDIS`)*
@@ -80,10 +62,55 @@ $$database$$:: $$Database index used by the connection factory.$$ *($$Integer$$,
 $$host$$:: $$Redis server host.$$ *($$String$$, default: `$$localhost$$`)*
 $$password$$:: $$Login password of the redis server.$$ *($$String$$, default: `$$<none>$$`)*
 $$port$$:: $$Redis server port.$$ *($$Integer$$, default: `$$6379$$`)*
-$$ssl$$:: $$Whether to enable SSL support.$$ *($$Boolean$$, default: `$$false$$`)*
 $$timeout$$:: $$Read timeout.$$ *($$Duration$$, default: `$$<none>$$`)*
 $$url$$:: $$Connection URL. Overrides host, port, and password. User is ignored. Example: redis://user:password@example.com:6379$$ *($$String$$, default: `$$<none>$$`)*
 $$username$$:: $$Login username of the redis server.$$ *($$String$$, default: `$$<none>$$`)*
+
+=== spring.data.redis.cluster
+
+$$max-redirects$$:: $$Maximum number of redirects to follow when executing commands across the cluster.$$ *($$Integer$$, default: `$$<none>$$`)*
+$$nodes$$:: $$Comma-separated list of "host:port" pairs to bootstrap from. This represents an "initial" list of cluster nodes and is required to have at least one entry.$$ *($$List<String>$$, default: `$$<none>$$`)*
+
+=== spring.data.redis.jedis.pool
+
+$$enabled$$:: $$Whether to enable the pool. Enabled automatically if "commons-pool2" is available. With Jedis, pooling is implicitly enabled in sentinel mode and this setting only applies to single node setup.$$ *($$Boolean$$, default: `$$<none>$$`)*
+$$max-active$$:: $$Maximum number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.$$ *($$Integer$$, default: `$$8$$`)*
+$$max-idle$$:: $$Maximum number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.$$ *($$Integer$$, default: `$$8$$`)*
+$$max-wait$$:: $$Maximum amount of time a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.$$ *($$Duration$$, default: `$$-1ms$$`)*
+$$min-idle$$:: $$Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if both it and time between eviction runs are positive.$$ *($$Integer$$, default: `$$0$$`)*
+$$time-between-eviction-runs$$:: $$Time between runs of the idle object evictor thread. When positive, the idle object evictor thread starts, otherwise no idle object eviction is performed.$$ *($$Duration$$, default: `$$<none>$$`)*
+
+=== spring.data.redis.lettuce.pool
+
+$$enabled$$:: $$Whether to enable the pool. Enabled automatically if "commons-pool2" is available. With Jedis, pooling is implicitly enabled in sentinel mode and this setting only applies to single node setup.$$ *($$Boolean$$, default: `$$<none>$$`)*
+$$max-active$$:: $$Maximum number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.$$ *($$Integer$$, default: `$$8$$`)*
+$$max-idle$$:: $$Maximum number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.$$ *($$Integer$$, default: `$$8$$`)*
+$$max-wait$$:: $$Maximum amount of time a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.$$ *($$Duration$$, default: `$$-1ms$$`)*
+$$min-idle$$:: $$Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if both it and time between eviction runs are positive.$$ *($$Integer$$, default: `$$0$$`)*
+$$time-between-eviction-runs$$:: $$Time between runs of the idle object evictor thread. When positive, the idle object evictor thread starts, otherwise no idle object eviction is performed.$$ *($$Duration$$, default: `$$<none>$$`)*
+
+=== spring.data.redis.lettuce
+
+$$shutdown-timeout$$:: $$Shutdown timeout.$$ *($$Duration$$, default: `$$100ms$$`)*
+
+=== spring.data.redis.sentinel
+
+$$master$$:: $$Name of the Redis server.$$ *($$String$$, default: `$$<none>$$`)*
+$$nodes$$:: $$Comma-separated list of "host:port" pairs.$$ *($$List<String>$$, default: `$$<none>$$`)*
+$$password$$:: $$Password for authenticating with sentinel(s).$$ *($$String$$, default: `$$<none>$$`)*
+$$username$$:: $$Login username for authenticating with sentinel(s).$$ *($$String$$, default: `$$<none>$$`)*
+
+=== spring.data.redis.ssl
+
+$$bundle$$:: $$SSL bundle name.$$ *($$String$$, default: `$$<none>$$`)*
+$$enabled$$:: $$Whether to enable SSL support. Enabled automatically if "bundle" is provided unless specified otherwise.$$ *($$Boolean$$, default: `$$<none>$$`)*
+
+=== spring.datasource
+
+$$driver-class-name$$:: $$Fully qualified name of the JDBC driver. Auto-detected based on the URL by default.$$ *($$String$$, default: `$$<none>$$`)*
+$$password$$:: $$Login password of the database.$$ *($$String$$, default: `$$<none>$$`)*
+$$url$$:: $$JDBC URL of the database.$$ *($$String$$, default: `$$<none>$$`)*
+$$username$$:: $$Login username of the database.$$ *($$String$$, default: `$$<none>$$`)*
 //end::configuration-properties[]

 //end::ref-doc[]
--- a/applications/processor/aggregator-processor/pom.xml
+++ b/applications/processor/aggregator-processor/pom.xml
@@ -23,6 +23,10 @@

    <build>
        <plugins>
+            <plugin>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dataflow-apps-docs-plugin</artifactId>
+            </plugin>
            <plugin>
                <groupId>org.springframework.cloud</groupId>
                <artifactId>spring-cloud-dataflow-apps-generator-plugin</artifactId>
--- 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
@@ -1,4 +1,16 @@
 configuration-properties.classes=org.springframework.cloud.fn.aggregator.AggregatorFunctionProperties,\
  org.springframework.boot.autoconfigure.mongo.MongoProperties,\
+  org.springframework.boot.autoconfigure.mongo.MongoProperties$Ssl,\
+  org.springframework.boot.autoconfigure.mongo.MongoProperties$Gridfs, \
  org.springframework.boot.autoconfigure.data.redis.RedisProperties,\
-  org.springframework.boot.autoconfigure.jdbc.DataSourceProperties
+  org.springframework.boot.autoconfigure.data.redis.RedisProperties$Sentinel,\
+  org.springframework.boot.autoconfigure.data.redis.RedisProperties$Cluster,\
+  org.springframework.boot.autoconfigure.data.redis.RedisProperties$Ssl,\
+  org.springframework.boot.autoconfigure.data.redis.RedisProperties$Jedis,\
+  org.springframework.boot.autoconfigure.data.redis.RedisProperties$Lettuce,\
+  org.springframework.boot.autoconfigure.data.redis.RedisProperties$Pool
+configuration-properties.names=\
+spring.datasource.url,\
+spring.datasource.driver-class-name,\
+spring.datasource.username,\
+spring.datasource.password
--- a/applications/processor/bridge-processor/README.adoc.tmp
+++ b/applications/processor/bridge-processor/README.adoc.tmp
@@ -1,11 +0,0 @@
-//tag::ref-doc[]
-= Bridge Processor
-
-A processor that bridges the input and ouput by simply passing the incoming payload to the outbound.
-
-=== Payload
-
-Any
-
-//end::ref-doc[]
-null
--- a/applications/sink/cassandra-sink/README.adoc
+++ b/applications/sink/cassandra-sink/README.adoc
@@ -14,16 +14,70 @@ The **$$cassandra$$** $$sink$$ has the following options:


 //tag::configuration-properties[]
-$$spring.cassandra.compression$$:: $$Compression supported by the Cassandra binary protocol.$$ *($$Compression$$, default: `$$none$$`, possible values: `LZ4`,`SNAPPY`,`NONE`)*
-$$spring.cassandra.config$$:: $$Location of the configuration file to use.$$ *($$Resource$$, default: `$$<none>$$`)*
-$$spring.cassandra.contact-points$$:: $$Cluster node addresses in the form 'host:port', or a simple 'host' to use the configured port.$$ *($$List<String>$$, default: `$$[127.0.0.1:9042]$$`)*
-$$spring.cassandra.keyspace-name$$:: $$Keyspace name to use.$$ *($$String$$, default: `$$<none>$$`)*
-$$spring.cassandra.local-datacenter$$:: $$Datacenter that is considered "local". Contact points should be from this datacenter.$$ *($$String$$, default: `$$<none>$$`)*
-$$spring.cassandra.password$$:: $$Login password of the server.$$ *($$String$$, default: `$$<none>$$`)*
-$$spring.cassandra.port$$:: $$Port to use if a contact point does not specify one.$$ *($$Integer$$, default: `$$9042$$`)*
-$$spring.cassandra.schema-action$$:: $$Schema action to take at startup.$$ *($$String$$, default: `$$none$$`)*
-$$spring.cassandra.session-name$$:: $$Name of the Cassandra session.$$ *($$String$$, default: `$$<none>$$`)*
-$$spring.cassandra.username$$:: $$Login user of the server.$$ *($$String$$, default: `$$<none>$$`)*
+Properties grouped by prefix:
+
+
+=== cassandra.cluster
+
+$$create-keyspace$$:: $$Flag to create (or not) keyspace on application startup.$$ *($$Boolean$$, default: `$$false$$`)*
+$$entity-base-packages$$:: $$Base packages to scan for entities annotated with Table annotations.$$ *($$String[]$$, default: `$$[]$$`)*
+$$init-script$$:: $$Resource with CQL scripts (delimited by ';') to initialize keyspace schema.$$ *($$Resource$$, default: `$$<none>$$`)*
+$$skip-ssl-validation$$:: $$Flag to validate the Servers' SSL certs.$$ *($$Boolean$$, default: `$$false$$`)*
+
+=== cassandra
+
+$$consistency-level$$:: $$The consistency level for write operation.$$ *($$ConsistencyLevel$$, default: `$$<none>$$`)*
+$$ingest-query$$:: $$Ingest Cassandra query.$$ *($$String$$, default: `$$<none>$$`)*
+$$query-type$$:: $$QueryType for Cassandra Sink.$$ *($$Type$$, default: `$$<none>$$`, possible values: `INSERT`,`UPDATE`,`DELETE`,`STATEMENT`)*
+$$statement-expression$$:: $$Expression in Cassandra query DSL style.$$ *($$Expression$$, default: `$$<none>$$`)*
+$$ttl$$:: $$Time-to-live option of WriteOptions.$$ *($$Integer$$, default: `$$0$$`)*
+
+=== spring.cassandra
+
+$$compression$$:: $$Compression supported by the Cassandra binary protocol.$$ *($$Compression$$, default: `$$none$$`, possible values: `LZ4`,`SNAPPY`,`NONE`)*
+$$config$$:: $$Location of the configuration file to use.$$ *($$Resource$$, default: `$$<none>$$`)*
+$$contact-points$$:: $$Cluster node addresses in the form 'host:port', or a simple 'host' to use the configured port.$$ *($$List<String>$$, default: `$$[127.0.0.1:9042]$$`)*
+$$keyspace-name$$:: $$Keyspace name to use.$$ *($$String$$, default: `$$<none>$$`)*
+$$local-datacenter$$:: $$Datacenter that is considered "local". Contact points should be from this datacenter.$$ *($$String$$, default: `$$<none>$$`)*
+$$password$$:: $$Login password of the server.$$ *($$String$$, default: `$$<none>$$`)*
+$$port$$:: $$Port to use if a contact point does not specify one.$$ *($$Integer$$, default: `$$9042$$`)*
+$$schema-action$$:: $$Schema action to take at startup.$$ *($$String$$, default: `$$none$$`)*
+$$session-name$$:: $$Name of the Cassandra session.$$ *($$String$$, default: `$$<none>$$`)*
+$$username$$:: $$Login user of the server.$$ *($$String$$, default: `$$<none>$$`)*
+
+=== spring.cassandra.connection
+
+$$connect-timeout$$:: $$Timeout to use when establishing driver connections.$$ *($$Duration$$, default: `$$5s$$`)*
+$$init-query-timeout$$:: $$Timeout to use for internal queries that run as part of the initialization process, just after a connection is opened.$$ *($$Duration$$, default: `$$5s$$`)*
+
+=== spring.cassandra.controlconnection
+
+$$timeout$$:: $$Timeout to use for control queries.$$ *($$Duration$$, default: `$$5s$$`)*
+
+=== spring.cassandra.pool
+
+$$heartbeat-interval$$:: $$Heartbeat interval after which a message is sent on an idle connection to make sure it's still alive.$$ *($$Duration$$, default: `$$30s$$`)*
+$$idle-timeout$$:: $$Idle timeout before an idle connection is removed.$$ *($$Duration$$, default: `$$5s$$`)*
+
+=== spring.cassandra.request
+
+$$consistency$$:: $$Queries consistency level.$$ *($$DefaultConsistencyLevel$$, default: `$$<none>$$`, possible values: `ANY`,`ONE`,`TWO`,`THREE`,`QUORUM`,`ALL`,`LOCAL_ONE`,`LOCAL_QUORUM`,`EACH_QUORUM`,`SERIAL`,`LOCAL_SERIAL`)*
+$$page-size$$:: $$How many rows will be retrieved simultaneously in a single network round-trip.$$ *($$Integer$$, default: `$$5000$$`)*
+$$serial-consistency$$:: $$Queries serial consistency level.$$ *($$DefaultConsistencyLevel$$, default: `$$<none>$$`, possible values: `ANY`,`ONE`,`TWO`,`THREE`,`QUORUM`,`ALL`,`LOCAL_ONE`,`LOCAL_QUORUM`,`EACH_QUORUM`,`SERIAL`,`LOCAL_SERIAL`)*
+$$timeout$$:: $$How long the driver waits for a request to complete.$$ *($$Duration$$, default: `$$2s$$`)*
+
+=== spring.cassandra.request.throttler
+
+$$drain-interval$$:: $$How often the throttler attempts to dequeue requests. Set this high enough that each attempt will process multiple entries in the queue, but not delay requests too much.$$ *($$Duration$$, default: `$$<none>$$`)*
+$$max-concurrent-requests$$:: $$Maximum number of requests that are allowed to execute in parallel.$$ *($$Integer$$, default: `$$<none>$$`)*
+$$max-queue-size$$:: $$Maximum number of requests that can be enqueued when the throttling threshold is exceeded.$$ *($$Integer$$, default: `$$<none>$$`)*
+$$max-requests-per-second$$:: $$Maximum allowed request rate.$$ *($$Integer$$, default: `$$<none>$$`)*
+$$type$$:: $$Request throttling type.$$ *($$ThrottlerType$$, default: `$$none$$`, possible values: `CONCURRENCY_LIMITING`,`RATE_LIMITING`,`NONE`)*
+
+=== spring.cassandra.ssl
+
+$$bundle$$:: $$SSL bundle name.$$ *($$String$$, default: `$$<none>$$`)*
+$$enabled$$:: $$Whether to enable SSL support.$$ *($$Boolean$$, default: `$$<none>$$`)*
 //end::configuration-properties[]

 //end::ref-doc[]
--- a/applications/sink/cassandra-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/sink/cassandra-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -1,3 +1,9 @@
-configuration-properties.classes=CassandraConsumerProperties, \
-  CassandraClusterProperties, \
-  org.springframework.boot.autoconfigure.cassandra.CassandraProperties
+configuration-properties.classes=org.springframework.cloud.fn.consumer.cassandra.CassandraConsumerProperties, \
+  org.springframework.cloud.fn.consumer.cassandra.cluster.CassandraClusterProperties, \
+  org.springframework.boot.autoconfigure.cassandra.CassandraProperties, \
+  org.springframework.boot.autoconfigure.cassandra.CassandraProperties$Ssl, \
+  org.springframework.boot.autoconfigure.cassandra.CassandraProperties$Connection, \
+  org.springframework.boot.autoconfigure.cassandra.CassandraProperties$Pool, \
+  org.springframework.boot.autoconfigure.cassandra.CassandraProperties$Request, \
+  org.springframework.boot.autoconfigure.cassandra.CassandraProperties$Controlconnection, \
+  org.springframework.boot.autoconfigure.cassandra.CassandraProperties$Throttler
--- a/applications/sink/elasticsearch-sink/README.adoc
+++ b/applications/sink/elasticsearch-sink/README.adoc
@@ -37,6 +37,15 @@ $$socket-keep-alive$$:: $$Whether to enable socket keep alive between client and
 $$socket-timeout$$:: $$Socket timeout used when communicating with Elasticsearch.$$ *($$Duration$$, default: `$$30s$$`)*
 $$uris$$:: $$Comma-separated list of the Elasticsearch instances to use.$$ *($$List<String>$$, default: `$$[http://localhost:9200]$$`)*
 $$username$$:: $$Username for authentication with Elasticsearch.$$ *($$String$$, default: `$$<none>$$`)*
+
+=== spring.elasticsearch.restclient.sniffer
+
+$$delay-after-failure$$:: $$Delay of a sniff execution scheduled after a failure.$$ *($$Duration$$, default: `$$1m$$`)*
+$$interval$$:: $$Interval between consecutive ordinary sniff executions.$$ *($$Duration$$, default: `$$5m$$`)*
+
+=== spring.elasticsearch.restclient.ssl
+
+$$bundle$$:: $$SSL bundle name.$$ *($$String$$, default: `$$<none>$$`)*
 //end::configuration-properties[]

 == Examples of running this sink
--- a/applications/sink/elasticsearch-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/sink/elasticsearch-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -1,2 +1,5 @@
 configuration-properties.classes=org.springframework.cloud.fn.consumer.elasticsearch.ElasticsearchConsumerProperties, \
-  org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchProperties
+  org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchProperties, \
+  org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchProperties$Restclient, \
+  org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchProperties$Restclient$Sniffer, \
+  org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchProperties$Restclient$Ssl
--- a/applications/sink/jdbc-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/sink/jdbc-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -3,7 +3,4 @@ configuration-properties.names=\
 spring.datasource.url,\
 spring.datasource.driver-class-name,\
 spring.datasource.username,\
-spring.datasource.password,\
-spring.datasource.schema,\
-spring.datasource.data,\
-spring.datasource.initialization-mode
+spring.datasource.password
--- a/applications/sink/kafka-sink/README.adoc
+++ b/applications/sink/kafka-sink/README.adoc
@@ -47,6 +47,11 @@ $$properties$$:: $$Additional producer-specific properties used to configure the
 $$retries$$:: $$When greater than zero, enables retrying of failed sends.$$ *($$Integer$$, default: `$$<none>$$`)*
 $$transaction-id-prefix$$:: $$When non empty, enables transaction support for producer.$$ *($$String$$, default: `$$<none>$$`)*
 $$value-serializer$$:: $$Serializer class for values.$$ *($$Class<?>$$, default: `$$<none>$$`)*
+
+=== spring.kafka.template
+
+$$default-topic$$:: $$Default topic to which messages are sent.$$ *($$String$$, default: `$$<none>$$`)*
+$$transaction-id-prefix$$:: $$Transaction id prefix, override the transaction id prefix in the producer factory.$$ *($$String$$, default: `$$<none>$$`)*
 //end::configuration-properties[]

 //end::ref-doc[]
--- a/applications/sink/kafka-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/sink/kafka-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -1,3 +1,4 @@
 configuration-properties.classes=org.springframework.cloud.fn.consumer.kafka.KafkaPublisherProperties, \
  org.springframework.boot.autoconfigure.kafka.KafkaProperties, \
-org.springframework.boot.autoconfigure.kafka.KafkaProperties$Producer
+org.springframework.boot.autoconfigure.kafka.KafkaProperties$Producer, \
+org.springframework.boot.autoconfigure.kafka.KafkaProperties$Template
--- a/applications/sink/mongodb-sink/README.adoc
+++ b/applications/sink/mongodb-sink/README.adoc
@@ -40,6 +40,16 @@ $$replica-set-name$$:: $$Required replica set name for the cluster. Cannot be se
 $$uri$$:: $$Mongo database URI. Overrides host, port, username, password, and database.$$ *($$String$$, default: `$$mongodb://localhost/test$$`)*
 $$username$$:: $$Login user of the mongo server. Cannot be set with URI.$$ *($$String$$, default: `$$<none>$$`)*
 $$uuid-representation$$:: $$Representation to use when converting a UUID to a BSON binary value.$$ *($$UuidRepresentation$$, default: `$$java-legacy$$`, possible values: `UNSPECIFIED`,`STANDARD`,`C_SHARP_LEGACY`,`JAVA_LEGACY`,`PYTHON_LEGACY`)*
+
+=== spring.data.mongodb.gridfs
+
+$$bucket$$:: $$GridFS bucket name.$$ *($$String$$, default: `$$<none>$$`)*
+$$database$$:: $$GridFS database name.$$ *($$String$$, default: `$$<none>$$`)*
+
+=== spring.data.mongodb.ssl
+
+$$bundle$$:: $$SSL bundle name.$$ *($$String$$, default: `$$<none>$$`)*
+$$enabled$$:: $$Whether to enable SSL support. Enabled automatically if "bundle" is provided unless specified otherwise.$$ *($$Boolean$$, default: `$$<none>$$`)*
 //end::configuration-properties[]

 //end::ref-doc[]
--- a/applications/sink/mongodb-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/sink/mongodb-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -1,3 +1,4 @@
 configuration-properties.classes=org.springframework.cloud.fn.consumer.mongo.MongoDbConsumerProperties,\
-  org.springframework.boot.autoconfigure.mongo.MongoProperties
-
+  org.springframework.boot.autoconfigure.mongo.MongoProperties,\
+  org.springframework.boot.autoconfigure.mongo.MongoProperties$Ssl,\
+  org.springframework.boot.autoconfigure.mongo.MongoProperties$Gridfs
--- a/applications/sink/rabbit-sink/README.adoc
+++ b/applications/sink/rabbit-sink/README.adoc
@@ -40,6 +40,15 @@ $$requested-channel-max$$:: $$Number of channels per connection requested by the
 $$requested-heartbeat$$:: $$Requested heartbeat timeout; zero for none. If a duration suffix is not specified, seconds will be used.$$ *($$Duration$$, default: `$$<none>$$`)*
 $$username$$:: $$Login user to authenticate to the broker.$$ *($$String$$, default: `$$guest$$`)*
 $$virtual-host$$:: $$Virtual host to use when connecting to the broker.$$ *($$String$$, default: `$$<none>$$`)*
+
+=== spring.rabbitmq.template
+
+$$default-receive-queue$$:: $$Name of the default queue to receive messages from when none is specified explicitly.$$ *($$String$$, default: `$$<none>$$`)*
+$$exchange$$:: $$Name of the default exchange to use for send operations.$$ *($$String$$, default: `$$<empty string>$$`)*
+$$mandatory$$:: $$Whether to enable mandatory messages.$$ *($$Boolean$$, default: `$$<none>$$`)*
+$$receive-timeout$$:: $$Timeout for receive() operations.$$ *($$Duration$$, default: `$$<none>$$`)*
+$$reply-timeout$$:: $$Timeout for sendAndReceive() operations.$$ *($$Duration$$, default: `$$<none>$$`)*
+$$routing-key$$:: $$Value of a default routing key to use for send operations.$$ *($$String$$, default: `$$<empty string>$$`)*
 //end::configuration-properties[]

 //end::ref-doc[]
--- a/applications/sink/rabbit-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/sink/rabbit-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -1,2 +1,3 @@
 configuration-properties.classes=org.springframework.cloud.fn.consumer.rabbit.RabbitConsumerProperties, \
-  org.springframework.boot.autoconfigure.amqp.RabbitProperties
+  org.springframework.boot.autoconfigure.amqp.RabbitProperties, \
+  org.springframework.boot.autoconfigure.amqp.RabbitProperties$Template
--- a/applications/sink/redis-sink/README.adoc
+++ b/applications/sink/redis-sink/README.adoc
@@ -33,6 +33,11 @@ $$timeout$$:: $$Read timeout.$$ *($$Duration$$, default: `$$<none>$$`)*
 $$url$$:: $$Connection URL. Overrides host, port, and password. User is ignored. Example: redis://user:password@example.com:6379$$ *($$String$$, default: `$$<none>$$`)*
 $$username$$:: $$Login username of the redis server.$$ *($$String$$, default: `$$<none>$$`)*

+=== spring.data.redis.cluster
+
+$$max-redirects$$:: $$Maximum number of redirects to follow when executing commands across the cluster.$$ *($$Integer$$, default: `$$<none>$$`)*
+$$nodes$$:: $$Comma-separated list of "host:port" pairs to bootstrap from. This represents an "initial" list of cluster nodes and is required to have at least one entry.$$ *($$List<String>$$, default: `$$<none>$$`)*
+
 === spring.data.redis.jedis.pool

 $$enabled$$:: $$Whether to enable the pool. Enabled automatically if "commons-pool2" is available. With Jedis, pooling is implicitly enabled in sentinel mode and this setting only applies to single node setup.$$ *($$Boolean$$, default: `$$<none>$$`)*
@@ -51,12 +56,21 @@ $$max-wait$$:: $$Maximum amount of time a connection allocation should block bef
 $$min-idle$$:: $$Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if both it and time between eviction runs are positive.$$ *($$Integer$$, default: `$$0$$`)*
 $$time-between-eviction-runs$$:: $$Time between runs of the idle object evictor thread. When positive, the idle object evictor thread starts, otherwise no idle object eviction is performed.$$ *($$Duration$$, default: `$$<none>$$`)*

+=== spring.data.redis.lettuce
+
+$$shutdown-timeout$$:: $$Shutdown timeout.$$ *($$Duration$$, default: `$$100ms$$`)*
+
 === spring.data.redis.sentinel

 $$master$$:: $$Name of the Redis server.$$ *($$String$$, default: `$$<none>$$`)*
 $$nodes$$:: $$Comma-separated list of "host:port" pairs.$$ *($$List<String>$$, default: `$$<none>$$`)*
 $$password$$:: $$Password for authenticating with sentinel(s).$$ *($$String$$, default: `$$<none>$$`)*
 $$username$$:: $$Login username for authenticating with sentinel(s).$$ *($$String$$, default: `$$<none>$$`)*
+
+=== spring.data.redis.ssl
+
+$$bundle$$:: $$SSL bundle name.$$ *($$String$$, default: `$$<none>$$`)*
+$$enabled$$:: $$Whether to enable SSL support. Enabled automatically if "bundle" is provided unless specified otherwise.$$ *($$Boolean$$, default: `$$<none>$$`)*
 //end::configuration-properties[]

 //end::ref-doc[]
--- a/applications/sink/redis-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/sink/redis-sink/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -1,5 +1,8 @@
 configuration-properties.classes=org.springframework.cloud.fn.consumer.redis.RedisConsumerProperties, \
-  org.springframework.boot.autoconfigure.data.redis.RedisProperties, \
-  org.springframework.boot.autoconfigure.data.redis.RedisProperties$Pool, \
-  org.springframework.boot.autoconfigure.data.redis.RedisProperties$Sentinel
-
+  org.springframework.boot.autoconfigure.data.redis.RedisProperties,\
+  org.springframework.boot.autoconfigure.data.redis.RedisProperties$Sentinel,\
+  org.springframework.boot.autoconfigure.data.redis.RedisProperties$Cluster,\
+  org.springframework.boot.autoconfigure.data.redis.RedisProperties$Ssl,\
+  org.springframework.boot.autoconfigure.data.redis.RedisProperties$Jedis,\
+  org.springframework.boot.autoconfigure.data.redis.RedisProperties$Lettuce,\
+  org.springframework.boot.autoconfigure.data.redis.RedisProperties$Pool
--- a/applications/source/file-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/source/file-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -1,10 +1,8 @@
 configuration-properties.classes=org.springframework.cloud.fn.supplier.file.FileSupplierProperties,\
  org.springframework.cloud.fn.common.file.FileConsumerProperties, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties, \
-  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Gemfire, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Redis, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$DynamoDb, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Jdbc, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Zookeeper, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Mongo
-
--- a/applications/source/ftp-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/source/ftp-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -2,9 +2,8 @@ configuration-properties.classes=org.springframework.cloud.fn.supplier.ftp.FtpSu
  org.springframework.cloud.fn.common.ftp.FtpSessionFactoryProperties, \
  org.springframework.cloud.fn.common.file.FileConsumerProperties, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties, \
-  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Gemfire, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Redis, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$DynamoDb, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Jdbc, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Zookeeper, \
-  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Mongo \
+  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Mongo
--- a/applications/source/jdbc-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/source/jdbc-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -4,7 +4,4 @@ configuration-properties.names=\
 spring.datasource.url,\
 spring.datasource.driver-class-name,\
 spring.datasource.username,\
-spring.datasource.password,\
-spring.datasource.schema,\
-spring.datasource.data,\
-spring.datasource.initialization-mode
+spring.datasource.password
--- a/applications/source/kafka-source/README.adoc
+++ b/applications/source/kafka-source/README.adoc
@@ -15,7 +15,7 @@ Properties grouped by prefix:

 === kafka.supplier

-$$ack-discarded$$:: $$Whether to acknowledge discarded records after 'RecordFilterStrategy'.$$ *($$Boolean$$, default: `$$<none>$$`)*
+$$ack-discarded$$:: $$Whether to acknowledge discarded records after 'RecordFilterStrategy'.$$ *($$Boolean$$, default: `$$false$$`)*
 $$record-filter$$:: $$SpEL expression for 'RecordFilterStrategy' with a 'ConsumerRecord' as a root object.$$ *($$Expression$$, default: `$$<none>$$`)*
 $$topic-pattern$$:: $$Apache Kafka topics pattern to subscribe.$$ *($$Pattern$$, default: `$$<none>$$`)*
 $$topics$$:: $$Apache Kafka topics to subscribe.$$ *($$String[]$$, default: `$$<none>$$`)*
--- a/applications/source/mail-source/README.adoc
+++ b/applications/source/mail-source/README.adoc
@@ -8,12 +8,12 @@ A source application that listens for Emails and emits the message body as a mes
 The **$$mail$$** $$source$$ has the following options:

 //tag::configuration-properties[]
-$$mail.supplier.charset$$:: $$The charset for byte[] mail-to-string transformation.$$ *($$String$$, default: `$$UTF-8$$`)*
-$$mail.supplier.delete$$:: $$Set to true to delete email after download.$$ *($$Boolean$$, default: `$$false$$`)*
-$$mail.supplier.expression$$:: $$Configure a SpEL expression to select messages.$$ *($$String$$, default: `$$true$$`)*
-$$mail.supplier.idle-imap$$:: $$Set to true to use IdleImap Configuration.$$ *($$Boolean$$, default: `$$false$$`)*
+$$mail.supplier.charset$$:: $$The charset for byte[] mail-to-string transformation.$$ *($$String$$, default: `$$<none>$$`)*
+$$mail.supplier.delete$$:: $$Set to true to delete email after download.$$ *($$Boolean$$, default: `$$<none>$$`)*
+$$mail.supplier.expression$$:: $$Configure a SpEL expression to select messages.$$ *($$String$$, default: `$$<none>$$`)*
+$$mail.supplier.idle-imap$$:: $$Set to true to use IdleImap Configuration.$$ *($$Boolean$$, default: `$$<none>$$`)*
 $$mail.supplier.java-mail-properties$$:: $$JavaMail properties as a new line delimited string of name-value pairs, e.g. 'foo=bar\n baz=car'.$$ *($$Properties$$, default: `$$<none>$$`)*
-$$mail.supplier.mark-as-read$$:: $$Set to true to mark email as read.$$ *($$Boolean$$, default: `$$false$$`)*
+$$mail.supplier.mark-as-read$$:: $$Set to true to mark email as read.$$ *($$Boolean$$, default: `$$<none>$$`)*
 $$mail.supplier.url$$:: $$Mail connection URL for connection to Mail server e.g. 'imaps://username:password@imap.server.com:993/Inbox'.$$ *($$URLName$$, default: `$$<none>$$`)*
 $$mail.supplier.user-flag$$:: $$The flag to mark messages when the server does not support \Recent.$$ *($$String$$, default: `$$<none>$$`)*
 //end::configuration-properties[]
--- a/applications/source/mongodb-source/README.adoc
+++ b/applications/source/mongodb-source/README.adoc
@@ -38,6 +38,16 @@ $$replica-set-name$$:: $$Required replica set name for the cluster. Cannot be se
 $$uri$$:: $$Mongo database URI. Overrides host, port, username, password, and database.$$ *($$String$$, default: `$$mongodb://localhost/test$$`)*
 $$username$$:: $$Login user of the mongo server. Cannot be set with URI.$$ *($$String$$, default: `$$<none>$$`)*
 $$uuid-representation$$:: $$Representation to use when converting a UUID to a BSON binary value.$$ *($$UuidRepresentation$$, default: `$$java-legacy$$`, possible values: `UNSPECIFIED`,`STANDARD`,`C_SHARP_LEGACY`,`JAVA_LEGACY`,`PYTHON_LEGACY`)*
+
+=== spring.data.mongodb.gridfs
+
+$$bucket$$:: $$GridFS bucket name.$$ *($$String$$, default: `$$<none>$$`)*
+$$database$$:: $$GridFS database name.$$ *($$String$$, default: `$$<none>$$`)*
+
+=== spring.data.mongodb.ssl
+
+$$bundle$$:: $$SSL bundle name.$$ *($$String$$, default: `$$<none>$$`)*
+$$enabled$$:: $$Whether to enable SSL support. Enabled automatically if "bundle" is provided unless specified otherwise.$$ *($$Boolean$$, default: `$$<none>$$`)*
 //end::configuration-properties[]

 Also see the https://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html[Spring Boot Documentation] for additional `MongoProperties` properties.
--- a/applications/source/mongodb-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/source/mongodb-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -1,3 +1,4 @@
 configuration-properties.classes=org.springframework.cloud.fn.supplier.mongo.MongodbSupplierProperties,\
-  org.springframework.boot.autoconfigure.mongo.MongoProperties
-
+  org.springframework.boot.autoconfigure.mongo.MongoProperties,\
+  org.springframework.boot.autoconfigure.mongo.MongoProperties$Ssl,\
+  org.springframework.boot.autoconfigure.mongo.MongoProperties$Gridfs
--- a/applications/source/rabbit-source/README.adoc
+++ b/applications/source/rabbit-source/README.adoc
@@ -52,6 +52,24 @@ $$requested-channel-max$$:: $$Number of channels per connection requested by the
 $$requested-heartbeat$$:: $$Requested heartbeat timeout; zero for none. If a duration suffix is not specified, seconds will be used.$$ *($$Duration$$, default: `$$<none>$$`)*
 $$username$$:: $$Login user to authenticate to the broker.$$ *($$String$$, default: `$$guest$$`)*
 $$virtual-host$$:: $$Virtual host to use when connecting to the broker.$$ *($$String$$, default: `$$<none>$$`)*
+
+=== spring.rabbitmq.listener.simple
+
+$$acknowledge-mode$$:: $$Acknowledge mode of container.$$ *($$AcknowledgeMode$$, default: `$$<none>$$`, possible values: `NONE`,`MANUAL`,`AUTO`)*
+$$auto-startup$$:: $$Whether to start the container automatically on startup.$$ *($$Boolean$$, default: `$$true$$`)*
+$$batch-size$$:: $$Batch size, expressed as the number of physical messages, to be used by the container.$$ *($$Integer$$, default: `$$<none>$$`)*
+$$concurrency$$:: $$Minimum number of listener invoker threads.$$ *($$Integer$$, default: `$$<none>$$`)*
+$$consumer-batch-enabled$$:: $$Whether the container creates a batch of messages based on the 'receive-timeout' and 'batch-size'. Coerces 'de-batching-enabled' to true to include the contents of a producer created batch in the batch as discrete records.$$ *($$Boolean$$, default: `$$false$$`)*
+$$de-batching-enabled$$:: $$Whether the container should present batched messages as discrete messages or call the listener with the batch.$$ *($$Boolean$$, default: `$$true$$`)*
+$$default-requeue-rejected$$:: $$Whether rejected deliveries are re-queued by default.$$ *($$Boolean$$, default: `$$<none>$$`)*
+$$idle-event-interval$$:: $$How often idle container events should be published.$$ *($$Duration$$, default: `$$<none>$$`)*
+$$max-concurrency$$:: $$Maximum number of listener invoker threads.$$ *($$Integer$$, default: `$$<none>$$`)*
+$$missing-queues-fatal$$:: $$Whether to fail if the queues declared by the container are not available on the broker and/or whether to stop the container if one or more queues are deleted at runtime.$$ *($$Boolean$$, default: `$$true$$`)*
+$$prefetch$$:: $$Maximum number of unacknowledged messages that can be outstanding at each consumer.$$ *($$Integer$$, default: `$$<none>$$`)*
+
+=== spring.rabbitmq.listener
+
+$$type$$:: $$Listener container type.$$ *($$ContainerType$$, default: `$$simple$$`, possible values: `SIMPLE`,`DIRECT`,`STREAM`)*
 //end::configuration-properties[]

 Also see the https://docs.spring.io/spring-boot/docs/current/reference/html/common-application-properties.html[Spring Boot Documentation]
--- a/applications/source/rabbit-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/source/rabbit-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -1,2 +1,4 @@
 configuration-properties.classes=org.springframework.cloud.fn.supplier.rabbit.RabbitSupplierProperties, \
-  org.springframework.boot.autoconfigure.amqp.RabbitProperties
+  org.springframework.boot.autoconfigure.amqp.RabbitProperties, \
+  org.springframework.boot.autoconfigure.amqp.RabbitProperties$Listener, \
+  org.springframework.boot.autoconfigure.amqp.RabbitProperties$SimpleContainer
--- a/applications/source/s3-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/source/s3-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -2,9 +2,8 @@ configuration-properties.classes=org.springframework.cloud.fn.supplier.s3.AwsS3S
  org.springframework.cloud.fn.common.file.FileConsumerProperties,\
  org.springframework.cloud.fn.common.aws.s3.AmazonS3Properties, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties, \
-  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Gemfire, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Redis, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$DynamoDb, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Jdbc, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Zookeeper, \
-  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Mongo \
+  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Mongo
--- a/applications/source/sftp-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/source/sftp-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -3,10 +3,8 @@ configuration-properties.classes=org.springframework.cloud.fn.supplier.sftp.Sftp
  org.springframework.cloud.fn.supplier.sftp.SftpSupplierProperties$SortSpec, \
  org.springframework.cloud.fn.common.file.FileConsumerProperties, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties, \
-  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Gemfire, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Redis, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$DynamoDb, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Jdbc, \
  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Zookeeper, \
-  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Mongo \
-
+  org.springframework.cloud.fn.common.metadata.store.MetadataStoreProperties$Mongo
--- a/applications/source/twitter-message-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/source/twitter-message-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -1,4 +1,3 @@
 configuration-properties.classes=org.springframework.cloud.fn.common.twitter.TwitterConnectionProperties,\
  org.springframework.cloud.fn.supplier.twitter.message.TwitterMessageSupplierProperties, \
-  org.springframework.boot.autoconfigure.integration.IntegrationProperties$Poller 
-
+  org.springframework.boot.autoconfigure.integration.IntegrationProperties$Poller
--- a/applications/source/twitter-search-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
+++ b/applications/source/twitter-search-source/src/main/resources/META-INF/dataflow-configuration-metadata.properties
@@ -1,5 +1,4 @@
 configuration-properties.classes=org.springframework.cloud.fn.common.twitter.TwitterConnectionProperties,\
  org.springframework.cloud.fn.supplier.twitter.status.search.TwitterSearchSupplierProperties, \
  org.springframework.cloud.fn.supplier.twitter.status.search.TwitterSearchSupplierProperties$Geocode, \
-  org.springframework.boot.autoconfigure.integration.IntegrationProperties$Poller 
-
+  org.springframework.boot.autoconfigure.integration.IntegrationProperties$Poller
--- a/functions/function/tasklauncher-function/README.adoc
+++ b/functions/function/tasklauncher-function/README.adoc
@@ -1,5 +0,0 @@
-# TaskLauncher Function
-
-[NOTE]
-This module has been relocated to the https://github.com/spring-cloud/spring-cloud-dataflow/tree/main/spring-cloud-dataflow-tasklauncher/spring-cloud-dataflow-tasklauncher-function[spring-cloud-data-flow repository].
-As of SCDF 2.9.x, this function is included in the SCDF build to ensure version compatibility with the SCDF server going forward.