Bootstrap Maven as non-modular packages

Resolves: rhbz#1951482
This commit is contained in:
Mikolaj Izdebski 2021-06-08 20:17:56 +02:00
parent 67d744ac03
commit e5a7e5fa07
3 changed files with 49 additions and 12 deletions

2
.gitignore vendored
View File

@ -5,3 +5,5 @@ maven-plugin-build-helper-1.4.tar.bz2
/maven-plugin-build-helper-1.9.1.tar.xz
/build-helper-maven-plugin-3.1.0.tar.gz
/build-helper-maven-plugin-3.2.0.tar.gz
/build-helper-maven-plugin-3.1.0-source-release.zip
/build-helper-maven-plugin-3.2.0-source-release.zip

View File

@ -1,26 +1,35 @@
%global srcname build-helper-maven-plugin
# 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-plugin-build-helper
Version: 3.2.0
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Build Helper Maven Plugin
License: MIT
URL: https://www.mojohaus.org/build-helper-maven-plugin/
Source0: https://github.com/mojohaus/%{srcname}/archive/%{srcname}-%{version}.tar.gz
BuildArch: noarch
Source0: https://repo1.maven.org/maven2/org/codehaus/mojo/build-helper-maven-plugin/%{version}/build-helper-maven-plugin-%{version}-source-release.zip
BuildRequires: maven-local
BuildRequires: mvn(org.apache-extras.beanshell:bsh)
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.shared:file-management)
BuildRequires: mvn(org.apache.maven:maven-compat)
BuildRequires: mvn(org.apache.maven:maven-core)
BuildRequires: mvn(org.apache.maven:maven-plugin-api)
BuildRequires: mvn(org.assertj:assertj-core)
BuildRequires: mvn(org.codehaus.mojo:mojo-parent:pom:)
BuildRequires: mvn(org.codehaus.plexus:plexus-utils)
BuildRequires: mvn(org.testng:testng)
%endif
%description
This plugin contains various small independent goals to assist with
@ -33,10 +42,17 @@ Summary: API documentation for %{name}
This package provides %{summary}.
%prep
%setup -q -n %{srcname}-%{srcname}-%{version}
%setup -q -n build-helper-maven-plugin-%{version}
%pom_add_dep junit:junit::test
find -name BeanshellPropertyMojo.java -delete
%pom_remove_dep :bsh
%pom_remove_plugin :maven-invoker-plugin
%build
%mvn_build -f
%mvn_build
%install
%mvn_install
@ -49,8 +65,15 @@ This package provides %{summary}.
%license LICENSE.txt
%changelog
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 3.2.0-4
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-5
- Bootstrap Maven for CentOS Stream 9
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-4
- Bump release
* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-2
- Bootstrap build
- Non-bootstrap build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@ -64,15 +87,27 @@ This package provides %{summary}.
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.1.0-2
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Mon Jun 22 2020 Marian Koncek <mkoncek@redhat.com> - 3.2.0-1
- Update to upstream version 3.2.0
* Sun May 17 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1.0-1
- Update to upstream version 3.1.0
* Sat May 09 2020 Fabio Valentini <decathorpe@gmail.com> - 3.1.0-1
- Update to version 3.1.0.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9.1-10
- Mass rebuild for javapackages-tools 201902
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.1-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9.1-9
- Mass rebuild for javapackages-tools 201901
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (build-helper-maven-plugin-3.2.0.tar.gz) = d15515edc3c09819ad0630294129bc7a35510540484995682044a7d55ab1f61296183e8ff8d3cdc8d71895bfc1f5cd035728763d6ae01f3ebed09876ebb27e85
SHA512 (build-helper-maven-plugin-3.2.0-source-release.zip) = 837118e0c77faca23267623d197478751407c102bab48d4d04413977b5f47515a92adda29296742900fdb07149ba1cf2dcd924644cd4b64576c8eb880acf148e