From 5e9cb32d536b1cfb8d52f681cbf10fddcb6df162 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Nov 20 2019 15:07:58 +0000 Subject: Update to upstream version 3.2.0 --- diff --git a/.gitignore b/.gitignore index 007bb51..48f46ee 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ maven-assembly-plugin-2.2.2-source-release.zip /maven-assembly-plugin-3.0.0-source-release.zip /maven-assembly-plugin-3.1.0-source-release.zip /maven-assembly-plugin-3.1.1-source-release.zip +/maven-assembly-plugin-3.2.0-source-release.zip diff --git a/0000-Upgrade-maven-artifact-transfer-0.11.0.patch b/0000-Upgrade-maven-artifact-transfer-0.11.0.patch deleted file mode 100644 index fd1ceb5..0000000 --- a/0000-Upgrade-maven-artifact-transfer-0.11.0.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 943f668d4326a2ef174bcf6ce86ec347aff3487d Mon Sep 17 00:00:00 2001 -From: Karl Heinz Marbaise -Date: Sun, 26 May 2019 12:05:14 +0200 -Subject: [PATCH] [MASSEMBLY-911] - Upgrade maven-artifact-transfer 0.11.0 - ---- - pom.xml | 2 +- - .../repository/DefaultRepositoryAssembler.java | 14 +++++++------- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/pom.xml b/pom.xml -index e5eb3a34..6acf3c5f 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -116,7 +116,7 @@ under the License. - - org.apache.maven.shared - maven-artifact-transfer -- 0.9.0 -+ 0.11.0 - - - -diff --git a/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java b/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java -index 31318b0f..ffc6b120 100644 ---- a/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java -+++ b/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java -@@ -36,16 +36,16 @@ - import org.apache.maven.plugins.assembly.repository.model.RepositoryInfo; - import org.apache.maven.project.MavenProject; - import org.apache.maven.project.ProjectBuildingRequest; --import org.apache.maven.shared.artifact.TransferUtils; - import org.apache.maven.shared.artifact.filter.PatternExcludesArtifactFilter; - import org.apache.maven.shared.artifact.filter.PatternIncludesArtifactFilter; - import org.apache.maven.shared.artifact.filter.ScopeArtifactFilter; --import org.apache.maven.shared.artifact.resolve.ArtifactResolver; --import org.apache.maven.shared.artifact.resolve.ArtifactResolverException; --import org.apache.maven.shared.artifact.resolve.ArtifactResult; --import org.apache.maven.shared.dependencies.resolve.DependencyResolver; --import org.apache.maven.shared.dependencies.resolve.DependencyResolverException; --import org.apache.maven.shared.repository.RepositoryManager; -+import org.apache.maven.shared.transfer.artifact.TransferUtils; -+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver; -+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException; -+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResult; -+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolver; -+import org.apache.maven.shared.transfer.dependencies.resolve.DependencyResolverException; -+import org.apache.maven.shared.transfer.repository.RepositoryManager; - import org.apache.maven.shared.utils.io.FileUtils; - import org.codehaus.plexus.component.annotations.Component; - import org.codehaus.plexus.component.annotations.Requirement; diff --git a/0001-Port-to-plexus-archiver-4.2.0.patch b/0001-Port-to-plexus-archiver-4.2.0.patch deleted file mode 100644 index 37a9ad6..0000000 --- a/0001-Port-to-plexus-archiver-4.2.0.patch +++ /dev/null @@ -1,89 +0,0 @@ -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 545b2ba..cf7214d 100644 --- a/maven-assembly-plugin.spec +++ b/maven-assembly-plugin.spec @@ -1,6 +1,6 @@ Name: maven-assembly-plugin -Version: 3.1.1 -Release: 3%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: Maven Assembly Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-assembly-plugin/ @@ -8,9 +8,6 @@ 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) BuildRequires: mvn(commons-codec:commons-codec) @@ -48,9 +45,6 @@ This package provides %{summary}. %prep %setup -q -%patch0 -p1 -%patch1 -p1 - %build # Tests need easymockclassextension version 2.x, which is incompatible # with easymockclassextension version 3.x we have in Fedora. @@ -66,6 +60,9 @@ This package provides %{summary}. %license LICENSE NOTICE %changelog +* Wed Nov 20 2019 Marian Koncek - 3.2.0-1 +- Update to upstream version 3.2.0 + * Tue Nov 05 2019 Mikolaj Izdebski - 3.1.1-3 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 0e52c01..b4b88e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-assembly-plugin-3.1.1-source-release.zip) = 249c65e6d92782ea4440c6a0030bbedb89a9db884286550d9541324a4d667aaaf02778973c5a30ef4dbf566a659c841846fbf8bfc0e1e52fe4bd154ac9f78d1b +SHA512 (maven-assembly-plugin-3.2.0-source-release.zip) = 23c1c79c51279232efc8dbeb697a6357257263c03356732d94b06f26ce219f44e650910ec7deb2ca8889449e669d40c47f7717ab6c1fb1e5ea6572cf643a5926