SPECS/plexus-io.spec

@@ -1,8 +1,6 @@
-%bcond_with bootstrap
-
 Name:           plexus-io
 Version:        3.2.0
-Release:        9%{?dist}
+Release:        2%{?dist}
 Summary:        Plexus IO Components
 License:        ASL 2.0
 URL:            https://github.com/codehaus-plexus/plexus-io
@@ -11,10 +9,7 @@ BuildArch:      noarch
 Source0:        https://github.com/codehaus-plexus/plexus-io/archive/plexus-io-%{version}.tar.gz
 Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 
-BuildRequires:  maven-local-openjdk8
+BuildRequires:  maven-local
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
 BuildRequires:  mvn(commons-io:commons-io)
 BuildRequires:  mvn(junit:junit)
@@ -22,16 +17,15 @@ BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
 BuildRequires:  mvn(org.codehaus.plexus:plexus:pom:)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
-%endif
 
 %description
 Plexus IO is a set of plexus components, which are designed for use
 in I/O operations.
 
-%package        javadoc
+%package javadoc
 Summary:        Javadoc for %{name}
 
-%description    javadoc
+%description javadoc
 API documentation for %{name}.
 
 %prep
@@ -40,9 +34,6 @@ cp %{SOURCE1} .
 
 %pom_remove_plugin :animal-sniffer-maven-plugin
 
-# Test fails in mock
-sed -i /class/i@org.junit.Ignore src/test/java/org/codehaus/plexus/components/io/attributes/SymlinkUtilsTest.java
-
 %build
 %mvn_file  : plexus/io
 %mvn_build
@@ -57,59 +48,18 @@ sed -i /class/i@org.junit.Ignore src/test/java/org/codehaus/plexus/components/io
 %license NOTICE.txt LICENSE-2.0.txt
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.2.0-9
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-8
-- Rebuild to workaround DistroBaker issue
-
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-7
-- Bootstrap Maven for CentOS Stream 9
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-6
-- Bootstrap build
-- Non-bootstrap build
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 3.2.0-3
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-2
 - Mass rebuild for javapackages-tools 201902
 
 * Wed Oct 23 2019 Marian Koncek <mkoncek@redhat.com> - 3.2.0-1
 - Update to upstream version 3.2.0
 
-* Wed Oct 16 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.0-1
-- Update to version 3.2.0.
-
-* Mon Jul 29 2019 Fabio Valentini <decathorpe@gmail.com> - 3.1.1-1
-- Update to version 3.1.1.
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-2
 - Mass rebuild for javapackages-tools 201901
 
 * Mon May 13 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.1-1
 - Update to upstream version 3.1.1
 
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild