Skip to content

Commit 93f8bd2

Browse files
committed
Merge branch '2.7.x' into 3.0.x
Closes gh-36126
2 parents 884489e + 996252f commit 93f8bd2

File tree

2 files changed

+5
-5
lines changed
  • spring-boot-project/spring-boot-tools/spring-boot-cli
  • spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/spring-boot-server-tests-app

2 files changed

+5
-5
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ dependencies {
5151

5252
task fullJar(type: Jar) {
5353
dependsOn configurations.loader
54-
classifier = "full"
54+
archiveClassifier = "full"
5555
entryCompression = "stored"
5656
from(configurations.runtimeClasspath) {
5757
into "BOOT-INF/lib"
@@ -75,7 +75,7 @@ task fullJar(type: Jar) {
7575
}
7676

7777
def configureArchive(archive) {
78-
archive.classifier = "bin"
78+
archive.archiveClassifier = "bin"
7979
archive.into "spring-${project.version}"
8080
archive.from(fullJar) {
8181
rename {
@@ -93,7 +93,7 @@ def configureArchive(archive) {
9393
}
9494

9595
task zip(type: Zip) {
96-
classifier = "bin"
96+
archiveClassifier = "bin"
9797
configureArchive it
9898
}
9999

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ tasks.register("resourcesJar", Jar) { jar ->
6262
rename (".*", 'nested-reserved-!#\\$%&()*+,:=?@[]-meta-inf-resource.txt')
6363
}
6464
}
65-
classifier = 'resources'
65+
archiveClassifier = 'resources'
6666
}
6767

6868
dependencies {
@@ -88,7 +88,7 @@ def boolean isWindows() {
8888
task.dependsOn resourcesJar
8989
task.mainClass = "com.example.ResourceHandlingApplication"
9090
task.classpath = configurations.getByName(webServer)
91-
task.classifier = webServer
91+
task.archiveClassifier = webServer
9292
task.targetJavaVersion = project.getTargetCompatibility()
9393
}
9494
tasks.register("${webServer}BootJar", BootJar, configurer)

0 commit comments

Comments
 (0)