Merge modular branch

xz-java.spec

@@ -1,3 +1,5 @@
+%bcond_with bootstrap
+
 Name:           xz-java
 Version:        1.8
 Release:        10%{?dist}
@@ -9,7 +11,11 @@ BuildArch:      noarch
 Source0:        http://tukaani.org/xz/xz-java-%{version}.zip
 
 BuildRequires:  javapackages-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  ant
+%endif
 
 %description
 A complete implementation of XZ data compression in Java.
@@ -28,9 +34,6 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -c %{name}-%{version}
 
-# disable javadoc linting
-sed -i -e '/<javadoc/aadditionalparam="-Xdoclint:none"' build.xml
-
 %mvn_file : %{name} xz
 
 %build
@@ -38,7 +41,7 @@ sed -i -e '/<javadoc/aadditionalparam="-Xdoclint:none"' build.xml
 # package-list from oracle.com. Create a dummy package-list to prevent that.
 mkdir -p extdoc && touch extdoc/package-list
 
-ant maven -Dsourcever=1.8
+%ant maven -Dsourcever=1.6
 
 %install
 %mvn_artifact build/maven/xz-%{version}.pom build/jar/xz.jar
@@ -68,9 +71,15 @@ ant maven -Dsourcever=1.8
 * Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-4
+- Mass rebuild for javapackages-tools 201902
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.8-3
+- Mass rebuild for javapackages-tools 201901
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild