Merge branch '2.5.x' into 2.6.x

Closes gh-29685
spring-projects · Feb 9, 2022 · c0664ef · c0664ef
2 parents 358cdb3 + 3a5bf49
commit c0664ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...s/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-and-jar-classifiers.gradle b/...s/spring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-and-jar-classifiers.gradle
@@ -5,11 +5,11 @@ plugins {
 
 // tag::classifiers[]
 bootJar {
-	classifier = 'boot'
+	archiveClassifier = 'boot'
 }
 
 jar {
-	classifier = ''
+	archiveClassifier = ''
 }
 // end::classifiers[]
 

diff --git a/...ring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-and-jar-classifiers.gradle.kts b/...ring-boot-gradle-plugin/src/docs/gradle/packaging/boot-jar-and-jar-classifiers.gradle.kts
@@ -7,11 +7,11 @@ plugins {
 
 // tag::classifiers[]
 tasks.getByName<BootJar>("bootJar") {
-	classifier = "boot"
+	archiveClassifier.set("boot")
 }
 
 tasks.getByName<Jar>("jar") {
-	classifier = ""
+	archiveClassifier.set("")
 }
 // end::classifiers[]