diff --git a/.gitignore b/.gitignore index 4b22e99..fee4c76 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /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 +/maven-shared-utils-3.3.3-source-release.zip diff --git a/0001-Restore-compatibility-with-current-maven.patch b/0001-Restore-compatibility-with-current-maven.patch index 0051408..9591843 100644 --- a/0001-Restore-compatibility-with-current-maven.patch +++ b/0001-Restore-compatibility-with-current-maven.patch @@ -1,16 +1,16 @@ -From e3d2a29743e1b36beaf1063567da9dfd2e5a8aa8 Mon Sep 17 00:00:00 2001 +From 0466ed821db9af6ad856b011566148b3ad0d0267 Mon Sep 17 00:00:00 2001 From: Michael Simacek 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 ++++++++++++++++++ - .../maven/shared/utils/logging/MessageBuilder.java | 3 +++ - .../shared/utils/logging/PlainMessageBuilder.java | 18 ++++++++++++++++++ + .../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 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 @@ -37,7 +37,7 @@ index 0103a6b..23b6d14 100644 + } } 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; @@ -51,7 +51,7 @@ index b60bb4e..1dc2624 100644 * 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 +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 @@ -77,6 +77,6 @@ index 2eec001..5236e99 100644 + return this; + } } --- -2.14.3 - +-- +2.26.2 + diff --git a/0002-Port-to-plexus-utils-3.0.10.patch b/0002-Port-to-plexus-utils-3.0.10.patch new file mode 100644 index 0000000..1445dff --- /dev/null +++ b/0002-Port-to-plexus-utils-3.0.10.patch @@ -0,0 +1,25 @@ +From 3b87b36b85e365f32a1b9443a962e3149e2dfd64 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Fri, 11 Sep 2020 11:02:29 +0200 +Subject: [PATCH 2/3] Port to plexus-utils 3.0.10 + +--- + .../java/org/apache/maven/shared/utils/io/FileUtilsTest.java | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java +index 9fa7c85..151bbc9 100644 +--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java ++++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java +@@ -655,7 +655,7 @@ public class FileUtilsTest + + private FileUtils.FilterWrapper[] wrappers( String key, String value ) + { +- final Map map = new HashMap<>(); ++ final Map map = new HashMap<>(); + map.put( key, value ); + return new FileUtils.FilterWrapper[] + { +-- +2.26.2 + diff --git a/0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch b/0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch new file mode 100644 index 0000000..7783723 --- /dev/null +++ b/0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch @@ -0,0 +1,28 @@ +From 932f9b15bd62255f81c66b564f748fff6ec84c86 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +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 + diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index bfc5a56..64cc274 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -1,18 +1,25 @@ +%bcond_with bootstrap + Name: maven-shared-utils -Version: 3.2.1 -Release: 0.8%{?dist} +Version: 3.3.3 +Release: 1%{?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-Port-to-plexus-utils-3.0.10.patch +Patch3: 0003-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 +28,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 +37,20 @@ 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 -Summary: Javadoc for %{name} - -%description javadoc -API documentation for %{name}. +%{?javadoc_package} %prep %setup -q -%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -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,13 +60,13 @@ API documentation for %{name}. %files -f .mfiles %license LICENSE NOTICE -%files javadoc -f .mfiles-javadoc -%license LICENSE NOTICE - %changelog * Tue Jan 26 2021 Fedora Release Engineering - 3.2.1-0.8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Fri Sep 11 2020 Marian Koncek - 3.3.3-1 +- Update to upstream version 3.3.3 + * Tue Jul 28 2020 Fedora Release Engineering - 3.2.1-0.7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild @@ -67,9 +76,18 @@ API documentation for %{name}. * Wed Jan 29 2020 Fedora Release Engineering - 3.2.1-0.5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Sat Jan 25 2020 Mikolaj Izdebski - 3.2.1-0.4 +- Build with OpenJDK 8 + +* Tue Nov 05 2019 Mikolaj Izdebski - 3.2.1-0.3 +- Mass rebuild for javapackages-tools 201902 + * Thu Jul 25 2019 Fedora Release Engineering - 3.2.1-0.4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Fri May 24 2019 Mikolaj Izdebski - 3.2.1-0.2 +- Mass rebuild for javapackages-tools 201901 + * Fri Feb 01 2019 Fedora Release Engineering - 3.2.1-0.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild @@ -166,4 +184,3 @@ API documentation for %{name}. * Wed Jan 16 2013 Tomas Radej - 0.2-1 - Initial version - diff --git a/sources b/sources index 92f99fb..4faa4ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (maven-shared-utils-3.2.1-source-release.zip) = 055a29985e6e27cdca0e81c62b6e441013e166470d17a3cc6640a56b23fe68506ed7cd115fef28e92f0a261025691b3cdcf01cafeded65fd7606e52c02f30cfa +SHA512 (maven-shared-utils-3.3.3-source-release.zip) = 6085d3bb3d065efaca7ed43f7342c2b71c624235ff38cd1410a06a4c915e39a13cb00e65e8c0cd7203dc5b2d1deeb392eaab2aa0a43bfadb7c9d4286a2b473bc