.gitignore

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

.maven-shared-utils.metadata

@@ -1 +1 @@
-56437c40076ab4057fe535bd6a60ef905878eba7 SOURCES/maven-shared-utils-3.3.4-source-release.zip
+e17b4406948be2df82bdd91271e270d394314951 SOURCES/maven-shared-utils-3.4.2-source-release.zip

SOURCES/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
 

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

@@ -1,82 +0,0 @@
-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 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
-

SPECS/maven-shared-utils.spec

@@ -1,32 +1,30 @@
 %bcond_with bootstrap
 
 Name:           maven-shared-utils
-Version:        3.3.4
-Release:        5%{?dist}
+Version:        3.4.2
+Release:        7%{?dist}
 Summary:        Maven shared utility classes
-License:        ASL 2.0
+License:        Apache-2.0
 URL:            https://maven.apache.org/shared/maven-shared-utils
 BuildArch:      noarch
+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
 
-BuildRequires:  maven-local-openjdk8
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
+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
@@ -43,10 +41,7 @@ a lot of unused code.
 
 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
+%patch 1 -p1
 
 %pom_remove_dep org.apache.commons:commons-text
 rm src/test/java/org/apache/maven/shared/utils/CaseTest.java
@@ -61,27 +56,47 @@ rm src/test/java/org/apache/maven/shared/utils/CaseTest.java
 %license LICENSE NOTICE
 
 %changelog
-* Thu Nov 21 2024 Marián Konček <mkoncek@redhat.com> - 3.3.4-5
-- Fix patch usage
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 3.4.2-7
+- Bump release for Aug 2024 java mass rebuild
 
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 3.3.4-4
-- Rebuild with regenerated Requires on Java
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.4.2-6
+- Bump release for June 2024 mass rebuild
 
-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.4-3
-- Rebuild to regenerate auto-requires
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* 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
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Fri Jun 25 2021 Marian Koncek <mkoncek@redhat.com> - 3.3.4-1
-- Update to upstream version 3.3.4
+* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.2-3
+- Rebuild to regenerate auto-Requires on java
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4.2-2
+- Rebuild
+
+* Wed Aug 16 2023 Marian Koncek <mkoncek@redhat.com> - 3.4.2-1
+- Update to upstream version 3.4.2
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.3-4
-- Rebuild to workaround DistroBaker issue
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.3-3
-- Bootstrap Maven for CentOS Stream 9
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.3.4-4
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jun 25 2021 Marian Koncek <mkoncek@redhat.com> - 3.3.4-1
+- Update to upstream version 3.3.4
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.3-2
 - Bootstrap build