[maven] In maven-script don't override M2_HOME if already set
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Mar 12 12:27:40 UTC 2013
commit 62a5dbea06f5c492d2f6f6efd98ed07a5f304132
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue Mar 12 13:27:04 2013 +0100
In maven-script don't override M2_HOME if already set
maven-script | 2 +-
maven.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/maven-script b/maven-script
index 4ab680b..0792f41 100644
--- a/maven-script
+++ b/maven-script
@@ -5,5 +5,5 @@ if [ -f /usr/share/java-utils/java-functions ] ; then
set_javacmd
fi
-export M2_HOME=/usr/share/maven
+export M2_HOME="${M2_HOME:-/usr/share/maven}"
export JAVA_HOME; $M2_HOME/bin/mvn "$@"
diff --git a/maven.spec b/maven.spec
index c7187de..0cf9d69 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -192,6 +192,9 @@ ln -sf $(build-classpath plexus/classworlds) \
%changelog
+* Tue Mar 12 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.0.5-2
+- In maven-script don't override M2_HOME if already set
+
* Fri Mar 1 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.0.5-1
- Update to upstream version 3.0.5
- Move settings.xml to /etc
More information about the scm-commits
mailing list