From d41c45c876cd263232f1953110702539221cdef1 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Mon, 2 Oct 2023 14:56:59 -0500 Subject: [PATCH] Update to Spring Cloud 2022.0.4 (#506) * Also update to Spring Cloud Stream 4.0.4 --- .../processor/aggregator-processor/README.adoc | 6 +++--- applications/sink/jdbc-sink/README.adoc | 1 + applications/sink/mongodb-sink/README.adoc | 4 ++-- applications/sink/redis-sink/README.adoc | 2 +- applications/sink/s3-sink/README.adoc | 7 +------ applications/sink/throughput-sink/README.adoc | 2 +- applications/source/mail-source/README.adoc | 10 +++++----- applications/source/mongodb-source/README.adoc | 4 ++-- applications/source/s3-source/README.adoc | 5 ----- stream-applications-build/pom.xml | 6 +++--- 10 files changed, 19 insertions(+), 28 deletions(-) diff --git a/applications/processor/aggregator-processor/README.adoc b/applications/processor/aggregator-processor/README.adoc index 7c4f6339c..0b9fe2db9 100644 --- a/applications/processor/aggregator-processor/README.adoc +++ b/applications/processor/aggregator-processor/README.adoc @@ -33,13 +33,13 @@ $$release$$:: $$SpEL expression for release strategy. Default is based on the se $$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$$, default: `$$$$`)* $$authentication-database$$:: $$Authentication database name.$$ *($$String$$, default: `$$$$`)* $$auto-index-creation$$:: $$Whether to enable auto-index creation.$$ *($$Boolean$$, default: `$$$$`)* -$$database$$:: $$Database name.$$ *($$String$$, default: `$$$$`)* +$$database$$:: $$Database name. Overrides database in URI.$$ *($$String$$, default: `$$$$`)* $$field-naming-strategy$$:: $$Fully qualified name of the FieldNamingStrategy to use.$$ *($$Class$$, default: `$$$$`)* $$host$$:: $$Mongo server host. Cannot be set with URI.$$ *($$String$$, default: `$$$$`)* $$password$$:: $$Login password of the mongo server. Cannot be set with URI.$$ *($$Character[]$$, default: `$$$$`)* $$port$$:: $$Mongo server port. Cannot be set with URI.$$ *($$Integer$$, default: `$$$$`)* $$replica-set-name$$:: $$Required replica set name for the cluster. Cannot be set with URI.$$ *($$String$$, default: `$$$$`)* -$$uri$$:: $$Mongo database URI. Overrides host, port, username, password, and database.$$ *($$String$$, default: `$$mongodb://localhost/test$$`)* +$$uri$$:: $$Mongo database URI. Overrides host, port, username, and password.$$ *($$String$$, default: `$$mongodb://localhost/test$$`)* $$username$$:: $$Login user of the mongo server. Cannot be set with URI.$$ *($$String$$, default: `$$$$`)* $$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`)* @@ -63,7 +63,7 @@ $$host$$:: $$Redis server host.$$ *($$String$$, default: `$$localhost$$`)* $$password$$:: $$Login password of the redis server.$$ *($$String$$, default: `$$$$`)* $$port$$:: $$Redis server port.$$ *($$Integer$$, default: `$$6379$$`)* $$timeout$$:: $$Read timeout.$$ *($$Duration$$, default: `$$$$`)* -$$url$$:: $$Connection URL. Overrides host, port, and password. User is ignored. Example: redis://user:password@example.com:6379$$ *($$String$$, default: `$$$$`)* +$$url$$:: $$Connection URL. Overrides host, port, username, and password. Example: redis://user:password@example.com:6379$$ *($$String$$, default: `$$$$`)* $$username$$:: $$Login username of the redis server.$$ *($$String$$, default: `$$$$`)* === spring.data.redis.cluster diff --git a/applications/sink/jdbc-sink/README.adoc b/applications/sink/jdbc-sink/README.adoc index b6af8cc8d..3da578481 100644 --- a/applications/sink/jdbc-sink/README.adoc +++ b/applications/sink/jdbc-sink/README.adoc @@ -52,6 +52,7 @@ The **$$jdbc$$** $$sink$$ has the following options: //tag::configuration-properties[] Properties grouped by prefix: + === jdbc.consumer $$batch-size$$:: $$Threshold in number of messages when data will be flushed to database table.$$ *($$Integer$$, default: `$$1$$`)* diff --git a/applications/sink/mongodb-sink/README.adoc b/applications/sink/mongodb-sink/README.adoc index 1b89979c3..73a365ad6 100644 --- a/applications/sink/mongodb-sink/README.adoc +++ b/applications/sink/mongodb-sink/README.adoc @@ -31,13 +31,13 @@ $$collection-expression$$:: $$The SpEL expression to evaluate MongoDB collection $$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$$, default: `$$$$`)* $$authentication-database$$:: $$Authentication database name.$$ *($$String$$, default: `$$$$`)* $$auto-index-creation$$:: $$Whether to enable auto-index creation.$$ *($$Boolean$$, default: `$$$$`)* -$$database$$:: $$Database name.$$ *($$String$$, default: `$$$$`)* +$$database$$:: $$Database name. Overrides database in URI.$$ *($$String$$, default: `$$$$`)* $$field-naming-strategy$$:: $$Fully qualified name of the FieldNamingStrategy to use.$$ *($$Class$$, default: `$$$$`)* $$host$$:: $$Mongo server host. Cannot be set with URI.$$ *($$String$$, default: `$$$$`)* $$password$$:: $$Login password of the mongo server. Cannot be set with URI.$$ *($$Character[]$$, default: `$$$$`)* $$port$$:: $$Mongo server port. Cannot be set with URI.$$ *($$Integer$$, default: `$$$$`)* $$replica-set-name$$:: $$Required replica set name for the cluster. Cannot be set with URI.$$ *($$String$$, default: `$$$$`)* -$$uri$$:: $$Mongo database URI. Overrides host, port, username, password, and database.$$ *($$String$$, default: `$$mongodb://localhost/test$$`)* +$$uri$$:: $$Mongo database URI. Overrides host, port, username, and password.$$ *($$String$$, default: `$$mongodb://localhost/test$$`)* $$username$$:: $$Login user of the mongo server. Cannot be set with URI.$$ *($$String$$, default: `$$$$`)* $$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`)* diff --git a/applications/sink/redis-sink/README.adoc b/applications/sink/redis-sink/README.adoc index 18a8b9732..ea07a136e 100644 --- a/applications/sink/redis-sink/README.adoc +++ b/applications/sink/redis-sink/README.adoc @@ -30,7 +30,7 @@ $$host$$:: $$Redis server host.$$ *($$String$$, default: `$$localhost$$`)* $$password$$:: $$Login password of the redis server.$$ *($$String$$, default: `$$$$`)* $$port$$:: $$Redis server port.$$ *($$Integer$$, default: `$$6379$$`)* $$timeout$$:: $$Read timeout.$$ *($$Duration$$, default: `$$$$`)* -$$url$$:: $$Connection URL. Overrides host, port, and password. User is ignored. Example: redis://user:password@example.com:6379$$ *($$String$$, default: `$$$$`)* +$$url$$:: $$Connection URL. Overrides host, port, username, and password. Example: redis://user:password@example.com:6379$$ *($$String$$, default: `$$$$`)* $$username$$:: $$Login username of the redis server.$$ *($$String$$, default: `$$$$`)* === spring.data.redis.cluster diff --git a/applications/sink/s3-sink/README.adoc b/applications/sink/s3-sink/README.adoc index bb670a2fc..dbf1bc2d7 100644 --- a/applications/sink/s3-sink/README.adoc +++ b/applications/sink/s3-sink/README.adoc @@ -18,14 +18,9 @@ The **$$s3$$** $$sink$$ has the following options: Properties grouped by prefix: -=== s3.common - -$$endpoint-url$$:: $$Optional endpoint url to connect to s3 compatible storage.$$ *($$String$$, default: `$$$$`)* -$$path-style-access$$:: $$Use path style access.$$ *($$Boolean$$, default: `$$false$$`)* - === s3.consumer -$$acl$$:: $$S3 Object access control list.$$ *($$CannedAccessControlList$$, default: `$$$$`)* +$$acl$$:: $$S3 Object access control list.$$ *($$ObjectCannedACL$$, default: `$$$$`, possible values: `private`,`public-read`,`public-read-write`,`authenticated-read`,`aws-exec-read`,`bucket-owner-read`,`bucket-owner-full-control`,`null`)* $$acl-expression$$:: $$Expression to evaluate S3 Object access control list.$$ *($$Expression$$, default: `$$$$`)* $$bucket$$:: $$AWS bucket for target file(s) to store.$$ *($$String$$, default: `$$$$`)* $$bucket-expression$$:: $$Expression to evaluate AWS bucket name.$$ *($$Expression$$, default: `$$$$`)* diff --git a/applications/sink/throughput-sink/README.adoc b/applications/sink/throughput-sink/README.adoc index b7589fa8b..1a077a493 100644 --- a/applications/sink/throughput-sink/README.adoc +++ b/applications/sink/throughput-sink/README.adoc @@ -8,7 +8,7 @@ Sink that will count messages and log the observed throughput at a selected inte The **$$throughput$$** $$sink$$ has the following options: //tag::configuration-properties[] -$$throughput.report-every-ms$$:: $$how often to report.$$ *($$Integer$$, default: `$$$$`)* +$$throughput.report-every-ms$$:: $$how often to report.$$ *($$Integer$$, default: `$$1000$$`)* //end::configuration-properties[] //end::ref-doc[] diff --git a/applications/source/mail-source/README.adoc b/applications/source/mail-source/README.adoc index 48f8673cc..a08737595 100644 --- 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: `$$$$`)* -$$mail.supplier.delete$$:: $$Set to true to delete email after download.$$ *($$Boolean$$, default: `$$$$`)* -$$mail.supplier.expression$$:: $$Configure a SpEL expression to select messages.$$ *($$String$$, default: `$$$$`)* -$$mail.supplier.idle-imap$$:: $$Set to true to use IdleImap Configuration.$$ *($$Boolean$$, default: `$$$$`)* +$$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.java-mail-properties$$:: $$JavaMail properties as a new line delimited string of name-value pairs, e.g. 'foo=bar\n baz=car'.$$ *($$Properties$$, default: `$$$$`)* -$$mail.supplier.mark-as-read$$:: $$Set to true to mark email as read.$$ *($$Boolean$$, default: `$$$$`)* +$$mail.supplier.mark-as-read$$:: $$Set to true to mark email as read.$$ *($$Boolean$$, default: `$$false$$`)* $$mail.supplier.url$$:: $$Mail connection URL for connection to Mail server e.g. 'imaps://username:password@imap.server.com:993/Inbox'.$$ *($$URLName$$, default: `$$$$`)* $$mail.supplier.user-flag$$:: $$The flag to mark messages when the server does not support \Recent.$$ *($$String$$, default: `$$$$`)* //end::configuration-properties[] diff --git a/applications/source/mongodb-source/README.adoc b/applications/source/mongodb-source/README.adoc index 83818756c..3abd80d07 100644 --- a/applications/source/mongodb-source/README.adoc +++ b/applications/source/mongodb-source/README.adoc @@ -29,13 +29,13 @@ $$update-expression$$:: $$The SpEL expression in MongoDB update DSL style.$$ *($ $$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$$, default: `$$$$`)* $$authentication-database$$:: $$Authentication database name.$$ *($$String$$, default: `$$$$`)* $$auto-index-creation$$:: $$Whether to enable auto-index creation.$$ *($$Boolean$$, default: `$$$$`)* -$$database$$:: $$Database name.$$ *($$String$$, default: `$$$$`)* +$$database$$:: $$Database name. Overrides database in URI.$$ *($$String$$, default: `$$$$`)* $$field-naming-strategy$$:: $$Fully qualified name of the FieldNamingStrategy to use.$$ *($$Class$$, default: `$$$$`)* $$host$$:: $$Mongo server host. Cannot be set with URI.$$ *($$String$$, default: `$$$$`)* $$password$$:: $$Login password of the mongo server. Cannot be set with URI.$$ *($$Character[]$$, default: `$$$$`)* $$port$$:: $$Mongo server port. Cannot be set with URI.$$ *($$Integer$$, default: `$$$$`)* $$replica-set-name$$:: $$Required replica set name for the cluster. Cannot be set with URI.$$ *($$String$$, default: `$$$$`)* -$$uri$$:: $$Mongo database URI. Overrides host, port, username, password, and database.$$ *($$String$$, default: `$$mongodb://localhost/test$$`)* +$$uri$$:: $$Mongo database URI. Overrides host, port, username, and password.$$ *($$String$$, default: `$$mongodb://localhost/test$$`)* $$username$$:: $$Login user of the mongo server. Cannot be set with URI.$$ *($$String$$, default: `$$$$`)* $$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`)* diff --git a/applications/source/s3-source/README.adoc b/applications/source/s3-source/README.adoc index c90956add..588af9e71 100644 --- a/applications/source/s3-source/README.adoc +++ b/applications/source/s3-source/README.adoc @@ -95,11 +95,6 @@ $$encoding$$:: $$Encoding to use when storing data in Zookeeper.$$ *($$Charset$$ $$retry-interval$$:: $$Retry interval for Zookeeper operations in milliseconds.$$ *($$Integer$$, default: `$$1000$$`)* $$root$$:: $$Root node - store entries are children of this node.$$ *($$String$$, default: `$$/SpringIntegration-MetadataStore$$`)* -=== s3.common - -$$endpoint-url$$:: $$Optional endpoint url to connect to s3 compatible storage.$$ *($$String$$, default: `$$$$`)* -$$path-style-access$$:: $$Use path style access.$$ *($$Boolean$$, default: `$$false$$`)* - === s3.supplier $$auto-create-local-dir$$:: $$Create or not the local directory.$$ *($$Boolean$$, default: `$$true$$`)* diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml index 06f6f4be1..023b7c111 100644 --- a/stream-applications-build/pom.xml +++ b/stream-applications-build/pom.xml @@ -43,10 +43,10 @@ 3.0.4 - 2022.0.3 - 4.0.3 + 2022.0.4 + 4.0.4 4.0.4 - 4.0.3 + 4.0.4 1.18.3 5.13.2