Merge branch '3.4.x'

Closes gh-45193
This commit is contained in:
Phillip Webb
2025-04-14 16:18:50 -07:00
41 changed files with 92 additions and 92 deletions

View File

@@ -39,7 +39,7 @@ dependencies {
testImplementation("org.zeroturnaround:zt-zip:1.13")
}
task reproducibleLoaderJar(type: Jar) {
tasks.register("reproducibleLoaderJar", Jar) {
dependsOn configurations.loader
from {
zipTree(configurations.loader.incoming.files.singleFile).matching {
@@ -54,7 +54,7 @@ task reproducibleLoaderJar(type: Jar) {
destinationDirectory = file(generatedResources.map {it.dir("META-INF/loader") })
}
task reproducibleLoaderClassicJar(type: Jar) {
tasks.register("reproducibleLoaderClassicJar", Jar) {
dependsOn configurations.loaderClassic
from {
zipTree(configurations.loaderClassic.incoming.files.singleFile).matching {
@@ -69,7 +69,7 @@ task reproducibleLoaderClassicJar(type: Jar) {
destinationDirectory = file(generatedResources.map { it.dir("META-INF/loader") })
}
task toolsJar(type: Sync) {
tasks.register("toolsJar", Sync) {
dependsOn configurations.jarmode
from {
file(configurations.jarmode.incoming.files.singleFile)