Skip to content

Fix spring-oxm Gradle build when configuration cache is enabled #36195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Sineaggi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix spring-oxm Gradle build when configuration cache is enabled #36195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions spring-oxm/spring-oxm.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import com.github.bjornvester.xjc.XjcTask

plugins {
id "com.github.bjornvester.xjc"
}
Expand Down Expand Up @@ -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 })