From 8ba50056cc222d8db811c4ee6cd952fe5322945f 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-resources-plugin.spec | 41 +++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/maven-resources-plugin.spec b/maven-resources-plugin.spec index f55ad4b..583f1c7 100644 --- a/maven-resources-plugin.spec +++ b/maven-resources-plugin.spec @@ -1,15 +1,23 @@ +# 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-resources-plugin Version: 3.2.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Maven Resources Plugin License: ASL 2.0 - URL: https://maven.apache.org/plugins/maven-resources-plugin Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-lang3) @@ -17,7 +25,7 @@ BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) -BuildRequires: mvn(org.apache.maven.shared:maven-filtering) >= 3.2.0 +BuildRequires: mvn(org.apache.maven.shared:maven-filtering) BuildRequires: mvn(org.apache.maven:maven-compat) BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) @@ -27,45 +35,47 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.eclipse.aether:aether-api) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) +%endif %description The Resources Plugin handles the copying of project resources to the output directory. - %package javadoc Summary: Javadoc for %{name} %description javadoc API documentation for %{name}. - %prep %setup -q - %build %mvn_build - %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.2.0-3 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Jun 08 2021 Mikolaj Izdebski - 3.2.0-4 +- Bootstrap Maven for CentOS Stream 9 + +* Mon May 17 2021 Mikolaj Izdebski - 3.2.0-3 +- Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 3.2.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Fri Sep 11 2020 Marian Koncek - 3.2.0-1 +- Update to upstream version 3.2.0 + * Tue Aug 11 2020 Fabio Valentini - 3.2.0-1 - Update to version 3.2.0. @@ -78,9 +88,15 @@ API documentation for %{name}. * Wed Jan 29 2020 Fedora Release Engineering - 3.1.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Nov 05 2019 Mikolaj Izdebski - 3.1.0-5 +- Mass rebuild for javapackages-tools 201902 + * Thu Jul 25 2019 Fedora Release Engineering - 3.1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Fri May 24 2019 Mikolaj Izdebski - 3.1.0-4 +- Mass rebuild for javapackages-tools 201901 + * Fri Feb 01 2019 Fedora Release Engineering - 3.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild @@ -177,7 +193,7 @@ API documentation for %{name}. * Tue Feb 08 2011 Fedora Release Engineering - 2.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -*Thu Sep 09 2010 Pierre-Yves Chibon - 2.4.3-1 +* Thu Sep 09 2010 Pierre-Yves Chibon - 2.4.3-1 - Update to 2.4.3 * Fri May 21 2010 Hui Wang - 2.2-6 @@ -199,4 +215,3 @@ API documentation for %{name}. * Thu May 13 2010 Hui Wang - 2.2-1 - Initial version of the package -