diff --git a/.gitignore b/.gitignore index 99bf66a..3d890a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/maven-assembly-plugin-3.1.1-source-release.zip +SOURCES/maven-assembly-plugin-3.7.1-source-release.zip diff --git a/.maven-assembly-plugin.metadata b/.maven-assembly-plugin.metadata index 839db60..62faad7 100644 --- a/.maven-assembly-plugin.metadata +++ b/.maven-assembly-plugin.metadata @@ -1 +1 @@ -32fc3a186c9bde502758ae4354288288ba5b86be SOURCES/maven-assembly-plugin-3.1.1-source-release.zip +8c3486b361208a269067f39cea68c12c5cd2fb42 SOURCES/maven-assembly-plugin-3.7.1-source-release.zip diff --git a/SOURCES/0000-Upgrade-maven-artifact-transfer-0.11.0.patch b/SOURCES/0000-Upgrade-maven-artifact-transfer-0.11.0.patch deleted file mode 100644 index fd1ceb5..0000000 --- a/SOURCES/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/SOURCES/0001-Port-to-plexus-archiver-4.2.0.patch b/SOURCES/0001-Port-to-plexus-archiver-4.2.0.patch deleted file mode 100644 index 37a9ad6..0000000 --- a/SOURCES/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/SPECS/maven-assembly-plugin.spec b/SPECS/maven-assembly-plugin.spec index 545b2ba..bed1efb 100644 --- a/SPECS/maven-assembly-plugin.spec +++ b/SPECS/maven-assembly-plugin.spec @@ -1,32 +1,36 @@ +%bcond_with bootstrap + Name: maven-assembly-plugin -Version: 3.1.1 -Release: 3%{?dist} +Version: 3.7.1 +Release: 9%{?dist} Summary: Maven Assembly Plugin -License: ASL 2.0 -URL: http://maven.apache.org/plugins/maven-assembly-plugin/ +License: Apache-2.0 +URL: https://maven.apache.org/plugins/maven-assembly-plugin/ BuildArch: noarch +ExclusiveArch: %{java_arches} 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 +Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(commons-codec:commons-codec) BuildRequires: mvn(commons-io:commons-io) -BuildRequires: mvn(org.apache.maven:maven-archiver) -BuildRequires: mvn(org.apache.maven:maven-artifact) -BuildRequires: mvn(org.apache.maven:maven-core) -BuildRequires: mvn(org.apache.maven:maven-model) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.apache.maven.plugins:maven-assembly-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) BuildRequires: mvn(org.apache.maven.shared:file-management) BuildRequires: mvn(org.apache.maven.shared:maven-artifact-transfer) BuildRequires: mvn(org.apache.maven.shared:maven-common-artifact-filters) BuildRequires: mvn(org.apache.maven.shared:maven-filtering) BuildRequires: mvn(org.apache.maven.shared:maven-shared-io) +BuildRequires: mvn(org.apache.maven:maven-archiver) +BuildRequires: mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-model) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.codehaus.modello:modello-maven-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) @@ -34,6 +38,8 @@ 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) +BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) +%endif %description A Maven plugin to create archives of your project's sources, classes, @@ -43,17 +49,14 @@ dependencies etc. from flexible assembly descriptors. Summary: API documentation for %{name} %description javadoc -This package provides %{summary}. +API documentation for %{name}. %prep -%setup -q +%autosetup -p1 -%patch0 -p1 -%patch1 -p1 +%pom_remove_dep jaxen:jaxen %build -# Tests need easymockclassextension version 2.x, which is incompatible -# with easymockclassextension version 3.x we have in Fedora. %mvn_build -f %install @@ -66,15 +69,103 @@ This package provides %{summary}. %license LICENSE NOTICE %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 3.7.1-6 +- Update javapackages test plan to f42 + +* Thu Jul 18 2024 Fedora Release Engineering - 3.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Apr 08 2024 Marian Koncek - 3.7.1-1 +- Update to upstream version 3.7.1 + +* Tue Feb 27 2024 Jiri Vanek - 3.6.0-6 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 3.6.0-5 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 3.6.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 3.6.0-2 +- Rebuild + +* Mon Aug 14 2023 Marian Koncek - 3.6.0-1 +- Update to upstream version 3.6.0 + +* Thu Jul 20 2023 Fedora Release Engineering - 3.3.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.3.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.3.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 3.3.0-8 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 3.3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 3.3.0-5 +- Bump release + +* Mon May 17 2021 Mikolaj Izdebski - 3.3.0-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 3.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 3.3.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 3.3.0-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon Jun 22 2020 Marian Koncek - 3.3.0-1 +- Update to upstream version 3.3.0 + +* Thu May 07 2020 Fabio Valentini - 3.3.0-1 +- Update to version 3.3.0. + +* Wed Jan 29 2020 Fedora Release Engineering - 3.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* 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 +* Fri Nov 01 2019 Fabio Valentini - 3.2.0-1 +- Update to version 3.2.0. + +* Wed Aug 14 2019 Fabio Valentini - 3.1.1-1 +- Update to version 3.1.1. + +* Thu Jul 25 2019 Fedora Release Engineering - 3.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * 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 +* Fri Feb 01 2019 Fedora Release Engineering - 3.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 3.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Igor Gnatenko - 3.1.0-3 - Escape macros in %%changelog