Merge branch '3.1.x'

Closes gh-36128

spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle

@@ -49,7 +49,7 @@ dependencies {
 
 task fullJar(type: Jar) {
 	dependsOn configurations.loader
-	classifier = "full"
+	archiveClassifier = "full"
 	entryCompression = "stored"
 	from(configurations.runtimeClasspath) {
 		into "BOOT-INF/lib"
@@ -73,7 +73,7 @@ task fullJar(type: Jar) {
 }
 
 def configureArchive(archive) {
-	archive.classifier = "bin"
+	archive.archiveClassifier = "bin"
 	archive.into "spring-${project.version}"
 	archive.from(fullJar) {
 		rename {
@@ -91,7 +91,7 @@ def configureArchive(archive) {
 }
 
 task zip(type: Zip) {
-	classifier = "bin"
+	archiveClassifier = "bin"
 	configureArchive it
 }
 

spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/spring-boot-server-tests-app/build.gradle

@@ -62,7 +62,7 @@ tasks.register("resourcesJar", Jar) { jar ->
 			rename (".*", 'nested-reserved-!#\\$%&()*+,:=?@[]-meta-inf-resource.txt')
 		}
 	}
-	classifier = 'resources'
+	archiveClassifier = 'resources'
 }
 
 dependencies {
@@ -88,7 +88,7 @@ def boolean isWindows() {
 		task.dependsOn resourcesJar
 		task.mainClass = "com.example.ResourceHandlingApplication"
 		task.classpath = configurations.getByName(webServer)
-		task.classifier = webServer
+		task.archiveClassifier = webServer
 		task.targetJavaVersion = project.getTargetCompatibility()
 	}
 	tasks.register("${webServer}BootJar", BootJar, configurer)