.gitignore

@@ -1 +1 @@
-SOURCES/maven-shared-utils-3.2.1-source-release.zip
+SOURCES/maven-shared-utils-3.3.4-source-release.zip

.maven-shared-utils.metadata

@@ -1 +1 @@
-015559e466938c7e9053603d37b96ef3e03b802b SOURCES/maven-shared-utils-3.2.1-source-release.zip
+56437c40076ab4057fe535bd6a60ef905878eba7 SOURCES/maven-shared-utils-3.3.4-source-release.zip

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

@@ -1,82 +1,82 @@
-From e3d2a29743e1b36beaf1063567da9dfd2e5a8aa8 Mon Sep 17 00:00:00 2001
+From 0466ed821db9af6ad856b011566148b3ad0d0267 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
+Subject: [PATCH 1/3] Restore compatibility with current maven
 
 ---
- .../maven/shared/utils/logging/AnsiMessageBuilder.java | 18 ++++++++++++++++++
+ .../utils/logging/AnsiMessageBuilder.java      | 18 ++++++++++++++++++
- .../maven/shared/utils/logging/MessageBuilder.java     |  3 +++
+ .../shared/utils/logging/MessageBuilder.java   |  3 +++
- .../shared/utils/logging/PlainMessageBuilder.java      | 18 ++++++++++++++++++
+ .../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
+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();
+         return ansi.toString();
-     }
+     }
-+
++
-+    @Override
++    @Override
-+    public MessageBuilder debug(Object message) {
++    public MessageBuilder debug(Object message) {
-+        a(message);
++        a(message);
-+        return this;
++        return this;
-+    }
++    }
-+
++
-+    @Override
++    @Override
-+    public MessageBuilder info(Object message) {
++    public MessageBuilder info(Object message) {
-+        a(message);
++        a(message);
-+        return this;
++        return this;
-+    }
++    }
-+
++
-+    @Override
++    @Override
-+    public MessageBuilder error(Object message) {
++    public MessageBuilder error(Object message) {
-+        a(message);
++        a(message);
-+        return this;
++        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
+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
+ public interface MessageBuilder
- {
+ {
-+    MessageBuilder debug( Object message );
++    MessageBuilder debug( Object message );
-+    MessageBuilder info( Object message );
++    MessageBuilder info( Object message );
-+    MessageBuilder error( Object message );
++    MessageBuilder error( Object message );
-     /**
+     /**
-      * Append message content in success style.
+      * Append message content in success style.
-      * By default, bold green
+      * 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
+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();
+         return buffer.toString();
-     }
+     }
-+
++
-+    @Override
++    @Override
-+    public MessageBuilder debug(Object message) {
++    public MessageBuilder debug(Object message) {
-+        a(message);
++        a(message);
-+        return this;
++        return this;
-+    }
++    }
-+
++
-+    @Override
++    @Override
-+    public MessageBuilder info(Object message) {
++    public MessageBuilder info(Object message) {
-+        a(message);
++        a(message);
-+        return this;
++        return this;
-+    }
++    }
-+
++
-+    @Override
++    @Override
-+    public MessageBuilder error(Object message) {
++    public MessageBuilder error(Object message) {
-+        a(message);
++        a(message);
-+        return this;
++        return this;
-+    }
++    }
- }
+ }
 -- 
-2.14.3
+2.26.2
 

SOURCES/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 <mizdebsk@redhat.com>
+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
+

SPECS/maven-shared-utils.spec

@@ -1,18 +1,24 @@
+%bcond_with bootstrap
+
 Name:           maven-shared-utils
-Version:        3.2.1
+Version:        3.3.4
-Release:        0.1%{?dist}
+Release:        5%{?dist}
 Summary:        Maven shared utility classes
 License:        ASL 2.0
-URL:            http://maven.apache.org/shared/maven-shared-utils
+URL:            https://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
+Source0:        https://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
+Patch1:         0001-Restore-compatibility-with-current-maven.patch
+Patch2:         0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch
 
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk8
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(com.google.code.findbugs:jsr305)
-BuildRequires:  mvn(commons-io:commons-io)
+BuildRequires:  %{?module_prefix}mvn(commons-io:commons-io)
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.commons:commons-lang3)
 BuildRequires:  mvn(org.apache.maven:maven-core)
@@ -21,6 +27,7 @@ BuildRequires:  mvn(org.apache.maven.shared:maven-shared-components:pom:)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
 BuildRequires:  mvn(org.fusesource.jansi:jansi)
 BuildRequires:  mvn(org.hamcrest:hamcrest-core)
+%endif
 
 %description
 This project aims to be a functional replacement for plexus-utils in Maven.
@@ -29,19 +36,21 @@ It is not a 100% API compatible replacement though but a replacement with
 improvements: lots of methods got cleaned up, generics got added and we dropped
 a lot of unused code.
 
-%package javadoc
+%{?javadoc_package}
-Summary:        Javadoc for %{name}
-
-%description javadoc
-API documentation for %{name}.
 
 %prep
 %setup -q
 
-%patch0 -p1
+find -name '*.java' -exec sed -i 's/\r//' {} +
+
+%patch -P 1 -p1
+%patch -P 2 -p1
 
 %pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
 
+%pom_remove_dep org.apache.commons:commons-text
+rm src/test/java/org/apache/maven/shared/utils/CaseTest.java
+
 %build
 %mvn_build
 
@@ -51,10 +60,66 @@ API documentation for %{name}.
 %files -f .mfiles
 %license LICENSE NOTICE
 
-%files javadoc -f .mfiles-javadoc
-%license LICENSE NOTICE
-
 %changelog
+* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 3.3.4-5
+- Fix patch usage
+
+* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 3.3.4-4
+- Rebuild with regenerated Requires on Java
+
+* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.4-3
+- Rebuild to regenerate auto-requires
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.3.4-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Jun 25 2021 Marian Koncek <mkoncek@redhat.com> - 3.3.4-1
+- Update to upstream version 3.3.4
+
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.3-4
+- Rebuild to workaround DistroBaker issue
+
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.3-3
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.3-2
+- Bootstrap build
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-0.8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Sep 11 2020 Marian Koncek <mkoncek@redhat.com> - 3.3.3-1
+- Update to upstream version 3.3.3
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-0.7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.2.1-0.6
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-0.5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-0.4
+- Build with OpenJDK 8
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-0.3
+- Mass rebuild for javapackages-tools 201902
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-0.4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-0.2
+- Mass rebuild for javapackages-tools 201901
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-0.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-0.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Mon Feb 26 2018 Michael Simacek <msimacek@redhat.com> - 3.2.1-0.1
 - Update to upstream version 3.2.1 (patched temporary)
 
@@ -145,4 +210,3 @@ API documentation for %{name}.
 
 * Wed Jan 16 2013 Tomas Radej <tradej@redhat.com> - 0.2-1
 - Initial version
-