From 996252f92933d86ff0b35d373f275c42ffe91a6b Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Fri, 30 Jun 2023 08:22:14 +0100
Subject: [PATCH] Stop using deprecated classifier property

Closes gh-36125
---
 spring-boot-project/spring-boot-cli/build.gradle            | 6 +++---
 .../spring-boot-server-tests-app/build.gradle               | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/spring-boot-project/spring-boot-cli/build.gradle b/spring-boot-project/spring-boot-cli/build.gradle
index 45658f4cd2a..ae6e4656adf 100644
--- a/spring-boot-project/spring-boot-cli/build.gradle
+++ b/spring-boot-project/spring-boot-cli/build.gradle
@@ -107,7 +107,7 @@ test {
 
 task fullJar(type: Jar) {
 	dependsOn configurations.loader
-	classifier = "full"
+	archiveClassifier = "full"
 	entryCompression = "stored"
 	from(configurations.runtimeClasspath) {
 		into "BOOT-INF/lib"
@@ -132,7 +132,7 @@ task fullJar(type: Jar) {
 }
 
 def configureArchive(archive) {
-	archive.classifier = "bin"
+	archive.archiveClassifier = "bin"
 	archive.into "spring-${project.version}"
 	archive.from(fullJar) {
 		rename {
@@ -150,7 +150,7 @@ def configureArchive(archive) {
 }
 
 task zip(type: Zip) {
-	classifier = "bin"
+	archiveClassifier = "bin"
 	configureArchive it
 }
 
diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/spring-boot-server-tests-app/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/spring-boot-server-tests-app/build.gradle
index 2b8a58f9478..782dc1ba8df 100644
--- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/spring-boot-server-tests-app/build.gradle
+++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/spring-boot-server-tests-app/build.gradle
@@ -45,7 +45,7 @@ tasks.register("resourcesJar", Jar) { jar ->
 			rename (".*", 'nested-reserved-!#\\$%&()*+,:=?@[]-meta-inf-resource.txt')
 		}
 	}
-	classifier = 'resources'
+	archiveClassifier = 'resources'
 }
 
 dependencies {
@@ -71,7 +71,7 @@ def boolean isWindows() {
 		task.dependsOn resourcesJar
 		task.mainClass = "com.example.ResourceHandlingApplication"
 		task.classpath = sourceSets.main.runtimeClasspath.plus(configurations.getByName(container))
-		task.classifier = container
+		task.archiveClassifier = container
 	}
 	tasks.register("${container}BootJar", BootJar, configurer)
 	tasks.register("${container}BootWar", BootWar, configurer)