From 682dc073f1e52a16d747e5bf909829ed43c4ec63 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: May 13 2021 14:44:53 +0000
Subject: Merge modular branch


---

diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec
index b03f118..bc69587 100644
--- a/apache-commons-cli.spec
+++ b/apache-commons-cli.spec
@@ -1,3 +1,5 @@
+%bcond_without bootstrap
+
 Name:           apache-commons-cli
 Version:        1.4
 Release:        12%{?dist}
@@ -11,10 +13,14 @@ Source0:        http://www.apache.org/dist/commons/cli/source/commons-cli-%{vers
 # workaround for https://issues.apache.org/jira/browse/CLI-253
 Patch0:         CLI-253-workaround.patch
 
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk8
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
+%endif
 
 %description
 The CLI library provides a simple and easy to use API for working with the
@@ -29,12 +35,6 @@ command line arguments and options.
 %mvn_alias : org.apache.commons:commons-cli
 %mvn_file : commons-cli %{name}
 
-# Fix javadoc generation on java 11
-%pom_xpath_inject pom:pluginManagement/pom:plugins "<plugin>
-<artifactId>maven-javadoc-plugin</artifactId>
-<configuration><source>1.6</source></configuration>
-</plugin>" 
-
 %build
 %mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6
 
@@ -61,9 +61,18 @@ command line arguments and options.
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-7
+- Build with OpenJDK 8
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-6
+- Mass rebuild for javapackages-tools 201902
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-5
+- Mass rebuild for javapackages-tools 201901
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild