From bc02b445a9226e6630a488e962974d22935e7f51 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 8 Jun 2021 20:17:56 +0200 Subject: [PATCH] Bootstrap Maven as non-modular packages Resolves: rhbz#1951482 --- .gitignore | 1 + maven-antrun-plugin.spec | 52 ++++++++++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 41 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index c5d6268..9bda890 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ maven-antrun-plugin-1.4.tar.xz maven-antrun-plugin-1.5-source-release.zip maven-antrun-plugin-1.7-source-release.zip /maven-antrun-plugin-1.8-source-release.zip +/maven-antrun-plugin-3.0.0-source-release.zip diff --git a/maven-antrun-plugin.spec b/maven-antrun-plugin.spec index 34f4b3f..2daa464 100644 --- a/maven-antrun-plugin.spec +++ b/maven-antrun-plugin.spec @@ -1,22 +1,36 @@ +# 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-antrun-plugin -Version: 1.8 -Release: 14%{?dist} +Version: 3.0.0 +Release: 3%{?dist} Summary: Maven AntRun Plugin - License: ASL 2.0 -URL: http://maven.apache.org/plugins/maven-antrun-plugin/ -Source0: http://repo2.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip - +URL: https://maven.apache.org/plugins/maven-antrun-plugin/ BuildArch: noarch +Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip + BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(org.apache.maven:maven-artifact) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-project) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) +BuildRequires: mvn(org.apache.maven:maven-artifact) +BuildRequires: mvn(org.apache.maven:maven-core) +BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.hamcrest:hamcrest-core) +BuildRequires: mvn(org.xmlunit:xmlunit-core) +BuildRequires: mvn(org.xmlunit:xmlunit-matchers) +%endif %description This plugin provides the ability to run Ant tasks from within Maven. @@ -38,15 +52,18 @@ This package contains the API documentation for %{name}. %mvn_install %files -f .mfiles -%dir %{_javadir}/%{name} %doc LICENSE NOTICE %files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE %changelog -* Fri Apr 16 2021 Mohan Boddu - 1.8-14 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Jun 08 2021 Mikolaj Izdebski - 3.0.0-3 +- Bootstrap Maven for CentOS Stream 9 + +* Mon May 17 2021 Mikolaj Izdebski - 3.0.0-2 +- Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 1.8-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild @@ -57,12 +74,21 @@ This package contains the API documentation for %{name}. * Fri Jul 10 2020 Jiri Vanek - 1.8-11 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 +* Sun May 17 2020 Mikolaj Izdebski - 3.0.0-1 +- Update to upstream version 3.0.0 + * Wed Jan 29 2020 Fedora Release Engineering - 1.8-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Nov 05 2019 Mikolaj Izdebski - 1.8-8 +- Mass rebuild for javapackages-tools 201902 + * Thu Jul 25 2019 Fedora Release Engineering - 1.8-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Fri May 24 2019 Mikolaj Izdebski - 1.8-7 +- Mass rebuild for javapackages-tools 201901 + * Fri Feb 01 2019 Fedora Release Engineering - 1.8-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index 10390e1..9ac166e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43d36446386292876c4ad834027ac609 maven-antrun-plugin-1.8-source-release.zip +SHA512 (maven-antrun-plugin-3.0.0-source-release.zip) = 27976fb318c8481013ba89f90eba118f25bad72704b642185b5bae2d796a3f57af7eddb7f665f1db402b2351d34b7487bb28d32e01e9c0180967f64be4836725