Remove dependency on maven-shade-plugin

This commit is contained in:
Marian Koncek 2019-07-10 16:48:57 +02:00
parent 23f96427a5
commit 6dde2c1ae7

View File

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