Merge branch '2.7.x' into 3.0.x

Closes gh-36126
This commit is contained in:
Andy Wilkinson 2023-06-30 08:25:53 +01:00
commit 93f8bd2170
2 changed files with 5 additions and 5 deletions

View File

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

View File

@ -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)