packages/maven-assembly-plugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

override abstract method due to base class archiver add methods

Browse Source
This commit is contained in:
wang--ge 2022-01-14 14:37:10 +08:00
parent 5955780f41
commit c17c6c839c
2 changed files with 170 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
0001-override-abstract-method.patch Normal file
View File

@ -0,0 +1,165 @@
From f81f4f73526686b40e76b000c1751b3bc257b384 Mon Sep 17 00:00:00 2001
From: wang--ge <wang__ge@126.com>
Date: Fri, 14 Jan 2022 12:11:10 +0800
Subject: [PATCH] override abstract method
---
.../archiver/AssemblyProxyArchiver.java | 73 +++++++++++++++++++
.../archiver/PrefixedArchivedFileSet.java | 8 ++
.../archive/archiver/PrefixedFileSet.java | 8 ++
3 files changed, 89 insertions(+)
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
index fe0c72e..56ceed3 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/archiver/AssemblyProxyArchiver.java
@@ -44,6 +44,8 @@ import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -1032,4 +1034,75 @@ public class AssemblyProxyArchiver
}
}
+ @Override
+ public void setLastModifiedDate( Date lastModifiedDate )
+ {
+ delegate.setLastModifiedDate( lastModifiedDate );
+ }
+
+ @Override
+ public Date getLastModifiedDate()
+ {
+ return delegate.getLastModifiedDate();
+ }
+
+ @Override
+ public void setFilenameComparator( Comparator<String> filenameComparator )
+ {
+ delegate.setFilenameComparator( filenameComparator );
+ }
+
+ @Override
+ public void configureReproducible( Date outputTimestamp )
+ {
+ delegate.configureReproducible( outputTimestamp );
+ }
+
+ @Override
+ public void setOverrideUid( int uid )
+ {
+ delegate.setOverrideUid( uid );
+ }
+
+ @Override
+ public void setOverrideUserName( String userName )
+ {
+ delegate.setOverrideUserName( userName );
+ }
+
+ @Override
+ public int getOverrideUid()
+ {
+ return delegate.getOverrideUid();
+ }
+
+ @Override
+ public String getOverrideUserName()
+ {
+ return delegate.getOverrideUserName();
+ }
+
+ @Override
+ public void setOverrideGid( int gid )
+ {
+ delegate.setOverrideGid( gid );
+ }
+
+ @Override
+ public void setOverrideGroupName( String groupName )
+ {
+ delegate.setOverrideGroupName( groupName );
+ }
+
+ @Override
+ public int getOverrideGid()
+ {
+ return delegate.getOverrideGid();
+ }
+
+ @Override
+ public String getOverrideGroupName()
+ {
+ return delegate.getOverrideGroupName();
+ }
}
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..5648c7e 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
@@ -23,6 +23,7 @@ import org.codehaus.plexus.archiver.ArchivedFileSet;
import org.codehaus.plexus.components.io.fileselectors.FileSelector;
import org.codehaus.plexus.components.io.functions.InputStreamTransformer;
+import org.codehaus.plexus.components.io.filemappers.FileMapper;
import java.io.File;
/**
@@ -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.30.0

6
maven-assembly-plugin.spec
View File

@ -1,11 +1,12 @@
Name: maven-assembly-plugin
Version: 3.1.0
Release: 5
Release: 6
Summary: Maven Assembly Plugin
License: ASL 2.0
URL: http://maven.apache.org/plugins/maven-assembly-plugin/
Source0: http://archive.apache.org/dist/maven/plugins/maven-assembly-plugin-3.1.0-source-release.zip
Patch0: 0001-override-abstract-method.patch
BuildRequires: maven-local mvn(org.codehaus.plexus:plexus-utils) mvn(org.codehaus.plexus:plexus-archiver)
BuildRequires: mvn(commons-codec:commons-codec) mvn(org.codehaus.plexus:plexus-component-annotations)
@ -47,5 +48,8 @@ This package contains the API documentation for maven-assembly-plugin.
%license NOTICE
%changelog
* Fri Jan 14 2022 Ge Wang <wangge20@huawei.com> - 3.1.0-6
- Override abstract method due to base class Archiver add methods
* Tue Feb 18 2020 wangye <wangye54@huawei.com> - 3.1.0-5
- Package init