Fix spring-oxm Gradle build when configuration cache is enabled #36195
+7
−11
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Existing solution used a filter to remove the generated sources from the main source set, but we shouldn't have xjc sources on main at all. This also still leaves the sources associated with main, just excluded. Additionally, this code relies on the
xjctask already being a dependency ofcompileJava, configuring sources when thexjctask is realized.We can work around this by resetting the main and resources source sets to their standard dirs.
Once we've done that, we can hook up the output (here
flatMaped out from the generation task) so that the output directories are properly associated with the task that generates them.This simplifies the overall configuration and enables the use of configuration-cache for test compile and debug tasks.