From 927256ccc004724619bc299183fe791035d724e0 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 25 Oct 2019 15:19:57 +0200 Subject: [PATCH] Port to plexus-archiver 4.2.0 --- 0001-Port-to-plexus-archiver-4.2.0.patch | 89 ++++++++++++++++++++++++ maven-assembly-plugin.spec | 2 + 2 files changed, 91 insertions(+) create mode 100644 0001-Port-to-plexus-archiver-4.2.0.patch diff --git a/0001-Port-to-plexus-archiver-4.2.0.patch b/0001-Port-to-plexus-archiver-4.2.0.patch new file mode 100644 index 0000000..37a9ad6 --- /dev/null +++ b/0001-Port-to-plexus-archiver-4.2.0.patch @@ -0,0 +1,89 @@ +From 6191bf7a4019ccb507068ceca594a8a7a4b6ade4 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Fri, 25 Oct 2019 15:01:11 +0200 +Subject: [PATCH] Port to plexus-archiver 4.2.0 + +--- + .../archiver/AssemblyProxyArchiver.java | 61 +++++++++++++++++++ + 1 file changed, 61 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 7b9a621..170d243 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; + +@@ -1029,4 +1031,63 @@ public class AssemblyProxyArchiver + } + } + ++ @Override ++ public void setLastModifiedDate( final Date lastModifiedDate ) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public Date getLastModifiedDate() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public void setFilenameComparator( Comparator filenameComparator ) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public void setOverrideUid( int uid ) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public void setOverrideUserName( String userName ) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public int getOverrideUid() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public String getOverrideUserName() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public void setOverrideGid( int gid ) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public void setOverrideGroupName( String groupName ) { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public int getOverrideGid() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public String getOverrideGroupName() { ++ throw new UnsupportedOperationException(); ++ } ++ ++ @Override ++ public void configureReproducible( Date lastModifiedDate ) { ++ throw new UnsupportedOperationException(); ++ } + } +-- +2.21.0 + diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec index 65b6c23..aeea011 100644 --- a/maven-assembly-plugin.spec +++ b/maven-assembly-plugin.spec @@ -9,6 +9,7 @@ BuildArch: noarch Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip Patch0: 0000-Upgrade-maven-artifact-transfer-0.11.0.patch +Patch1: 0001-Port-to-plexus-archiver-4.2.0.patch BuildRequires: maven-local BuildRequires: mvn(com.google.code.findbugs:jsr305) @@ -48,6 +49,7 @@ This package provides %{summary}. %setup -q %patch0 -p1 +%patch1 -p1 %build # Tests need easymockclassextension version 2.x, which is incompatible