Merge branch '3.1.x'

Closes gh-38233

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-productionRuntimeClasspathIsConfiguredWithAttributes.gradle

@@ -1,16 +0,0 @@
-plugins {
-	id 'org.springframework.boot' version '{version}'
-	id 'java'
-}
-
-springBoot {
-	mainClass = "com.example.Main"
-}
-
-gradle.taskGraph.whenReady {
-	def attributes = configurations.findByName('productionRuntimeClasspath').attributes
-	println "${attributes.keySet().size()} productionRuntimeClasspath attributes:"		
-	attributes.keySet().each { attribute ->
-		println "    ${attribute}: ${attributes.getAttribute(attribute)}" 
-	}
-}

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/resources/org/springframework/boot/gradle/plugin/JavaPluginActionIntegrationTests-productionRuntimeClasspathIsConfiguredWithAttributesThatMatchRuntimeClasspath.gradle

@@ -0,0 +1,22 @@
+def collectAttributes(String configurationName) {
+	def attributes = configurations.findByName(configurationName).attributes
+	def keys = new TreeSet<>((a1, a2) -> a1.name.compareTo(a2.name))
+	keys.addAll(attributes.keySet())
+	keys.collect { key -> "${key}: ${attributes.getAttribute(key)}" }
+}
+
+plugins {
+	id 'org.springframework.boot' version '{version}'
+	id 'java'
+}
+
+springBoot {
+	mainClass = "com.example.Main"
+}
+
+gradle.taskGraph.whenReady {
+	def runtimeClasspathAttributes = collectAttributes("runtimeClasspath")
+	def productionRuntimeClasspathAttributes = collectAttributes("productionRuntimeClasspath")
+	println("runtimeClasspath: ${runtimeClasspathAttributes}")
+	println("productionRuntimeClasspath: ${productionRuntimeClasspathAttributes}")
+}