2 changed files with 67 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +0,0 @@
-SOURCES/commons-collections-3.2.2-src.tar.gz
--- a/SPECS/apache-commons-collections.spec
+++ b/SPECS/apache-commons-collections.spec
@ -1,20 +1,27 @@
+%bcond_with bootstrap
+
 Name:           apache-commons-collections
 Version:        3.2.2
-Release:        13%{?dist}
+Release:        28%{?dist}
 Summary:        Provides new interfaces, implementations and utilities for Java Collections
 License:        ASL 2.0
 URL:            http://commons.apache.org/collections/
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch

 Source0:        http://www.apache.org/dist/commons/collections/source/commons-collections-%{version}-src.tar.gz

 Patch0:         0001-Port-to-Java-8.patch
 Patch1:         0002-Port-to-OpenJDK-11.patch

+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
+%endif

 %description
 The introduction of the Collections API by Sun in JDK 1.2 has been a
@ -54,6 +61,9 @@ find . -name "*.class" -exec rm -f {} \;
 %patch0 -p1
 %patch1 -p1

+# Port to maven-antrun-plugin 3.0.0
+sed -i s/tasks/target/ pom.xml
+
 # Fix file eof
 sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt

@ -61,7 +71,7 @@ sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt
 %mvn_file ':commons-collections{,-testframework}' %{name}@1 commons-collections@1

 %build
-%mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6
+%mvn_build -- -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 -Dcommons.osgi.symbolicName=org.apache.commons.collections

 %install
 %mvn_artifact commons-collections:commons-collections-testframework:%{version} target/commons-collections-testframework-%{version}.jar
@ -77,15 +87,70 @@ sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt
 %license LICENSE.txt NOTICE.txt

 %changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.2.2-27
+- Rebuilt for java-17-openjdk as system jdk
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-25
+- Bump Java compiler source/target levels to 1.7
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-23
+- Bootstrap build
+- Non-bootstrap build
+
+* Fri Mar 05 2021 Mat Booth <mat.booth@redhat.com> - 3.2.2-22
+- Backport fix to build with maven-antrun-plugin 3.0.0
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.2.2-19
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Fri Jun 26 2020 Alexander Kurtakov <akurtako@redhat.com> 3.2.2-18
+- Rebuild to verify xmvn/maven switch to jakarta-annotations.
+
+* Thu Jun 25 2020 Roland Grunberg <rgrunber@redhat.com> - 3.2.2-17
+- Fix ambiguous reference in AbstractTestCollection to build on Java 11.
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Nov 15 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.2-15
+- Adapt build and install scriptlets to fix issues in dependencies.
+
+* Tue Nov 05 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.2-14
+- Really actually skip tests to fix builds with xmvn 3.1.0.
+
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-13
 - Mass rebuild for javapackages-tools 201902

+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Fri Jun 28 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-12
 - Enable tests

 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.2-11
 - Mass rebuild for javapackages-tools 201901

+* Fri Feb 08 2019 Mat Booth <mat.booth@redhat.com> - 3.2.2-12
+- Rebuild to regenerate OSGi metadata
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.2-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
				`@ -1 +0,0 @@`
				`SOURCES/commons-collections-3.2.2-src.tar.gz`