From 4c87186d50811151add42471c3850916b8ad46d2 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 --- plexus-containers.spec | 64 +++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 25 deletions(-) diff --git a/plexus-containers.spec b/plexus-containers.spec index 56d212c..3f94f32 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -1,21 +1,29 @@ +# 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: plexus-containers -Summary: Containers for Plexus Version: 2.1.0 -Release: 6%{?dist} +Release: 7%{?dist} +Summary: Containers for Plexus # Most of the files are either under ASL 2.0 or MIT # The following files are under xpp: # plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/Driver.java # plexus-component-metadata/src/main/java/org/codehaus/plexus/metadata/merge/MXParser.java License: ASL 2.0 and MIT and xpp +URL: https://github.com/codehaus-plexus/plexus-containers +BuildArch: noarch -URL: https://github.com/codehaus-plexus/%{name} -Source0: %{url}/archive/%{name}-%{version}.tar.gz +Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: LICENSE.MIT -BuildArch: noarch - -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(com.google.guava:guava) BuildRequires: mvn(com.thoughtworks.qdox:qdox) BuildRequires: mvn(junit:junit) @@ -31,9 +39,7 @@ BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.jdom:jdom2) BuildRequires: mvn(org.ow2.asm:asm) - -Obsoletes: plexus-containers-component-javadoc < 2.0.0-1 - +%endif %description The Plexus project seeks to create end-to-end developer tools for @@ -52,7 +58,7 @@ Summary: Component metadata from %{name} %package component-annotations Summary: Component API from %{name} -%description component-annotations +%description -n %{?module_prefix}%{name}-component-annotations %{summary}. %package container-default @@ -61,11 +67,7 @@ Summary: Default Container from %{name} %description container-default %{summary}. -%package javadoc -Summary: API documentation for all plexus-containers packages - -%description javadoc -%{summary}. +%{?javadoc_package} %prep %setup -q -n %{name}-%{name}-%{version} @@ -109,11 +111,9 @@ rm plexus-component-metadata/src/test/java/org/codehaus/plexus/metadata/DefaultC %build %mvn_build -s - %install %mvn_install - # plexus-containers pom goes into main package %files -f .mfiles-plexus-containers %license LICENSE-2.0.txt LICENSE.MIT @@ -127,13 +127,13 @@ rm plexus-component-metadata/src/test/java/org/codehaus/plexus/metadata/DefaultC %files component-metadata -f .mfiles-plexus-component-metadata %license LICENSE-2.0.txt LICENSE.MIT -%files javadoc -f .mfiles-javadoc -%license LICENSE-2.0.txt LICENSE.MIT - - %changelog -* Fri Apr 16 2021 Mohan Boddu - 2.1.0-6 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Jun 08 2021 Mikolaj Izdebski - 2.1.0-7 +- Bootstrap Maven for CentOS Stream 9 + +* Mon May 17 2021 Mikolaj Izdebski - 2.1.0-6 +- Bootstrap build +- Non-bootstrap build * Wed Jan 27 2021 Fedora Release Engineering - 2.1.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild @@ -147,6 +147,15 @@ rm plexus-component-metadata/src/test/java/org/codehaus/plexus/metadata/DefaultC * Thu Jan 30 2020 Fedora Release Engineering - 2.1.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Sat Jan 25 2020 Mikolaj Izdebski - 2.1.0-2 +- Build with OpenJDK 8 + +* Wed Nov 20 2019 Marian Koncek - 2.1.0-1 +- Update to upstream version 2.1.0 + +* Tue Nov 05 2019 Mikolaj Izdebski - 2.0.0-2 +- Mass rebuild for javapackages-tools 201902 + * Thu Oct 24 2019 Fabio Valentini - 2.1.0-1 - Update to version 2.1.0. @@ -156,6 +165,12 @@ rm plexus-component-metadata/src/test/java/org/codehaus/plexus/metadata/DefaultC * Fri Jul 26 2019 Fedora Release Engineering - 1.7.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Thu May 30 2019 Marian Koncek - 2.0.0-1 +- Update to upstream version 2.0.0 + +* Fri May 24 2019 Mikolaj Izdebski - 1.7.1-9 +- Mass rebuild for javapackages-tools 201901 + * Sat Feb 02 2019 Fedora Release Engineering - 1.7.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild @@ -328,4 +343,3 @@ rm plexus-component-metadata/src/test/java/org/codehaus/plexus/metadata/DefaultC * Tue Apr 08 2008 Deepak Bhole 1.0-0.1.a34.0jpp.1 - Initial build with original base spec from JPackage -