This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MJAVADOC-634 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit 04f94fdcb5d04ef4285021cb3c2df78bc490ed11 Author: rfscholte <[email protected]> AuthorDate: Fri Apr 30 09:21:00 2021 +0200 Optimize content package file --- .../org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java index 1738079..bc75193 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -2046,7 +2046,7 @@ public abstract class AbstractJavadocMojo } setFJavadocVersion( new File( jExecutable ) ); - List<String> packageNames; + Collection<String> packageNames; if ( javadocRuntimeVersion.isAtLeast( "9" ) ) { packageNames = getPackageNamesRespectingJavaModules( sourcePaths ); @@ -4519,16 +4519,15 @@ public abstract class AbstractJavadocMojo * @see #getFiles * @see #getSourcePaths() */ - private List<String> getPackageNamesRespectingJavaModules( Collection<JavadocModule> javadocModules ) + private Collection<String> getPackageNamesRespectingJavaModules( Collection<JavadocModule> javadocModules ) throws MavenReportException { - List<String> returnList = new ArrayList<>(); - if ( !StringUtils.isEmpty( sourcepath ) ) { - return returnList; + return Collections.emptyList(); } + Set<String> returnList = new LinkedHashSet<>(); for ( JavadocModule javadocModule : javadocModules ) { Collection<Path> artifactSourcePaths = javadocModule.getSourcePaths(); @@ -4796,7 +4795,7 @@ public abstract class AbstractJavadocMojo * Reference Guide, Command line argument files</a> * @see #PACKAGES_FILE_NAME */ - private void addCommandLinePackages( Commandline cmd, File javadocOutputDirectory, List<String> packageNames ) + private void addCommandLinePackages( Commandline cmd, File javadocOutputDirectory, Collection<String> packageNames ) throws MavenReportException { File packagesFile = new File( javadocOutputDirectory, PACKAGES_FILE_NAME );
