Merge branch '6.2.x'

.github/actions/build/action.yml

@@ -19,7 +19,7 @@ inputs:
   java-version:
     description: 'Java version to compile and test with'
     required: false
-    default: '17'
+    default: '24'
   publish:
     description: 'Whether to publish artifacts ready for deployment to Artifactory'
     required: false

settings.gradle

@@ -1,6 +1,5 @@
 plugins {
 	id "io.spring.develocity.conventions" version "0.0.22"
-	id "org.gradle.toolchains.foojay-resolver-convention" version "0.9.0"
 }
 
 include "spring-aop"