diff --git a/build.gradle b/build.gradle index 1355c6da9c2..4e7acf9e103 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,5 @@ import io.spring.gradle.IncludeRepoTask +import trang.RncToXsd buildscript { dependencies { @@ -174,7 +175,7 @@ if (hasProperty('buildScan')) { nohttp { source.exclude "buildSrc/build/**" - + source.builtBy(project(':spring-security-config').tasks.withType(RncToXsd)) } tasks.register('cloneSamples', IncludeRepoTask) { diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle index 2936c19376d..5f6677ef8c4 100644 --- a/config/spring-security-config.gradle +++ b/config/spring-security-config.gradle @@ -1,4 +1,5 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile +import trang.RncToXsd apply plugin: 'io.spring.convention.spring-module' apply plugin: 'trang' @@ -115,13 +116,20 @@ dependencies { testRuntimeOnly 'org.hsqldb:hsqldb' } - -rncToXsd { +tasks.named('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.withType(KotlinCompile).configureEach { kotlinOptions { languageVersion = "1.7" @@ -130,5 +138,3 @@ tasks.withType(KotlinCompile).configureEach { jvmTarget = "17" } } - -build.dependsOn rncToXsd