From 566feaccd52ae3ee577fd4924311c5960f3551c9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 8 Jun 2021 20:17:56 +0200 Subject: [PATCH] Bootstrap Maven as non-modular packages Resolves: rhbz#1951482 --- maven-assembly-plugin.spec | 63 ++++++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/maven-assembly-plugin.spec b/maven-assembly-plugin.spec index 0c3ecad..3a8fa75 100644 --- a/maven-assembly-plugin.spec +++ b/maven-assembly-plugin.spec @@ -1,75 +1,84 @@ +# Workaround for rhbz#1969370: __bootstrap macro is not defined in +# CentOS Stream, See https://bugzilla.redhat.com/1969370 +%global __bootstrap ~bootstrap + +%bcond_without bootstrap + Name: maven-assembly-plugin -Summary: Maven Assembly Plugin Version: 3.3.0 -Release: 5%{?dist} +Release: 6%{?dist} +Summary: Maven Assembly Plugin License: ASL 2.0 - URL: https://maven.apache.org/plugins/maven-assembly-plugin/ -Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip - 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) -BuildRequires: mvn(org.apache.maven:maven-archiver) >= 3.5.0 +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-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.shared:file-management) -BuildRequires: mvn(org.apache.maven.shared:maven-artifact-transfer) >= 0.11.0 +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.codehaus.modello:modello-maven-plugin) -BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) >= 4.2.0 +BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) -BuildRequires: mvn(org.codehaus.plexus:plexus-io) >= 3.2.0 -BuildRequires: mvn(org.codehaus.plexus:plexus-utils) >= 3.3.0 +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, dependencies etc. from flexible assembly descriptors. - %package javadoc Summary: API documentation for %{name} %description javadoc This package provides %{summary}. - %prep %setup -q - %build # Tests need easymockclassextension version 2.x, which is incompatible # with easymockclassextension version 3.x we have in Fedora. %mvn_build -f - %install %mvn_install - %files -f .mfiles %license LICENSE NOTICE %files javadoc -f .mfiles-javadoc %license LICENSE NOTICE - %changelog -* Fri Apr 16 2021 Mohan Boddu - 3.3.0-5 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Jun 08 2021 Mikolaj Izdebski - 3.3.0-6 +- Bootstrap Maven for CentOS Stream 9 + +* 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 @@ -80,12 +89,21 @@ This package provides %{summary}. * 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. @@ -95,6 +113,12 @@ This package provides %{summary}. * 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 @@ -263,4 +287,3 @@ This package provides %{summary}. * Thu May 20 2010 Yong Yang - 2.2-0.1.beta5 - Initial build -