This is an automated email from the ASF dual-hosted git repository. eolivelli pushed a commit to branch MASSEMBLY-900 in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git
commit d33a9061185caa57bdf43df41c43ae47a13487dc Author: Enrico Olivelli <eolive...@apache.org> AuthorDate: Mon Dec 24 11:24:20 2018 +0100 MASSEMBLY-900 Upgrade plexus-archiver to 4.0.0 --- pom.xml | 2 +- .../assembly/archive/archiver/PrefixedArchivedFileSet.java | 7 +++++++ .../plugins/assembly/archive/archiver/PrefixedFileSet.java | 10 +++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 81a0246..7f5ed0b 100644 --- a/pom.xml +++ b/pom.xml @@ -138,7 +138,7 @@ under the License. <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> 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.fileselectors.FileSelector; import org.codehaus.plexus.components.io.functions.InputStreamTransformer; import java.io.File; +import org.codehaus.plexus.components.io.filemappers.FileMapper; /** * @@ -31,6 +32,7 @@ import java.io.File; class PrefixedArchivedFileSet implements ArchivedFileSet { + private final static FileMapper[] EMPTY_FILE_MAPPERS_ARRAY = new FileMapper[0]; private final String rootPrefix; @@ -149,4 +151,9 @@ class PrefixedArchivedFileSet return fileSet.getStreamTransformer(); } + @Override + public FileMapper[] getFileMappers() + { + return EMPTY_FILE_MAPPERS_ARRAY; + } } 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.fileselectors.FileSelector; import org.codehaus.plexus.components.io.functions.InputStreamTransformer; import java.io.File; +import org.codehaus.plexus.components.io.filemappers.FileMapper; /** * @@ -31,6 +32,7 @@ import java.io.File; class PrefixedFileSet implements FileSet { + private final static FileMapper[] EMPTY_FILE_MAPPERS_ARRAY = new FileMapper[0]; private final String rootPrefix; @@ -177,4 +179,10 @@ class PrefixedFileSet { return fileSet.getStreamTransformer(); } -} + + @Override + public FileMapper[] getFileMappers() + { + return EMPTY_FILE_MAPPERS_ARRAY; + } +} \ No newline at end of file