Upgrade plexus-archiver to 4.2.6 fails and need to upgrade plexus-utils to 3.3.0 to resolve it.

(cherry picked from commit 20e7f12b0862f9041098bb60fc6fa39a980425a0)
This commit is contained in:
starlet-dx 2021-12-30 22:33:33 +08:00 committed by openeuler-sync-bot
parent c3d82b0d73
commit 1773ac7733
4 changed files with 5 additions and 29 deletions

View File

@ -1,25 +0,0 @@
From 978fcb3b207d1b1a9895dadd40ba31c290c57918 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
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

Binary file not shown.

BIN
plexus-utils-3.3.0.tar.gz Normal file

Binary file not shown.

View File

@ -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 <yaoxin30@huawei.com> - 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 <hujiangping@huawei.com> - 3.1.0-4
- Package init