Upgrade deps and infra; prepare for release

* Upgrade to Gradle `8.14.2`
* Upgrade to Checkstyle `10.25.0`
* Upgrade Gradle plugins, and project deps to their latest point versions
* Fix Checkstyle violations in the classes

Author: artembilan

build.gradle

@@ -7,7 +7,7 @@ plugins {
 	id 'eclipse'
 	id 'idea'
 	id 'checkstyle'
-	id 'io.spring.dependency-management' version '1.1.6'
+	id 'io.spring.dependency-management' version '1.1.7'
 }
 
 description = 'Spring Integration AWS Support'
@@ -25,17 +25,17 @@ repositories {
 }
 
 ext {
-	awaitilityVersion = '4.2.2'
+	awaitilityVersion = '4.3.0'
 	awsSdkVersion = '2.20.162'
 	jacksonVersion = '2.15.4'
-	junitVersion = '5.11.0'
-	log4jVersion = '2.24.0'
+	junitVersion = '5.11.4'
+	log4jVersion = '2.24.3'
 	servletApiVersion = '6.0.0'
 	springCloudAwsVersion = '3.0.5'
 	springIntegrationVersion = '6.0.9'
 	kinesisClientVersion = '2.5.8'
-	kinesisProducerVersion = '0.15.11'
-	testcontainersVersion = '1.20.1'
+	kinesisProducerVersion = '0.15.12'
+	testcontainersVersion = '1.21.3'
 
 	idPrefix = 'aws'
 
@@ -92,7 +92,7 @@ dependencyManagement {
 
 checkstyle {
 	configDirectory.set(rootProject.file('src/checkstyle'))
-	toolVersion = '10.18.1'
+	toolVersion = '10.25.0'
 }
 
 dependencies {

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionSha256Sum=7197a12f450794931532469d4ff21a59ea2c1cd59a3ec3f89c035c3c420a6999
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id 'io.spring.develocity.conventions' version '0.0.21'
+	id 'io.spring.develocity.conventions' version '0.0.23'
 }
 
 rootProject.name = 'spring-integration-aws'

src/checkstyle/checkstyle.xml

@@ -13,6 +13,7 @@
 		<property name="headerFile" value="${config_loc}/checkstyle-header.txt"/>
 		<property name="fileExtensions" value="java"/>
 	</module>
+
 	<module name="NewlineAtEndOfFile"/>
 
 	<!-- TreeWalker Checks -->
@@ -23,11 +24,11 @@
 			<property name="elementStyle" value="compact"/>
 		</module>
 		<module name="MissingOverride"/>
-		<module name="PackageAnnotation"/>
-		<module name="AnnotationLocation">
-			<property name="allowSamelineSingleParameterlessAnnotation"
-					  value="false"/>
-		</module>
+		<!-- 		<module name="PackageAnnotation" /> -->
+		<!-- 		<module name="AnnotationLocation"> -->
+		<!-- 			<property name="allowSamelineSingleParameterlessAnnotation" -->
+		<!-- 				value="false" /> -->
+		<!-- 		</module> -->
 
 		<!-- Block Checks -->
 		<module name="EmptyBlock">
@@ -52,7 +53,7 @@
 		<module name="CovariantEquals"/>
 		<module name="EmptyStatement"/>
 		<module name="EqualsHashCode"/>
-<!--		<module name="InnerAssignment"/>-->
+		<!-- 		<module name="InnerAssignment" /> -->
 		<module name="SimplifyBooleanExpression"/>
 		<module name="SimplifyBooleanReturn"/>
 		<module name="StringLiteralEquality"/>
@@ -77,14 +78,24 @@
 		<module name="AvoidStaticImport">
 			<property name="excludes"
 					  value="org.assertj.core.api.Assertions.*,
+					  org.xmlunit.assertj3.XmlAssert.*,
 				org.assertj.core.api.Assumptions.*,
+				org.assertj.core.api.InstanceOfAssertFactories.*,
 				org.awaitility.Awaitility.*,
 				org.mockito.Mockito.*,
 				org.mockito.BDDMockito.*,
 				org.mockito.AdditionalAnswers.*,
 				org.mockito.ArgumentMatchers.*,
+				org.mockito.AdditionalMatchers.*,
+				org.springframework.kafka.test.assertj.KafkaConditions.*,
 				org.springframework.integration.test.mock.MockIntegration.*,
-				org.springframework.integration.test.util.TestUtils.*"/>
+				org.springframework.integration.test.util.TestUtils.*,
+				org.springframework.test.web.client.match.MockRestRequestMatchers.*,
+				org.springframework.test.web.client.response.MockRestResponseCreators.*,
+				org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*,
+				org.springframework.test.web.servlet.result.MockMvcResultMatchers.*,
+				org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*,
+				org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.*"/>
 		</module>
 		<module name="IllegalImport"/>
 		<module name="RedundantImport"/>
@@ -102,15 +113,14 @@
 		<!-- Javadoc Comments -->
 		<module name="JavadocType">
 			<property name="scope" value="package"/>
-			<property name="authorFormat" value=".+\s.+"/>
 		</module>
-		<module name="JavadocMethod"/>
-		<module name="JavadocVariable">
+		<!--<module name="JavadocVariable">
 			<property name="scope" value="public"/>
-		</module>
-		<module name="JavadocStyle">
-			<property name="checkEmptyJavadoc" value="true"/>
-		</module>
+			<property name="ignoreNamePattern" value="[A-Z_0-9]*"/>
+		</module>-->
+		<!--<module name="JavadocStyle">
+			<property name="checkEmptyJavadoc" value="false"/>
+		</module>-->
 		<module name="NonEmptyAtclauseDescription"/>
 		<module name="JavadocTagContinuationIndentation">
 			<property name="offset" value="0"/>
@@ -134,6 +144,7 @@
 
 		<!-- Modifiers -->
 		<module name="RedundantModifier"/>
+		<module name="ModifierOrderCheck"/>
 
 		<!-- Regexp -->
 		<module name="RegexpSinglelineJava">
@@ -142,30 +153,31 @@
 					  value="Line has leading space characters; indentation should be performed with tabs only."/>
 			<property name="ignoreComments" value="true"/>
 		</module>
-		<module name="RegexpSinglelineJava">
-			<property name="maximum" value="0"/>
-			<property name="format" value="org\.mockito\..*Mockito\.(when|doThrow|doAnswer)"/>
-			<property name="message"
-					  value="Please use BDDMockito instead of Mockito.(when|doThrow|doAnswer)."/>
-			<property name="ignoreComments" value="true"/>
-		</module>
-		<module name="RegexpSinglelineJava">
-			<property name="maximum" value="0"/>
-			<property name="format" value="org\.junit\.Assert\.assert"/>
-			<property name="message"
-					  value="Please use AssertJ imports."/>
-			<property name="ignoreComments" value="true"/>
-		</module>
+		<!--  		<module name="RegexpSinglelineJava"> -->
+		<!--  			<property name="maximum" value="0"/> -->
+		<!-- 			<property name="format" value="org\.mockito\.Mockito\.(when|doThrow|doAnswer)" /> -->
+		<!-- 			<property name="message" -->
+		<!-- 				value="Please use BDDMockto imports." /> -->
+		<!-- 			<property name="ignoreComments" value="true" /> -->
+		<!-- 		</module> -->
+		<!--  		<module name="RegexpSinglelineJava"> -->
+		<!--  			<property name="maximum" value="0"/> -->
+		<!-- 			<property name="format" value="org\.junit\.Assert\.assert" /> -->
+		<!-- 			<property name="message" -->
+		<!-- 				value="Please use AssertJ imports." /> -->
+		<!-- 			<property name="ignoreComments" value="true" /> -->
+		<!-- 		</module> -->
 		<module name="Regexp">
-			<property name="format" value="[ \t]+$"/>
+			<property name="format" value="System.(out|err).print"/>
 			<property name="illegalPattern" value="true"/>
-			<property name="message" value="Trailing whitespace"/>
+			<property name="message" value="System.out or .err"/>
 		</module>
 		<module name="Regexp">
-			<property name="format" value="System.(out|err).print"/>
+			<property name="format" value="[ \t]+$"/>
 			<property name="illegalPattern" value="true"/>
-			<property name="message" value="System.out or .err"/>
+			<property name="message" value="Trailing whitespace"/>
 		</module>
+
 		<!-- Whitespace -->
 		<module name="GenericWhitespace"/>
 		<module name="MethodParamPad"/>
@@ -177,6 +189,10 @@
 		<module name="TypecastParenPad"/>
 		<module name="WhitespaceAfter"/>
 		<module name="WhitespaceAround"/>
-
+		<module name="EmptyLineSeparator">
+			<property name="tokens"
+					  value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF, COMPACT_CTOR_DEF "/>
+			<property name="allowMultipleEmptyLines" value="false"/>
+		</module>
 	</module>
 </module>

src/main/java/org/springframework/integration/aws/inbound/kinesis/KinesisMessageDrivenChannelAdapter.java

@@ -1644,7 +1644,7 @@ public boolean isLongLived() {
 
 	}
 
-	private final static class LockCompletableFuture extends CompletableFuture<Boolean> {
+	private static final class LockCompletableFuture extends CompletableFuture<Boolean> {
 
 		private final String lockKey;
 

src/main/java/org/springframework/integration/aws/lock/DynamoDbLockRegistry.java

@@ -59,7 +59,6 @@ public DynamoDbLockRegistry(DynamoDbLockRepository dynamoDbLockRepository) {
 		this.dynamoDbLockRepository = dynamoDbLockRepository;
 	}
 
-
 	/**
 	 * Specify a {@link Duration} to sleep between lock record insert/update attempts.
 	 * Defaults to 100 milliseconds.

src/test/java/org/springframework/integration/aws/kinesis/KclMessageDrivenChannelAdapterTests.java

@@ -76,7 +76,9 @@
 public class KclMessageDrivenChannelAdapterTests implements LocalstackContainerTest {
 
 	private static final String TEST_STREAM = "TestStreamKcl";
+
 	public static final String LEASE_TABLE_NAME = "test_table";
+
 	public static final String TEST_DATA = "test data";
 
 	private static KinesisAsyncClient AMAZON_KINESIS;
@@ -236,6 +238,7 @@ public KclMessageDrivenChannelAdapter kclMessageDrivenChannelAdapter(PollableCha
 		public PollableChannel kinesisReceiveChannel() {
 			return new QueueChannel();
 		}
+
 	}
 
 	private static CompletableFuture<WaiterResponse<DescribeStreamResponse>> initialiseStream(String streamName) {
@@ -277,4 +280,5 @@ private static CompletableFuture<PutItemResponse> initialiseLeaseTableFor(String
 						))
 						.build()));
 	}
+
 }