[plexus-mail-sender] Do not build test submodule to simplify dependencies

[Stanislav Ochotnicky]

commit 1102848def9ed2abcc9d81e02ccf556975827555
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Thu Oct 11 11:07:42 2012 +0200

    Do not build test submodule to simplify dependencies

 plexus-mail-sender-jpp-depmap.xml |   20 --------------------
 plexus-mail-sender.spec           |   17 ++++++++---------
 2 files changed, 8 insertions(+), 29 deletions(-)
---
diff --git a/plexus-mail-sender.spec b/plexus-mail-sender.spec
index ae7184f..c215017 100644
--- a/plexus-mail-sender.spec
+++ b/plexus-mail-sender.spec
@@ -32,7 +32,7 @@
 
 Name:           plexus-mail-sender
 Version:        1.0
-Release:        0.a2.21%{?dist}.1
+Release:        0.a2.22%{?dist}
 Epoch:          0
 Summary:        Plexus Mail Sender
 License:        MIT and ASL 1.1
@@ -44,8 +44,6 @@ URL:            http://plexus.codehaus.org/
 # tar czf plexus-mail-sender-1.0-a2-src.tar.gz plexus-mail-sender-1.0-a2
 Source0:        plexus-mail-sender-%{version}-a2-src.tar.gz
 
-Source2:        %{name}-jpp-depmap.xml
-
 # http://jira.codehaus.org/browse/PLX-417
 # http://fisheye.codehaus.org/rdiff/plexus?csid=8336&u&N
 Patch0:         %{name}-clarifylicense.patch
@@ -60,7 +58,6 @@ BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-site-plugin
 BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-doxia-sitetools
-BuildRequires:  dumbster
 BuildRequires:  saxon
 BuildRequires:  saxon-scripts
 BuildRequires:  java-devel >= 1:1.6.0
@@ -96,6 +93,7 @@ mv release-pom.xml pom.xml
 
 pushd plexus-mail-senders
 mv release-pom.xml pom.xml
+%pom_xpath_remove "modules/module [text()='plexus-mail-sender-test']"
 for mod in javamail simple test;do
     pushd %{name}-$mod
     mv release-pom.xml pom.xml
@@ -109,17 +107,15 @@ find . -iname 'pom.xml' -exec sed -i \
 
 
 %build
-mvn-rpmbuild \
-        -Dmaven.local.depmap.file="%{SOURCE2}" \
-        -Dmaven.test.skip=true \
-        install javadoc:aggregate
+mvn-rpmbuild -Dmaven.test.skip=true \
+            package javadoc:aggregate
 
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 pushd plexus-mail-senders
-for mod in javamail simple test;do
+for mod in javamail simple;do
     pushd %{name}-$mod
     install -pm 644 target/%{name}-$mod-%{namedversion}*.jar \
             $RPM_BUILD_ROOT%{_javadir}/plexus/mail-sender-$mod.jar
@@ -152,6 +148,9 @@ cp -pr target/site/apidocs/* \
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Oct 11 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.0-0.a2.22
+- Do not build test submodule to simplify dependencies
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.0-0.a2.21.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild