.apache-commons-io.metadata

@@ -1 +1 @@
-0a814676ae1fc3e61d15c4aa50b55dc0faf23308 SOURCES/commons-io-2.6-src.tar.gz
+d82ee085d66826d0bacdb4528080726e2d3caedd SOURCES/commons-io-2.8.0-src.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/commons-io-2.6-src.tar.gz
+SOURCES/commons-io-2.8.0-src.tar.gz

SOURCES/0001-Fix-Files.size-failing-when-symlink-target-is-non-ex.patch

@@ -0,0 +1,25 @@
+From 610065347bbbc8fea366de32e558de4977807e52 Mon Sep 17 00:00:00 2001
+From: Mat Booth <mat.booth@redhat.com>
+Date: Wed, 3 Feb 2021 19:45:13 +0000
+Subject: [PATCH] Fix Files.size failing when symlink target is non-existant
+
+---
+ src/main/java/org/apache/commons/io/file/PathUtils.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/java/org/apache/commons/io/file/PathUtils.java b/src/main/java/org/apache/commons/io/file/PathUtils.java
+index d370ef0b..b38a46a0 100644
+--- a/src/main/java/org/apache/commons/io/file/PathUtils.java
++++ b/src/main/java/org/apache/commons/io/file/PathUtils.java
+@@ -358,7 +358,7 @@ public static PathCounters deleteFile(final Path file, final DeleteOption... opt
+         }
+         final PathCounters pathCounts = Counters.longPathCounters();
+         final boolean exists = Files.exists(file, LinkOption.NOFOLLOW_LINKS);
+-        final long size = exists ? Files.size(file) : 0;
++        final long size = exists && Files.exists(file) ? Files.size(file) : 0;
+         if (overrideReadOnly(options) && exists) {
+             setReadOnly(file, false, LinkOption.NOFOLLOW_LINKS);
+         }
+-- 
+2.28.0
+

SPECS/apache-commons-io.spec

@@ -1,57 +1,143 @@
+%bcond_with bootstrap
+
 Name:           apache-commons-io
 Epoch:          1
-Version:        2.6
-Release:        6%{?dist}
+Version:        2.8.0
+Release:        8%{?dist}
 Summary:        Utilities to assist with developing IO functionality
 License:        ASL 2.0
-URL:            http://commons.apache.org/io
+URL:            https://commons.apache.org/io
 BuildArch:      noarch
 
-Source0:        http://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz
+Source0:        https://archive.apache.org/dist/commons/io/source/commons-io-%{version}-src.tar.gz
+
+Patch0:         0001-Fix-Files.size-failing-when-symlink-target-is-non-ex.patch
 
 BuildRequires:  maven-local-openjdk8
-BuildRequires:  mvn(junit:junit)
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
+BuildRequires:  mvn(org.apache.commons:commons-lang3)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
+BuildRequires:  mvn(org.junit.jupiter:junit-jupiter)
+BuildRequires:  mvn(org.mockito:mockito-core)
+%endif
 
 %description
 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
+%patch0 -p1
 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
+sed -i '/<argLine>/d' pom.xml
 
 %mvn_file  : commons-io %{name}
 %mvn_alias : org.apache.commons:
 
+%pom_remove_dep org.junit-pioneer:junit-pioneer
+%pom_remove_dep com.google.jimfs:jimfs
+
+# Test depends on com.google.jimfs:jimfs
+rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFile.java
+
+# This annotation is part of junitpioneer
+sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java
+sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java
+
 %build
-%mvn_build
+# See "-DcommonsIoVersion" in maven-surefire for the tested version
+
+# The following tests fail on tmpfs/nfs:
+#  * PathUtilsDeleteDirectoryTest.testDeleteDirectory1FileSize0OverrideReadOnly:80->testDeleteDirectory1FileSize0:68 » FileSystem
+#  * PathUtilsDeleteFileTest.testDeleteReadOnlyFileDirectory1FileSize1:114 » FileSystem
+#  * PathUtilsDeleteFileTest.testSetReadOnlyFileDirectory1FileSize1:134 » FileSystem
+#  * PathUtilsDeleteTest.testDeleteDirectory1FileSize0OverrideReadonly:97->testDeleteDirectory1FileSize0:69 » FileSystem
+#  * PathUtilsDeleteTest.testDeleteDirectory1FileSize1OverrideReadOnly:145->testDeleteDirectory1FileSize1:117 » FileSystem
+
+%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.io
 
 %install
 %mvn_install
 
-%files -n %{?module_prefix}%{name} -f .mfiles
+%files -f .mfiles
 %license LICENSE.txt NOTICE.txt
 %doc RELEASE-NOTES.txt
 
 %changelog
+* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.8.0-8
+- Rebuild to regenerate auto-requires
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:2.8.0-7
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.8.0-6
+- Rebuild to workaround DistroBaker issue
+
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.8.0-5
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.8.0-4
+- Bootstrap build
+- Non-bootstrap build
+
+* Wed Feb  3 2021 Mat Booth <mat.booth@redhat.com> - 1:2.8.0-3
+- Add patch to fix Files.size() failing when symlink target is non-existant
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Oct 16 2020 Fabio Valentini <decathorpe@gmail.com> - 1:2.8.0-1
+- Update to version 2.8.0.
+
+* Fri Sep 18 2020 Marian Koncek <mkoncek@redhat.com> - 1:2.8.0-1
+- Update to upstream version 2.8.0
+
+* Tue Aug 18 2020 Fabio Valentini <decathorpe@gmail.com> - 1:2.7-1
+- Update to version 2.7.
+
+* Wed Jul 29 2020 Marian Koncek <mkoncek@redhat.com> - 1:2.7-1
+- Update to upstream version 2.7
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1:2.6-9
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * 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
 
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.6-4
 - Mass rebuild for javapackages-tools 201901
 
+* Thu Feb 07 2019 Mat Booth <mat.booth@redhat.com> - 1:2.6-6
+- Rebuild to regenerate OSGi metadata
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild