From 913f0d8b647279d3d3256a0931e3405c16726212 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 26 Jul 2021 11:53:05 +0200 Subject: [PATCH] Update to upstream version 3.3.4 Related: rhbz#1977203 --- .gitignore | 1 + ...ore-compatibility-with-current-maven.patch | 112 +++++++++--------- ...-POSIX-attributes-for-symbolic-links.patch | 28 +++++ maven-shared-utils.spec | 13 +- sources | 2 +- 5 files changed, 94 insertions(+), 62 deletions(-) create mode 100644 0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch diff --git a/.gitignore b/.gitignore index fee4c76..b5489c1 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /maven-shared-utils-3.1.0-source-release.zip /maven-shared-utils-3.2.1-source-release.zip /maven-shared-utils-3.3.3-source-release.zip +/maven-shared-utils-3.3.4-source-release.zip diff --git a/0001-Restore-compatibility-with-current-maven.patch b/0001-Restore-compatibility-with-current-maven.patch index 9591843..479e5a1 100644 --- a/0001-Restore-compatibility-with-current-maven.patch +++ b/0001-Restore-compatibility-with-current-maven.patch @@ -14,69 +14,69 @@ 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 - { - return ansi.toString(); - } -+ -+ @Override -+ public MessageBuilder debug(Object message) { -+ a(message); -+ return this; -+ } -+ -+ @Override -+ public MessageBuilder info(Object message) { -+ a(message); -+ return this; -+ } -+ -+ @Override -+ public MessageBuilder error(Object message) { -+ a(message); -+ return this; -+ } - } + { + return ansi.toString(); + } ++ ++ @Override ++ public MessageBuilder debug(Object message) { ++ a(message); ++ return this; ++ } ++ ++ @Override ++ public MessageBuilder info(Object message) { ++ a(message); ++ return this; ++ } ++ ++ @Override ++ public MessageBuilder error(Object message) { ++ a(message); ++ return this; ++ } + } 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 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; - */ - public interface MessageBuilder - { -+ MessageBuilder debug( Object message ); -+ MessageBuilder info( Object message ); -+ MessageBuilder error( Object message ); - /** - * Append message content in success style. - * By default, bold green + */ + public interface MessageBuilder + { ++ MessageBuilder debug( Object message ); ++ MessageBuilder info( Object message ); ++ MessageBuilder error( Object message ); + /** + * 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 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 - { - return buffer.toString(); - } -+ -+ @Override -+ public MessageBuilder debug(Object message) { -+ a(message); -+ return this; -+ } -+ -+ @Override -+ public MessageBuilder info(Object message) { -+ a(message); -+ return this; -+ } -+ -+ @Override -+ public MessageBuilder error(Object message) { -+ a(message); -+ return this; -+ } - } --- -2.26.2 - + { + return buffer.toString(); + } ++ ++ @Override ++ public MessageBuilder debug(Object message) { ++ a(message); ++ return this; ++ } ++ ++ @Override ++ public MessageBuilder info(Object message) { ++ a(message); ++ return this; ++ } ++ ++ @Override ++ public MessageBuilder error(Object message) { ++ a(message); ++ return this; ++ } + } +-- +2.26.2 + diff --git a/0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch b/0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch new file mode 100644 index 0000000..c82fcf4 --- /dev/null +++ b/0002-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 0c5ddb0..e0e800c 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: maven-shared-utils -Version: 3.3.3 -Release: 4%{?dist} +Version: 3.3.4 +Release: 1%{?dist} Summary: Maven shared utility classes License: ASL 2.0 URL: https://maven.apache.org/shared/maven-shared-utils @@ -11,8 +11,7 @@ BuildArch: noarch Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip # 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 +Patch2: 0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch BuildRequires: maven-local-openjdk8 %if %{with bootstrap} @@ -42,9 +41,10 @@ a lot of unused code. %prep %setup -q +find -name '*.java' -exec sed -i 's/\r//' {} + + %patch1 -p1 %patch2 -p1 -%patch3 -p1 %pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin @@ -61,6 +61,9 @@ rm src/test/java/org/apache/maven/shared/utils/CaseTest.java %license LICENSE NOTICE %changelog +* Fri Jun 25 2021 Marian Koncek - 3.3.4-1 +- Update to upstream version 3.3.4 + * Wed Jun 09 2021 Mikolaj Izdebski - 3.3.3-4 - Rebuild to workaround DistroBaker issue diff --git a/sources b/sources index 4faa4ba..2071fd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-shared-utils-3.3.3-source-release.zip) = 6085d3bb3d065efaca7ed43f7342c2b71c624235ff38cd1410a06a4c915e39a13cb00e65e8c0cd7203dc5b2d1deeb392eaab2aa0a43bfadb7c9d4286a2b473bc +SHA512 (maven-shared-utils-3.3.4-source-release.zip) = 27b63d3c8214c3ced472c4eae69199adad85b4badabd3b1608b8ab288f2246efba8f833763e87ad13e55268814e392b0d8146fb4a32a9de6d3c50c9652d66326