Merge branch '2.7.x'

Closes gh-33714

settings.gradle

@@ -2,9 +2,6 @@ pluginManagement {
 	repositories {
 		mavenCentral()
 		gradlePluginPortal()
-		maven {
-			url 'https://repo.spring.io/release'
-		}
 		if (version.endsWith('-SNAPSHOT')) {
 			maven { url "https://repo.spring.io/snapshot" }
 		}
@@ -23,7 +20,7 @@ pluginManagement {
 
 plugins {
 	id "com.gradle.enterprise" version "3.12.1"
-	id "io.spring.ge.conventions" version "0.0.12"
+	id "io.spring.ge.conventions" version "0.0.13"
 }
 
 rootProject.name="spring-boot-build"