Merge branch 'remove-plexus-container-default'

Conflicts:
	plexus-cipher.spec
This commit is contained in:
Mikolaj Izdebski 2013-04-10 13:04:49 +02:00
commit 60041a74fd

View File

@ -1,6 +1,6 @@
Name: plexus-cipher
Version: 1.7
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Plexus Cipher: encryption/decryption Component
Group: Development/Libraries
@ -26,7 +26,6 @@ BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-doxia-sitetools
BuildRequires: plexus-container-default
BuildRequires: forge-parent
BuildRequires: spice-parent
BuildRequires: plexus-containers-component-metadata
@ -89,6 +88,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name}/
* Wed Mar 13 2013 Michal Srb <msrb@redhat.com> - 1.7-1
- Update to upstream version 1.7
* Thu Feb 21 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5-15
- Reemove BR: plexus-container-default
* Fri Feb 08 2013 Michal Srb <msrb@redhat.com> - 1.5-14
- Remove unnecessary dependency on plexus-containers (#908586)