Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Closes gh-36128
This commit is contained in:
Andy Wilkinson 2023-06-30 08:26:26 +01:00
commit 6d8ca7286a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-tools/spring-boot-cli/build.gradle
View File

@ -49,7 +49,7 @@ dependencies {
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"
@ -73,7 +73,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 {
@ -91,7 +91,7 @@ def configureArchive(archive) {
} }
task zip(type: Zip) { task zip(type: Zip) {
classifier = "bin" archiveClassifier = "bin"
configureArchive it configureArchive it
} }

4
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/spring-boot-server-tests-app/build.gradle
View File

@ -62,7 +62,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 {
@ -88,7 +88,7 @@ def boolean isWindows() {
task.dependsOn resourcesJar task.dependsOn resourcesJar
task.mainClass = "com.example.ResourceHandlingApplication" task.mainClass = "com.example.ResourceHandlingApplication"
task.classpath = configurations.getByName(webServer) task.classpath = configurations.getByName(webServer)
task.classifier = webServer task.archiveClassifier = webServer
task.targetJavaVersion = project.getTargetCompatibility() task.targetJavaVersion = project.getTargetCompatibility()
} }
tasks.register("${webServer}BootJar", BootJar, configurer) tasks.register("${webServer}BootJar", BootJar, configurer)