From 3520f1d666f37eb5c2243ead653cd44d2334296f 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 --- plexus-pom.spec | 72 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 19 deletions(-) diff --git a/plexus-pom.spec b/plexus-pom.spec index 6562700..22a8e6a 100644 --- a/plexus-pom.spec +++ b/plexus-pom.spec @@ -1,32 +1,41 @@ -Name: plexus-pom -Version: 7 -Release: 2%{?dist} -Summary: Root Plexus Projects POM -License: ASL 2.0 +# Workaround for rhbz#1969370: __bootstrap macro is not defined in +# CentOS Stream, See https://bugzilla.redhat.com/1969370 +%global __bootstrap ~bootstrap -URL: https://github.com/codehaus-plexus/plexus-pom -Source0: %{url}/archive/plexus-%{version}.tar.gz -Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +%bcond_without bootstrap -BuildArch: noarch +Name: plexus-pom +Version: 7 +Release: 3%{?dist} +Summary: Root Plexus Projects POM +License: ASL 2.0 +URL: https://github.com/codehaus-plexus/plexus-pom +Source0: https://github.com/codehaus-plexus/plexus-pom/archive/plexus-%{version}.tar.gz +Source1: https://www.apache.org/licenses/LICENSE-2.0.txt +BuildArch: noarch -BuildRequires: maven-local -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%endif + +# Test dependency that should be propagated down the POM hierarchy +Requires: mvn(junit:junit) %description The Plexus project provides a full software stack for creating and -executing software projects. This package provides parent POM for +executing software projects. This package provides parent POM for Plexus packages. %prep %setup -q -n plexus-pom-plexus-%{version} - -%pom_remove_plugin :findbugs-maven-plugin -%pom_remove_plugin :maven-site-plugin -%pom_remove_plugin :taglist-maven-plugin - cp -p %{SOURCE1} LICENSE +%pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :findbugs-maven-plugin +%pom_remove_plugin :taglist-maven-plugin + %build %mvn_build @@ -37,8 +46,12 @@ cp -p %{SOURCE1} LICENSE %license LICENSE %changelog -* Fri Apr 16 2021 Mohan Boddu - 7-2 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Jun 08 2021 Mikolaj Izdebski - 7-3 +- Bootstrap Maven for CentOS Stream 9 + +* Mon May 17 2021 Mikolaj Izdebski - 7-2 +- Bootstrap build +- Non-bootstrap build * Mon Feb 01 2021 Fabio Valentini - 7-1 - Update to version 7. @@ -46,12 +59,24 @@ cp -p %{SOURCE1} LICENSE * Wed Jan 27 2021 Fedora Release Engineering - 6.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Tue Jan 26 2021 Marian Koncek - 7-1 +- Update to upstream version 7 + +* Fri Dec 4 2020 Mikolaj Izdebski - 6.5-1 +- Update to upstream version 6.5 + * Sat Oct 24 2020 Fabio Valentini - 6.5-1 - Update to version 6.5. +* Fri Sep 11 2020 Marian Koncek - 6.4-2 +- Update to upstream version 6.4 + * Sun Aug 16 2020 Fabio Valentini - 6.4-1 - Update to version 6.4. +* Wed Jul 29 2020 Marian Koncek - 6.3-1 +- Update to upstream version 6.3 + * Tue Jul 28 2020 Fedora Release Engineering - 6.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild @@ -70,12 +95,21 @@ cp -p %{SOURCE1} LICENSE * Thu Jan 30 2020 Fedora Release Engineering - 5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Nov 05 2019 Mikolaj Izdebski - 5.1-2 +- Mass rebuild for javapackages-tools 201902 + * Thu Oct 24 2019 Fabio Valentini - 5.1-1 - Update to version 5.1. +* Mon Jul 29 2019 Marian Koncek - 5.1-1 +- Update to upstream version 5.1 + * Fri Jul 26 2019 Fedora Release Engineering - 5.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Fri May 24 2019 Mikolaj Izdebski - 5.0-3 +- Mass rebuild for javapackages-tools 201901 + * Sat Feb 02 2019 Fedora Release Engineering - 5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild