Bootstrap Maven as non-modular packages
Resolves: rhbz#1951482
This commit is contained in:
Mikolaj Izdebski
parent
fe3030b1be
commit
9ba267a66d
@ -1,43 +1,41 @@
|
||||
# Workaround for rhbz#1969370: __bootstrap macro is not defined in
|
||||
# CentOS Stream, See https://bugzilla.redhat.com/1969370
|
||||
%global __bootstrap ~bootstrap
|
||||
|
||||
%bcond_without bootstrap
|
||||
|
||||
Name: maven-parent
|
||||
Version: 34
|
||||
Release: 7%{?dist}
|
||||
Release: 8%{?dist}
|
||||
Summary: Apache Maven parent POM
|
||||
License: ASL 2.0
|
||||
|
||||
URL: http://maven.apache.org
|
||||
URL: https://maven.apache.org
|
||||
Source0: https://repo1.maven.org/maven2/org/apache/maven/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: maven-local
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: javapackages-bootstrap
|
||||
%else
|
||||
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
|
||||
BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
|
||||
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)
|
||||
|
||||
# this package obsoletes maven-shared and maven-plugins-pom
|
||||
Provides: maven-shared = %{version}-%{release}
|
||||
Obsoletes: maven-shared < 22-9
|
||||
|
||||
Provides: maven-plugins-pom = %{version}-%{release}
|
||||
Obsoletes: maven-plugins-pom < 28-9
|
||||
|
||||
Patch1: remove_javadoc_plugin_taglet.patch
|
||||
%endif
|
||||
|
||||
%description
|
||||
Apache Maven parent POM file used by other Maven projects.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%pom_remove_plugin :apache-rat-plugin
|
||||
%pom_disable_module apache-resource-bundles
|
||||
%pom_remove_plugin :maven-enforcer-plugin
|
||||
%pom_remove_plugin :maven-checkstyle-plugin
|
||||
%pom_remove_plugin -r :maven-enforcer-plugin
|
||||
%pom_remove_plugin :maven-scm-publish-plugin
|
||||
%pom_remove_plugin :maven-site-plugin
|
||||
%pom_remove_plugin :apache-rat-plugin
|
||||
|
||||
%patch1 -p2
|
||||
%pom_xpath_remove "pom:execution[pom:id='generate-helpmojo']" maven-plugins
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
@ -49,8 +47,12 @@ Apache Maven parent POM file used by other Maven projects.
|
||||
%doc LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 34-7
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 34-8
|
||||
- Bootstrap Maven for CentOS Stream 9
|
||||
|
||||
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 34-7
|
||||
- Bootstrap build
|
||||
- Non-bootstrap build
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 34-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
@ -61,6 +63,9 @@ Apache Maven parent POM file used by other Maven projects.
|
||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 34-4
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Mon Jun 22 2020 Marian Koncek <mkoncek@redhat.com> - 34-1
|
||||
- Update to upstream version 34
|
||||
|
||||
* Fri Mar 27 2020 Severin Gehwolf <sgehwolf@redhat.com> - 34-3
|
||||
- Remove javadoc taglet configuration which is not longer available
|
||||
|
||||
@ -75,13 +80,22 @@ Apache Maven parent POM file used by other Maven projects.
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 33-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 33-3
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 33-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 33-2
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
|
||||
* Fri May 17 2019 Fabio Valentini <decathorpe@gmail.com> - 33-1
|
||||
- Update to upstream version 33
|
||||
- Obsolete maven-shared and maven-plugins-pom.
|
||||
|
||||
* Tue May 14 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 33-1
|
||||
- Update to upstream version 33
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 27-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
diff --git a/maven-parent-34/maven-plugins/pom.xml b/maven-parent-34/maven-plugins/pom.xml
|
||||
index ef0aebe..df9fbc7 100644
|
||||
--- a/maven-parent-34/maven-plugins/pom.xml
|
||||
+++ b/maven-parent-34/maven-plugins/pom.xml
|
||||
@@ -94,19 +94,6 @@ under the License.
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</plugin>
|
||||
- <plugin>
|
||||
- <groupId>org.apache.maven.plugins</groupId>
|
||||
- <artifactId>maven-javadoc-plugin</artifactId>
|
||||
- <configuration>
|
||||
- <tagletArtifacts>
|
||||
- <tagletArtifact combine.id="org.apache.maven.plugin-tools:maven-plugin-tools-javadoc">
|
||||
- <groupId>org.apache.maven.plugin-tools</groupId>
|
||||
- <artifactId>maven-plugin-tools-javadoc</artifactId>
|
||||
- <version>${mavenPluginToolsVersion}</version>
|
||||
- </tagletArtifact>
|
||||
- </tagletArtifacts>
|
||||
- </configuration>
|
||||
- </plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-release-plugin</artifactId>
|
||||
Loading…
Reference in New Issue
Block a user