From 5d69761e8b5b9d0b421cc6105638b2466db424e8 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-compiler.spec | 47 +++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/plexus-compiler.spec b/plexus-compiler.spec index 72eb562..48d5144 100644 --- a/plexus-compiler.spec +++ b/plexus-compiler.spec @@ -1,7 +1,10 @@ -%bcond_without eclipse +# 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-compiler -Epoch: 0 Version: 2.8.8 Release: 3%{?dist} Summary: Compiler call initiators for Plexus @@ -16,16 +19,15 @@ Source1: https://www.apache.org/licenses/LICENSE-2.0.txt Source2: LICENSE.MIT BuildRequires: maven-local -BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-components:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -%if %{with eclipse} -BuildRequires: mvn(org.eclipse.jdt:ecj) %endif - %description Plexus Compiler adds support for using various compilers from a unified api. Support for javac is available in main package. For @@ -57,6 +59,8 @@ API documentation for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} +find -name '.class' -delete + cp %{SOURCE1} LICENSE cp %{SOURCE2} LICENSE.MIT @@ -64,16 +68,11 @@ cp %{SOURCE2} LICENSE.MIT # missing com.google.errorprone:error_prone_core %pom_disable_module plexus-compiler-javac-errorprone plexus-compilers -%if %{without eclipse} %pom_disable_module plexus-compiler-eclipse plexus-compilers -%endif # don't build/install compiler-test module, it needs maven2 test harness %pom_disable_module plexus-compiler-test -# disable integration tests (they require plexus-compiler-test) -%pom_disable_module plexus-compiler-its - # don't install sources jars %mvn_package ":*::sources:" __noinstall @@ -83,10 +82,11 @@ cp %{SOURCE2} LICENSE.MIT # don't generate requires on test dependency (see #1007498) %pom_xpath_remove "pom:dependency[pom:artifactId[text()='plexus-compiler-test']]" plexus-compilers -%pom_remove_plugin :maven-enforcer-plugin -%pom_remove_plugin :maven-javadoc-plugin %pom_remove_plugin :maven-site-plugin %pom_remove_plugin :animal-sniffer-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin + +%pom_remove_dep -r org.codehaus.plexus:plexus-compiler-javac-errorprone %build # Tests are skipped because of unavailable plexus-compiler-test artifact @@ -96,7 +96,6 @@ cp %{SOURCE2} LICENSE.MIT %mvn_install %files -f .mfiles -%dir %{_javadir}/%{name} %doc LICENSE LICENSE.MIT %files extras -f .mfiles-extras %files pom -f .mfiles-pom @@ -105,12 +104,19 @@ cp %{SOURCE2} LICENSE.MIT %doc LICENSE LICENSE.MIT %changelog -* Fri Apr 16 2021 Mohan Boddu - 0:2.8.8-3 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Jun 08 2021 Mikolaj Izdebski - 2.8.8-3 +- Bootstrap Maven for CentOS Stream 9 + +* Mon May 17 2021 Mikolaj Izdebski - 2.8.8-2 +- Bootstrap build +- Non-bootstrap build * Wed Jan 27 2021 Fedora Release Engineering - 0:2.8.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild +* Fri Sep 11 2020 Marian Koncek - 2.8.8-1 +- Update to upstream version 2.8.8 + * Fri Aug 28 2020 Fabio Valentini - 0:2.8.8-1 - Update to version 2.8.8. @@ -129,12 +135,21 @@ cp %{SOURCE2} LICENSE.MIT * Thu Jan 30 2020 Fedora Release Engineering - 0:2.8.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Nov 05 2019 Mikolaj Izdebski - 2.8.5-3 +- Mass rebuild for javapackages-tools 201902 + * Tue Aug 20 2019 Fabio Valentini - 0:2.8.5-1 - Update to version 2.8.5. * Fri Jul 26 2019 Fedora Release Engineering - 0:2.8.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Fri May 24 2019 Mikolaj Izdebski - 2.8.5-2 +- Mass rebuild for javapackages-tools 201901 + +* Mon May 13 2019 Mikolaj Izdebski - 2.8.5-1 +- Update to upstream version 2.8.5 + * Sat Feb 02 2019 Fedora Release Engineering - 0:2.8.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild