commit d33a9061185caa57bdf43df41c43ae47a13487dc
author Enrico Olivelli <eolivelli@apache.org> Mon Dec 24 11:24:20 2018 +0100
committer Enrico Olivelli <eolivelli@apache.org> Wed Dec 26 12:13:08 2018 +0100
tree 7d05744d1662c5f13f40ead19a7ec82ecb413ce0
parent 01b305de161f97972008df7b9841f15094bf7cb9

MASSEMBLY-900 Upgrade plexus-archiver to 4.0.0

pom.xml

diff --git a/pom.xml b/pom.xml
index 81a0246..7f5ed0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-archiver</artifactId>
-      <version>3.6.0</version>
+      <version>4.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>

src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java

diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
index bfe122d..2f1d12e 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedArchivedFileSet.java
@@ -24,6 +24,7 @@
 import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
 
 import java.io.File;
+import org.codehaus.plexus.components.io.filemappers.FileMapper;
 
 /**
  *
@@ -31,6 +32,7 @@
 class PrefixedArchivedFileSet
     implements ArchivedFileSet
 {
+    private final static FileMapper[] EMPTY_FILE_MAPPERS_ARRAY = new FileMapper[0];
 
     private final String rootPrefix;
 
@@ -149,4 +151,9 @@
         return fileSet.getStreamTransformer();
     }
 
+    @Override
+    public FileMapper[] getFileMappers()
+    {
+        return EMPTY_FILE_MAPPERS_ARRAY;
+    }
 }

src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java

diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java
index 922b29e..86d8071 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/PrefixedFileSet.java
@@ -24,6 +24,7 @@
 import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
 
 import java.io.File;
+import org.codehaus.plexus.components.io.filemappers.FileMapper;
 
 /**
  *
@@ -31,6 +32,7 @@
 class PrefixedFileSet
     implements FileSet
 {
+    private final static FileMapper[] EMPTY_FILE_MAPPERS_ARRAY = new FileMapper[0];
 
     private final String rootPrefix;
 
@@ -177,4 +179,10 @@
     {
         return fileSet.getStreamTransformer();
     }
-}
+
+    @Override
+    public FileMapper[] getFileMappers()
+    {
+        return EMPTY_FILE_MAPPERS_ARRAY;
+    }
+}
\ No newline at end of file