Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.8.x' into 6.0.x

This commit is contained in:
Marcus Da Coregio 2023-09-13 14:23:01 +01:00
parent f03224fe7f f026e29771
commit 48babb7efa
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.gradle
View File

@ -1,4 +1,5 @@
import io.spring.gradle.IncludeRepoTask import io.spring.gradle.IncludeRepoTask
import trang.RncToXsd
buildscript { buildscript {
dependencies { dependencies {
@ -174,7 +175,7 @@ if (hasProperty('buildScan')) {
nohttp { nohttp {
source.exclude "buildSrc/build/**" source.exclude "buildSrc/build/**"
source.builtBy(project(':spring-security-config').tasks.withType(RncToXsd))
} }
tasks.register('cloneSamples', IncludeRepoTask) { tasks.register('cloneSamples', IncludeRepoTask) {

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

@ -1,4 +1,5 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import trang.RncToXsd
apply plugin: 'io.spring.convention.spring-module' apply plugin: 'io.spring.convention.spring-module'
apply plugin: 'trang' apply plugin: 'trang'
@ -115,12 +116,20 @@ dependencies {
} }
rncToXsd { 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 {
main {
resources {
srcDir(tasks.named('rncToXsd'))
}
}
}
tasks.withType(KotlinCompile).configureEach { tasks.withType(KotlinCompile).configureEach {
kotlinOptions { kotlinOptions {
languageVersion = "1.7" languageVersion = "1.7"
@ -129,5 +138,3 @@ tasks.withType(KotlinCompile).configureEach {
jvmTarget = "17" jvmTarget = "17"
} }
} }
build.dependsOn rncToXsd