From ca24e4369092eecc4ccd1e7d825ec15cec84cf6c Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 13 Mar 2025 14:01:11 +0000 Subject: [PATCH] import CS maven-parent-43-4.module_el9+1171+eb38a622 --- .gitignore | 2 +- .maven-parent.metadata | 2 +- SPECS/maven-parent.spec | 137 +++++++++++++++++++++++++++++++++++++--- 3 files changed, 129 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index fdeabb8..8f5549d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/maven-parent-33-source-release.zip +SOURCES/maven-parent-43-source-release.zip diff --git a/.maven-parent.metadata b/.maven-parent.metadata index c35b904..753b5a3 100644 --- a/.maven-parent.metadata +++ b/.maven-parent.metadata @@ -1 +1 @@ -b90e526a9508d2db7bd101315e54159417394e50 SOURCES/maven-parent-33-source-release.zip +3cd118ac4a7ac516c5f10c610070f7fd73b81f86 SOURCES/maven-parent-43-source-release.zip diff --git a/SPECS/maven-parent.spec b/SPECS/maven-parent.spec index fabcfdb..b8dd327 100644 --- a/SPECS/maven-parent.spec +++ b/SPECS/maven-parent.spec @@ -1,12 +1,19 @@ -Name: maven-parent -Version: 33 -Release: 3%{?dist} -Summary: Apache Maven parent POM -License: ASL 2.0 -URL: http://maven.apache.org -Source0: http://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip -BuildArch: noarch +%bcond_with bootstrap +Name: maven-parent +Version: 43 +Release: 4%{?dist} +Summary: Apache Maven parent POM +License: Apache-2.0 +URL: https://maven.apache.org +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch + +Source0: https://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip + +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: maven-local BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) @@ -14,16 +21,22 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin) BuildRequires: mvn(org.apache:apache:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) +%endif %description Apache Maven parent POM file used by other Maven projects. %prep -%setup -q -%pom_disable_module apache-resource-bundles +%autosetup -p1 %pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-checkstyle-plugin %pom_remove_plugin :apache-rat-plugin +%pom_remove_plugin :spotless-maven-plugin +%pom_remove_plugin -r :maven-site-plugin +%pom_remove_plugin -r :maven-scm-publish-plugin +%pom_remove_dep :junit-bom + +%pom_xpath_remove "pom:execution[pom:id='generate-helpmojo']" maven-plugins %build %mvn_build @@ -35,15 +48,119 @@ Apache Maven parent POM file used by other Maven projects. %doc LICENSE NOTICE %changelog +* Fri Nov 29 2024 Mikolaj Izdebski - 43-2 +- Update javapackages test plan to f42 + +* Fri Aug 23 2024 Mikolaj Izdebski - 43-1 +- Update to upstream version 43 +- Resolves: rhbz#2296838 + +* Thu Jul 18 2024 Fedora Release Engineering - 41-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 41-5 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 41-4 +- bump of release for for java-21-openjdk as system jdk + +* Thu Jan 25 2024 Fedora Release Engineering - 41-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 41-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 04 2023 Mikolaj Izdebski - 41-1 +- Update to upstream version 41 + +* Fri Sep 01 2023 Mikolaj Izdebski - 40-2 +- Rebuild + +* Wed Aug 16 2023 Marian Koncek - 40-1 +- Update to upstream version 40 + +* Thu Jul 20 2023 Fedora Release Engineering - 39-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Mar 31 2023 Mikolaj Izdebski - 39-2 +- Rebuild with no changes + +* Thu Mar 23 2023 Mikolaj Izdebski - 39-1 +- Update to upstream version 39 + +* Thu Jan 19 2023 Fedora Release Engineering - 37-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Sep 06 2022 Marian Koncek - 37-1 +- Update to upstream version 37 + +* Thu Jul 21 2022 Fedora Release Engineering - 35-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Apr 21 2022 Mikolaj Izdebski - 35-1 +- Update to upstream version 35 + +* Sat Feb 05 2022 Jiri Vanek - 34-10 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 34-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 34-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 34-7 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 34-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 34-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 34-4 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Mon Jun 22 2020 Marian Koncek - 34-1 +- Update to upstream version 34 + +* Fri Mar 27 2020 Severin Gehwolf - 34-3 +- Remove javadoc taglet configuration which is not longer available + +* Wed Mar 25 2020 Severin Gehwolf - 34-2 +- Remove explicit requirement on maven-plugin-tools-javadoc + +* Mon Mar 02 2020 Fabio Valentini - 34-1 +- Update to version 34. +- Switch to HTTPS URL for source downloads. +- Remove upstream patch that's part of this release. + +* Wed Jan 29 2020 Fedora Release Engineering - 33-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Nov 05 2019 Mikolaj Izdebski - 33-3 - Mass rebuild for javapackages-tools 201902 +* Thu Jul 25 2019 Fedora Release Engineering - 33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 24 2019 Mikolaj Izdebski - 33-2 - Mass rebuild for javapackages-tools 201901 +* Fri May 17 2019 Fabio Valentini - 33-1 +- Update to upstream version 33 +- Obsolete maven-shared and maven-plugins-pom. + * Tue May 14 2019 Mikolaj Izdebski - 33-1 - Update to upstream version 33 +* Fri Feb 01 2019 Fedora Release Engineering - 27-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 27-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 27-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild