[java-sig-commits] [plexus-maven-plugin] Do not require maven2.

Alexander Kurtakov akurtakov at fedoraproject.org
Fri Jun 3 12:45:28 UTC 2011


commit 29262304dc612c4a809cc0bc3aec763bbe92cdbc
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Jun 3 15:45:00 2011 +0300

    Do not require maven2.
    
    Fix surefire plugin name.

 plexus-maven-plugin-jpp-depmap.xml |  133 ------------------------------------
 plexus-maven-plugin.spec           |   12 ++--
 2 files changed, 7 insertions(+), 138 deletions(-)
---
diff --git a/plexus-maven-plugin.spec b/plexus-maven-plugin.spec
index 7aa6c92..5b1a6d5 100644
--- a/plexus-maven-plugin.spec
+++ b/plexus-maven-plugin.spec
@@ -2,11 +2,9 @@
 %global parent plexus
 %global subname maven-plugin
 
-%global maven_settings_file %{_builddir}/%{name}/settings.xml
-
 Name:           %{parent}-%{subname}
 Version:        1.3.8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Plexus Maven plugin
 License:        MIT
@@ -30,7 +28,7 @@ BuildRequires:  maven-jar-plugin
 BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-plugin-plugin
 BuildRequires:  maven-resources-plugin
-BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven2-common-poms >= 1.0
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  maven-surefire-provider-junit
@@ -39,7 +37,7 @@ BuildRequires:  plexus-cdc >= 1.0-0.8.a14
 BuildRequires:  plexus-container-default
 BuildRequires:  plexus-runtime-builder >= 1.0-0.a9.2
 
-Requires:       maven2
+Requires:       maven
 Requires:       maven2-common-poms >= 1.0
 Requires:       plexus-appserver >= 1.0-0.a5.3
 Requires:       plexus-cdc >= 1.0-0.8.a14
@@ -108,6 +106,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Fri Jun 3 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.3.8-5
+- Do not require maven2.
+- Fix surefire plugin name.
+
 * Thu Feb 10 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.3.8-4
 - Fix build
 - Versionless jars & javadocs


More information about the java-sig-commits mailing list