[java-sig-commits] [maven2/f15] Fix jpp script to limit maven2.jpp.mode scope

[Stanislav Ochotnicky]

commit 8a36b01ac94a936b0084addd3b3f40c702feaba3
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon Apr 18 14:22:33 2011 +0200

    Fix jpp script to limit maven2.jpp.mode scope

 maven2-jpp-script |    5 ++++-
 maven2.spec       |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/maven2-jpp-script b/maven2-jpp-script
index 1be34bf..c19fe5d 100644
--- a/maven2-jpp-script
+++ b/maven2-jpp-script
@@ -7,4 +7,7 @@ fi
 
 export M2_HOME=/usr/share/maven2
 echo $JAVA_HOME
-export JAVA_HOME; $M2_HOME/bin/mvn -Dmaven2.jpp.mode "$@"
+# can't put it on command line due to
+# http://jira.codehaus.org/browse/SUREFIRE-121
+export MAVEN_OPTS="$MAVEN_OPTS -Dmaven2.jpp.mode"
+export JAVA_HOME; $M2_HOME/bin/mvn "$@"
diff --git a/maven2.spec b/maven2.spec
index 7194705..03f03b7 100644
--- a/maven2.spec
+++ b/maven2.spec
@@ -3,7 +3,7 @@
 
 Name:	    maven2
 Version:	2.2.1
-Release:	21%{?dist}
+Release:	22%{?dist}
 Summary:	Java project management and project comprehension tool
 
 Group:		Development/Build Tools
@@ -519,6 +519,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc
 
 %changelog
+* Mon Apr 18 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2.1-22
+- Fix jpp script to limit maven2.jpp.mode scope
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild