diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec
index a37d17f..a4630ef 100644
--- a/maven-compiler-plugin.spec
+++ b/maven-compiler-plugin.spec
@@ -1,12 +1,14 @@
+%bcond_with bootstrap
+
 Name:           maven-compiler-plugin
 Version:        3.8.1
 Release:        8%{?dist}
 Summary:        Maven Compiler Plugin
 License:        ASL 2.0
-URL:            http://maven.apache.org/plugins/maven-compiler-plugin
+URL:            https://maven.apache.org/plugins/maven-compiler-plugin
 BuildArch:      noarch
 
-Source0:        http://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip
+Source0:        https://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip
 
 # port to plexus-languages 1.0.3
 Patch0:         0001-plexus-languages-1.0.patch
@@ -15,11 +17,17 @@ Patch0:         0001-plexus-languages-1.0.patch
 Patch1:         0002-MCOMPILER-359-Fix-for-NPE.patch
 
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
+BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
+BuildRequires:  mvn(org.apache.maven:maven-compat)
 BuildRequires:  mvn(org.apache.maven:maven-core)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 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:maven-shared-incremental)
 BuildRequires:  mvn(org.apache.maven.shared:maven-shared-utils)
@@ -28,7 +36,8 @@ BuildRequires:  mvn(org.codehaus.plexus:plexus-compiler-javac)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-compiler-manager)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-java)
-
+BuildRequires:  mvn(org.mockito:mockito-core)
+%endif
 
 %description
 The Compiler Plugin is used to compile the sources of your project.
@@ -44,8 +53,11 @@ API documentation for %{name}.
 %patch0 -p1
 %patch1 -p1
 
+# Replace path to junit in a test case with the system wide .jar
+sed -i 's|localRepository,\ "junit/junit/3.8.1/junit-3.8.1.jar"|"%(find-jar junit || find-jar javapackages-bootstrap/junit)"|' src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java
+
 %build
-%mvn_build -f
+%mvn_build
 
 %install
 %mvn_install
@@ -72,6 +84,9 @@ API documentation for %{name}.
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.8.1-2
+- Mass rebuild for javapackages-tools 201902
+
 * Tue Oct 15 2019 Fabio Valentini <decathorpe@gmail.com> - 3.8.1-3
 - Port to plexus-languages 1.0.
 
@@ -81,6 +96,15 @@ API documentation for %{name}.
 * Sat Jun 08 2019 Fabio Valentini <decathorpe@gmail.com> - 3.8.1-1
 - Update to version 3.8.1.
 
+* Tue Jun 04 2019 Marian Koncek <mkoncek@redhat.com> - 3.8.1-1
+- Update to upstream version 3.8.1
+
+* Fri May 31 2019 Marian Koncek <mkoncek@redhat.com> - 3.8.0-1
+- Update to upstream version 3.8.0
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.7.0-3
+- Mass rebuild for javapackages-tools 201901
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild