From 84a998d4b80ac44f4f69f4c607949e18a858e98e Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Wed, 15 Jan 2025 13:04:05 -0600 Subject: [PATCH] Import from Fedora --- .fmf/version | 1 + .gitignore | 15 ++ ...-POSIX-attributes-for-symbolic-links.patch | 28 +++ ci.fmf | 1 + gating.yaml | 7 + maven-shared-utils.spec | 238 ++++++++++++++++++ plans/javapackages.fmf | 7 + sources | 1 + 8 files changed, 298 insertions(+) create mode 100644 .fmf/version create mode 100644 .gitignore create mode 100644 0001-Avoid-setting-POSIX-attributes-for-symbolic-links.patch create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 maven-shared-utils.spec create mode 100644 plans/javapackages.fmf create mode 100644 sources diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4b26e37 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +/maven-shared-utils-0.2-source-release.zip +/maven-shared-utils-0.3-source-release.zip +/maven-shared-utils-0.4-source-release.zip +/maven-shared-utils-0.5-source-release.zip +/maven-shared-utils-0.6-source-release.zip +/maven-shared-utils-0.7-source-release.zip +/maven-shared-utils-0.8-source-release.zip +/maven-shared-utils-0.9-source-release.zip +/maven-shared-utils-3.0.0-source-release.zip +/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 +/maven-shared-utils-3.3.4-source-release.zip +/maven-shared-utils-3.4.2-source-release.zip diff --git a/0001-Avoid-setting-POSIX-attributes-for-symbolic-links.patch b/0001-Avoid-setting-POSIX-attributes-for-symbolic-links.patch new file mode 100644 index 0000000..0180300 --- /dev/null +++ b/0001-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 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 +@@ -1774,9 +1774,9 @@ public class FileUtils { + } + } + } +- } + +- copyFilePermissions(from, to); ++ copyFilePermissions(from, to); ++ } + } + + /** +-- +2.41.0 + diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..df26947 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,7 @@ +--- !Policy +product_versions: + - rhel-9 +decision_contexts: + - osci_compose_gate +rules: + - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/javapackages.functional} diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec new file mode 100644 index 0000000..ddef41a --- /dev/null +++ b/maven-shared-utils.spec @@ -0,0 +1,238 @@ +%bcond_with bootstrap + +Name: maven-shared-utils +Version: 3.4.2 +Release: 19%{?dist} +Summary: Maven shared utility classes +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 + +Patch: 0001-Avoid-setting-POSIX-attributes-for-symbolic-links.patch + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local +BuildRequires: mvn(com.google.code.findbugs:jsr305) +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) +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 +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: API documentation for %{name} + +%description javadoc +API documentation for %{name}. + +%prep +%autosetup -p1 + +find -name '*.java' -exec sed -i 's/\r//' {} + + + +%pom_remove_dep org.apache.commons:commons-text +rm src/test/java/org/apache/maven/shared/utils/CaseTest.java + +%build +%mvn_build + +%install +%mvn_install + +%files -f .mfiles +%license LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc + +%changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 3.4.2-17 +- Update javapackages test plan to f42 + +* Thu Jul 18 2024 Fedora Release Engineering - 3.4.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 3.4.2-7 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 3.4.2-6 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 3.4.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.4.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Sep 20 2023 Mikolaj Izdebski - 3.4.2-3 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 3.4.2-2 +- Rebuild + +* Wed Aug 16 2023 Marian Koncek - 3.4.2-1 +- Update to upstream version 3.4.2 + +* Thu Jul 20 2023 Fedora Release Engineering - 3.3.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.3.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.3.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 3.3.4-4 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 3.3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 25 2021 Marian Koncek - 3.3.4-1 +- Update to upstream version 3.3.4 + +* Mon May 17 2021 Mikolaj Izdebski - 3.3.3-2 +- Bootstrap build +- Non-bootstrap build + +* 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 + +* Fri Jul 10 2020 Jiri Vanek - 3.2.1-0.6 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* 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 + +* Fri Jul 13 2018 Fedora Release Engineering - 3.2.1-0.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* 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/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8ba3510 --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: c9s +execute: + how: tmt diff --git a/sources b/sources new file mode 100644 index 0000000..9997d5c --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (maven-shared-utils-3.4.2-source-release.zip) = 9cd7e2d3cc4409644394acfb200d0a3f022f0890f2bd2bb814591624e5d2d481b308ba96f3903c2a8c02c4a805e6b85b903dd98d51e21768b1cf8b44d5c4b4b6