90 lines
3.2 KiB
Diff
90 lines
3.2 KiB
Diff
From aa6e1cabed31fcdbb5437447df05b92ad5d4e437 Mon Sep 17 00:00:00 2001
|
|
From: baizg1107 <preloyalwhite@163.com>
|
|
Date: Wed, 23 Mar 2022 17:08:46 +0800
|
|
Subject: [PATCH] upgrade plexus-archiver to 4.0.0
|
|
|
|
---
|
|
pom.xml | 2 +-
|
|
.../archive/archiver/PrefixedArchivedFileSet.java | 8 ++++++++
|
|
.../assembly/archive/archiver/PrefixedFileSet.java | 8 ++++++++
|
|
3 files changed, 17 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/pom.xml b/pom.xml
|
|
index e9017aa..477c9a5 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -132,7 +132,7 @@ under the License.
|
|
<dependency>
|
|
<groupId>org.codehaus.plexus</groupId>
|
|
<artifactId>plexus-archiver</artifactId>
|
|
- <version>3.5</version>
|
|
+ <version>4.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 5cf5d18..021255e 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;
|
|
|
|
/**
|
|
* @version $Id: PrefixedArchivedFileSet.java 1691831 2015-07-19 15:06:13Z rfscholte $
|
|
@@ -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,10 @@ 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 c2ba83f..f4f2c0d 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;
|
|
|
|
/**
|
|
* @version $Id: PrefixedFileSet.java 1691831 2015-07-19 15:06:13Z rfscholte $
|
|
@@ -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;
|
|
+ }
|
|
}
|
|
--
|
|
2.27.0
|
|
|