root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.3.x' into 2.4.x 

Closes gh-25836
This commit is contained in:
Andy Wilkinson 2021-03-30 20:42:29 +01:00
parent 7a846ad41f ca9a619259
commit 38a4f135a9
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-cli/build.gradle
View File

@ -111,8 +111,8 @@ task fullJar(type: Jar) {
from(sourceSets.main.output) {
into "BOOT-INF/classes"
}
into("") {
from(zipTree(configurations.loader.singleFile)) {
from {
zipTree(configurations.loader.singleFile).matching {
exclude "META-INF/LICENSE.txt"
exclude "META-INF/NOTICE.txt"
}

20
spring-boot-project/spring-boot-tools/spring-boot-loader-tools/build.gradle
View File

@ -11,9 +11,11 @@ def generatedResources = "${buildDir}/generated-resources/main"
configurations {
loader {
extendsFrom dependencyManagement
transitive = false
}
jarmode {
extendsFrom dependencyManagement
transitive = false
}
}
@ -40,10 +42,11 @@ sourceSets {
}
task reproducibleLoaderJar(type: Jar) {
dependsOn configurations.loader
from(zipTree(configurations.loader.incoming.files.filter {it.name.startsWith "spring-boot-loader" }.singleFile)) {
exclude "META-INF/LICENSE.txt"
exclude "META-INF/NOTICE.txt"
from {
zipTree(configurations.loader.incoming.files.singleFile).matching {
exclude "META-INF/LICENSE.txt"
exclude "META-INF/NOTICE.txt"
}
}
reproducibleFileOrder = true
preserveFileTimestamps = false
@ -52,10 +55,11 @@ task reproducibleLoaderJar(type: Jar) {
}
task reproducibleJarModeLayerToolsJar(type: Jar) {
dependsOn configurations.jarmode
from(zipTree(configurations.jarmode.incoming.files.filter {it.name.startsWith "spring-boot-jarmode-layertools" }.singleFile)) {
exclude "META-INF/LICENSE.txt"
exclude "META-INF/NOTICE.txt"
from {
zipTree(configurations.jarmode.incoming.files.singleFile).matching {
exclude "META-INF/LICENSE.txt"
exclude "META-INF/NOTICE.txt"
}
}
reproducibleFileOrder = true
preserveFileTimestamps = false

9
spring-boot-project/spring-boot/build.gradle
View File

@ -115,11 +115,12 @@ dependencies {
}
task extractTomcatConfigProperties(type: Sync) {
dependsOn configurations.tomcatDistribution
destinationDir = file(tomcatConfigProperties)
from(zipTree(configurations.tomcatDistribution.incoming.files.singleFile).matching {
include '**/conf/catalina.properties'
}.singleFile)
from {
zipTree(configurations.tomcatDistribution.incoming.files.singleFile).matching {
include '**/conf/catalina.properties'
}.singleFile
}
}
sourceSets {