Merge branch '6.2.x'

sdeleuze · sdeleuze · commit 9505e768ae34 · 2025-06-06T18:21:24.000+02:00
diff --git a/.github/actions/build/action.yml b/.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
diff --git a/settings.gradle b/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"

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id "io.spring.develocity.conventions" version "0.0.22"`
`3`		`- id "org.gradle.toolchains.foojay-resolver-convention" version "0.9.0"`
`4`	`3`	`}`
`5`	`4`
`6`	`5`	`include "spring-aop"`