From fc1e8b47ffa930bf339234332d594dfb957c1fb2 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Thu, 15 Mar 2018 14:22:45 +0100
Subject: [PATCH] Update to upstream version 3.2.1 (patched temporary)

---
 .gitignore                                    |  1 +
 ...ore-compatibility-with-current-maven.patch | 82 +++++++++++++++++++
 maven-shared-utils.spec                       | 14 +++-
 sources                                       |  2 +-
 4 files changed, 95 insertions(+), 4 deletions(-)
 create mode 100644 0001-Restore-compatibility-with-current-maven.patch

diff --git a/.gitignore b/.gitignore
index cce2216..4b22e99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /maven-shared-utils-3.0.0-source-release.zip
 /maven-shared-utils-3.0.1-source-release.zip
 /maven-shared-utils-3.1.0-source-release.zip
+/maven-shared-utils-3.2.1-source-release.zip
diff --git a/0001-Restore-compatibility-with-current-maven.patch b/0001-Restore-compatibility-with-current-maven.patch
new file mode 100644
index 0000000..0051408
--- /dev/null
+++ b/0001-Restore-compatibility-with-current-maven.patch
@@ -0,0 +1,82 @@
+From e3d2a29743e1b36beaf1063567da9dfd2e5a8aa8 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
+
+---
+ .../maven/shared/utils/logging/AnsiMessageBuilder.java | 18 ++++++++++++++++++
+ .../maven/shared/utils/logging/MessageBuilder.java     |  3 +++
+ .../shared/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
+--- 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 b60bb4e..1dc2624 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 2eec001..5236e99 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.14.3
+
diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec
index 90315d0..54fa643 100644
--- a/maven-shared-utils.spec
+++ b/maven-shared-utils.spec
@@ -1,12 +1,14 @@
 Name:           maven-shared-utils
-Version:        3.1.0
-Release:        6%{?dist}
+Version:        3.2.1
+Release:        0.1%{?dist}
 Summary:        Maven shared utility classes
 License:        ASL 2.0
 URL:            http://maven.apache.org/shared/maven-shared-utils
 BuildArch:      noarch
 
 Source0:        http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
+# XXX temporary for maven upgrade
+Patch0:         0001-Restore-compatibility-with-current-maven.patch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
@@ -29,12 +31,15 @@ a lot of unused code.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-    
+
 %description javadoc
 API documentation for %{name}.
 
 %prep
 %setup -q
+
+%patch0 -p1
+
 %pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
 
 %build
@@ -50,6 +55,9 @@ API documentation for %{name}.
 %license LICENSE NOTICE
 
 %changelog
+* Mon Feb 26 2018 Michael Simacek <msimacek@redhat.com> - 3.2.1-0.1
+- Update to upstream version 3.2.1 (patched temporary)
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 31e29d5..92f99fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b759ae20f173351757b7ba9b5e3edeba  maven-shared-utils-3.1.0-source-release.zip
+SHA512 (maven-shared-utils-3.2.1-source-release.zip) = 055a29985e6e27cdca0e81c62b6e441013e166470d17a3cc6640a56b23fe68506ed7cd115fef28e92f0a261025691b3cdcf01cafeded65fd7606e52c02f30cfa