diff --git a/0001-Follow-symlinks-in-NioFiles.copy.patch b/0001-Follow-symlinks-in-NioFiles.copy.patch deleted file mode 100644 index 9d12d47..0000000 --- a/0001-Follow-symlinks-in-NioFiles.copy.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 978fcb3b207d1b1a9895dadd40ba31c290c57918 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Wed, 11 Jul 2018 13:15:55 +0200 -Subject: [PATCH] Follow symlinks in NioFiles.copy - ---- - src/main/java/org/codehaus/plexus/util/NioFiles.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main/java/org/codehaus/plexus/util/NioFiles.java b/src/main/java/org/codehaus/plexus/util/NioFiles.java -index 2841978..50cdeb7 100644 ---- a/src/main/java/org/codehaus/plexus/util/NioFiles.java -+++ b/src/main/java/org/codehaus/plexus/util/NioFiles.java -@@ -138,7 +138,7 @@ public static File copy( File source, File target ) - throws IOException - { - Path copy = Files.copy( source.toPath(), target.toPath(), StandardCopyOption.REPLACE_EXISTING, -- StandardCopyOption.COPY_ATTRIBUTES, LinkOption.NOFOLLOW_LINKS ); -+ StandardCopyOption.COPY_ATTRIBUTES ); - return copy.toFile(); - } - --- -2.17.1 - diff --git a/plexus-utils-3.1.0.tar.gz b/plexus-utils-3.1.0.tar.gz deleted file mode 100644 index 5728131..0000000 Binary files a/plexus-utils-3.1.0.tar.gz and /dev/null differ diff --git a/plexus-utils-3.3.0.tar.gz b/plexus-utils-3.3.0.tar.gz new file mode 100644 index 0000000..b6d4243 Binary files /dev/null and b/plexus-utils-3.3.0.tar.gz differ diff --git a/plexus-utils.spec b/plexus-utils.spec index 72388d5..fbe44a6 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -1,14 +1,12 @@ Name: plexus-utils -Version: 3.1.0 -Release: 4 +Version: 3.3.0 +Release: 1 Summary: Plexus Common Utilities License: ASL 1.1 and ASL 2.0 and xpp and BSD and Public Domain URL: https://codehaus-plexus.github.io/plexus-utils/ Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz Source1: http://apache.org/licenses/LICENSE-2.0.txt -Patch0001: 0001-Follow-symlinks-in-NioFiles.copy.patch - BuildArch: noarch BuildRequires: maven-local mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) @@ -60,5 +58,8 @@ cp %{SOURCE1} . %files help -f .mfiles-javadoc %changelog +* Thu Dec 30 2021 yaoxin - 3.3.0-1 +- Upgrade plexus-archiver to 4.2.6 fails and need to upgrade plexus-utils to 3.3.0 to resolve it. + * Thu Dec 05 2019 Jiangping Hu - 3.1.0-4 - Package init