diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 9d5548f..e69de29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +0,0 @@ -/results_* -/*.src.rpm - -/apache-parent-14.pom -/LICENSE-2.0.txt -/apache-15-source-release.zip -/apache-16-source-release.zip -/apache-17-source-release.zip -/apache-18-source-release.zip -/apache-19-source-release.zip -/apache-21-source-release.zip -/apache-22-source-release.zip -/apache-23-source-release.zip -/apache-26-source-release.zip -/apache-27-source-release.zip -/apache-30-source-release.zip -/apache-31-source-release.zip -/apache-33-source-release.zip -/apache-35-source-release.zip diff --git a/apache-parent.spec b/apache-parent.spec index dbb56e7..d97601c 100644 --- a/apache-parent.spec +++ b/apache-parent.spec @@ -1,47 +1,77 @@ -%bcond_with bootstrap - Name: apache-parent -Version: 35 -Release: %autorelease -Summary: Parent POM file for Apache projects -License: Apache-2.0 -URL: https://apache.org/ +Version: 10 +Release: 8%{?dist} +Summary: Parent pom file for Apache projects +Group: Development/Libraries +License: ASL 2.0 +URL: http://apache.org/ +Source0: http://svn.apache.org/repos/asf/maven/pom/tags/apache-10/pom.xml +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildArch: noarch -ExclusiveArch: %{java_arches} noarch -Source0: https://repo1.maven.org/maven2/org/apache/apache/%{version}/apache-%{version}-source-release.zip +BuildRequires: maven +BuildRequires: jpackage-utils +BuildRequires: apache-resource-bundles +BuildRequires: maven-remote-resources-plugin -%if %{with bootstrap} -BuildRequires: javapackages-bootstrap -%else -BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) -%endif -%if %{without bootstrap} -# Not generated automatically -BuildRequires: mvn(org.apache.apache.resources:apache-jar-resource-bundle) -%endif -Requires: mvn(org.apache.apache.resources:apache-jar-resource-bundle) +Requires: jpackage-utils +Requires: apache-resource-bundles +Requires: maven-remote-resources-plugin %description This package contains the parent pom file for apache projects. -%prep -%autosetup -p1 -C -%pom_remove_plugin :maven-enforcer-plugin -%pom_remove_plugin :maven-site-plugin -%pom_remove_plugin :maven-site-plugin docs -%pom_remove_plugin :maven-scm-publish-plugin docs +%prep +%setup -n %{name}-%{version} -Tc + +# This simplifies work with child projects that can use generics +cp %{SOURCE0} . +sed -i 's:1.4:1.5:' pom.xml +sed -i 's:1.4:1.5:' pom.xml + +cp %{SOURCE1} LICENSE %build -%mvn_build -j + %install -%mvn_install +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} +install -pm 644 pom.xml \ + $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom -%files -f .mfiles -%license LICENSE NOTICE +%add_maven_depmap JPP-%{name}.pom + +%check +mvn-rpmbuild verify + +%files +%doc LICENSE +%{_mavenpomdir}/JPP-%{name}.pom +%{_mavendepmapfragdir}/%{name} %changelog -%autochangelog +* Tue Dec 18 2012 Michal Srb - 10-8 +- Added license (Resolves: #888287) + +* Wed Nov 21 2012 Stanislav Ochotnicky - 10-7 +- Install patched pom not the original + +* Fri Nov 2 2012 Mikolaj Izdebski - 10-6 +- Add missing R: maven-remote-resources-plugin, apache-resource-bundles +- Add %%check to verify dependencies during build + +* Thu Jul 26 2012 Stanislav Ochotnicky - 10-5 +- Make sure we generate 1.5 version bytecode + +* Wed Jul 18 2012 Fedora Release Engineering - 10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Sep 13 2011 Andy Grimm 10-2 +- Follow suggestions in BZ #736069 + +* Mon Aug 29 2011 Andy Grimm 10-1 +- Initial Build diff --git a/changelog b/changelog deleted file mode 100644 index 22a9adc..0000000 --- a/changelog +++ /dev/null @@ -1,180 +0,0 @@ -* Wed Jul 17 2024 Fedora Release Engineering - 31-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 31-5 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 31-4 -- bump of release for for java-21-openjdk as system jdk - -* Mon Jan 22 2024 Fedora Release Engineering - 31-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 31-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Dec 08 2023 Marian Koncek - 31-1 -- Update to upstream version 31 - -* Fri Sep 01 2023 Mikolaj Izdebski - 30-2 -- Rebuild - -* Fri Aug 11 2023 Marian Koncek - 30-1 -- Update to upstream version 30 - -* Wed Jul 19 2023 Fedora Release Engineering - 27-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 27-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Sep 06 2022 Marian Koncek - 27-1 -- Update to upstream version 27 - -* Wed Jul 20 2022 Fedora Release Engineering - 26-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Apr 27 2022 Mikolaj Izdebski - 26-2 -- Workaround build issue with RPM 4.18 - -* Thu Apr 21 2022 Mikolaj Izdebski - 26-1 -- Update to upstream version 26 - -* Sat Feb 05 2022 Jiri Vanek - 23-8 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 23-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 23-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 23-5 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 23-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 23-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 23-2 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Mon Mar 02 2020 Fabio Valentini - 23-1 -- Update to version 23. - -* Wed Jan 29 2020 Marian Koncek - 23-1 -- Update to upstream version 23 - -* Tue Jan 28 2020 Fedora Release Engineering - 22-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jan 17 2020 Fabio Valentini - 22-1 -- Update to version 22. - -* Tue Nov 05 2019 Mikolaj Izdebski - 21-3 -- Mass rebuild for javapackages-tools 201902 - -* Wed Jul 24 2019 Fedora Release Engineering - 21-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 21-2 -- Mass rebuild for javapackages-tools 201901 - -* Tue May 14 2019 Mikolaj Izdebski - 21-1 -- Update to upstream version 21 - -* Thu Jan 31 2019 Fedora Release Engineering - 19-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 19-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 19-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 25 2018 Mikolaj Izdebski - 19-1 -- Update to upstream version 19 -- Add missing BR on apache-resource-bundles - -* Wed Jul 26 2017 Fedora Release Engineering - 18-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 18-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue May 17 2016 Mikolaj Izdebski - 18-1 -- Update to upstream version 18 - -* Wed Feb 03 2016 Fedora Release Engineering - 17-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Apr 27 2015 Mikolaj Izdebski - 17-1 -- Update to upstream version 17 - -* Mon Nov 17 2014 Mikolaj Izdebski - 16-1 -- Update to upstream version 16 - -* Mon Sep 29 2014 Mikolaj Izdebski - 15-1 -- Update to upstream version 15 - -* Sat Jun 07 2014 Fedora Release Engineering - 14-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed May 28 2014 Mikolaj Izdebski - 14-2 -- Rebuild to regenerate Maven auto-requires - -* Mon Mar 10 2014 Mikolaj Izdebski - 14-1 -- Update to upstream version 14 - -* Tue Mar 04 2014 Stanislav Ochotnicky - 10-15 -- Remove maven-site-plugin from dependencies - -* Fri Sep 20 2013 Mikolaj Izdebski - 10-14 -- Rebuild to regenerate Maven provides - -* Thu Aug 29 2013 Mikolaj Izdebski - 10-13 -- Add missing R: apache-resource-bundles - -* Mon Aug 26 2013 Michal Srb - 10-12 -- Migrate away from mvn-rpmbuild - -* Sat Aug 03 2013 Fedora Release Engineering - 10-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 10-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Feb 06 2013 Java SIG - 10-9 -- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild -- Replace maven BuildRequires with maven-local - -* Tue Dec 18 2012 Michal Srb - 10-8 -- Added license (Resolves: #888287) - -* Wed Nov 21 2012 Stanislav Ochotnicky - 10-7 -- Install patched pom not the original - -* Fri Nov 2 2012 Mikolaj Izdebski - 10-6 -- Add missing R: maven-remote-resources-plugin, apache-resource-bundles -- Add %%check to verify dependencies during build - -* Thu Jul 26 2012 Stanislav Ochotnicky - 10-5 -- Make sure we generate 1.5 version bytecode - -* Wed Jul 18 2012 Fedora Release Engineering - 10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 10-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Sep 13 2011 Andy Grimm 10-2 -- Follow suggestions in BZ #736069 - -* Mon Aug 29 2011 Andy Grimm 10-1 -- Initial Build diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 0d484d7..0000000 --- a/gating.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_contexts: - - bodhi_update_push_testing - - bodhi_update_push_stable -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf deleted file mode 100644 index ae17c0c..0000000 --- a/plans/javapackages.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Run javapackages-specific tests -discover: - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f43 -execute: - how: tmt diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..095e38b --- /dev/null +++ b/pom.xml @@ -0,0 +1,411 @@ + + + + + + 4.0.0 + + + org.apache + apache + 10 + pom + + The Apache Software Foundation + + The Apache Software Foundation provides support for the Apache community of open-source software projects. + The Apache projects are characterized by a collaborative, consensus based development process, an open and + pragmatic software license, and a desire to create high quality software that leads the way in its field. + We consider ourselves not simply a group of projects sharing a server, but rather a community of developers + and users. + + http://www.apache.org/ + + The Apache Software Foundation + http://www.apache.org/ + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + + apache.snapshots + Apache Snapshot Repository + http://repository.apache.org/snapshots + + false + + + + + + + Apache Announce List + announce-subscribe@apache.org + announce-unsubscribe@apache.org + announce@apache.org + http://mail-archives.apache.org/mod_mbox/www-announce/ + + + + + scm:svn:http://svn.apache.org/repos/asf/maven/pom/tags/apache-10 + scm:svn:https://svn.apache.org/repos/asf/maven/pom/tags/apache-10 + http://svn.apache.org/viewvc/maven/pom/tags/apache-10 + + + + + apache.releases.https + Apache Release Distribution Repository + https://repository.apache.org/service/local/staging/deploy/maven2 + + + apache.snapshots.https + ${distMgmtSnapshotsName} + ${distMgmtSnapshotsUrl} + + + + + Apache Development Snapshot Repository + https://repository.apache.org/content/repositories/snapshots + http://www.apache.org/images/asf_logo_wide.gif + UTF-8 + source-release + true + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.6 + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2.1 + + + org.apache.maven.plugins + maven-clean-plugin + 2.4.1 + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.4 + 1.4 + + + + org.apache.maven.plugins + maven-deploy-plugin + 2.6 + + + org.apache.maven.plugins + maven-docck-plugin + 1.0 + + + org.apache.maven.plugins + maven-enforcer-plugin + 1.0.1 + + + org.apache.maven.plugins + maven-gpg-plugin + 1.3 + + + org.apache.maven.plugins + maven-install-plugin + 2.3.1 + + + org.apache.maven.plugins + maven-invoker-plugin + 1.5 + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + + + true + true + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8 + + + org.apache.maven.plugins + maven-plugin-plugin + 2.8 + + + + org.apache.maven.plugins + maven-release-plugin + 2.1 + + false + deploy + -Papache-release + + + + + org.apache.maven.plugins + maven-remote-resources-plugin + 1.2.1 + + + org.apache.maven.plugins + maven-resources-plugin + 2.5 + + + org.apache.maven.plugins + maven-scm-plugin + 1.4 + + + org.apache.maven.plugins + maven-site-plugin + 3.0 + + + org.apache.maven.wagon + wagon-ssh + 1.0 + + + + + org.apache.maven.plugins + maven-source-plugin + 2.1.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 2.9 + + + org.apache.rat + apache-rat-plugin + 0.7 + + + org.codehaus.mojo + clirr-maven-plugin + 2.3 + + + + + + + org.apache.maven.plugins + maven-remote-resources-plugin + + + + process + + + + org.apache:apache-jar-resource-bundle:1.4 + + + + + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.4 + + + + index + summary + modules + license + project-team + scm + issue-tracking + mailing-list + dependency-management + dependencies + dependency-convergence + cim + plugin-management + plugins + distribution-management + + + + + + + + + + + apache-release + + + + + maven-assembly-plugin + + + org.apache.apache.resources + apache-source-release-assembly-descriptor + 1.0.3 + + + + + source-release-assembly + package + + single + + + true + + ${sourceReleaseAssemblyDescriptor} + + gnu + + + + + + + true + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + + ${gpg.passphrase} + ${gpg.useagent} + + + + + sign + + + + + + + + + + + maven-3 + + + + ${basedir} + + + + + + org.apache.maven.plugins + maven-site-plugin + + + attach-descriptor + + attach-descriptor + + + + + + + + + + diff --git a/sources b/sources index e50d149..08b565e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-35-source-release.zip) = 7dcbfa0eacd43e66da1c12274bf558fb2618d3fae0831de6b0309e8df539afc07080eb1963174a0a6cc4d0d81ae8d2a01f147780f7ca44a3caa94d3ffd364b61 +3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt