Update to upstream 1.4.0 release

- Re-enable tests
This commit is contained in:
Mat Booth 2015-01-27 13:40:18 +00:00
parent 2e510e5973
commit a41b807b1e
3 changed files with 12 additions and 7 deletions

4
.gitignore vendored
View File

@ -1 +1,5 @@
/org.apache.felix.utils-1.2.0-source-release.tar.gz
/org.apache.felix.utils-1.4.0-source-release.tar.gz
/noarch
/.build-*.log
/*.src.rpm

View File

@ -1,8 +1,8 @@
%global bundle org.apache.felix.utils
Name: felix-utils
Version: 1.2.0
Release: 8%{?dist}
Version: 1.4.0
Release: 1%{?dist}
Summary: Utility classes for OSGi
License: ASL 2.0
URL: http://felix.apache.org
@ -16,8 +16,6 @@ BuildRequires: mvn(org.osgi:org.osgi.compendium)
BuildRequires: mvn(org.osgi:org.osgi.core)
BuildRequires: mvn(org.mockito:mockito-core)
Requires: java-headless
%description
Utility classes for OSGi
@ -38,8 +36,7 @@ This package contains the API documentation for %{name}.
%mvn_file :%{bundle} "felix/%{bundle}"
%build
# one of the tests fails in mock (local build is ok)
%mvn_build -- -Dmaven.test.failure.ignore=true
%mvn_build
%install
%mvn_install
@ -51,6 +48,10 @@ This package contains the API documentation for %{name}.
%doc LICENSE NOTICE
%changelog
* Tue Jan 27 2015 Mat Booth <mat.booth@redhat.com> - 1.4.0-1
- Update to upstream 1.4.0 release
- Re-enable tests
* Mon Aug 4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.0-8
- Add build-requires on mockito

View File

@ -1 +1 @@
6f9ff73e46113bfda117119e9d78b7a7 org.apache.felix.utils-1.2.0-source-release.tar.gz
2dd38bea2fb31d30a8d054bd5373c496 org.apache.felix.utils-1.4.0-source-release.tar.gz