From 54c80843dbe012263e22dc40b62962b37dc24f15 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 16:35:48 +0200 Subject: [PATCH] Remove build-dependency on powermock --- apache-commons-compress.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apache-commons-compress.spec b/apache-commons-compress.spec index 7965d25..6466556 100644 --- a/apache-commons-compress.spec +++ b/apache-commons-compress.spec @@ -3,7 +3,7 @@ Name: apache-%{short_name} Version: 1.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java API for working with compressed files and archivers License: ASL 2.0 URL: http://commons.apache.org/proper/commons-compress/ @@ -20,9 +20,8 @@ BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +BuildRequires: mvn(org.mockito:mockito-core) BuildRequires: mvn(org.osgi:org.osgi.core) -BuildRequires: mvn(org.powermock:powermock-api-mockito) -BuildRequires: mvn(org.powermock:powermock-module-junit4) BuildRequires: mvn(org.tukaani:xz) %description @@ -61,6 +60,10 @@ rm src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCas %pom_remove_dep :slf4j-api::test rm src/test/java/org/apache/commons/compress/OsgiITest.java +# Remove test that requires powermock +%pom_remove_dep org.powermock: +%pom_add_dep org.mockito:mockito-core::test +rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStreamTest.java %build %mvn_file : %{short_name} %{name} @@ -77,6 +80,9 @@ rm src/test/java/org/apache/commons/compress/OsgiITest.java %doc LICENSE.txt NOTICE.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.18-5 +- Remove build-dependency on powermock + * Thu Feb 14 2019 Mat Booth - 1.18-4 - Rebuild to regenerate OSGi metadata