migrate from the obsolete felix-osgi-core to osgi-core
This commit is contained in:
parent
b83cadbdd7
commit
ac6ae231a9
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
Name: apache-%{short_name}
|
Name: apache-%{short_name}
|
||||||
Version: 1.18
|
Version: 1.18
|
||||||
Release: 6%{?dist}
|
Release: 7%{?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/
|
||||||
@ -21,7 +21,7 @@ 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.mockito:mockito-core)
|
||||||
BuildRequires: mvn(org.osgi:org.osgi.core)
|
BuildRequires: mvn(org.osgi:osgi.core)
|
||||||
BuildRequires: mvn(org.tukaani:xz)
|
BuildRequires: mvn(org.tukaani:xz)
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -60,6 +60,9 @@ 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
|
||||||
|
|
||||||
|
# use osgi-core instead of felix-osgi-core
|
||||||
|
%pom_change_dep :org.osgi.core org.osgi:osgi.core
|
||||||
|
|
||||||
# Remove test that requires powermock
|
# Remove test that requires powermock
|
||||||
%pom_remove_dep org.powermock:
|
%pom_remove_dep org.powermock:
|
||||||
%pom_add_dep org.mockito:mockito-core::test
|
%pom_add_dep org.mockito:mockito-core::test
|
||||||
@ -80,6 +83,9 @@ rm src/test/java/org/apache/commons/compress/compressors/z/ZCompressorInputStrea
|
|||||||
%doc LICENSE.txt NOTICE.txt
|
%doc LICENSE.txt NOTICE.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 18 2019 Fabio Valentini <decathorpe@gmail.com> - 1.18-7
|
||||||
|
- Migrate from the obsolete felix-osgi-core to osgi-core.
|
||||||
|
|
||||||
* Wed Aug 14 2019 Fabio Valentini <decathorpe@gmail.com> - 1.18-6
|
* Wed Aug 14 2019 Fabio Valentini <decathorpe@gmail.com> - 1.18-6
|
||||||
- Remove build-dependency on powermock
|
- Remove build-dependency on powermock
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user