From d71c65e9f8932dc848fe297dfcd444d5a364c9c6 Mon Sep 17 00:00:00 2001 From: Clayton Walker Date: Thu, 22 Jan 2026 09:43:05 -0700 Subject: [PATCH] Fix spring-xml when configuration-cache is enabled Signed-off-by: Clayton Walker --- spring-oxm/spring-oxm.gradle | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle index dea37ac797e1..1ddbace20202 100644 --- a/spring-oxm/spring-oxm.gradle +++ b/spring-oxm/spring-oxm.gradle @@ -1,3 +1,5 @@ +import com.github.bjornvester.xjc.XjcTask + plugins { id "com.github.bjornvester.xjc" } @@ -26,14 +28,8 @@ dependencies { testRuntimeOnly("com.sun.xml.bind:jaxb-impl") } -tasks.named("xjc").configure { xjc -> - // XJC plugin only works against main sources, so we have to "move" them to test sources. - sourceSets.main.java.exclude { - it.file.absolutePath.startsWith(outputJavaDir.get().asFile.absolutePath) - } - sourceSets.main.resources.exclude { - it.file.absolutePath.startsWith(outputResourcesDir.get().asFile.absolutePath) - } - sourceSets.test.java.srcDir(xjc.outputJavaDir) - sourceSets.test.resources.srcDir(xjc.outputResourcesDir) -} +// XJC plugin adds generated code to main source set, but we need it only for tests +sourceSets.main.java.setSrcDirs(["src/main/java"]) +sourceSets.main.resources.setSrcDirs(["src/main/resources"]) +sourceSets.test.java.srcDir(tasks.named("xjc", XjcTask).flatMap { it.outputJavaDir }) +sourceSets.test.resources.srcDir(tasks.named("xjc", XjcTask).flatMap { it.outputResourcesDir })