Skip to content

Commit e63d7fd

Browse files
erichaagdevmarcusdacoregio
authored andcommitted
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
1 parent 718c470 commit e63d7fd

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

config/spring-security-config.gradle

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -111,26 +111,26 @@ dependencies {
111111
testRuntimeOnly 'org.hsqldb:hsqldb'
112112
}
113113

114-
def versionlessXsd = project.tasks.create("versionlessXsd", CreateVersionlessXsdTask) {
115-
inputFiles.from(project.sourceSets.main.resources)
116-
versionlessXsdFile = project.layout.buildDirectory.file("versionlessXsd/spring-security.xsd")
117-
}
118-
119114
def rncToXsd = tasks.named('rncToXsd', RncToXsd)
120115
rncToXsd.configure {
121116
rncDir = file('src/main/resources/org/springframework/security/config/')
122117
xsdDir = rncDir
123118
xslFile = new File(rncDir, 'spring-security.xsl')
124119
}
125120

121+
def versionlessXsd = tasks.register("versionlessXsd", CreateVersionlessXsdTask) {
122+
inputFiles.from(rncToXsd.map { task -> project.fileTree(task.xsdDir) })
123+
versionlessXsdFile = project.layout.buildDirectory.file("versionlessXsd/spring-security.xsd")
124+
}
125+
126126
tasks.named('processResources', ProcessResources).configure {
127-
from(versionlessXsd) {
128-
into 'org/springframework/security/config/'
129-
}
130-
from(rncToXsd) {
131-
duplicatesStrategy DuplicatesStrategy.EXCLUDE
132-
into 'org/springframework/security/config/'
133-
}
127+
from(versionlessXsd) {
128+
into 'org/springframework/security/config/'
129+
}
130+
from(rncToXsd) {
131+
duplicatesStrategy DuplicatesStrategy.EXCLUDE
132+
into 'org/springframework/security/config/'
133+
}
134134
}
135135

136136
tasks.withType(KotlinCompile).configureEach {

0 commit comments

Comments
 (0)