rpms/apache-commons-io
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 2.11.0

Browse Source
This commit is contained in:
Mikolaj Izdebski 2022-04-24 13:55:58 +02:00
parent f300f5fdd3
commit 6f8c4e7d43
4 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -12,3 +12,4 @@
/commons-io-2.6-src.tar.gz
/commons-io-2.7-src.tar.gz
/commons-io-2.8.0-src.tar.gz
/commons-io-2.11.0-src.tar.gz

25
0001-Fix-Files.size-failing-when-symlink-target-is-non-ex.patch
View File

@ -1,25 +0,0 @@
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

11
apache-commons-io.spec
View File

@ -2,8 +2,8 @@
Name: apache-commons-io
Epoch: 1
Version: 2.8.0
Release: 7%{?dist}
Version: 2.11.0
Release: 1%{?dist}
Summary: Utilities to assist with developing IO functionality
License: ASL 2.0
URL: https://commons.apache.org/io
@ -11,8 +11,6 @@ BuildArch: 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
@ -33,7 +31,6 @@ to assist with developing IO functionality.
%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
@ -44,6 +41,7 @@ sed -i '/<argLine>/d' pom.xml
%mvn_alias : org.apache.commons:
%pom_remove_dep org.junit-pioneer:junit-pioneer
%pom_remove_dep :junit-bom
%pom_remove_dep com.google.jimfs:jimfs
# Test depends on com.google.jimfs:jimfs
@ -73,6 +71,9 @@ sed -i '/DefaultLocale/d' src/test/java/org/apache/commons/io/input/XmlStreamRea
%doc RELEASE-NOTES.txt
%changelog
* Sun Apr 24 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:2.11.0-1
- Update to upstream version 2.11.0
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:2.8.0-7
- Rebuilt for java-17-openjdk as system jdk

2
sources
View File

@ -1 +1 @@
SHA512 (commons-io-2.8.0-src.tar.gz) = 6189c72eff8661bfb8cfed95dd7ee32578b24b50f6586d4628a4dbfd3618853a72eb73da311729e55742ace47b2d38d3ce130ab87b684494d8ce33d1ccf14a2d
SHA512 (commons-io-2.11.0-src.tar.gz) = e2ab8ebc9c328093a460f8f5f96c80bb45f5073ec7aaa0beabdcdeac2e97324292eab2e2cb8b64d8e78b2c5d89048ba84e50daa0965dffcbe2fd0da7ab789ee3