From 76a0e67c3cd9487153cc9f78741f1f97403d8408 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-plugin-testing.spec | 55 ++++++++++++++++++--------------------- sources | 2 +- 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/maven-plugin-testing.spec b/maven-plugin-testing.spec index 97b757a..b8ca516 100644 --- a/maven-plugin-testing.spec +++ b/maven-plugin-testing.spec @@ -1,6 +1,12 @@ +# 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-testing Version: 3.3.0 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Maven Plugin Testing License: ASL 2.0 URL: http://maven.apache.org/plugin-testing/ @@ -12,6 +18,9 @@ Patch0: 0001-Port-to-plexus-utils-3.0.21.patch Patch1: 0002-Port-to-current-maven-artifact.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.maven:maven-aether-provider) @@ -20,13 +29,9 @@ BuildRequires: mvn(org.apache.maven:maven-core) BuildRequires: mvn(org.apache.maven:maven-model) BuildRequires: mvn(org.apache.maven:maven-parent:pom:) BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.apache.maven.shared:maven-invoker) -BuildRequires: mvn(org.apache.maven.wagon:wagon-file) BuildRequires: mvn(org.codehaus.plexus:plexus-archiver) -BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.easymock:easymock) +%endif %description The Maven Plugin Testing contains the necessary modules @@ -40,25 +45,10 @@ API documentation for %{name}. %package harness Summary: Maven Plugin Testing Mechanism -Obsoletes: maven-shared-plugin-testing-harness <= 0:1.2 %description harness The Maven Plugin Testing Harness provides mechanisms to manage tests on Mojo. -%package tools -Summary: Maven Plugin Testing Tools -Obsoletes: maven-shared-plugin-testing-tools <= 0:%{version}-%{release} - -%description tools -A set of useful tools to help the Maven Plugin testing. - -%package -n maven-test-tools -Summary: Maven Testing Tool -Obsoletes: maven-shared-test-tools <= 0:%{version}-%{release} - -%description -n maven-test-tools -Framework to test Maven Plugins with Easymock objects. - %prep %setup -q @@ -67,11 +57,10 @@ Framework to test Maven Plugins with Easymock objects. %pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :maven-source-plugin maven-plugin-testing-harness -sed -i -e "s/MockControl/IMocksControl/g" maven-test-tools/src/main/java/org/apache/maven/shared/tools/easymock/MockManager.java - -# needs network for some reason -rm maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java +%pom_disable_module maven-plugin-testing-tools +%pom_disable_module maven-test-tools %mvn_alias : org.apache.maven.shared: @@ -84,14 +73,16 @@ rm maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ %files -f .mfiles-%{name} %doc LICENSE NOTICE %files harness -f .mfiles-%{name}-harness -%files tools -f .mfiles-%{name}-tools -%files -n maven-test-tools -f .mfiles-maven-test-tools %files javadoc -f .mfiles-javadoc %doc LICENSE NOTICE %changelog -* Fri Apr 16 2021 Mohan Boddu - 3.3.0-20 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Tue Jun 08 2021 Mikolaj Izdebski - 3.3.0-21 +- Bootstrap Maven for CentOS Stream 9 + +* Mon May 17 2021 Mikolaj Izdebski - 3.3.0-20 +- Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 3.3.0-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild @@ -105,9 +96,15 @@ rm maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ * Wed Jan 29 2020 Fedora Release Engineering - 3.3.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild +* Tue Nov 05 2019 Mikolaj Izdebski - 3.3.0-14 +- Mass rebuild for javapackages-tools 201902 + * Thu Jul 25 2019 Fedora Release Engineering - 3.3.0-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild +* Fri May 24 2019 Mikolaj Izdebski - 3.3.0-13 +- Mass rebuild for javapackages-tools 201901 + * Fri Feb 01 2019 Fedora Release Engineering - 3.3.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index aa1887b..71ff2ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e895f6d96435dd8ffc9fcb8f5089ac6a maven-plugin-testing-3.3.0-source-release.zip +SHA512 (maven-plugin-testing-3.3.0-source-release.zip) = d4a36aeec71244d93ab880dfec88f48415098926898926094b53708e4ea0c49a7f82c4f058ec73e2c41d9650b370ca6526d73c067e8367ffec9324c1164e6d1e