.apache-commons-io.metadata

@@ -1 +1 @@
-d3e0fd2ec0a26425468656e4e0e580e8c6b8561f SOURCES/commons-io-2.13.0-src.tar.gz
+d82ee085d66826d0bacdb4528080726e2d3caedd SOURCES/commons-io-2.8.0-src.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/commons-io-2.13.0-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

@@ -2,27 +2,27 @@
 
 Name:           apache-commons-io
 Epoch:          1
-Version:        2.13.0
+Version:        2.8.0
-Release:        8%{?dist}
+Release:        10%{?dist}
 Summary:        Utilities to assist with developing IO functionality
-License:        Apache-2.0
+License:        ASL 2.0
 URL:            https://commons.apache.org/io
 BuildArch:      noarch
-ExclusiveArch:  %{java_arches} noarch
 
 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
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
-BuildRequires:  maven-local
 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
-BuildRequires:  jurand
 
 %description
 Commons-IO contains utility classes, stream implementations,
@@ -33,7 +33,7 @@ to assist with developing IO functionality.
 
 %prep
 %setup -q -n commons-io-%{version}-src
-
+%patch -P 0 -p1
 sed -i 's/\r//' *.txt
 
 # Run tests in multiple reusable forks to improve test performance
@@ -44,11 +44,15 @@ sed -i '/<argLine>/d' pom.xml
 %mvn_alias : org.apache.commons:
 
 %pom_remove_dep org.junit-pioneer:junit-pioneer
-%java_remove_annotations src -s -n DefaultLocale
-
 %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
 # See "-DcommonsIoVersion" in maven-surefire for the tested version
 
@@ -59,7 +63,6 @@ rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFil
 #  * PathUtilsDeleteTest.testDeleteDirectory1FileSize0OverrideReadonly:97->testDeleteDirectory1FileSize0:69 » FileSystem
 #  * PathUtilsDeleteTest.testDeleteDirectory1FileSize1OverrideReadOnly:145->testDeleteDirectory1FileSize1:117 » FileSystem
 
-# moditect profile generates module-info.class
 %mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.io
 
 %install
@@ -70,53 +73,24 @@ rm src/test/java/org/apache/commons/io/input/ReversedLinesFileReaderTestParamFil
 %doc RELEASE-NOTES.txt
 
 %changelog
-* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1:2.13.0-8
+* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 1:2.8.0-10
-- Rebuilt for MSVSphere 10
+- Fix patch usage
-
-* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 1:2.13.0-8
-- Bump release for Aug 2024 java mass rebuild
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:2.13.0-7
-- Bump release for June 2024 mass rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.13.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.13.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.13.0-4
-- Rebuild to regenerate auto-Requires on java
-
-* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.13.0-3
-- Rebuild
-
-* Wed Aug 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.13.0-2
-- Build with Jurand instead of deprecated javapackages-extra
-
-* Wed Aug 09 2023 Marian Koncek <mkoncek@redhat.com> - 1:2.13.0-1
-- Update to upstream version 2.13.0
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.11.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.11.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.11.0-2
+* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 1:2.8.0-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+- Rebuild with regenerated Requires on Java
 
-* Sun Apr 24 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.11.0-1
+* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.8.0-8
-- Update to upstream version 2.11.0
+- Rebuild to regenerate auto-requires
 
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:2.8.0-7
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:2.8.0-7
-- Rebuilt for java-17-openjdk as system jdk
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8.0-6
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.8.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+- Rebuild to workaround DistroBaker issue
 
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.8.0-5
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.8.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Bootstrap Maven for CentOS Stream 9
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.8.0-4
 - Bootstrap build