[maven-javadoc-plugin] branch MJAVADOC-584 updated: Verify with packages files

[rf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch MJAVADOC-584
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git


The following commit(s) were added to refs/heads/MJAVADOC-584 by this push:
     new 7223b4b  Verify with packages files
7223b4b is described below

commit 7223b4b9b8bdfa2a78f8ed3eb8ca03698612b5f2
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon May 17 21:37:24 2021 +0200

    Verify with packages files
---
 .../projects/examples/exclude-package-names/verify.groovy  | 14 ++++++++++----
 .../java/org/apache/maven/plugins/javadoc/JavadocUtil.java |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/it/projects/examples/exclude-package-names/verify.groovy b/src/it/projects/examples/exclude-package-names/verify.groovy
index e3c6aa2..a20870b 100644
--- a/src/it/projects/examples/exclude-package-names/verify.groovy
+++ b/src/it/projects/examples/exclude-package-names/verify.groovy
@@ -17,8 +17,14 @@
  * under the License.
  */
 
-File argfile = new File( basedir, 'target/site/apidocs/argfile' )
-assert argfile.exists() : new File( basedir, "build.log" ).getText()
+File packages = new File( basedir, 'target/site/apidocs/packages' )
 
-assert argfile.readLines().size() == 7
-assert argfile.readLines().count{it.endsWith("Include.java'")} == 7
+def expectedPackages = ['com.mycompany.myapp',
+						'com.mycompany.myapp.package1',
+						'com.mycompany.myapp.package3',
+						'com.mycompany.myapp.package3.subpackage6',
+						'com.mycompany.myapp.package3.subpackage6.subsubpackage1',
+						'com.mycompany.myapp.package3.subpackage6.subsubpackage2',
+						'com.mycompany.myapp.package3.subpackage7']
+
+assert packages.readLines() == expectedPackages
diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
index 6e5e650..9404a9b 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java
@@ -379,7 +379,7 @@ public class JavadocUtil
 
             if ( !excluded )
             {
-                files.add( file );
+                files.add( file.replace( '\\', '/' ) );
             }
         }