diff --git a/plexus-cipher.spec b/plexus-cipher.spec
index 68d4fe2..996d46f 100644
--- a/plexus-cipher.spec
+++ b/plexus-cipher.spec
@@ -1,3 +1,5 @@
+%bcond_with bootstrap
+
 Name:           plexus-cipher
 Version:        1.7
 Release:        22%{?dist}
@@ -13,25 +15,27 @@ BuildArch:      noarch
 # git archive --format tar --prefix=plexus-cipher-1.7/ 0cff29e6b2e | gzip -9 > plexus-cipher-1.7.tar.gz
 Source0:        %{name}-%{version}.tar.gz
 
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk8
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(javax.enterprise:cdi-api)
 BuildRequires:  mvn(javax.inject:javax.inject)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.sonatype.plugins:sisu-maven-plugin)
-BuildRequires:  mvn(org.sonatype.spice:spice-parent:pom:)
+%endif
 
 %description
 Plexus Cipher: encryption/decryption Component
 
-%package javadoc
-Summary:        Javadoc for %{name}
-
-%description javadoc
-API documentation for %{name}.
+%{?javadoc_package}
 
 %prep
 %setup -q
 
+%pom_remove_parent
+%pom_xpath_inject "pom:dependency[pom:artifactId='junit']" "<scope>test</scope>"
+
 # replace %{version}-SNAPSHOT with %{version}
 %pom_xpath_replace pom:project/pom:version "<version>%{version}</version>"
 
@@ -42,27 +46,18 @@ API documentation for %{name}.
 %pom_add_dep javax.inject:javax.inject:1:provided
 %pom_add_dep javax.enterprise:cdi-api:1.0:provided
 
+%pom_xpath_set "pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/*" 1.6
+
 %mvn_file : plexus/%{name}
 
-sed -i -e "s|1.5|1.8|" pom.xml
-# Fix javadoc generation on java 11
-%pom_xpath_inject pom:build/pom:plugins "<plugin>
-<artifactId>maven-javadoc-plugin</artifactId>
-<configuration><source>1.8</source></configuration>
-</plugin>" 
-
 %build
-# Tests depend on sisu-guice
 %mvn_build -f
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE.txt NOTICE.txt
-
-%files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt NOTICE.txt
+%license LICENSE.txt NOTICE.txt
 
 %changelog
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-22
@@ -80,9 +75,18 @@ sed -i -e "s|1.5|1.8|" pom.xml
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-17
+- Build with OpenJDK 8
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-16
+- Mass rebuild for javapackages-tools 201902
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.7-15
+- Mass rebuild for javapackages-tools 201901
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 0b04675..647e333 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-052bfc5cab808a1fe012a8f7d840f6b0  plexus-cipher-1.7.tar.gz
+SHA512 (plexus-cipher-1.7.tar.gz) = fab57bc55519c29f0d0ae6c37a076d1a00b7ecdae50408705e31595d4dae8fd4a771cfe3b28be2afedc0b89dd5270f4b6abafc0b04019f8e406c667bf2f78bea