From 9775efdf093a1b8a9a41ebac85f5d1f278ab3a57 Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Wed, 15 Jan 2025 12:53:34 -0600 Subject: [PATCH] Import from Fedora --- .fmf/version | 1 + .gitignore | 3 + 0001-Fix-running-tests-with-Maven-3.3.9.patch | 38 ++++ ci.fmf | 1 + gating.yaml | 7 + maven-shared-io.spec | 188 ++++++++++++++++++ plans/javapackages.fmf | 7 + sources | 1 + 8 files changed, 246 insertions(+) create mode 100644 .fmf/version create mode 100644 .gitignore create mode 100644 0001-Fix-running-tests-with-Maven-3.3.9.patch create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 maven-shared-io.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..657c466 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/LICENSE-2.0.txt +/maven-shared-io-1.1.tar.xz +/maven-shared-io-3.0.0-source-release.zip diff --git a/0001-Fix-running-tests-with-Maven-3.3.9.patch b/0001-Fix-running-tests-with-Maven-3.3.9.patch new file mode 100644 index 0000000..0d9f4bf --- /dev/null +++ b/0001-Fix-running-tests-with-Maven-3.3.9.patch @@ -0,0 +1,38 @@ +From 7ce11eec214f2a87a63cbb22525f3fdc8f5759ce Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Tue, 5 Jan 2016 08:28:31 +0100 +Subject: [PATCH] Fix running tests with Maven 3.3.9 + +--- + .../maven/shared/io/download/DefaultDownloadManagerTest.java | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java b/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java +index f67cb5c..c99631a 100644 +--- a/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java ++++ b/src/test/java/org/apache/maven/shared/io/download/DefaultDownloadManagerTest.java +@@ -38,6 +38,8 @@ import org.apache.maven.wagon.authorization.AuthorizationException; + import org.apache.maven.wagon.events.TransferListener; + import org.apache.maven.wagon.proxy.ProxyInfo; + import org.apache.maven.wagon.repository.Repository; ++import org.codehaus.plexus.ContainerConfiguration; ++import org.codehaus.plexus.PlexusConstants; + import org.codehaus.plexus.PlexusTestCase; + + import static org.easymock.EasyMock.*; +@@ -59,6 +61,12 @@ public class DefaultDownloadManagerTest + wagon = createMock( Wagon.class ); + } + ++ protected void customizeContainerConfiguration( ContainerConfiguration conf ) ++ { ++ conf.setAutoWiring( true ); ++ conf.setClassPathScanning( PlexusConstants.SCANNING_INDEX ); ++ } ++ + public void testShouldConstructWithNoParamsAndHaveNonNullMessageHolder() + { + new DefaultDownloadManager(); +-- +2.5.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-io.spec b/maven-shared-io.spec new file mode 100644 index 0000000..f9299d0 --- /dev/null +++ b/maven-shared-io.spec @@ -0,0 +1,188 @@ +%bcond_with bootstrap + +Name: maven-shared-io +Epoch: 1 +Version: 3.0.0 +Release: 43%{?dist} +Summary: API for I/O support like logging, download or file scanning +License: Apache-2.0 +URL: https://maven.apache.org/shared/maven-shared-io +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch + +Source0: https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip + +# Rejected upstream: https://issues.apache.org/jira/browse/MSHARED-490 +Patch: 0001-Fix-running-tests-with-Maven-3.3.9.patch + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: maven-local +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) +BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) +BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api) +BuildRequires: mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-compat) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.easymock:easymock) +%endif + +%description +API for I/O support like logging, download or file scanning. + +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. + +%prep +%autosetup -p1 + +%build +%mvn_build -- -Dmaven.compiler.target=8 + +%install +%mvn_install + +%files -f .mfiles +%license LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%license LICENSE NOTICE + +%changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 1:3.0.0-40 +- Update javapackages test plan to f42 + +* Fri Aug 23 2024 Mikolaj Izdebski - 1:3.0.0-39 +- Fix Maven compiler target setting + +* Thu Jul 18 2024 Fedora Release Engineering - 1:3.0.0-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1:3.0.0-25 +- Rebuilt for java-21-openjdk as system jdk + +* Tue Feb 20 2024 Marian Koncek - 1:3.0.0-24 +- Update Java source/target to 1.8 + +* Thu Jan 25 2024 Fedora Release Engineering - 1:3.0.0-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1:3.0.0-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 1:3.0.0-21 +- Convert License tag to SPDX format + +* Thu Jul 20 2023 Fedora Release Engineering - 1:3.0.0-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 1:3.0.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 1:3.0.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1:3.0.0-17 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1:3.0.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 1:3.0.0-15 +- Set explicit Java compiler source/target levels to 1.7 + +* Thu Jul 22 2021 Fedora Release Engineering - 1:3.0.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1:3.0.0-13 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1:3.0.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 1:3.0.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1:3.0.0-10 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jan 29 2020 Fedora Release Engineering - 1:3.0.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 1:3.0.0-7 +- Mass rebuild for javapackages-tools 201902 + +* Thu Jul 25 2019 Fedora Release Engineering - 1:3.0.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1:3.0.0-6 +- Mass rebuild for javapackages-tools 201901 + +* Fri Feb 01 2019 Fedora Release Engineering - 1:3.0.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 1:3.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 1:3.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1:3.0.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1:3.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1:3.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jan 5 2016 Mikolaj Izdebski - 1:3.0.0-1 +- Update to upstream version 3.0.0 + +* Wed Jun 17 2015 Fedora Release Engineering - 1:1.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Mar 11 2015 Mikolaj Izdebski - 1:1.1-11 +- Add test dependency on junit + +* Sat Jun 07 2014 Fedora Release Engineering - 1:1.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1:1.1-9 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Feb 19 2014 Mikolaj Izdebski - 1:1.1-8 +- Fix unowned directory + +* Fri Aug 30 2013 Mikolaj Izdebski - 1:1.1-7 +- Bump release + +* Fri Aug 30 2013 Mikolaj Izdebski - 1:1.1-6 +- Migrate from easymock 1 to easymock 3 +- Resolves: rhbz#1002479 + +* Sat Aug 03 2013 Fedora Release Engineering - 1:1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Feb 19 2013 Mikolaj Izdebski - 1:1.1-5 +- Build with xmvn + +* Mon Feb 18 2013 Mikolaj Izdebski - 1:1.1-4 +- Drop dependency on plexus-container-default + +* Thu Feb 14 2013 Fedora Release Engineering - 1:1.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 1:1.1-2 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Tue Jan 15 2013 Tomas Radej - 1:1.1-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..fd5ea07 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (maven-shared-io-3.0.0-source-release.zip) = de87f14d4a7639dd2ce228d5a6d2a7f3f1735b0bf41b09f8f3041eed7e801dec28f48d9459d22cb1c3b70bc363b31f012625d73ba095eeaa758101d68bb4010a