Browse Source

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
pull/13885/head
Eric Haag 2 years ago committed by Marcus Da Coregio
parent
commit
e63d7fd9e9
  1. 10
      config/spring-security-config.gradle

10
config/spring-security-config.gradle

@ -111,11 +111,6 @@ dependencies {
testRuntimeOnly 'org.hsqldb:hsqldb' 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) def rncToXsd = tasks.named('rncToXsd', RncToXsd)
rncToXsd.configure { rncToXsd.configure {
rncDir = file('src/main/resources/org/springframework/security/config/') rncDir = file('src/main/resources/org/springframework/security/config/')
@ -123,6 +118,11 @@ rncToXsd.configure {
xslFile = new File(rncDir, 'spring-security.xsl') 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 { tasks.named('processResources', ProcessResources).configure {
from(versionlessXsd) { from(versionlessXsd) {
into 'org/springframework/security/config/' into 'org/springframework/security/config/'

Loading…
Cancel
Save