Skip to content

Fix incremental build losing output under excludedocfilessubdir #1346

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
delanym wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix incremental build losing output under excludedocfilessubdir #1346

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
11 changes: 5 additions & 6 deletions src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1936,12 +1936,6 @@ protected void executeReport(Locale unusedLocale) throws MavenReportException {
}
javadocOutputDirectory.mkdirs();

// ----------------------------------------------------------------------
// Copy all resources
// ----------------------------------------------------------------------

copyAllResources(javadocOutputDirectory);

// ----------------------------------------------------------------------
// Create command line for Javadoc
// ----------------------------------------------------------------------
Expand Down Expand Up @@ -4971,12 +4965,17 @@ private void addTagletsFromTagletArtifacts(List<String> arguments) throws MavenR
* @throws MavenReportException if any errors occur
*/
private void executeJavadocCommandLine(Commandline cmd, File javadocOutputDirectory) throws MavenReportException {
// Resources must be copied only when Javadoc is actually (re)generated. copyAllResources removes
// excluded doc-file subdirectories from the output directory; if it ran while generation was skipped
// as up to date, those files would be deleted without being regenerated, leaving the output incomplete.
if (staleDataPath != null) {
if (!isUpToDate(cmd)) {
copyAllResources(javadocOutputDirectory);
doExecuteJavadocCommandLine(cmd, javadocOutputDirectory);
StaleHelper.writeStaleData(cmd, staleDataPath.toPath());
}
} else {
copyAllResources(javadocOutputDirectory);
doExecuteJavadocCommandLine(cmd, javadocOutputDirectory);
}
}
Expand Down