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
This commit is contained in:
parent
700b711c4b
commit
718c470910
|
@ -116,23 +116,20 @@ 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/'
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue