Update various dependencies patch versions

This commit updates various dependencies to the latest patch
versions as follows:

- spring-boot to 3.1.12
- spring-framework to 6.0.21
- spring-integration-aws to 3.0.2
- spring-cloud to 2022.0.5
- spring-cloud-aws to 3.0.2
- spring-kafka to 6.0.21
- spring-amqp to 3.0.14
- org.apache.sshd:sshd-sftp to 2.9.3

The AwsS3ConsumerTests are also adjusted as they broke with the
dependency updates.

* Add script to delete all apps

This adds a convenience script that deletes all of
the generated /apps directories. Useful for local
development.

* Update to apps plugin 1.0.14

The previous apps plugin 1.0.10 seeds the apps with Maven
3.5.6 which has issues w/ the current install plugin.

The 1.0.14 plugin seeds the apps with Maven 3.8.8 which
works well.

* Update SCS and java-cfenv versions (2022.0.x)

This updates the SCS starter to v4.0.5 and java-cfenv-boot
version to v3.2.0 to properly support Boot 3.1.x.

See #550

applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/sink/redis/RedisSinkTests.java

@@ -52,6 +52,7 @@ public void testRedisSink() {
 						.getCompleteConfiguration(RedisSinkTestApplication.class))
 				.web(WebApplicationType.NONE)
 				.run("--spring.cloud.function.definition=redisConsumer",
+						"--spring.cloud.stream.bindings.redisConsumer-in-0.consumer.use-native-decoding=true",
 						"--spring.data.redis.url=" + RedisTestContainerSupport.getUri(),
 						"--redis.consumer.key=foo")) {
 

applications/sink/s3-sink/README.adoc

@@ -44,6 +44,7 @@ $$static$$:: $$<documentation missing>$$ *($$String$$, default: `$$<none>$$`)*
 $$accelerate-mode-enabled$$:: $$Option to enable using the accelerate endpoint when accessing S3. Accelerate endpoints allow faster transfer of objects by using Amazon CloudFront's globally distributed edge locations.$$ *($$Boolean$$, default: `$$<none>$$`)*
 $$checksum-validation-enabled$$:: $$Option to disable doing a validation of the checksum of an object stored in S3.$$ *($$Boolean$$, default: `$$<none>$$`)*
 $$chunked-encoding-enabled$$:: $$Option to enable using chunked encoding when signing the request payload for {@link software.amazon.awssdk.services.s3.model.PutObjectRequest} and {@link software.amazon.awssdk.services.s3.model.UploadPartRequest}.$$ *($$Boolean$$, default: `$$<none>$$`)*
+$$cross-region-enabled$$:: $$Enables cross-region bucket access.$$ *($$Boolean$$, default: `$$<none>$$`)*
 $$endpoint$$:: $$Overrides the default endpoint.$$ *($$URI$$, default: `$$<none>$$`)*
 $$path-style-access-enabled$$:: $$Option to enable using path style access for accessing S3 objects instead of DNS style access. DNS style access is preferred as it will result in better load balancing when accessing S3.$$ *($$Boolean$$, default: `$$<none>$$`)*
 $$region$$:: $$Overrides the default region.$$ *($$String$$, default: `$$<none>$$`)*

applications/source/jms-source/README.adoc

@@ -30,7 +30,7 @@ $$pub-sub-domain$$:: $$Whether the default destination type is topic.$$ *($$Bool
 
 $$acknowledge-mode$$:: $$Acknowledge mode of the container. By default, the listener is transacted with automatic acknowledgment.$$ *($$AcknowledgeMode$$, default: `$$<none>$$`, possible values: `AUTO`,`CLIENT`,`DUPS_OK`)*
 $$auto-startup$$:: $$Start the container automatically on startup.$$ *($$Boolean$$, default: `$$true$$`)*
-$$concurrency$$:: $$Minimum number of concurrent consumers.$$ *($$Integer$$, default: `$$<none>$$`)*
+$$concurrency$$:: $$Minimum number of concurrent consumers. When max-concurrency is not specified the minimum will also be used as the maximum.$$ *($$Integer$$, default: `$$<none>$$`)*
 $$max-concurrency$$:: $$Maximum number of concurrent consumers.$$ *($$Integer$$, default: `$$<none>$$`)*
 $$receive-timeout$$:: $$Timeout to use for receive calls. Use -1 for a no-wait receive or 0 for no timeout at all. The latter is only feasible if not running within a transaction manager and is generally discouraged since it prevents clean shutdown.$$ *($$Duration$$, default: `$$1s$$`)*
 //end::configuration-properties[]

applications/source/s3-source/README.adoc

@@ -126,6 +126,7 @@ $$static$$:: $$<documentation missing>$$ *($$String$$, default: `$$<none>$$`)*
 $$accelerate-mode-enabled$$:: $$Option to enable using the accelerate endpoint when accessing S3. Accelerate endpoints allow faster transfer of objects by using Amazon CloudFront's globally distributed edge locations.$$ *($$Boolean$$, default: `$$<none>$$`)*
 $$checksum-validation-enabled$$:: $$Option to disable doing a validation of the checksum of an object stored in S3.$$ *($$Boolean$$, default: `$$<none>$$`)*
 $$chunked-encoding-enabled$$:: $$Option to enable using chunked encoding when signing the request payload for {@link software.amazon.awssdk.services.s3.model.PutObjectRequest} and {@link software.amazon.awssdk.services.s3.model.UploadPartRequest}.$$ *($$Boolean$$, default: `$$<none>$$`)*
+$$cross-region-enabled$$:: $$Enables cross-region bucket access.$$ *($$Boolean$$, default: `$$<none>$$`)*
 $$endpoint$$:: $$Overrides the default endpoint.$$ *($$URI$$, default: `$$<none>$$`)*
 $$path-style-access-enabled$$:: $$Option to enable using path style access for accessing S3 objects instead of DNS style access. DNS style access is preferred as it will result in better load balancing when accessing S3.$$ *($$Boolean$$, default: `$$<none>$$`)*
 $$region$$:: $$Overrides the default region.$$ *($$String$$, default: `$$<none>$$`)*

applications/stream-applications-core/pom.xml

@@ -20,10 +20,11 @@
         <java-functions.version>4.0.1-SNAPSHOT</java-functions.version>
         <apps.base-image>springcloud/baseimage:1.0.4</apps.base-image>
 		<prometheus-rsocket.version>1.5.2</prometheus-rsocket.version>
-        <spring-cloud-dataflow-apps-generator-plugin.version>1.0.10</spring-cloud-dataflow-apps-generator-plugin.version>
-        <spring-cloud-dataflow-apps-docs-plugin.version>1.0.10</spring-cloud-dataflow-apps-docs-plugin.version>
-        <spring-cloud-dataflow-apps-metadata-plugin.version>1.0.10</spring-cloud-dataflow-apps-metadata-plugin.version>
-        <java-cfenv-boot.version>2.4.0</java-cfenv-boot.version>
+        <spring-cloud-dataflow-apps-generator-plugin.version>1.0.14</spring-cloud-dataflow-apps-generator-plugin.version>
+        <spring-cloud-dataflow-apps-docs-plugin.version>1.0.14</spring-cloud-dataflow-apps-docs-plugin.version>
+        <spring-cloud-dataflow-apps-metadata-plugin.version>1.0.14</spring-cloud-dataflow-apps-metadata-plugin.version>
+        <java-cfenv-boot.version>3.2.0</java-cfenv-boot.version>
+        <spring-cloud-services.version>4.0.5</spring-cloud-services.version>
     </properties>
 
     <modules>
@@ -262,7 +263,7 @@
                                         <dependency>
                                             <groupId>io.pivotal.spring.cloud</groupId>
                                             <artifactId>spring-cloud-services-starter-config-client</artifactId>
-                                            <version>3.2.0.RELEASE</version>
+                                            <version>${spring-cloud-services.version}</version>
                                         </dependency>
                                     </dependencies>
                                 </maven>

clean-apps.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+echo "About to delete the following 'apps' folders:"
+find . -type d -name apps
+echo "----------------"
+echo "Enter 'Y' or 'N':"
+read shouldDelete
+if [ "$shouldDelete" = "Y" ] || [ "$shouldDelete" = "y" ]; then
+  echo "Deleting..."
+  find . -type d -name apps -prune -exec rm -rf {} \;
+  echo "Done"
+else
+  echo "Not deleting"
+fi

functions/common/function-test-support/pom.xml

@@ -14,7 +14,7 @@
     <description>file consumer</description>
 
     <properties>
-        <sshd-sftp.version>2.7.0</sshd-sftp.version>
+        <sshd-sftp.version>2.9.3</sshd-sftp.version>
         <apache-ftpserver.version>1.2.0</apache-ftpserver.version>
     </properties>
 

functions/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AbstractAwsS3ConsumerMockTests.java

@@ -36,23 +36,22 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.MediaType;
 import org.springframework.messaging.Message;
 import org.springframework.test.annotation.DirtiesContext;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.willReturn;
-import static org.mockito.Mockito.spy;
 
 @DirtiesContext
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE,
-		properties = {
-				"spring.cloud.aws.credentials.accessKey=" + AbstractAwsS3ConsumerMockTests.AWS_ACCESS_KEY,
+		properties = { "spring.cloud.aws.credentials.accessKey=" + AbstractAwsS3ConsumerMockTests.AWS_ACCESS_KEY,
 				"spring.cloud.aws.credentials.secretKey=" + AbstractAwsS3ConsumerMockTests.AWS_SECRET_KEY,
 				"spring.cloud.aws.region.static=" + AbstractAwsS3ConsumerMockTests.AWS_REGION,
 				"spring.cloud.aws.s3.endpoint=s3://foo",
-				"s3.consumer.bucket=" + AbstractAwsS3ConsumerMockTests.S3_BUCKET})
+				"s3.consumer.bucket=" + AbstractAwsS3ConsumerMockTests.S3_BUCKET })
 public abstract class AbstractAwsS3ConsumerMockTests {
 
 	protected static final String AWS_ACCESS_KEY = "test.accessKey";
@@ -66,7 +65,7 @@ public abstract class AbstractAwsS3ConsumerMockTests {
 	@TempDir
 	protected static Path temporaryRemoteFolder;
 
-	@Autowired
+	@MockBean
 	private S3AsyncClient amazonS3;
 
 	@Autowired
@@ -80,10 +79,7 @@ public abstract class AbstractAwsS3ConsumerMockTests {
 
 	@BeforeEach
 	public void setupTest() {
-		S3AsyncClient amazonS3 = spy(this.amazonS3);
-
-		willReturn(CompletableFuture.completedFuture(PutObjectResponse.builder().build()))
-				.given(amazonS3)
+		willReturn(CompletableFuture.completedFuture(PutObjectResponse.builder().build())).given(amazonS3)
 				.putObject(any(PutObjectRequest.class), any(AsyncRequestBody.class));
 
 		new DirectFieldAccessor(this.s3TransferManager).setPropertyValue("s3AsyncClient", amazonS3);
@@ -101,7 +97,6 @@ public CountDownLatch transferCompletedLatch() {
 		public TransferListener transferListener() {
 			return new TransferListener() {
 
-
 				@Override
 				public void transferComplete(Context.TransferComplete context) {
 					transferCompletedLatch().countDown();

functions/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadFileTests.java

@@ -32,6 +32,7 @@
 import org.springframework.messaging.Message;
 import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.test.context.TestPropertySource;
+import org.springframework.util.FileCopyUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.atLeastOnce;
@@ -42,38 +43,36 @@ public class AmazonS3UploadFileTests extends AbstractAwsS3ConsumerMockTests {
 
 	@Test
 	public void test() throws Exception {
-		S3AsyncClient amazonS3Client =
-				TestUtils.getPropertyValue(this.s3TransferManager, "s3AsyncClient", S3AsyncClient.class);
+		S3AsyncClient amazonS3Client = TestUtils.getPropertyValue(this.s3TransferManager, "s3AsyncClient",
+				S3AsyncClient.class);
 
 		File file = new File(temporaryRemoteFolder.toFile(), "foo.mp3");
-		file.createNewFile();
-		Message<?> message = MessageBuilder.withPayload(file)
-				.build();
+		FileCopyUtils.copy(new byte[] { 1 }, file);
+		Message<?> message = MessageBuilder.withPayload(file).build();
 
 		this.s3Consumer.accept(message);
 
-		ArgumentCaptor<PutObjectRequest> putObjectRequestArgumentCaptor =
-				ArgumentCaptor.forClass(PutObjectRequest.class);
-		ArgumentCaptor<AsyncRequestBody> asyncRequestBodyArgumentCaptor =
-				ArgumentCaptor.forClass(AsyncRequestBody.class);
-		verify(amazonS3Client, atLeastOnce())
-				.putObject(putObjectRequestArgumentCaptor.capture(), asyncRequestBodyArgumentCaptor.capture());
+		ArgumentCaptor<PutObjectRequest> putObjectRequestArgumentCaptor = ArgumentCaptor.captor();
+		ArgumentCaptor<AsyncRequestBody> asyncRequestBodyArgumentCaptor = ArgumentCaptor.captor();
+		verify(amazonS3Client, atLeastOnce()).putObject(putObjectRequestArgumentCaptor.capture(),
+				asyncRequestBodyArgumentCaptor.capture());
 
 		PutObjectRequest putObjectRequest = putObjectRequestArgumentCaptor.getValue();
 		assertThat(putObjectRequest.bucket()).isEqualTo(S3_BUCKET);
 		assertThat(putObjectRequest.key()).isEqualTo("foo.mp3");
 		assertThat(putObjectRequest.contentMD5()).isEqualTo(Md5Utils.md5AsBase64(file));
-		assertThat(putObjectRequest.contentLength()).isEqualTo(0L);
+		assertThat(putObjectRequest.contentLength()).isEqualTo(1L);
 		assertThat(putObjectRequest.contentType()).isEqualTo("audio/mpeg");
 		assertThat(putObjectRequest.acl()).isEqualTo(ObjectCannedACL.PUBLIC_READ_WRITE);
 
 		AsyncRequestBody asyncRequestBody = asyncRequestBodyArgumentCaptor.getValue();
 		StepVerifier.create(asyncRequestBody)
-				.assertNext(buffer -> assertThat(buffer.array()).isEmpty())
+				.assertNext((buffer) -> assertThat(buffer.limit()).isEqualTo(1))
 				.expectComplete()
 				.verify();
 
 		assertThat(this.transferCompletedLatch.await(10, TimeUnit.SECONDS)).isTrue();
 	}
 
+
 }

functions/consumer/s3-consumer/src/test/java/org/springframework/cloud/fn/consumer/s3/AmazonS3UploadInputStreamTests.java

@@ -17,6 +17,7 @@
 package org.springframework.cloud.fn.consumer.s3;
 
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -42,22 +43,18 @@ public class AmazonS3UploadInputStreamTests extends AbstractAwsS3ConsumerMockTes
 
 	@Test
 	public void test() throws Exception {
-		S3AsyncClient amazonS3Client =
-				TestUtils.getPropertyValue(this.s3TransferManager, "s3AsyncClient", S3AsyncClient.class);
+		S3AsyncClient amazonS3Client = TestUtils.getPropertyValue(this.s3TransferManager, "s3AsyncClient",
+				S3AsyncClient.class);
 
 		InputStream payload = new StringInputStream("a");
-		Message<?> message = MessageBuilder.withPayload(payload)
-				.setHeader("key", "myInputStream")
-				.build();
+		Message<?> message = MessageBuilder.withPayload(payload).setHeader("key", "myInputStream").build();
 
 		this.s3Consumer.accept(message);
 
-		ArgumentCaptor<PutObjectRequest> putObjectRequestArgumentCaptor =
-				ArgumentCaptor.forClass(PutObjectRequest.class);
-		ArgumentCaptor<AsyncRequestBody> asyncRequestBodyArgumentCaptor =
-				ArgumentCaptor.forClass(AsyncRequestBody.class);
-		verify(amazonS3Client, atLeastOnce())
-				.putObject(putObjectRequestArgumentCaptor.capture(), asyncRequestBodyArgumentCaptor.capture());
+		ArgumentCaptor<PutObjectRequest> putObjectRequestArgumentCaptor = ArgumentCaptor.captor();
+		ArgumentCaptor<AsyncRequestBody> asyncRequestBodyArgumentCaptor = ArgumentCaptor.captor();
+		verify(amazonS3Client, atLeastOnce()).putObject(putObjectRequestArgumentCaptor.capture(),
+				asyncRequestBodyArgumentCaptor.capture());
 
 		PutObjectRequest putObjectRequest = putObjectRequestArgumentCaptor.getValue();
 		assertThat(putObjectRequest.bucket()).isEqualTo(S3_BUCKET);
@@ -67,9 +64,8 @@ public void test() throws Exception {
 		assertThat(putObjectRequest.contentType()).isEqualTo(MediaType.APPLICATION_JSON_VALUE);
 		assertThat(putObjectRequest.contentDisposition()).isEqualTo("test.json");
 
-
 		AsyncRequestBody asyncRequestBody = asyncRequestBodyArgumentCaptor.getValue();
-		StepVerifier.create(asyncRequestBody.map(buffer -> new String(buffer.array())))
+		StepVerifier.create(asyncRequestBody.map((buffer) -> StandardCharsets.UTF_8.decode(buffer).toString()))
 				.expectNext("a")
 				.expectComplete()
 				.verify();

stream-applications-build/pom.xml

@@ -36,33 +36,29 @@
         <disable.nohttp.checks>true</disable.nohttp.checks>
         <spring-javaformat-checkstyle.version>0.0.35</spring-javaformat-checkstyle.version>
 
-        <spring-boot.version>3.1.8</spring-boot.version>
-        <spring.version>6.0.16</spring.version>
-
-        <spring-kafka.version>3.0.13</spring-kafka.version>
-        <spring-rabbit.version>3.0.10</spring-rabbit.version>
-        <!--        <spring-integration.version>6.1.0</spring-integration.version>-->
-
-        <spring-cloud.version>2022.0.4</spring-cloud.version>
+        <spring-boot.version>3.1.12</spring-boot.version>
+        <spring.version>6.0.21</spring.version>
+        <spring-kafka.version>3.0.17</spring-kafka.version>
+        <spring-rabbit.version>3.0.14</spring-rabbit.version>
+        <spring-cloud.version>2022.0.5</spring-cloud.version>
         <spring-cloud-starters.version>4.0.5</spring-cloud-starters.version>
         <spring-cloud-function.version>4.0.6</spring-cloud-function.version>
         <spring-cloud-stream-dependencies.version>4.0.5</spring-cloud-stream-dependencies.version>
-
-        <testcontainers.version>1.18.3</testcontainers.version>
-        <mockserver.version>5.13.2</mockserver.version>
-
         <groovy.version>4.0.14</groovy.version>
         <apache-ivy.version>2.5.2</apache-ivy.version>
         <jakarta-jms.version>3.1.0</jakarta-jms.version>
-        <spring-cloud-aws.version>3.0.2</spring-cloud-aws.version>
-        <spring-integration-aws.version>3.0.2</spring-integration-aws.version>
+        <spring-cloud-aws.version>3.0.5</spring-cloud-aws.version>
+        <spring-integration-aws.version>3.0.8</spring-integration-aws.version>
         <curator.version>5.5.0</curator.version>
-        <mavenThreads>1</mavenThreads>
+        <testcontainers.version>1.18.3</testcontainers.version>
+        <mockito.version>5.14.2</mockito.version>
+		<mockserver.version>5.13.2</mockserver.version>
 
-		<!--suppress UnresolvedMavenProperty -->
-		<buildName>${env.BUILD_NAME}</buildName>
-		<!--suppress UnresolvedMavenProperty -->
-		<buildNumber>${env.BUILD_NUMBER}</buildNumber>
+        <mavenThreads>1</mavenThreads>
+        <!--suppress UnresolvedMavenProperty -->
+        <buildName>${env.BUILD_NAME}</buildName>
+        <!--suppress UnresolvedMavenProperty -->
+        <buildNumber>${env.BUILD_NUMBER}</buildNumber>
 	</properties>
 
     <url>https://spring.io/projects/spring-cloud-stream-applications</url>
@@ -81,6 +77,13 @@
 
     <dependencyManagement>
         <dependencies>
+			<dependency>
+				<groupId>org.mockito</groupId>
+				<artifactId>mockito-bom</artifactId>
+				<version>${mockito.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>