From e63d7fd9e96572048fdae1b9513802b25ae56660 Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Mon, 18 Sep 2023 14:17:46 -0500 Subject: [PATCH] Add dependency between rncToXsd and versionlessXsd Since processResources is configured directly instead of via the source set container, an explicit dependency task between rncToXsd and versionlessXsd must be defined. Issue gh-13845 --- config/spring-security-config.gradle | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle index 37e77602a3..16f71d5a68 100644 --- a/config/spring-security-config.gradle +++ b/config/spring-security-config.gradle @@ -111,11 +111,6 @@ dependencies { testRuntimeOnly 'org.hsqldb:hsqldb' } -def versionlessXsd = project.tasks.create("versionlessXsd", CreateVersionlessXsdTask) { - inputFiles.from(project.sourceSets.main.resources) - versionlessXsdFile = project.layout.buildDirectory.file("versionlessXsd/spring-security.xsd") -} - def rncToXsd = tasks.named('rncToXsd', RncToXsd) rncToXsd.configure { rncDir = file('src/main/resources/org/springframework/security/config/') @@ -123,14 +118,19 @@ rncToXsd.configure { xslFile = new File(rncDir, 'spring-security.xsl') } +def versionlessXsd = tasks.register("versionlessXsd", CreateVersionlessXsdTask) { + inputFiles.from(rncToXsd.map { task -> project.fileTree(task.xsdDir) }) + versionlessXsdFile = project.layout.buildDirectory.file("versionlessXsd/spring-security.xsd") +} + tasks.named('processResources', ProcessResources).configure { - from(versionlessXsd) { - into 'org/springframework/security/config/' - } - from(rncToXsd) { - duplicatesStrategy DuplicatesStrategy.EXCLUDE - into 'org/springframework/security/config/' - } + from(versionlessXsd) { + into 'org/springframework/security/config/' + } + from(rncToXsd) { + duplicatesStrategy DuplicatesStrategy.EXCLUDE + into 'org/springframework/security/config/' + } } tasks.withType(KotlinCompile).configureEach {