Various upgrades for version 6.1

* Upgrade to Gradle `8.0.1`
* Upgrade to Kotlin `1.8`
* Some other libs updates
* Resolve some compatible TODOs

Author: artembilan

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlinVersion = '1.7.21'
+    ext.kotlinVersion = '1.8.10'
     ext.isCI = System.getenv('GITHUB_ACTION') || System.getenv('bamboo_buildKey')
     repositories {
         gradlePluginPortal()
@@ -49,13 +49,13 @@ ext {
             files(grgit.status().unstaged.modified).filter { f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
 
     apacheSshdVersion = '2.9.2'
-    artemisVersion = '2.27.1'
+    artemisVersion = '2.28.0'
     aspectjVersion = '1.9.19'
     assertjVersion = '3.24.2'
     assertkVersion = '0.25'
     avroVersion = '1.11.1'
     awaitilityVersion = '4.2.0'
-    camelVersion = '3.20.1'
+    camelVersion = '3.20.2'
     commonsDbcp2Version = '2.9.0'
     commonsIoVersion = '2.11.0'
     commonsNetVersion = '3.9.0'
@@ -77,7 +77,7 @@ ext {
     jeroMqVersion = '0.5.3'
     jmsApiVersion = '3.1.0'
     jpaApiVersion = '3.1.0'
-    jrubyVersion = '9.3.10.0'
+    jrubyVersion = '9.4.1.0'
     jsonpathVersion = '2.7.0'
     junit4Version = '4.13.2'
     junitJupiterVersion = '5.9.2'
@@ -87,27 +87,26 @@ ext {
     lettuceVersion = '6.2.3.RELEASE'
     log4jVersion = '2.19.0'
     mailVersion = '1.0.0'
-    micrometerPropagationVersion = '1.1.0-M2'
     micrometerTracingVersion = '1.1.0-M1'
     micrometerVersion = '1.11.0-M1'
     mockitoVersion = '5.1.1'
-    mongoDriverVersion = '4.8.2'
+    mongoDriverVersion = '4.9.0'
     mysqlVersion = '8.0.32'
     pahoMqttClientVersion = '1.2.5'
-    postgresVersion = '42.5.2'
+    postgresVersion = '42.5.4'
     r2dbch2Version = '1.0.0.RELEASE'
     reactorVersion = '2022.0.3'
     resilience4jVersion = '2.0.2'
     romeToolsVersion = '1.18.0'
     rsocketVersion = '1.1.3'
     servletApiVersion = '6.0.0'
     smackVersion = '4.4.6'
-    springAmqpVersion = '3.0.2-SNAPSHOT'
-    springDataVersion = '2023.0.0-SNAPSHOT'
-    springGraphqlVersion = '1.1.2-SNAPSHOT'
-    springKafkaVersion = '3.0.3-SNAPSHOT'
+    springAmqpVersion = '3.0.2'
+    springDataVersion = '2023.0.0-M2'
+    springGraphqlVersion = '1.1.2'
+    springKafkaVersion = '3.0.3'
     springRetryVersion = '2.0.0'
-    springSecurityVersion = '6.1.0-SNAPSHOT'
+    springSecurityVersion = '6.1.0-M1'
     springVersion = '6.0.5'
     springWsVersion = '4.0.1'
     testcontainersVersion = '1.17.6'
@@ -230,6 +229,7 @@ configure(javaProjects) { subproject ->
     }
     compileTestKotlin {
         kotlinOptions {
+            languageVersion = '1.8'
             freeCompilerArgs = ['-Xjsr305=strict', '-opt-in=kotlin.RequiresOptIn']
         }
     }
@@ -328,9 +328,9 @@ configure(javaProjects) { subproject ->
 
     jacocoTestReport {
         reports {
-            xml.enabled true
-            csv.enabled false
-            html.enabled false
+            xml.required = true
+            csv.required = false
+            html.required = false
             xml.destination file("${buildDir}/reports/jacoco/test/jacocoTestReport.xml")
         }
     }

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionSha256Sum=1b6b558be93f29438d3df94b7dfee02e794b94d9aca4611a92cdb79b6b88e909
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b

gradle/wrapper/gradle-wrapper.properties

@@ -144,15 +144,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac

gradlew

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -123,11 +123,6 @@ public enum BatchMode {
 
 	private BatchMode batchMode = BatchMode.MESSAGES;
 
-	// TODO Remove in 6.0
-	public AmqpInboundChannelAdapter(AbstractMessageListenerContainer listenerContainer) {
-		this((MessageListenerContainer) listenerContainer);
-	}
-
 	/**
 	 * Construct an instance using the provided container.
 	 * @param listenerContainer the container.

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundChannelAdapter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -101,19 +101,6 @@ public AmqpInboundGateway(AbstractMessageListenerContainer listenerContainer) {
 		this(listenerContainer, new RabbitTemplate(listenerContainer.getConnectionFactory()), false);
 	}
 
-	// TODO Remove in 6.0
-
-	/**
-	 * Construct {@link AmqpInboundGateway} based on the provided {@link AbstractMessageListenerContainer}
-	 * to receive request messages and {@link AmqpTemplate} to send replies.
-	 * @param listenerContainer the {@link MessageListenerContainer} to receive AMQP messages.
-	 * @param amqpTemplate the {@link AmqpTemplate} to send reply messages.
-	 * @since 4.2
-	 */
-	public AmqpInboundGateway(AbstractMessageListenerContainer listenerContainer, AmqpTemplate amqpTemplate) {
-		this((MessageListenerContainer) listenerContainer, amqpTemplate);
-	}
-
 	/**
 	 * Construct {@link AmqpInboundGateway} based on the provided {@link MessageListenerContainer}
 	 * to receive request messages and {@link AmqpTemplate} to send replies.

spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,11 +47,6 @@ class KotlinRouterSpec<K, R : AbstractMappingMessageRouter>(override val delegat
 		this.delegate.suffix(suffix)
 	}
 
-	@Deprecated(message = "Since 6.0", replaceWith = ReplaceWith("channelKeyFallback(false)"))
-	fun noChannelKeyFallback() {
-		channelKeyFallback(false)
-	}
-
 	fun channelKeyFallback(channelKeyFallback: Boolean) {
 		this.delegate.channelKeyFallback(channelKeyFallback)
 	}