This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MJAVADOC-618 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git
commit e86301ed09833aaac983cd18a27ba53a1f6be11e Author: rfscholte <[email protected]> AuthorDate: Sun Aug 29 12:35:20 2021 +0200 Adjust file separator and adjust verify script --- src/it/projects/MJAVADOC-618_modular-war/verify.groovy | 5 +++-- .../java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/it/projects/MJAVADOC-618_modular-war/verify.groovy b/src/it/projects/MJAVADOC-618_modular-war/verify.groovy index 519f0e1..d665081 100644 --- a/src/it/projects/MJAVADOC-618_modular-war/verify.groovy +++ b/src/it/projects/MJAVADOC-618_modular-war/verify.groovy @@ -17,6 +17,7 @@ * under the License. */ -assert new File( basedir, 'target/apidocs/argfile').readLines().size() == 4 +assert new File( basedir, 'target/apidocs/argfile').readLines().size() == 2 assert new File( basedir, 'target/apidocs/com.mycompany.lib/com/mycompany/lib/Library.html').exists() -assert new File( basedir, 'target/apidocs/com.mycompany.app/com/mycompany/app/Application.html').exists() +// module descriptor of com.mycompany.app has no exports, so nothing is documented +assert !new File( basedir, 'target/apidocs/com.mycompany.app/com/mycompany/app/Application.html').exists() 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 8901360..c07e487 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -4729,11 +4729,11 @@ public abstract class AbstractJavadocMojo continue; } - int lastIndexOfSeparator = currentFile.lastIndexOf( File.separatorChar ); + int lastIndexOfSeparator = currentFile.lastIndexOf( '/' ); if ( lastIndexOfSeparator != -1 ) { String packagename = - currentFile.substring( 0, lastIndexOfSeparator ).replace( File.separatorChar, '.' ); + currentFile.substring( 0, lastIndexOfSeparator ).replace( '/', '.' ); if ( exportAllPackages || exportedPackages.contains( packagename ) ) {
