diff --git a/plexus-pom.spec b/plexus-pom.spec
index b2a9700..b6df6ce 100644
--- a/plexus-pom.spec
+++ b/plexus-pom.spec
@@ -1,32 +1,37 @@
-Name:           plexus-pom
-Version:        7
-Release:        1%{?dist}
-Summary:        Root Plexus Projects POM
-License:        ASL 2.0
-
-URL:            https://github.com/codehaus-plexus/plexus-pom
-Source0:        %{url}/archive/plexus-%{version}.tar.gz
-Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
-
-BuildArch:      noarch
-
-BuildRequires:  maven-local
-BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+%bcond_with bootstrap
+
+Name:          plexus-pom
+Version:       7
+Release:       1%{?dist}
+Summary:       Root Plexus Projects POM
+License:       ASL 2.0
+URL:           https://github.com/codehaus-plexus/plexus-pom
+Source0:       https://github.com/codehaus-plexus/plexus-pom/archive/plexus-%{version}.tar.gz
+Source1:       https://www.apache.org/licenses/LICENSE-2.0.txt
+BuildArch:     noarch
+
+BuildRequires: maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%endif
+
+# Test dependency that should be propagated down the POM hierarchy
+Requires:      mvn(junit:junit)
 
 %description
 The Plexus project provides a full software stack for creating and
-executing software projects.  This package provides parent POM for
+executing software projects. This package provides parent POM for
 Plexus packages.
 
 %prep
 %setup -q -n plexus-pom-plexus-%{version}
+cp -p %{SOURCE1} LICENSE
 
-%pom_remove_plugin :findbugs-maven-plugin
 %pom_remove_plugin :maven-site-plugin
+%pom_remove_plugin :maven-enforcer-plugin
+%pom_remove_plugin :findbugs-maven-plugin
 %pom_remove_plugin :taglist-maven-plugin
 
-cp -p %{SOURCE1} LICENSE
-
 %build
 %mvn_build
 
@@ -43,12 +48,24 @@ cp -p %{SOURCE1} LICENSE
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
+* Tue Jan 26 2021 Marian Koncek <mkoncek@redhat.com> - 7-1
+- Update to upstream version 7
+
+* Fri Dec  4 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 6.5-1
+- Update to upstream version 6.5
+
 * Sat Oct 24 2020 Fabio Valentini <decathorpe@gmail.com> - 6.5-1
 - Update to version 6.5.
 
+* Fri Sep 11 2020 Marian Koncek <mkoncek@redhat.com> - 6.4-2
+- Update to upstream version 6.4
+
 * Sun Aug 16 2020 Fabio Valentini <decathorpe@gmail.com> - 6.4-1
 - Update to version 6.4.
 
+* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 6.3-1
+- Update to upstream version 6.3
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
@@ -67,12 +84,21 @@ cp -p %{SOURCE1} LICENSE
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.1-2
+- Mass rebuild for javapackages-tools 201902
+
 * Thu Oct 24 2019 Fabio Valentini <decathorpe@gmail.com> - 5.1-1
 - Update to version 5.1.
 
+* Mon Jul 29 2019 Marian Koncek <mkoncek@redhat.com> - 5.1-1
+- Update to upstream version 5.1
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.0-3
+- Mass rebuild for javapackages-tools 201901
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild