Remove build-dependency on powermock
This commit is contained in:
parent
9a01765d53
commit
54c80843db
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: apache-%{short_name}
|
Name: apache-%{short_name}
|
||||||
Version: 1.18
|
Version: 1.18
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: Java API for working with compressed files and archivers
|
Summary: Java API for working with compressed files and archivers
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
URL: http://commons.apache.org/proper/commons-compress/
|
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.commons:commons-parent:pom:)
|
||||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||||
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-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.osgi:org.osgi.core)
|
||||||
BuildRequires: mvn(org.powermock:powermock-api-mockito)
|
|
||||||
BuildRequires: mvn(org.powermock:powermock-module-junit4)
|
|
||||||
BuildRequires: mvn(org.tukaani:xz)
|
BuildRequires: mvn(org.tukaani:xz)
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -61,6 +60,10 @@ rm src/test/java/org/apache/commons/compress/compressors/DetectCompressorTestCas
|
|||||||
%pom_remove_dep :slf4j-api::test
|
%pom_remove_dep :slf4j-api::test
|
||||||
rm src/test/java/org/apache/commons/compress/OsgiITest.java
|
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
|
%build
|
||||||
%mvn_file : %{short_name} %{name}
|
%mvn_file : %{short_name} %{name}
|
||||||
@ -77,6 +80,9 @@ rm src/test/java/org/apache/commons/compress/OsgiITest.java
|
|||||||
%doc LICENSE.txt NOTICE.txt
|
%doc LICENSE.txt NOTICE.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.18-5
|
||||||
|
- Remove build-dependency on powermock
|
||||||
|
|
||||||
* Thu Feb 14 2019 Mat Booth <mat.booth@redhat.com> - 1.18-4
|
* Thu Feb 14 2019 Mat Booth <mat.booth@redhat.com> - 1.18-4
|
||||||
- Rebuild to regenerate OSGi metadata
|
- Rebuild to regenerate OSGi metadata
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user