Update to 3.3.3 for fix CVE-2022-29599

(cherry picked from commit 1d403a82a07f2bd2b39365331d5c454fe97646ed)

0002-Port-to-plexus-utils-3.0.10.patch

@@ -0,0 +1,25 @@
+From 3b87b36b85e365f32a1b9443a962e3149e2dfd64 Mon Sep 17 00:00:00 2001
+From: Marian Koncek <mkoncek@redhat.com>
+Date: Fri, 11 Sep 2020 11:02:29 +0200
+Subject: [PATCH 2/3] Port to plexus-utils 3.0.10
+
+---
+ .../java/org/apache/maven/shared/utils/io/FileUtilsTest.java    | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+index 9fa7c85..151bbc9 100644
+--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
++++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+@@ -655,7 +655,7 @@ public class FileUtilsTest
+ 
+     private FileUtils.FilterWrapper[] wrappers( String key, String value )
+     {
+-        final Map<String, String> map = new HashMap<>();
++        final Map<String, Object> map = new HashMap<>();
+         map.put( key, value );
+         return new FileUtils.FilterWrapper[]
+             {
+-- 
+2.26.2
+

0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch

@@ -0,0 +1,28 @@
+From 932f9b15bd62255f81c66b564f748fff6ec84c86 Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Thu, 24 Sep 2020 20:17:56 +0200
+Subject: [PATCH 3/3] Avoid setting POSIX attributes for symbolic links
+
+---
+ src/main/java/org/apache/maven/shared/utils/io/FileUtils.java | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
+index a3be324..a396d99 100644
+--- a/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
++++ b/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
+@@ -1973,9 +1973,9 @@ public class FileUtils
+                     }
+                 }
+             }
+-        }
+ 
+-        copyFilePermissions( from, to );
++            copyFilePermissions( from, to );
++        }
+     }
+ 
+     /**
+-- 
+2.26.2
+

maven-shared-utils.spec

@@ -1,6 +1,6 @@
 Name:           maven-shared-utils
-Version:        3.2.1
-Release:        2
+Version:        3.3.3
+Release:        1
 Summary:        The functional replacement of plexus-utils in maven
 License:        ASL 2.0
 URL:            https://maven.apache.org/shared/maven-shared-utils
@@ -8,6 +8,8 @@ BuildArch:      noarch
 
 Source0:        https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
 Patch0001:      0001-Restore-compatibility-with-current-maven.patch
+Patch0002:      0002-Port-to-plexus-utils-3.0.10.patch
+Patch0003:      0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch
 
 BuildRequires:  maven-local mvn(com.google.code.findbugs:jsr305) mvn(commons-io:commons-io)
 BuildRequires:  mvn(junit:junit) mvn(org.apache.commons:commons-lang3) mvn(org.apache.maven:maven-core)
@@ -31,6 +33,9 @@ Man pages and other related help documents for %{name}.
 %autosetup -n %{name}-%{version} -p1
 %pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
 
+%pom_remove_dep org.apache.commons:commons-text
+rm src/test/java/org/apache/maven/shared/utils/CaseTest.java
+
 %build
 %mvn_build
 
@@ -43,5 +48,8 @@ Man pages and other related help documents for %{name}.
 %files help -f .mfiles-javadoc
 
 %changelog
+* Wed May 25 2022 yaoxin <yaoxin30@h-partners.com> - 3.3.3-1
+- Update to 3.3.3 for fix CVE-2022-29599
+
 * Thur Feb 20 2020 zhusongbao <zhusongbao@huawei.com> - 3.2.1-2
 - Package init