From e6ab8dc15df9aa0d9822f5eeb07f2089c961ef53 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 25 Jun 2021 15:43:10 +0200 Subject: [PATCH] Update to upstream version 3.3.4 Resolves: rhbz#1865869 --- .gitignore | 1 + ...ore-compatibility-with-current-maven.patch | 112 +++++++++--------- ...-POSIX-attributes-for-symbolic-links.patch | 28 ++--- 0002-Port-to-plexus-utils-3.0.10.patch | 25 ---- maven-shared-utils.spec | 13 +- sources | 2 +- 6 files changed, 80 insertions(+), 101 deletions(-) rename 0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch => 0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch (98%) delete mode 100644 0002-Port-to-plexus-utils-3.0.10.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/0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch b/0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch similarity index 98% rename from 0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch rename to 0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch index 7783723..c82fcf4 100644 --- a/0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch +++ b/0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch @@ -12,17 +12,17 @@ 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 - + } + } + } +- } + +- copyFilePermissions( from, to ); ++ copyFilePermissions( from, to ); ++ } + } + + /** +-- +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 deleted file mode 100644 index 1445dff..0000000 --- a/0002-Port-to-plexus-utils-3.0.10.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3b87b36b85e365f32a1b9443a962e3149e2dfd64 Mon Sep 17 00:00:00 2001 -From: Marian Koncek -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 map = new HashMap<>(); -+ final Map map = new HashMap<>(); - map.put( key, value ); - return new FileUtils.FilterWrapper[] - { --- -2.26.2 - diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index 35b614b..b2b40c4 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: 2%{?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 + * Mon May 17 2021 Mikolaj Izdebski - 3.3.3-2 - Bootstrap build - Non-bootstrap build 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