Skip to content

Make the legacyMode consistent (Filter out all of the module-info.java files in legacy mode, do not use --source-path in legacy mode) #1217

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

Merged
merged 1 commit into from
Jul 20, 2025
Merged

Make the legacyMode consistent (Filter out all of the module-info.java files in legacy mode, do not use --source-path in legacy mode) #1217

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
29 changes: 16 additions & 13 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 @@ -2022,7 +2022,7 @@ protected void executeReport(Locale unusedLocale) throws MavenReportException {
getLog().warn("sourceFileIncludes and sourceFileExcludes have no effect when subpackages are specified!");
includesExcludesActive = false;
}
if (!packageNames.isEmpty() && !includesExcludesActive) {
if (!packageNames.isEmpty() && !includesExcludesActive && !legacyMode) {
addCommandLinePackages(cmd, javadocOutputDirectory, packageNames);

// ----------------------------------------------------------------------
Expand Down Expand Up @@ -2093,23 +2093,26 @@ protected Map<Path, Collection<String>> getFiles(Collection<Path> sourcePaths) t
if (subpackages == null || subpackages.isEmpty()) {
Collection<String> excludedPackages = getExcludedPackages();

final boolean autoExclude;
if (release != null) {
autoExclude = JavaVersion.parse(release).isBefore("9");
} else if (source != null) {
autoExclude = JavaVersion.parse(source).isBefore("9");
} else {
// if legacy mode is active, treat it like pre-Java 9 (exclude module-info),
// otherwise don't auto-exclude anything.
autoExclude = legacyMode;
// if legacy mode is active, treat it like pre-Java 9 (exclude module-info),
// otherwise don't auto-exclude anything. Do this regardless of the release
// or source values specified
boolean autoExclude = legacyMode;
if (!autoExclude) {
if (release != null) {
autoExclude = JavaVersion.parse(release).isBefore("9");
} else if (source != null) {
autoExclude = JavaVersion.parse(source).isBefore("9");
}
}

for (Path sourcePath : sourcePaths) {
File sourceDirectory = sourcePath.toFile();
List<String> files = new ArrayList<>(JavadocUtil.getFilesFromSource(
ArrayList<String> files = new ArrayList<>(JavadocUtil.getFilesFromSource(
sourceDirectory, sourceFileIncludes, sourceFileExcludes, excludedPackages));

if (autoExclude && files.remove("module-info.java")) {
// in the aggregate goal (and theoretically in others too), there can be
// more then one module-info.java. Filter out all of them.
if (autoExclude && files.removeIf(s -> s.endsWith("module-info.java"))) {
getLog().debug("Auto exclude module-info.java due to source value");
}
mappedFiles.put(sourcePath, files);
Expand Down Expand Up @@ -4603,7 +4606,7 @@ private void addJavadocOptions(
}

if (moduleSourceDir == null) {
if (!disableSourcepathUsage) {
if (!disableSourcepathUsage && !legacyMode) {
addArgIfNotEmpty(
arguments,
"-sourcepath",
Expand Down
Loading