From c96d69fb5db95001dfbb79ac0984c0c080d8bf4c Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Sat, 28 Mar 2020 17:52:52 -0400
Subject: [PATCH] replace deprecated methd scheduled fo removal and update
 archiver

---
 pom.xml                                                     | 2 +-
 .../apache/maven/plugins/javadoc/ResourcesBundleMojo.java   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5953f547..183cfba7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -281,7 +281,7 @@ under the License.
     <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>
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 89b9e738..4ba0c0bf 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 @@ public void doExecute()
             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 );