From bf520744c3b74ccae88f35f73330518cc51bc7ea Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 16 Aug 2023 09:11:30 +0200 Subject: [PATCH] Update to upstream version 3.4.2 --- .gitignore | 1 + ...-POSIX-attributes-for-symbolic-links.patch | 10 +-- ...ore-compatibility-with-current-maven.patch | 82 ------------------- maven-shared-utils.spec | 27 +++--- sources | 2 +- 5 files changed, 19 insertions(+), 103 deletions(-) rename 0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch => 0001-Avoid-setting-POSIX-attributes-for-symbolic-links.patch (81%) delete mode 100644 0001-Restore-compatibility-with-current-maven.patch diff --git a/.gitignore b/.gitignore index b5489c1..4b26e37 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /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 +/maven-shared-utils-3.4.2-source-release.zip diff --git a/0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch b/0001-Avoid-setting-POSIX-attributes-for-symbolic-links.patch similarity index 81% rename from 0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch rename to 0001-Avoid-setting-POSIX-attributes-for-symbolic-links.patch index c82fcf4..0180300 100644 --- a/0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch +++ b/0001-Avoid-setting-POSIX-attributes-for-symbolic-links.patch @@ -8,21 +8,21 @@ Subject: [PATCH 3/3] Avoid setting POSIX attributes for symbolic links 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 +index 1ce26eb..2a5b561 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 +@@ -1774,9 +1774,9 @@ public class FileUtils { } } } - } -- copyFilePermissions( from, to ); -+ copyFilePermissions( from, to ); +- copyFilePermissions(from, to); ++ copyFilePermissions(from, to); + } } /** -- -2.26.2 +2.41.0 diff --git a/0001-Restore-compatibility-with-current-maven.patch b/0001-Restore-compatibility-with-current-maven.patch deleted file mode 100644 index 479e5a1..0000000 --- a/0001-Restore-compatibility-with-current-maven.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 0466ed821db9af6ad856b011566148b3ad0d0267 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Mon, 26 Feb 2018 16:21:04 +0100 -Subject: [PATCH 1/3] Restore compatibility with current maven - ---- - .../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 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; -+ } - } -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 -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 - diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index 047688b..bf80e91 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.4 -Release: 7%{?dist} +Version: 3.4.2 +Release: 1%{?dist} Summary: Maven shared utility classes License: Apache-2.0 URL: https://maven.apache.org/shared/maven-shared-utils @@ -11,23 +11,20 @@ ExclusiveArch: %{java_arches} 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-Avoid-setting-POSIX-attributes-for-symbolic-links.patch +Patch1: 0001-Avoid-setting-POSIX-attributes-for-symbolic-links.patch %if %{with bootstrap} -BuildRequires: javapackages-bootstrap-openjdk8 +BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local-openjdk8 +BuildRequires: maven-local BuildRequires: mvn(com.google.code.findbugs:jsr305) -BuildRequires: %{?module_prefix}mvn(commons-io:commons-io) +BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) -BuildRequires: mvn(org.apache.commons:commons-lang3) -BuildRequires: mvn(org.apache.maven:maven-core) -BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) -BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.fusesource.jansi:jansi) BuildRequires: mvn(org.hamcrest:hamcrest-core) +BuildRequires: mvn(org.slf4j:slf4j-api) %endif %description @@ -44,10 +41,7 @@ a lot of unused code. find -name '*.java' -exec sed -i 's/\r//' {} + -%patch1 -p1 -%patch2 -p1 - -%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin +%patch 1 -p1 %pom_remove_dep org.apache.commons:commons-text rm src/test/java/org/apache/maven/shared/utils/CaseTest.java @@ -62,6 +56,9 @@ rm src/test/java/org/apache/maven/shared/utils/CaseTest.java %license LICENSE NOTICE %changelog +* Wed Aug 16 2023 Marian Koncek - 3.4.2-1 +- Update to upstream version 3.4.2 + * Thu Jul 20 2023 Fedora Release Engineering - 3.3.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 2071fd2..9997d5c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-shared-utils-3.3.4-source-release.zip) = 27b63d3c8214c3ced472c4eae69199adad85b4badabd3b1608b8ab288f2246efba8f833763e87ad13e55268814e392b0d8146fb4a32a9de6d3c50c9652d66326 +SHA512 (maven-shared-utils-3.4.2-source-release.zip) = 9cd7e2d3cc4409644394acfb200d0a3f022f0890f2bd2bb814591624e5d2d481b308ba96f3903c2a8c02c4a805e6b85b903dd98d51e21768b1cf8b44d5c4b4b6