-
Notifications
You must be signed in to change notification settings - Fork 43
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.
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
[MBUILDCACHE-106] Missing compile source roots matching 'generated-sources' and 'generated-test-sources' when compiler is skipped #178
base: master
Are you sure you want to change the base?
Conversation
…ted-test-sources' when compiler is skipped
return; | ||
} | ||
Path targetDir = Paths.get(project.getBuild().getDirectory()); | ||
if (outputDir.equals(targetDir.resolve("generated-sources")) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please explain why we need to attach the sources to the project? The cache should not affect the build; it should only restore dependencies. If the build doesn't require these source roots, it doesn't seem correct to attach them.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The bug fixed by this PR can emerge with #177 merged.
If reconciliation is done like proposed in #177, we can have the following situation.
A project uses an annotation processor to generate some java files. A cached entry exists and comes from a verify -DskipTests
. The new build verify
reuses this entry by skipping all plugin executions preceding maven-surefire-plugin
. Among the skipped executions is compiler:compile
. After the tests comes maven-javadoc-plugin
. When maven-javadoc-plugin
runs, the build fails because maven-javadoc-plugin
is unable to find the source files of the compiled generated-sources
.
This is because maven-javadoc-plugin
expects maven-compiler-plugin
to have enriched the maven context with the additional source roots. But since this later was skipped by the cache, additional source roots are missing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's possible that there are multiple generated source roots attached at different levels. The best solution would be to add extra metadata to accurately track and restore all the source roots. Alternatively, it's possible to implement a convention-based restoration by matching the logic in CacheControllerImpl#attachGeneratedSources
to restore all the sources associated with a GENERATED_SOURCE
cache entry. Check this part too:
for (String sourceRoot : sourceRoots) {
final Path sourceRootPath = Paths.get(sourceRoot);
if (Files.isDirectory(sourceRootPath)
&& sourceRootPath.startsWith(targetDir)
&& !(sourceRootPath.startsWith(generatedSourcesDir)
|| sourceRootPath.startsWith(generatedTestSourcesDir))) { // dir within target
attachDirIfNotEmpty(sourceRootPath, targetDir, project);
}
}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The fix should work in a generic case
return; | ||
} | ||
Path targetDir = Paths.get(project.getBuild().getDirectory()); | ||
if (outputDir.equals(targetDir.resolve("generated-sources")) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's possible that there are multiple generated source roots attached at different levels. The best solution would be to add extra metadata to accurately track and restore all the source roots. Alternatively, it's possible to implement a convention-based restoration by matching the logic in CacheControllerImpl#attachGeneratedSources
to restore all the sources associated with a GENERATED_SOURCE
cache entry. Check this part too:
for (String sourceRoot : sourceRoots) {
final Path sourceRootPath = Paths.get(sourceRoot);
if (Files.isDirectory(sourceRootPath)
&& sourceRootPath.startsWith(targetDir)
&& !(sourceRootPath.startsWith(generatedSourcesDir)
|| sourceRootPath.startsWith(generatedTestSourcesDir))) { // dir within target
attachDirIfNotEmpty(sourceRootPath, targetDir, project);
}
}
Following this checklist to help us incorporate your
contribution quickly and easily:
for the change (usually before you start working on it). Trivial changes like typos do not
require a JIRA issue. Your pull request should address just this issue, without
pulling in other changes.
[MBUILDCACHE-XXX] - Fixes bug in ApproximateQuantiles
,where you replace
MBUILDCACHE-XXX
with the appropriate JIRA issue. Best practiceis to use the JIRA issue title in the pull request title and in the first line of the
commit message.
mvn clean verify
to make sure basic checks pass. A more thorough check willbe performed on your pull request automatically.
If your pull request is about ~20 lines of code you don't need to sign an
Individual Contributor License Agreement if you are unsure
please ask on the developers list.
To make clear that you license your contribution under
the Apache License Version 2.0, January 2004
you have to acknowledge this by using the following check-box.
I hereby declare this contribution to be licenced under the Apache License Version 2.0, January 2004
In any other case, please file an Apache Individual Contributor License Agreement.