Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-25 21:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.0.x' into 6.1.x

Browse Source
This commit is contained in:
Marcus Da Coregio 2023-09-19 14:20:17 +01:00
commit 94bba79834
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
config/spring-security-config.gradle
View File

@ -117,28 +117,32 @@ dependencies {
testRuntimeOnly 'org.hsqldb:hsqldb' testRuntimeOnly 'org.hsqldb:hsqldb'
} }
def versionlessXsd = project.tasks.create("versionlessXsd", CreateVersionlessXsdTask) { def rncToXsd = tasks.named('rncToXsd', RncToXsd)
inputFiles.from(project.sourceSets.main.resources) rncToXsd.configure {
versionlessXsdFile = project.layout.buildDirectory.file("versionlessXsd/spring-security.xsd")
}
processResources {
from(versionlessXsd) {
into 'org/springframework/security/config/'
}
}
tasks.named('rncToXsd', RncToXsd).configure {
rncDir = file('src/main/resources/org/springframework/security/config/') rncDir = file('src/main/resources/org/springframework/security/config/')
xsdDir = rncDir xsdDir = rncDir
xslFile = new File(rncDir, 'spring-security.xsl') xslFile = new File(rncDir, 'spring-security.xsl')
} }
sourceSets { def versionlessXsd = tasks.register("versionlessXsd", CreateVersionlessXsdTask) {
main { inputFiles.from(rncToXsd.map { task -> project.fileTree(task.xsdDir) })
resources { versionlessXsdFile = project.layout.buildDirectory.file("versionlessXsd/spring-security.xsd")
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.named('sourcesJar', Jar).configure {
from(rncToXsd) {
duplicatesStrategy DuplicatesStrategy.EXCLUDE
into 'org/springframework/security/config/'
} }
} }