SPECS/apache-commons-io.spec

@@ -1,7 +1,7 @@
 Name:           apache-commons-io
 Epoch:          1
 Version:        2.6
-Release:        6%{?dist}
+Release:        3%{?dist}
 Summary:        Utilities to assist with developing IO functionality
 License:        ASL 2.0
 URL:            http://commons.apache.org/io
@@ -9,7 +9,7 @@ BuildArch:      noarch
 
 Source0:        http://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz
 
-BuildRequires:  maven-local-openjdk8
+BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
@@ -19,39 +19,28 @@ Commons-IO contains utility classes, stream implementations,
 file filters, and endian classes. It is a library of utilities
 to assist with developing IO functionality.
 
-%{?module_package}
 %{?javadoc_package}
 
 %prep
 %setup -q -n commons-io-%{version}-src
 sed -i 's/\r//' *.txt
 
-# Run tests in multiple reusable forks to improve test performance
-sed -i -e /reuseForks/d -e /forkCount/d pom.xml
-
+%build
 %mvn_file  : commons-io %{name}
 %mvn_alias : org.apache.commons:
 
-%build
+# NOTE: tests *may* fail because commons-io is on surefire's classpath and causes
+# tests to be run against the system version and not the one we just built
 %mvn_build
 
 %install
 %mvn_install
 
-%files -n %{?module_prefix}%{name} -f .mfiles
+%files -f .mfiles
 %license LICENSE.txt NOTICE.txt
 %doc RELEASE-NOTES.txt
 
 %changelog
-* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.6-6
-- Build with OpenJDK 8
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.6-5
-- Mass rebuild for javapackages-tools 201902
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.6-4
-- Mass rebuild for javapackages-tools 201901
-
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild