From 86b43d388ab1e9e2f72a0b5958b2d70449f5b6dd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 May 2019 21:17:52 +0200 Subject: [PATCH 1/9] Update to upstream version 3.1.1 --- .gitignore | 1 + maven-assembly-plugin.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5d1eb71..007bb51 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ maven-assembly-plugin-2.2.2-source-release.zip /maven-assembly-plugin-2.6-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 diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec index 8604b59..9a1a17d 100644 --- a/maven-assembly-plugin.spec +++ b/maven-assembly-plugin.spec @@ -1,6 +1,6 @@ Name: maven-assembly-plugin -Version: 3.1.0 -Release: 3%{?dist} +Version: 3.1.1 +Release: 1%{?dist} Summary: Maven Assembly Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-assembly-plugin/ @@ -60,6 +60,9 @@ This package provides %{summary}. %license LICENSE NOTICE %changelog +* Mon May 13 2019 Mikolaj Izdebski - 3.1.1-1 +- Update to upstream version 3.1.1 + * Fri Feb 09 2018 Igor Gnatenko - 3.1.0-3 - Escape macros in %%changelog diff --git a/sources b/sources index 606bb4f..0e52c01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-assembly-plugin-3.1.0-source-release.zip) = 48c55a5c88be1ede6d7c411b2206a1306d38c7e949cc8df234014b8b96d605ee62cc3567a2676a952ce752702e8f7c4614c51ce0681c59d945da6b6946c6234e +SHA512 (maven-assembly-plugin-3.1.1-source-release.zip) = 249c65e6d92782ea4440c6a0030bbedb89a9db884286550d9541324a4d667aaaf02778973c5a30ef4dbf566a659c841846fbf8bfc0e1e52fe4bd154ac9f78d1b From 8601ca0f5184cb8c4bc22026aeb21697bee4c230 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:00 +0200 Subject: [PATCH 2/9] Mass rebuild for javapackages-tools 201901 --- maven-assembly-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec index 9a1a17d..7798210 100644 --- a/maven-assembly-plugin.spec +++ b/maven-assembly-plugin.spec @@ -1,6 +1,6 @@ Name: maven-assembly-plugin Version: 3.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Maven Assembly Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-assembly-plugin/ @@ -60,6 +60,9 @@ This package provides %{summary}. %license LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 3.1.1-2 +- Mass rebuild for javapackages-tools 201901 + * Mon May 13 2019 Mikolaj Izdebski - 3.1.1-1 - Update to upstream version 3.1.1 From 821e30152a350b54dd5b7282987d724e82d513ea Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 11 Sep 2019 13:00:23 +0200 Subject: [PATCH 3/9] Port to maven-artifact-transfer 0.11.0 --- ...grade-maven-artifact-transfer-0.11.0.patch | 51 +++++++++++++++++++ maven-assembly-plugin.spec | 4 ++ 2 files changed, 55 insertions(+) create mode 100644 0000-Upgrade-maven-artifact-transfer-0.11.0.patch diff --git a/0000-Upgrade-maven-artifact-transfer-0.11.0.patch b/0000-Upgrade-maven-artifact-transfer-0.11.0.patch new file mode 100644 index 0000000..fd1ceb5 --- /dev/null +++ b/0000-Upgrade-maven-artifact-transfer-0.11.0.patch @@ -0,0 +1,51 @@ +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/maven-assembly-plugin.spec b/maven-assembly-plugin.spec index 7798210..65b6c23 100644 --- a/maven-assembly-plugin.spec +++ b/maven-assembly-plugin.spec @@ -8,6 +8,8 @@ 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 + BuildRequires: maven-local BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(commons-codec:commons-codec) @@ -45,6 +47,8 @@ This package provides %{summary}. %prep %setup -q +%patch0 -p1 + %build # Tests need easymockclassextension version 2.x, which is incompatible # with easymockclassextension version 3.x we have in Fedora. From 927256ccc004724619bc299183fe791035d724e0 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 25 Oct 2019 15:19:57 +0200 Subject: [PATCH 4/9] 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 From 02e90d6391668b8b636199dd97c3875d46138938 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 5/9] Mass rebuild for javapackages-tools 201902 --- maven-assembly-plugin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec index aeea011..545b2ba 100644 --- a/maven-assembly-plugin.spec +++ b/maven-assembly-plugin.spec @@ -1,6 +1,6 @@ Name: maven-assembly-plugin Version: 3.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Maven Assembly Plugin License: ASL 2.0 URL: http://maven.apache.org/plugins/maven-assembly-plugin/ @@ -66,6 +66,9 @@ This package provides %{summary}. %license LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 3.1.1-3 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 3.1.1-2 - Mass rebuild for javapackages-tools 201901 From 461547fd04c11d2a5f9956da06bf92b131dcac43 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 20 Nov 2019 16:07:58 +0100 Subject: [PATCH 6/9] Update to upstream version 3.2.0 --- .gitignore | 1 + ...grade-maven-artifact-transfer-0.11.0.patch | 51 ----------- 0001-Port-to-plexus-archiver-4.2.0.patch | 89 ------------------- maven-assembly-plugin.spec | 13 ++- sources | 2 +- 5 files changed, 7 insertions(+), 149 deletions(-) delete mode 100644 0000-Upgrade-maven-artifact-transfer-0.11.0.patch delete mode 100644 0001-Port-to-plexus-archiver-4.2.0.patch 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 From ecdc6b4fba92f2d5437cff006d4c9c36152e06f5 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 22 Jun 2020 15:25:33 +0200 Subject: [PATCH 7/9] Update to upstream version 3.3.0 --- .gitignore | 1 + maven-assembly-plugin.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 48f46ee..f92036f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ maven-assembly-plugin-2.2.2-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 +/maven-assembly-plugin-3.3.0-source-release.zip diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec index cf7214d..a89be8f 100644 --- a/maven-assembly-plugin.spec +++ b/maven-assembly-plugin.spec @@ -1,12 +1,12 @@ Name: maven-assembly-plugin -Version: 3.2.0 +Version: 3.3.0 Release: 1%{?dist} Summary: Maven Assembly Plugin License: ASL 2.0 -URL: http://maven.apache.org/plugins/maven-assembly-plugin/ +URL: https://maven.apache.org/plugins/maven-assembly-plugin/ BuildArch: noarch -Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip +Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip BuildRequires: maven-local BuildRequires: mvn(com.google.code.findbugs:jsr305) @@ -60,6 +60,9 @@ This package provides %{summary}. %license LICENSE NOTICE %changelog +* Mon Jun 22 2020 Marian Koncek - 3.3.0-1 +- Update to upstream version 3.3.0 + * Wed Nov 20 2019 Marian Koncek - 3.2.0-1 - Update to upstream version 3.2.0 diff --git a/sources b/sources index b4b88e4..f91b7c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-assembly-plugin-3.2.0-source-release.zip) = 23c1c79c51279232efc8dbeb697a6357257263c03356732d94b06f26ce219f44e650910ec7deb2ca8889449e669d40c47f7717ab6c1fb1e5ea6572cf643a5926 +SHA512 (maven-assembly-plugin-3.3.0-source-release.zip) = d41ba25dd35dea5b1b690f6cb84e4e30c5466c0e6fb3d5d98305daf70cb1ba9468c0ba2181afb8fa5f6d41c735f4f1d9d462f58eb320df0c85d57dbefa70b15a From 4641d16f297d6d68f6cdb844448f89eb9259548e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 8/9] Conditionalize buildrequires in bootstrap mode --- maven-assembly-plugin.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec index a89be8f..bc1b22a 100644 --- a/maven-assembly-plugin.spec +++ b/maven-assembly-plugin.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: maven-assembly-plugin Version: 3.3.0 Release: 1%{?dist} @@ -9,6 +11,9 @@ BuildArch: noarch Source0: http://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(commons-codec:commons-codec) BuildRequires: mvn(commons-io:commons-io) @@ -31,6 +36,7 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) BuildRequires: mvn(org.codehaus.plexus:plexus-io) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +%endif %description A Maven plugin to create archives of your project's sources, classes, From 70b7adb47c8372f5117ebed5cbeb034f335e6fad Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 9/9] Turn off bootstrap mode by default --- maven-assembly-plugin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec index bc1b22a..ccdd4a6 100644 --- a/maven-assembly-plugin.spec +++ b/maven-assembly-plugin.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: maven-assembly-plugin Version: 3.3.0