mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-10-03 13:39:34 +00:00
Improve XJC configuration for spring-oxm in the Gradle build
Closes gh-36195
Signed-off-by: Clayton Walker <clayton.m.walker@gmail.com>
(cherry picked from commit e102bc4933)
This commit is contained in:
committed by
Sam Brannen
parent
b4646ce9b4
commit
15c82d558d
@@ -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 })
|
||||
|
||||
Reference in New Issue
Block a user