From 718c470910fd070f69556148337b05065347b7c6 Mon Sep 17 00:00:00 2001 From: Eric Haag Date: Mon, 18 Sep 2023 14:07:24 -0500 Subject: [PATCH] Prevent creating duplicate .xsd entries This change removes .xsd entries that would appear in the top level of the assembled artifacts. This occurred because the output of the rncToXsd task does not consider the path beneath the resources directory. To fix this, the processResources task is directly configured with a copy spec so the required path can be set. Issue gh-13845 --- config/spring-security-config.gradle | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle index 255c9f0cfe..37e77602a3 100644 --- a/config/spring-security-config.gradle +++ b/config/spring-security-config.gradle @@ -116,24 +116,21 @@ def versionlessXsd = project.tasks.create("versionlessXsd", CreateVersionlessXsd versionlessXsdFile = project.layout.buildDirectory.file("versionlessXsd/spring-security.xsd") } -processResources { - from(versionlessXsd) { - into 'org/springframework/security/config/' - } -} - -tasks.named('rncToXsd', RncToXsd).configure { +def rncToXsd = tasks.named('rncToXsd', RncToXsd) +rncToXsd.configure { rncDir = file('src/main/resources/org/springframework/security/config/') xsdDir = rncDir xslFile = new File(rncDir, 'spring-security.xsl') } -sourceSets { - main { - resources { - srcDir(tasks.named('rncToXsd')) - } - } +tasks.named('processResources', ProcessResources).configure { + from(versionlessXsd) { + into 'org/springframework/security/config/' + } + from(rncToXsd) { + duplicatesStrategy DuplicatesStrategy.EXCLUDE + into 'org/springframework/security/config/' + } } tasks.withType(KotlinCompile).configureEach {