Revert "Remove dependency on maven-shade-plugin"

This reverts commit 6dde2c1ae7.
This commit is contained in:
Marian Koncek 2019-07-15 10:00:25 +02:00
parent 6dde2c1ae7
commit bc5f2fabe9

View File

@ -1,6 +1,6 @@
Name: maven-surefire
Version: 3.0.0~M3
Release: 3%{?dist}
Release: 2%{?dist}
Summary: Test framework project
License: ASL 2.0 and CPL
URL: http://maven.apache.org/surefire/
@ -32,6 +32,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-invoker-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api)
BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl)
@ -46,6 +47,7 @@ BuildRequires: mvn(org.fusesource.jansi:jansi)
BuildRequires: mvn(org.testng:testng)
BuildRequires: mvn(org.testng:testng::jdk15:)
# PpidChecker relies on /usr/bin/ps to check process uptime
Requires: procps-ng
@ -70,6 +72,7 @@ Summary: JUnit provider for Maven Surefire
%description provider-junit
JUnit provider for Maven Surefire.
%package provider-testng
Summary: TestNG provider for Maven Surefire
@ -140,8 +143,6 @@ sed -i /-Xdoclint:all/d pom.xml
%pom_remove_plugin :maven-assembly-plugin maven-surefire-plugin
%pom_remove_dep -r ::::site-source
%pom_remove_plugin -r :maven-shade-plugin
%pom_remove_plugin :maven-shade-plugin surefire-shadefire
%build
%mvn_package ":*{surefire-plugin,report-plugin}*" @1
@ -155,6 +156,7 @@ sed -i /-Xdoclint:all/d pom.xml
%install
%mvn_install
%files -f .mfiles
%doc README.md
%license LICENSE NOTICE cpl-v10.html
@ -170,9 +172,6 @@ sed -i /-Xdoclint:all/d pom.xml
%license LICENSE NOTICE cpl-v10.html
%changelog
* Wed Jul 10 2019 Marian Koncek <mkoncek@redhat.com> - 3.0.0~M3-3
- Remove dependency on maven-shade-plugin
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.0~M3-2
- Mass rebuild for javapackages-tools 201901