commit ca7d1008763fd318275cbd3748c8f8d06512cede
author Elliotte Rusty Harold <elharo@users.noreply.github.com> Wed Apr 08 06:26:34 2020 -0400
committer GitHub <noreply@github.com> Wed Apr 08 06:26:34 2020 -0400
tree ea45b94ff41c3599531e93d86fb888640ea091a4
parent d39b2755b3c94318e38fb69cd156f9d3f701a15d

replace deprecated methd scheduled fo removal and update archiver (#47)

pom.xml

diff --git a/pom.xml b/pom.xml
index 5953f54..183cfba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -281,7 +281,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
-      <version>4.2.1</version>
+      <version>4.2.2</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>

src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java

diff --git a/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java
index 89b9e73..4ba0c0b 100644
--- a/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java
+++ b/src/main/java/org/apache/maven/plugins/javadoc/ResourcesBundleMojo.java
@@ -31,6 +31,7 @@
 import org.codehaus.plexus.archiver.ArchiverException;

 import org.codehaus.plexus.archiver.manager.ArchiverManager;

 import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;

+import org.codehaus.plexus.archiver.util.DefaultFileSet;

 

 import java.io.File;

 import java.io.IOException;

@@ -122,9 +123,10 @@
             archiver.addFile( optionsFile, BUNDLE_OPTIONS_PATH );

 

             File javadocDir = getJavadocDirectory();

-            if ( javadocDir.exists() && javadocDir.isDirectory() )

+            if ( javadocDir.isDirectory() )

             {

-                archiver.addDirectory( javadocDir, RESOURCES_DIR_PATH + "/" );

+                DefaultFileSet fileSet = DefaultFileSet.fileSet( javadocDir ).prefixed( RESOURCES_DIR_PATH + "/" );

+                archiver.addFileSet( fileSet );

             }

 

             archiver.setDestFile( bundleFile );