diff --git a/build.gradle b/build.gradle
index 252cd9fd66..32a379c25a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -108,16 +108,16 @@ ext {
     rsocketVersion = '1.1.5'
     servletApiVersion = '6.0.0'
     smackVersion = '4.4.8'
-    springAmqpVersion = '3.2.2'
+    springAmqpVersion = '3.2.3'
     springDataVersion = '2024.1.3'
-    springGraphqlVersion = '1.3.3'
-    springKafkaVersion = '3.3.2'
+    springGraphqlVersion = '1.3.4'
+    springKafkaVersion = '3.3.3'
     springRetryVersion = '2.0.11'
-    springSecurityVersion = '6.4.2'
+    springSecurityVersion = '6.4.3'
     springVersion = '6.2.3'
     springWsVersion = '4.0.11'
     testcontainersVersion = '1.20.4'
-    tomcatVersion = '10.1.35'
+    tomcatVersion = '10.1.36'
     xmlUnitVersion = '2.10.0'
     xstreamVersion = '1.4.21'
     ztZipVersion = '1.17'
@@ -233,6 +233,9 @@ configure(javaProjects) { subproject ->
     }
 
     java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(17)
+        }
         withJavadocJar()
         withSourcesJar()
         registerFeature('optional') {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fb602ee2af..d71047787f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index f5feea6d6b..f3b75f3b0d 100755
--- a/gradlew
+++ b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/settings.gradle b/settings.gradle
index e017200c2f..451d8d3992 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -7,6 +7,7 @@ pluginManagement {
 
 plugins {
 	id 'io.spring.develocity.conventions' version '0.0.22'
+	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
 }
 
 rootProject.name = 'spring-integration'