commit 6b041a99a7ddafd3662173108b4e9ed090bc1e6e Author: Stanislav Ochotnicky sochotnicky@redhat.com Date: Tue May 22 10:28:07 2012 +0200
Replace plexus-maven-plugin with plexus-component-metadata
plexus-sec-dispatcher-pom.patch | 33 ++++++++++++++++++++++++++------- plexus-sec-dispatcher.spec | 23 +++++++++-------------- 2 files changed, 35 insertions(+), 21 deletions(-) --- diff --git a/plexus-sec-dispatcher-pom.patch b/plexus-sec-dispatcher-pom.patch index a540574..9cdcb1c 100644 --- a/plexus-sec-dispatcher-pom.patch +++ b/plexus-sec-dispatcher-pom.patch @@ -1,13 +1,32 @@ ---- pom.xml.orig 2009-12-16 21:55:06.000000000 +0800 -+++ pom.xml 2010-06-04 10:45:50.000000000 +0800 -@@ -38,10 +38,6 @@ +diff --git a/pom.xml b/pom.xml +index 1eb2158..7e7ac5d 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -25,25 +25,17 @@ + <plugins> <plugin> - <artifactId>maven-compiler-plugin - </artifactId> + <groupId>org.codehaus.plexus</groupId> +- <artifactId>plexus-maven-plugin</artifactId> ++ <artifactId>plexus-component-metadata</artifactId> + <version>1.3.5</version> + <executions> + <execution> + <goals> +- <goal>descriptor</goal> ++ <goal>generate-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> +- <artifactId>maven-compiler-plugin +- </artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - <plugin> +- </plugin> +- <plugin> <groupId>org.codehaus.modello</groupId> + <artifactId>modello-maven-plugin</artifactId> + <configuration> diff --git a/plexus-sec-dispatcher.spec b/plexus-sec-dispatcher.spec index a72512b..b6c8e57 100644 --- a/plexus-sec-dispatcher.spec +++ b/plexus-sec-dispatcher.spec @@ -1,6 +1,6 @@ Name: plexus-sec-dispatcher Version: 1.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Plexus Security Dispatcher Component
Group: Development/Libraries @@ -15,7 +15,7 @@ Patch0: %{name}-pom.patch BuildArch: noarch
BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: maven2 +BuildRequires: maven BuildRequires: maven-plugin-plugin BuildRequires: maven-compiler-plugin BuildRequires: maven-install-plugin @@ -26,6 +26,7 @@ BuildRequires: maven-surefire-maven-plugin BuildRequires: plexus-utils BuildRequires: plexus-cipher BuildRequires: plexus-container-default +BuildRequires: plexus-containers-component-metadata BuildRequires: junit BuildRequires: forge-parent BuildRequires: spice-parent @@ -35,9 +36,6 @@ Requires: jpackage-utils Requires: java Requires: spice-parent
-Requires(post): jpackage-utils -Requires(postun): jpackage-utils - %description Plexus Security Dispatcher Component
@@ -52,7 +50,7 @@ API documentation for %{name}.
%prep %setup -q -%patch0 -p0 +%patch0 -p1
%build mvn-rpmbuild install javadoc:javadoc @@ -75,21 +73,18 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/plexus/%{name} [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-%post -%update_maven_depmap - -%postun -%update_maven_depmap - %files %{_javadir}/plexus/* -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* +%{_mavenpomdir}/JPP.plexus-%{name}.pom +%{_mavendepmapfragdir}/%{name}
%files javadoc %{_javadocdir}/plexus/%{name}
%changelog +* Tue May 22 2012 Stanislav Ochotnicky sochotnicky@redhat.com - 1.4-6 +- Replace plexus-maven-plugin with plexus-component-metadata + * Sat Jan 14 2012 Fedora Release Engineering rel-eng@lists.fedoraproject.org - 1.4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild