You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by eo...@apache.org on 2018/12/24 10:24:31 UTC
[maven-assembly-plugin] branch MASSEMBLY-900 created (now 0b3d983)
This is an automated email from the ASF dual-hosted git repository.
eolivelli pushed a change to branch MASSEMBLY-900
in repository https://gitbox.apache.org/repos/asf/maven-assembly-plugin.git.
at 0b3d983 MASSEMBLY-900 Upgrade plexus-archiver to 4.0.0
This branch includes the following new commits:
new 0b3d983 MASSEMBLY-900 Upgrade plexus-archiver to 4.0.0
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-assembly-plugin] 01/01: MASSEMBLY-900 Upgrade
plexus-archiver to 4.0.0
Posted by eo...@apache.org.
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 0b3d983bf393be9a6cc8c8634facb05c1ff138ea
Author: Enrico Olivelli <eo...@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 50f7e93..114cd50 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