diff --git a/opentest4j.spec b/opentest4j.spec
index 70bed43..7efbecb 100644
--- a/opentest4j.spec
+++ b/opentest4j.spec
@@ -1,17 +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:           opentest4j
 Version:        1.2.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Open Test Alliance for the JVM
 License:        ASL 2.0
-
 URL:            https://github.com/ota4j-team/opentest4j
-Source0:        %{url}/archive/r%{version}.tar.gz
-Source100:      https://repo1.maven.org/maven2/org/opentest4j/opentest4j/%{version}/opentest4j-%{version}.pom
-
 BuildArch:      noarch
 
+Source0:        https://github.com/ota4j-team/opentest4j/archive/r%{version}.tar.gz
+Source100:      https://repo1.maven.org/maven2/org/opentest4j/opentest4j/%{version}/opentest4j-%{version}.pom
+
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(junit:junit)
+%endif
 
 %description
 Open Test Alliance for the JVM is a minimal common foundation for
@@ -65,8 +74,12 @@ cp -p %{SOURCE100} pom.xml
     </pluginManagement>
   </build>"
 
+# Fix unused reference to unused dependency
+# This is fixed upstream: https://github.com/ota4j-team/opentest4j/commit/70d3d54f2cd076a962e81d9510e6716f3cbf8060
+sed -i -e '/org\.apache\.commons\.codec/d' src/test/java/org/opentest4j/AssertionFailedErrorTests.java
+
 %build
-%mvn_build -- -Dmaven.compiler.release=8
+%mvn_build
 
 %install
 %mvn_install
@@ -79,8 +92,12 @@ cp -p %{SOURCE100} pom.xml
 %license LICENSE
 
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.2.0-6
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-7
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-6
+- Bootstrap build
+- Non-bootstrap build
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@@ -100,9 +117,18 @@ cp -p %{SOURCE100} pom.xml
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-2
+- Mass rebuild for javapackages-tools 201902
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Mon Jul 15 2019 Marian Koncek <mkoncek@redhat.com> - 1.2.0-1
+- Update to upstream version 1.2.0
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.1.1-2
+- Mass rebuild for javapackages-tools 201901
+
 * Tue Mar 05 2019 Mat Booth <mat.booth@redhat.com> - 1.1.1-1
 - Update to latest upstream release