From 54b85ac3442dbe67f864ae6689b9c6bb4becbb79 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 24 Sep 2020 20:19:59 +0200 Subject: [PATCH] Avoid setting POSIX attributes for symbolic links --- ...ore-compatibility-with-current-maven.patch | 22 +++++++-------- 0002-Port-to-plexus-utils-3.0.10.patch | 12 ++++---- ...-POSIX-attributes-for-symbolic-links.patch | 28 +++++++++++++++++++ maven-shared-utils.spec | 2 ++ 4 files changed, 47 insertions(+), 17 deletions(-) create mode 100644 0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch diff --git a/0001-Restore-compatibility-with-current-maven.patch b/0001-Restore-compatibility-with-current-maven.patch index 0051408..9591843 100644 --- a/0001-Restore-compatibility-with-current-maven.patch +++ b/0001-Restore-compatibility-with-current-maven.patch @@ -1,16 +1,16 @@ -From e3d2a29743e1b36beaf1063567da9dfd2e5a8aa8 Mon Sep 17 00:00:00 2001 +From 0466ed821db9af6ad856b011566148b3ad0d0267 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 26 Feb 2018 16:21:04 +0100 -Subject: [PATCH] Restore compatibility with current maven +Subject: [PATCH 1/3] Restore compatibility with current maven --- - .../maven/shared/utils/logging/AnsiMessageBuilder.java | 18 ++++++++++++++++++ - .../maven/shared/utils/logging/MessageBuilder.java | 3 +++ - .../shared/utils/logging/PlainMessageBuilder.java | 18 ++++++++++++++++++ + .../utils/logging/AnsiMessageBuilder.java | 18 ++++++++++++++++++ + .../shared/utils/logging/MessageBuilder.java | 3 +++ + .../utils/logging/PlainMessageBuilder.java | 18 ++++++++++++++++++ 3 files changed, 39 insertions(+) diff --git a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java -index 0103a6b..23b6d14 100644 +index 2d59bc9..77c93ae 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java @@ -153,4 +153,22 @@ class AnsiMessageBuilder @@ -37,7 +37,7 @@ index 0103a6b..23b6d14 100644 + } } diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java -index b60bb4e..1dc2624 100644 +index 060e824..a3b3025 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java @@ -26,6 +26,9 @@ package org.apache.maven.shared.utils.logging; @@ -51,7 +51,7 @@ index b60bb4e..1dc2624 100644 * Append message content in success style. * By default, bold green diff --git a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java -index 2eec001..5236e99 100644 +index 6a7b56e..1a5889a 100644 --- a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java +++ b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java @@ -139,4 +139,22 @@ class PlainMessageBuilder @@ -77,6 +77,6 @@ index 2eec001..5236e99 100644 + return this; + } } --- -2.14.3 - +-- +2.26.2 + diff --git a/0002-Port-to-plexus-utils-3.0.10.patch b/0002-Port-to-plexus-utils-3.0.10.patch index be61bca..1445dff 100644 --- a/0002-Port-to-plexus-utils-3.0.10.patch +++ b/0002-Port-to-plexus-utils-3.0.10.patch @@ -1,14 +1,14 @@ -From 15924bb52d1774f04cd8cd34ef2d568d429cd05e Mon Sep 17 00:00:00 2001 +From 3b87b36b85e365f32a1b9443a962e3149e2dfd64 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 11 Sep 2020 11:02:29 +0200 -Subject: [PATCH] Port to plexus-utils 3.0.10 +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 cd3338c..4ad8f6b 100644 +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 @@ -20,6 +20,6 @@ index cd3338c..4ad8f6b 100644 map.put( key, value ); return new FileUtils.FilterWrapper[] { --- -2.26.2 - +-- +2.26.2 + diff --git a/0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch b/0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch new file mode 100644 index 0000000..7783723 --- /dev/null +++ b/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 +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 + diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index 0850e8f..dd49b64 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -10,6 +10,7 @@ Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/% # XXX temporary for maven upgrade Patch1: 0001-Restore-compatibility-with-current-maven.patch Patch2: 0002-Port-to-plexus-utils-3.0.10.patch +Patch3: 0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch BuildRequires: maven-local-openjdk8 BuildRequires: mvn(com.google.code.findbugs:jsr305) @@ -38,6 +39,7 @@ a lot of unused code. %patch1 -p1 %patch2 -p1 +%patch3 -p1 %pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin