From a393689aff52a028c1b63b1006caf2cee95c7a64 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:16 +0200 Subject: [PATCH 01/11] Mass rebuild for javapackages-tools 201901 --- maven-shared-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index 54fa643..a88e0b5 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -1,6 +1,6 @@ Name: maven-shared-utils Version: 3.2.1 -Release: 0.1%{?dist} +Release: 0.2%{?dist} Summary: Maven shared utility classes License: ASL 2.0 URL: http://maven.apache.org/shared/maven-shared-utils @@ -55,6 +55,9 @@ API documentation for %{name}. %license LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 3.2.1-0.2 +- Mass rebuild for javapackages-tools 201901 + * Mon Feb 26 2018 Michael Simacek - 3.2.1-0.1 - Update to upstream version 3.2.1 (patched temporary) From d515b3da7d2d499be371632fc5c4c1e8c6bbf661 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 13:40:12 +0200 Subject: [PATCH 02/11] Use javadoc_package macro --- maven-shared-utils.spec | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index a88e0b5..96e5d28 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -29,11 +29,7 @@ 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 @@ -51,9 +47,6 @@ API documentation for %{name}. %files -f .mfiles %license LICENSE NOTICE -%files javadoc -f .mfiles-javadoc -%license LICENSE NOTICE - %changelog * Fri May 24 2019 Mikolaj Izdebski - 3.2.1-0.2 - Mass rebuild for javapackages-tools 201901 From e6f370546fedd6d1fad30d5cacc698ad0809b7b4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 13:40:32 +0200 Subject: [PATCH 03/11] Declare module package --- maven-shared-utils.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index 96e5d28..39681d3 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -29,6 +29,7 @@ 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. +%{?module_package} %{?javadoc_package} %prep @@ -44,7 +45,7 @@ a lot of unused code. %install %mvn_install -%files -f .mfiles +%files -n %{?module_prefix}%{name} -f .mfiles %license LICENSE NOTICE %changelog From b4e277cfb0776251f537dff3eeb9d6fd0d004f8d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 13:41:46 +0200 Subject: [PATCH 04/11] Namespace buildrequires --- maven-shared-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index 39681d3..31b0aca 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -12,7 +12,7 @@ Patch0: 0001-Restore-compatibility-with-current-maven.patch BuildRequires: maven-local 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) From 193f8f38c37af249efd0146f71695208d93e3fe1 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 29 Aug 2019 15:24:40 +0200 Subject: [PATCH 05/11] Port to hamcrest 2.1 --- 0002-Port-to-hamcrest-2.1.patch | 79 +++++++++++++++++++++++++++++++++ maven-shared-utils.spec | 7 ++- 2 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 0002-Port-to-hamcrest-2.1.patch diff --git a/0002-Port-to-hamcrest-2.1.patch b/0002-Port-to-hamcrest-2.1.patch new file mode 100644 index 0000000..f975bac --- /dev/null +++ b/0002-Port-to-hamcrest-2.1.patch @@ -0,0 +1,79 @@ +From 613f27fe7ff4a89c21689a16f6f6b9b3e0b7c347 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Thu, 29 Aug 2019 15:04:46 +0200 +Subject: [PATCH] Port to hamcrest 2.1 + +--- + .../shared/utils/reflection/ReflectorTest.java | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java +index 0088361..09f6048 100644 +--- a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java ++++ b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java +@@ -50,7 +50,7 @@ public class ReflectorTest + public void newInstanceClassNull() + throws Exception + { +- assertThat( reflector.newInstance( Object.class, null ), is( Object.class ) ); ++ assertThat( reflector.newInstance( Object.class, null ), isA( Object.class ) ); + } + + @Test( expected = NullPointerException.class ) +@@ -64,7 +64,7 @@ public class ReflectorTest + public void newInstanceClassEmptyArray() + throws Exception + { +- assertThat( reflector.newInstance( Object.class, new Object[0] ), is( Object.class ) ); ++ assertThat( reflector.newInstance( Object.class, new Object[0] ), isA( Object.class ) ); + } + + @Test( expected = ReflectorException.class ) +@@ -156,7 +156,7 @@ public class ReflectorTest + public void getSingletonClassNull() + throws Exception + { +- assertThat( reflector.getSingleton( (Class)Object.class, (Object)null ), is( Object.class ) ); ++ assertThat( reflector.getSingleton( (Class)Object.class, (Object)null ), isA( Object.class ) ); + } + + @Test( expected = NullPointerException.class ) +@@ -170,7 +170,7 @@ public class ReflectorTest + public void getSingletonClassEmptyArray() + throws Exception + { +- assertThat( reflector.getSingleton( Object.class, new Object[0] ), is( Object.class ) ); ++ assertThat( reflector.getSingleton( Object.class, new Object[0] ), isA( Object.class ) ); + } + + @Test( expected = ReflectorException.class ) +@@ -787,7 +787,7 @@ public class ReflectorTest + public void invokeStaticClassNullNull() + throws Exception + { +- assertThat( reflector.invokeStatic( Object.class, (String)null, (Object)null ), is( Object.class ) ); ++ assertThat( reflector.invokeStatic( Object.class, (String)null, (Object)null ), isA( Object.class ) ); + } + + @Test( expected = NullPointerException.class ) +@@ -801,7 +801,7 @@ public class ReflectorTest + public void invokeStaticClassNullEmptyArray() + throws Exception + { +- assertThat( reflector.invokeStatic( Object.class, null, new Object[0] ), is( Object.class ) ); ++ assertThat( reflector.invokeStatic( Object.class, null, new Object[0] ), isA( Object.class ) ); + } + + @Test( expected = NullPointerException.class ) +@@ -829,7 +829,7 @@ public class ReflectorTest + public void invokeStaticClassEmptyEmptyArray() + throws Exception + { +- assertThat( reflector.invokeStatic( Object.class, "", new Object[0] ), is( Object.class ) ); ++ assertThat( reflector.invokeStatic( Object.class, "", new Object[0] ), isA( Object.class ) ); + } + + @Test( expected = IllegalArgumentException.class ) +-- +2.21.0 + diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index 31b0aca..b2958f2 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -8,7 +8,9 @@ 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 +Patch1: 0001-Restore-compatibility-with-current-maven.patch + +Patch2: 0002-Port-to-hamcrest-2.1.patch BuildRequires: maven-local BuildRequires: mvn(com.google.code.findbugs:jsr305) @@ -35,7 +37,8 @@ a lot of unused code. %prep %setup -q -%patch0 -p1 +%patch1 -p1 +%patch2 -p1 %pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin From d32376c4b5466bcb5317e4239215624f4f3bc8cc Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 06/11] Mass rebuild for javapackages-tools 201902 --- maven-shared-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index b2958f2..686126d 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -1,6 +1,6 @@ Name: maven-shared-utils Version: 3.2.1 -Release: 0.2%{?dist} +Release: 0.3%{?dist} Summary: Maven shared utility classes License: ASL 2.0 URL: http://maven.apache.org/shared/maven-shared-utils @@ -52,6 +52,9 @@ a lot of unused code. %license LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 3.2.1-0.3 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 3.2.1-0.2 - Mass rebuild for javapackages-tools 201901 From 485f5f5dc619053b672a5efae2474b215335c020 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 07/11] Build with OpenJDK 8 --- maven-shared-utils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index 686126d..e59c76f 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -1,6 +1,6 @@ Name: maven-shared-utils Version: 3.2.1 -Release: 0.3%{?dist} +Release: 0.4%{?dist} Summary: Maven shared utility classes License: ASL 2.0 URL: http://maven.apache.org/shared/maven-shared-utils @@ -12,7 +12,7 @@ Patch1: 0001-Restore-compatibility-with-current-maven.patch Patch2: 0002-Port-to-hamcrest-2.1.patch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: %{?module_prefix}mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) @@ -52,6 +52,9 @@ a lot of unused code. %license LICENSE NOTICE %changelog +* 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 From e54cfbba776bdbefe9802dc442a991aae6d6bd7e Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 11 Sep 2020 11:05:17 +0200 Subject: [PATCH 08/11] Update to upstream version 3.3.3 --- .gitignore | 1 + 0002-Port-to-hamcrest-2.1.patch | 79 -------------------------- 0002-Port-to-plexus-utils-3.0.10.patch | 25 ++++++++ maven-shared-utils.spec | 17 ++++-- sources | 2 +- 5 files changed, 38 insertions(+), 86 deletions(-) delete mode 100644 0002-Port-to-hamcrest-2.1.patch create mode 100644 0002-Port-to-plexus-utils-3.0.10.patch 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/0002-Port-to-hamcrest-2.1.patch b/0002-Port-to-hamcrest-2.1.patch deleted file mode 100644 index f975bac..0000000 --- a/0002-Port-to-hamcrest-2.1.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 613f27fe7ff4a89c21689a16f6f6b9b3e0b7c347 Mon Sep 17 00:00:00 2001 -From: Marian Koncek -Date: Thu, 29 Aug 2019 15:04:46 +0200 -Subject: [PATCH] Port to hamcrest 2.1 - ---- - .../shared/utils/reflection/ReflectorTest.java | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java -index 0088361..09f6048 100644 ---- a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java -+++ b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java -@@ -50,7 +50,7 @@ public class ReflectorTest - public void newInstanceClassNull() - throws Exception - { -- assertThat( reflector.newInstance( Object.class, null ), is( Object.class ) ); -+ assertThat( reflector.newInstance( Object.class, null ), isA( Object.class ) ); - } - - @Test( expected = NullPointerException.class ) -@@ -64,7 +64,7 @@ public class ReflectorTest - public void newInstanceClassEmptyArray() - throws Exception - { -- assertThat( reflector.newInstance( Object.class, new Object[0] ), is( Object.class ) ); -+ assertThat( reflector.newInstance( Object.class, new Object[0] ), isA( Object.class ) ); - } - - @Test( expected = ReflectorException.class ) -@@ -156,7 +156,7 @@ public class ReflectorTest - public void getSingletonClassNull() - throws Exception - { -- assertThat( reflector.getSingleton( (Class)Object.class, (Object)null ), is( Object.class ) ); -+ assertThat( reflector.getSingleton( (Class)Object.class, (Object)null ), isA( Object.class ) ); - } - - @Test( expected = NullPointerException.class ) -@@ -170,7 +170,7 @@ public class ReflectorTest - public void getSingletonClassEmptyArray() - throws Exception - { -- assertThat( reflector.getSingleton( Object.class, new Object[0] ), is( Object.class ) ); -+ assertThat( reflector.getSingleton( Object.class, new Object[0] ), isA( Object.class ) ); - } - - @Test( expected = ReflectorException.class ) -@@ -787,7 +787,7 @@ public class ReflectorTest - public void invokeStaticClassNullNull() - throws Exception - { -- assertThat( reflector.invokeStatic( Object.class, (String)null, (Object)null ), is( Object.class ) ); -+ assertThat( reflector.invokeStatic( Object.class, (String)null, (Object)null ), isA( Object.class ) ); - } - - @Test( expected = NullPointerException.class ) -@@ -801,7 +801,7 @@ public class ReflectorTest - public void invokeStaticClassNullEmptyArray() - throws Exception - { -- assertThat( reflector.invokeStatic( Object.class, null, new Object[0] ), is( Object.class ) ); -+ assertThat( reflector.invokeStatic( Object.class, null, new Object[0] ), isA( Object.class ) ); - } - - @Test( expected = NullPointerException.class ) -@@ -829,7 +829,7 @@ public class ReflectorTest - public void invokeStaticClassEmptyEmptyArray() - throws Exception - { -- assertThat( reflector.invokeStatic( Object.class, "", new Object[0] ), is( Object.class ) ); -+ assertThat( reflector.invokeStatic( Object.class, "", new Object[0] ), isA( Object.class ) ); - } - - @Test( expected = IllegalArgumentException.class ) --- -2.21.0 - 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..be61bca --- /dev/null +++ b/0002-Port-to-plexus-utils-3.0.10.patch @@ -0,0 +1,25 @@ +From 15924bb52d1774f04cd8cd34ef2d568d429cd05e Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Fri, 11 Sep 2020 11:02:29 +0200 +Subject: [PATCH] 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 cd3338c..4ad8f6b 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/maven-shared-utils.spec b/maven-shared-utils.spec index e59c76f..0850e8f 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -1,16 +1,15 @@ Name: maven-shared-utils -Version: 3.2.1 -Release: 0.4%{?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 Patch1: 0001-Restore-compatibility-with-current-maven.patch - -Patch2: 0002-Port-to-hamcrest-2.1.patch +Patch2: 0002-Port-to-plexus-utils-3.0.10.patch BuildRequires: maven-local-openjdk8 BuildRequires: mvn(com.google.code.findbugs:jsr305) @@ -42,6 +41,9 @@ a lot of unused code. %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 @@ -52,6 +54,9 @@ a lot of unused code. %license LICENSE NOTICE %changelog +* Fri Sep 11 2020 Marian Koncek - 3.3.3-1 +- Update to upstream version 3.3.3 + * Sat Jan 25 2020 Mikolaj Izdebski - 3.2.1-0.4 - Build with OpenJDK 8 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 From 54b85ac3442dbe67f864ae6689b9c6bb4becbb79 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 24 Sep 2020 20:19:59 +0200 Subject: [PATCH 09/11] Avoid setting POSIX attributes for symbolic links --- ...ore-compatibility-with-current-maven.patch | 22 +++++++-------- 0002-Port-to-plexus-utils-3.0.10.patch | 12 ++++---- ...-POSIX-attributes-for-symbolic-links.patch | 28 +++++++++++++++++++ maven-shared-utils.spec | 2 ++ 4 files changed, 47 insertions(+), 17 deletions(-) create mode 100644 0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch 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 index be61bca..1445dff 100644 --- a/0002-Port-to-plexus-utils-3.0.10.patch +++ b/0002-Port-to-plexus-utils-3.0.10.patch @@ -1,14 +1,14 @@ -From 15924bb52d1774f04cd8cd34ef2d568d429cd05e Mon Sep 17 00:00:00 2001 +From 3b87b36b85e365f32a1b9443a962e3149e2dfd64 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 11 Sep 2020 11:02:29 +0200 -Subject: [PATCH] Port to plexus-utils 3.0.10 +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 cd3338c..4ad8f6b 100644 +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 @@ -20,6 +20,6 @@ index cd3338c..4ad8f6b 100644 map.put( key, value ); return new FileUtils.FilterWrapper[] { --- -2.26.2 - +-- +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 0850e8f..dd49b64 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -10,6 +10,7 @@ Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/% # XXX temporary for maven upgrade 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-openjdk8 BuildRequires: mvn(com.google.code.findbugs:jsr305) @@ -38,6 +39,7 @@ a lot of unused code. %patch1 -p1 %patch2 -p1 +%patch3 -p1 %pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin From 52aebc66c614b6bcdb20e79203471faae081490f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 10/11] Conditionalize buildrequires in bootstrap mode --- maven-shared-utils.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index dd49b64..ee952d7 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: maven-shared-utils Version: 3.3.3 Release: 1%{?dist} @@ -13,6 +15,9 @@ Patch2: 0002-Port-to-plexus-utils-3.0.10.patch Patch3: 0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: %{?module_prefix}mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) @@ -23,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. From 6b819fcc2809e52a6298d881f093adb249b486a5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 11/11] Turn off bootstrap mode by default --- maven-shared-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec index ee952d7..8021bd9 100644 --- a/maven-shared-utils.spec +++ b/maven-shared-utils.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: maven-shared-utils Version: 3.3.3