From dc4e92748ba145c0b54a2d6486290f96a6ed9643 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Wed, 15 Jan 2025 12:53:14 -0600 Subject: [PATCH] Import from Fedora --- .fmf/version | 1 + .gitignore | 13 ++ 0001-Skip-failed-tests.patch | 32 +++++ ci.fmf | 1 + gating.yaml | 7 ++ maven-filtering.spec | 236 +++++++++++++++++++++++++++++++++++ plans/javapackages.fmf | 7 ++ sources | 1 + 8 files changed, 298 insertions(+) create mode 100644 .fmf/version create mode 100644 .gitignore create mode 100644 0001-Skip-failed-tests.patch create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 maven-filtering.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..41d68c4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +/results_* +/*.src.rpm + +/maven-filtering-1.0-source-release.zip +/maven-filtering-1.1-source-release.zip +/maven-filtering-1.2-source-release.zip +/maven-filtering-1.3-source-release.zip +/maven-filtering-3.0.0-source-release.zip +/maven-filtering-3.1.0-source-release.zip +/maven-filtering-3.1.1-source-release.zip +/maven-filtering-3.2.0-source-release.zip +/maven-filtering-3.3.1-source-release.zip +/maven-filtering-3.3.2-source-release.zip diff --git a/0001-Skip-failed-tests.patch b/0001-Skip-failed-tests.patch new file mode 100644 index 0000000..9c2fedd --- /dev/null +++ b/0001-Skip-failed-tests.patch @@ -0,0 +1,32 @@ +From d0e06dae5be616b5eab16603c4c9d855c4bf7202 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Thu, 17 Aug 2023 19:28:42 +0200 +Subject: [PATCH] Skip failed tests + +--- + .../shared/filtering/IncrementalResourceFilteringTest.java | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java b/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java +index ed3b91e..d20b143 100644 +--- a/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java ++++ b/src/test/java/org/apache/maven/shared/filtering/IncrementalResourceFilteringTest.java +@@ -68,6 +68,7 @@ class IncrementalResourceFilteringTest { + } + + @Test ++ @org.junit.jupiter.api.Disabled + void simpleIncrementalFiltering() throws Exception { + // run full build first + filter("time"); +@@ -192,6 +193,7 @@ class IncrementalResourceFilteringTest { + } + + @Test ++ @org.junit.jupiter.api.Disabled + void filterDeleted() throws Exception { + // run full build first + filter("time"); +-- +2.46.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-filtering.spec b/maven-filtering.spec new file mode 100644 index 0000000..77ca49a --- /dev/null +++ b/maven-filtering.spec @@ -0,0 +1,236 @@ +%bcond_with bootstrap + +Name: maven-filtering +Version: 3.3.2 +Release: 4%{?dist} +Summary: Shared component providing resource filtering +License: Apache-2.0 +URL: https://maven.apache.org/shared/%{name}/index.html +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-Skip-failed-tests.patch + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local +BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(javax.inject:javax.inject) +BuildRequires: mvn(org.apache.commons:commons-lang3) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) +BuildRequires: mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-model) +BuildRequires: mvn(org.apache.maven:maven-settings) +BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) +BuildRequires: mvn(org.codehaus.plexus:plexus-testing) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.codehaus.plexus:plexus-xml) +BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.inject) +BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) +BuildRequires: mvn(org.eclipse.sisu:sisu-maven-plugin) +BuildRequires: mvn(org.hamcrest:hamcrest) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) +BuildRequires: mvn(org.mockito:mockito-core) +BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(org.slf4j:slf4j-simple) +BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) +%endif + +%description +These Plexus components have been built from the filtering process/code in +Maven Resources Plugin. The goal is to provide a shared component for all +plugins that needs to filter resources. + +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. + +%prep +%autosetup -p1 + +%build +%mvn_build + +%install +%mvn_install + +%files -f .mfiles +%license LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE + +%changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 3.3.2-2 +- Update javapackages test plan to f42 + +* Fri Aug 23 2024 Mikolaj Izdebski - 3.3.2-1 +- Update to upstream version 3.3.2 + +* Thu Jul 18 2024 Fedora Release Engineering - 3.3.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri May 31 2024 Mikolaj Izdebski - 3.3.1-7 +- Switch to a newer patch macro syntax + +* Tue Feb 27 2024 Jiri Vanek - 3.3.1-6 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 3.3.1-5 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 3.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 3.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 3.3.1-2 +- Convert License tag to SPDX format + +* Thu Aug 17 2023 Mikolaj Izdebski - 3.3.1-1 +- Update to upstream version 3.3.1 + +* Thu Jul 20 2023 Fedora Release Engineering - 3.2.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 3.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 3.2.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 3.2.0-5 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 3.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 3.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 3.2.0-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 3.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Aug 26 2020 Marian Koncek - 3.2.0-1 +- Update to upstream version 3.2.0 + +* Tue Aug 11 2020 Fabio Valentini - 3.2.0-1 +- Update to version 3.2.0. + +* Tue Jul 28 2020 Fedora Release Engineering - 3.1.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 3.1.1-10 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 3.1.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 3.1.1-7 +- Mass rebuild for javapackages-tools 201902 + +* Thu Jul 25 2019 Fedora Release Engineering - 3.1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 3.1.1-6 +- Mass rebuild for javapackages-tools 201901 + +* Fri Feb 01 2019 Fedora Release Engineering - 3.1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 3.1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 3.1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.1.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Jul 6 2016 Mikolaj Izdebski - 3.1.1-2 +- Regenerate build-requires + +* Fri Jun 3 2016 Mikolaj Izdebski - 3.1.1-1 +- Update to upstream version 3.1.1 + +* Wed Apr 13 2016 Mikolaj Izdebski - 3.1.0-1 +- Update to upstream version 3.1.0 + +* Thu Feb 04 2016 Fedora Release Engineering - 3.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Nov 9 2015 Mikolaj Izdebski - 3.0.0-1 +- Update to upstream version 3.0.0 +- Remove legacy obsoletes/provides +- Update to current packaging guidelines + +* Wed Jun 17 2015 Fedora Release Engineering - 1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Oct 24 2014 Mikolaj Izdebski - 1.3-1 +- Update to upstream version 1.3 + +* Sat Jun 07 2014 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 11 2014 Mikolaj Izdebski - 1.2-1 +- Update to upstream version 1.2 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.1-4 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Feb 19 2014 Mikolaj Izdebski - 1.1-3 +- Fix unowned directory + +* Sat Aug 03 2013 Fedora Release Engineering - 1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Feb 19 2013 Mikolaj Izdebski - 1.1-1 +- Update to upstream version 1.1 + +* Thu Feb 14 2013 Fedora Release Engineering - 1.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1.0-10 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Tue Nov 27 2012 Tomas Radej - 1.0-9 +- Added NOTICE to javadoc + +* Thu Jul 19 2012 Fedora Release Engineering - 1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Mar 15 2012 Tomas Radej - 1.0-7 +- Replaced plexus-maven-plugin with plexus-containers-component-metadata + +* Fri Jan 13 2012 Fedora Release Engineering - 1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Aug 31 2011 Tomas Radej - 1.0-5 +- Really fixed Provides/Obsoletes + +* Wed Aug 31 2011 Tomas Radej - 1.0-4 +- Fixed Provides/Obsoletes + +* Wed Aug 31 2011 Tomas Radej - 1.0-3 +- Added Provides/Obsoletes + +* Tue Aug 16 2011 Tomas Radej 1.0-2 +- Removed rm -rf {buildroot} + +* Tue Aug 16 2011 Tomas Radej 1.0-1 +- Initial release (thanks to the GULaG team) 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..e630ffb --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (maven-filtering-3.3.2-source-release.zip) = 62f191b3b306a0fe7a896044d115d926f0694b2a355beae838eb38b69a5052c29c8a318c96dd3d22c844bbf4b50dd528adb1327ae3999ba6f4d81723e303ed02