diff --git a/plexus-utils.spec b/plexus-utils.spec
index 155c352..f6218ce 100644
--- a/plexus-utils.spec
+++ b/plexus-utils.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:           plexus-utils
 Version:        3.3.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Plexus Common Utilities
 # ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/ 
 # xpp: src/main/java/org/codehaus/plexus/util/xml/pull directory
@@ -17,14 +23,14 @@ BuildArch:      noarch
 Source0:        https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz
 Source1:        http://apache.org/licenses/LICENSE-2.0.txt
 
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk8
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
-BuildRequires:  mvn(org.apache.maven.shared:maven-plugin-testing-harness)
 BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
-
-# some tests require "mvn" on $PATH
-BuildRequires:  maven
+%endif
 
 %description
 The Plexus project seeks to create end-to-end developer tools for
@@ -34,23 +40,13 @@ reusable components for hibernate, form processing, jndi, i18n,
 velocity, etc. Plexus also includes an application server which
 is like a J2EE application server, without all the baggage.
 
-%package javadoc
-Summary:          Javadoc for %{name}
-
-%description javadoc
-Javadoc for %{name}.
+%{?javadoc_package}
 
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 
 cp %{SOURCE1} .
 
-# unpackaged dependencies for some tests
-%pom_remove_dep -r org.openjdk.jmh:jmh-core
-%pom_remove_dep -r org.openjdk.jmh:jmh-generator-annprocess
-rm src/test/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractorTest.java
-rm src/test/java/org/codehaus/plexus/util/xml/Xpp3DomPerfTest.java
-
 %mvn_file : plexus/utils
 %mvn_alias : plexus:plexus-utils
 
@@ -70,20 +66,21 @@ rm src/test/java/org/codehaus/plexus/util/xml/Xpp3DomPerfTest.java
         </plugin>"
 
 %build
-%mvn_build
+%mvn_build -f
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc NOTICE.txt LICENSE-2.0.txt
-
-%files javadoc -f .mfiles-javadoc
-%doc NOTICE.txt LICENSE-2.0.txt
+%license NOTICE.txt LICENSE-2.0.txt
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.3.0-6
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-7
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-6
+- Bootstrap build
+- Non-bootstrap build
 
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -97,18 +94,36 @@ rm src/test/java/org/codehaus/plexus/util/xml/Xpp3DomPerfTest.java
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-3
+- Build with OpenJDK 8
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.0-2
+- Mass rebuild for javapackages-tools 201902
+
+* Wed Oct 23 2019 Marian Koncek <mkoncek@redhat.com> - 3.3.0-1
+- Update to upstream verssion 3.3.0
+
 * Wed Oct 16 2019 Fabio Valentini <decathorpe@gmail.com> - 3.3.0-1
 - Update to version 3.3.0.
 
 * Fri Oct 11 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.1-1
 - Update to version 3.2.1.
 
+* Mon Jul 29 2019 Marian Koncek <mkoncek@redhat.com> - 3.2.1-1
+- Update to upstream version 3.2.1
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
 * Wed Jul 03 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.0-1
 - Update to version 3.2.0.
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-2
+- Mass rebuild for javapackages-tools 201901
+
+* Sat Apr 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-1
+- Update to upstream version 3.2.0
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
@@ -257,4 +272,3 @@ rm src/test/java/org/codehaus/plexus/util/xml/Xpp3DomPerfTest.java
 
 * Mon Nov 07 2005 Ralph Apel <r.apel at r-apel.de> - 0:1.0.4-1jpp
 - First JPackage build
-