OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-shared-utils?expand=0&rev=19

0001-Restore-compatibility-with-current-maven.patch

@@ -0,0 +1,82 @@
+From 9b56e978de98c6927e8c88456154cfaf6dfeb7c9 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek@redhat.com>
+Date: Mon, 26 Feb 2018 16:21:04 +0100
+Subject: [PATCH] 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 ddb9ab7..6fc9012 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
+@@ -133,4 +133,22 @@ class AnsiMessageBuilder implements MessageBuilder, LoggerLevelRenderer {
+     public String build() {
+         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 fa1c07b..5cc49cc 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
+@@ -30,6 +30,9 @@ import java.util.Formatter;
+  * @since 3.1.0
+  */
+ 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 86b3e2a..a3f9685 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
+@@ -120,4 +120,22 @@ class PlainMessageBuilder implements MessageBuilder, LoggerLevelRenderer {
+     public String build() {
+         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.45.2
+

maven-shared-utils.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Tue Jun 18 08:48:53 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 3.4.2
+  * New features and improvements
+    + [MNG-7729] - deprecate questionable IsEmpty/IsNotEmpty methods
+    + [MSHARED-1014] - Make Commandline.addSystemEnvironment public
+      and deprecated
+    + Deprecate newXmlWriter
+    + [MSHARED-1172] - Deprecate redundant isEmptyString method
+    + [MSHARED-1169] - deprecate join methods now available in
+      Java 8 String class
+    + [MSHARED-1122] - FileUtils: avoid getCanonicalPath()
+    + [MSHARED-1079] - add build() method and document toString()
+      method
+    + [MSHARED-1014] - Optionally inherit system environment
+      variables by Commandline
+    + [MSHARED-983] - Drop plexus container default
+  * Bug Fixes
+    + [MSHARED-953] - don't trim
+    + [MSHARED-1072] - fix blocking in StreamFeeder
+    + [MSHARED-1109] - Ignore MessageUtilsTest methods on
+      unsupported platforms
+    + [MSHARED-1107] - Make copyFile succeed with source file
+      having lastModified() = 0
+    + [MSHARED-985] - XmlWriterUtil platform independent and
+      consistent
+    + [MSHARED-1072] - Poll data from input stream
+- Modified patch:
+  * 0001-Restore-compatibility-with-current-maven.patch
+    + rediff to changed context
+
 -------------------------------------------------------------------
 Sun May 26 22:42:50 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

maven-shared-utils.spec

@@ -25,6 +25,8 @@ Group:          Development/Libraries/Java
 URL:            https://maven.apache.org/shared/maven-shared-utils
 Source0:        https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
 Source1:        %{name}-build.xml
+# XXX temporary for maven upgrade
+Patch0:         0001-Restore-compatibility-with-current-maven.patch
 BuildRequires:  ant
 BuildRequires:  apache-commons-io
 BuildRequires:  fdupes
@@ -51,6 +53,7 @@ API documentation for %{name}.
 
 %prep
 %setup -q
+%patch -P 0 -p1
 cp %{SOURCE1} build.xml
 
 %build