Stop using deprecated classifier property

Closes gh-36125
pull/36620/head
Andy Wilkinson 1 year ago
parent 9e1f2c4257
commit 996252f929

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

@ -45,7 +45,7 @@ tasks.register("resourcesJar", Jar) { jar ->
rename (".*", 'nested-reserved-!#\\$%&()*+,:=?@[]-meta-inf-resource.txt') rename (".*", 'nested-reserved-!#\\$%&()*+,:=?@[]-meta-inf-resource.txt')
} }
} }
classifier = 'resources' archiveClassifier = 'resources'
} }
dependencies { dependencies {
@ -71,7 +71,7 @@ def boolean isWindows() {
task.dependsOn resourcesJar task.dependsOn resourcesJar
task.mainClass = "com.example.ResourceHandlingApplication" task.mainClass = "com.example.ResourceHandlingApplication"
task.classpath = sourceSets.main.runtimeClasspath.plus(configurations.getByName(container)) task.classpath = sourceSets.main.runtimeClasspath.plus(configurations.getByName(container))
task.classifier = container task.archiveClassifier = container
} }
tasks.register("${container}BootJar", BootJar, configurer) tasks.register("${container}BootJar", BootJar, configurer)
tasks.register("${container}BootWar", BootWar, configurer) tasks.register("${container}BootWar", BootWar, configurer)

Loading…
Cancel
Save