From 4ffe36fd208b0edd9c448b23114fe65026a5d8a6 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 --- maven-compiler-plugin.spec | 46 ++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 7 deletions(-) diff --git a/maven-compiler-plugin.spec b/maven-compiler-plugin.spec index 738c570..3cb6496 100644 --- a/maven-compiler-plugin.spec +++ b/maven-compiler-plugin.spec @@ -1,12 +1,18 @@ +# 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-compiler-plugin Version: 3.8.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Maven Compiler Plugin License: ASL 2.0 -URL: http://maven.apache.org/plugins/maven-compiler-plugin +URL: https://maven.apache.org/plugins/maven-compiler-plugin BuildArch: noarch -Source0: http://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip +Source0: https://archive.apache.org/dist/maven/plugins/%{name}-%{version}-source-release.zip # port to plexus-languages 1.0.3 Patch0: 0001-plexus-languages-1.0.patch @@ -15,11 +21,17 @@ Patch0: 0001-plexus-languages-1.0.patch Patch1: 0002-MCOMPILER-359-Fix-for-NPE.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.maven:maven-artifact) +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.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:) +BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.shared:maven-shared-incremental) BuildRequires: mvn(org.apache.maven.shared:maven-shared-utils) @@ -28,7 +40,8 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-javac) BuildRequires: mvn(org.codehaus.plexus:plexus-compiler-manager) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-java) - +BuildRequires: mvn(org.mockito:mockito-core) +%endif %description The Compiler Plugin is used to compile the sources of your project. @@ -44,8 +57,11 @@ API documentation for %{name}. %patch0 -p1 %patch1 -p1 +# Replace path to junit in a test case with the system wide .jar +sed -i 's|localRepository,\ "junit/junit/3.8.1/junit-3.8.1.jar"|"%(find-jar junit || find-jar javapackages-bootstrap/junit)"|' src/test/java/org/apache/maven/plugin/compiler/CompilerMojoTestCase.java + %build -%mvn_build -f +%mvn_build %install %mvn_install @@ -57,8 +73,12 @@ API documentation for %{name}. %license LICENSE NOTICE %changelog -* Fri Apr 16 2021 Mohan Boddu - 3.8.1-9 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Jun 08 2021 Mikolaj Izdebski - 3.8.1-10 +- Bootstrap Maven for CentOS Stream 9 + +* Mon May 17 2021 Mikolaj Izdebski - 3.8.1-9 +- Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 3.8.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild @@ -75,6 +95,9 @@ API documentation for %{name}. * Wed Jan 29 2020 Fedora Release Engineering - 3.8.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Nov 05 2019 Mikolaj Izdebski - 3.8.1-2 +- Mass rebuild for javapackages-tools 201902 + * Tue Oct 15 2019 Fabio Valentini - 3.8.1-3 - Port to plexus-languages 1.0. @@ -84,6 +107,15 @@ API documentation for %{name}. * Sat Jun 08 2019 Fabio Valentini - 3.8.1-1 - Update to version 3.8.1. +* Tue Jun 04 2019 Marian Koncek - 3.8.1-1 +- Update to upstream version 3.8.1 + +* Fri May 31 2019 Marian Koncek - 3.8.0-1 +- Update to upstream version 3.8.0 + +* Fri May 24 2019 Mikolaj Izdebski - 3.7.0-3 +- Mass rebuild for javapackages-tools 201901 + * Fri Feb 01 2019 Fedora Release Engineering - 3.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild