From 512fdb989bb8c5aff4180eb20700760f68109c35 Mon Sep 17 00:00:00 2001 From: James Antill Date: Mon, 8 Aug 2022 12:36:14 -0400 Subject: [PATCH] Import rpm: 5036f3a1f7d69e03f8d0a584c390f617b008b8fe --- .gitignore | 1 + ...ore-compatibility-with-current-maven.patch | 82 ++++++++++ ...-POSIX-attributes-for-symbolic-links.patch | 28 ++++ 0002-Port-to-plexus-utils-3.0.10.patch | 25 +++ ...-POSIX-attributes-for-symbolic-links.patch | 28 ++++ gating.yaml | 8 + maven-shared-utils.spec | 148 ++++++++++++++++++ sources | 1 + 8 files changed, 321 insertions(+) create mode 100644 .gitignore create mode 100644 0001-Restore-compatibility-with-current-maven.patch create mode 100644 0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch create mode 100644 0002-Port-to-plexus-utils-3.0.10.patch create mode 100644 0003-Avoid-setting-POSIX-attributes-for-symbolic-links.patch create mode 100644 gating.yaml create mode 100644 maven-shared-utils.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0fe1524 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/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 +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/0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch b/0002-Avoid-setting-POSIX-attributes-for-symbolic-links.patch new file mode 100644 index 0000000..c82fcf4 --- /dev/null +++ b/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 +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/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/gating.yaml b/gating.yaml new file mode 100644 index 0000000..d6b7694 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - rhel-9 +decision_contexts: + - osci_compose_gate +rules: + # https://docs.engineering.redhat.com/display/RHELPLAN/Maven+Bootstrap+manual+gating+test + - !PassingTestCaseRule {test_case_name: manual.sst_cs_apps.maven.bootstrap} diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec new file mode 100644 index 0000000..54fa643 --- /dev/null +++ b/maven-shared-utils.spec @@ -0,0 +1,148 @@ +Name: maven-shared-utils +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) +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.fusesource.jansi:jansi) +BuildRequires: mvn(org.hamcrest:hamcrest-core) + +%description +This project aims to be a functional replacement for plexus-utils in Maven. + +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}. + +%prep +%setup -q + +%patch0 -p1 + +%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin + +%build +%mvn_build + +%install +%mvn_install + +%files -f .mfiles +%license LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE + +%changelog +* Mon Feb 26 2018 Michael Simacek - 3.2.1-0.1 +- Update to upstream version 3.2.1 (patched temporary) + +* Thu Feb 08 2018 Fedora Release Engineering - 3.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Feb 13 2017 Michael Simacek - 3.1.0-4 +- Regenerate BuildRequires + +* Fri Feb 10 2017 Fedora Release Engineering - 3.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Jul 27 2016 Mikolaj Izdebski - 3.1.0-2 +- Re-enable tests + +* Fri Jul 22 2016 Mikolaj Izdebski - 3.1.0-0.1.RC +- Update to upstream version 3.1.0 +- Temporarly disable tests + +* Fri Jul 15 2016 Mikolaj Izdebski - 3.0.1-2 +- Remove unneeded build-requires + +* Thu Jun 2 2016 Mikolaj Izdebski - 3.0.1-1 +- Update to upstream version 3.0.1 + +* Thu Feb 04 2016 Fedora Release Engineering - 3.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Oct 16 2015 Mikolaj Izdebski - 3.0.0-2 +- Enable all tests + +* Mon Oct 12 2015 Mikolaj Izdebski - 3.0.0-1 +- Update to upstream version 3.0.0 + +* Mon Sep 21 2015 Mikolaj Izdebski - 0.9-1 +- Update to upstream version 0.9 + +* Mon Jun 22 2015 Michal Srb - 0.8-1 +- Update to upstream release 0.8 + +* Wed Jun 17 2015 Fedora Release Engineering - 0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Oct 24 2014 Mikolaj Izdebski - 0.7-1 +- Update to upstream version 0.7 + +* Sat Jun 07 2014 Fedora Release Engineering - 0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Mar 24 2014 Mikolaj Izdebski - 0.6-1 +- Update to upstream version 0.6 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0.5-3 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Feb 19 2014 Mikolaj Izdebski - 0.5-2 +- Fix unowned directory + +* Mon Dec 23 2013 Mikolaj Izdebski - 0.5-1 +- Update to upstream version 0.5 +- Remove patch for MSHARED-285 (accepted upstream) + +* Sat Aug 03 2013 Fedora Release Engineering - 0.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Apr 22 2013 Tomas Radej - 0.4-1 +- Updated to latest upstream version +- Fixed and reenabled tests + +* Mon Apr 08 2013 Michal Srb - 0.3-2 +- Disable tests (they don't work with junit >= 4.11) + +* Fri Mar 15 2013 Michal Srb - 0.3-1 +- Update to upstream version 0.3 + +* Tue Feb 19 2013 Mikolaj Izdebski - 0.2-4 +- Build with xmvn + +* Thu Feb 14 2013 Fedora Release Engineering - 0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 0.2-2 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Wed Jan 16 2013 Tomas Radej - 0.2-1 +- Initial version + diff --git a/sources b/sources new file mode 100644 index 0000000..41bdf72 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA1 (maven-shared-utils-3.2.1-source-release.zip) = 015559e466938c7e9053603d37b96ef3e03b802b