diff --git a/maven-jar-plugin.spec b/maven-jar-plugin.spec
index 1920195..407036a 100644
--- a/maven-jar-plugin.spec
+++ b/maven-jar-plugin.spec
@@ -1,18 +1,26 @@
+# 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-jar-plugin
 Version:        3.2.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Maven JAR Plugin
 
 License:        ASL 2.0
 URL:            http://maven.apache.org/plugins/maven-jar-plugin/
 Source0:        http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
 
-BuildArch: noarch
+BuildArch:      noarch
 
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.maven.shared:maven-shared-utils)
-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-compat)
 BuildRequires:  mvn(org.apache.maven:maven-core)
@@ -22,8 +30,10 @@ BuildRequires:  mvn(org.apache.maven.plugins:maven-plugins:pom:)
 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.shared:file-management)
-BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver) >= 4.2.0
-BuildRequires:  mvn(org.codehaus.plexus:plexus-utils) >= 3.3.0
+BuildRequires:  mvn(org.apache.maven.shared:maven-shared-utils)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+%endif
 
 %description
 Builds a Java Archive (JAR) file from the compiled
@@ -35,9 +45,10 @@ Summary:        Javadoc for %{name}
 %description javadoc
 API documentation for %{name}.
 
-
 %prep
 %setup -q
+# System version of maven-jar-plugin should be used, not reactor version
+%pom_xpath_inject pom:pluginManagement/pom:plugins "<plugin><artifactId>maven-jar-plugin</artifactId><version>SYSTEM</version></plugin>"
 
 %build
 %mvn_build
@@ -46,15 +57,18 @@ API documentation for %{name}.
 %mvn_install
 
 %files -f .mfiles
-%dir %{_javadir}/%{name}
 %doc LICENSE NOTICE
 
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.2.0-6
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-7
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-6
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -68,6 +82,12 @@ API documentation for %{name}.
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Wed Nov 20 2019 Marian Koncek <mkoncek@redhat.com> - 3.2.0-1
+- Update to upstream version 3.2.0
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.2-3
+- Mass rebuild for javapackages-tools 201902
+
 * Sun Nov 03 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.0-1
 - Update to version 3.2.0.
 
@@ -77,6 +97,12 @@ API documentation for %{name}.
 * Sat Jun 08 2019 Fabio Valentini <decathorpe@gmail.com> - 3.1.2-1
 - Update to version 3.1.2.
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.2-2
+- Mass rebuild for javapackages-tools 201901
+
+* Mon May 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.2-1
+- Update to upstream version 3.1.2
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild