Bootstrap Maven as non-modular packages

Resolves: rhbz#1951482

maven-shared-incremental.spec

@@ -1,6 +1,12 @@
+# 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-shared-incremental
 Version:        1.1
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        Maven Incremental Build support utilities
 License:        ASL 2.0
 URL:            http://maven.apache.org/shared/maven-shared-incremental/
@@ -9,13 +15,16 @@ BuildArch:      noarch
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.apache.maven.shared:maven-shared-components:pom:)
 BuildRequires:  mvn(org.apache.maven.shared:maven-shared-utils)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-component-api)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
+%endif
 
 %description
 Various utility classes and plexus components for supporting
@@ -29,6 +38,7 @@ This package provides %{summary}.
 
 %prep
 %setup -q
+%pom_remove_dep :plexus-component-api
 
 %build
 %mvn_build
@@ -43,8 +53,12 @@ This package provides %{summary}.
 %doc LICENSE NOTICE
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.1-22
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1-23
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1-22
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -55,12 +69,21 @@ This package provides %{summary}.
 * Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.1-19
 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
 
+* Thu Apr 30 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1-17
+- Remove unneeded dependency on plexus-component-api
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1-16
+- Mass rebuild for javapackages-tools 201902
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1-15
+- Mass rebuild for javapackages-tools 201901
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

sources

@@ -1 +1 @@
-8e094d95b871851481cfd2d57af9033c  maven-shared-incremental-1.1-source-release.zip
+SHA512 (maven-shared-incremental-1.1-source-release.zip) = 4088703e15ecf16a4a6c5e98f5d88f3194825f010a361681abfedc5cdffe0a30e3e706fc4c9fdfc1edbaf6672225327e6be02885cbe4dcb7bd5359a16030a5dc