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

apache · Apr 8, 2020 · ca7d100 · ca7d100
1 parent d39b275
commit ca7d100
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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 );