From 7f6fe1e63da317cb497da815f8d90cd6873f0351 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Wed, 1 Feb 2017 14:54:26 +0100 Subject: [PATCH 1/4] Adapt mvn script --- apache-maven/src/bin/mvn | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn index a554c6617..818cf70b8 100755 --- a/apache-maven/src/bin/mvn +++ b/apache-maven/src/bin/mvn @@ -22,7 +22,7 @@ # # Environment Variable Prerequisites # -# JAVA_HOME Must point at your Java Development Kit installation. +# JAVA_HOME (Optional) Must point at your Java Development Kit installation. # MAVEN_OPTS (Optional) Java runtime options used when Maven is executed. # MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files. # ----------------------------------------------------------------------------- @@ -33,12 +33,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then . /etc/mavenrc fi + if [ -f /etc/java/maven.conf ] ; then + . /etc/java/maven.conf + fi + if [ -f "$HOME/.mavenrc" ] ; then . "$HOME/.mavenrc" fi fi +if [ -f /usr/share/java-utils/java-functions ] ; then + . /usr/share/java-utils/java-functions + set_jvm + set_javacmd +fi +export JAVA_HOME +export JAVACMD + # OS specific support. $var _must_ be set to either true or false. cygwin=false; mingw=false; @@ -63,7 +75,8 @@ done saveddir=`pwd` -MAVEN_HOME=`dirname "$PRG"`/.. +MAVEN_HOME="${_FEDORA_MAVEN_HOME:-`dirname "$PRG"`/..}" +unset _FEDORA_MAVEN_HOME # make it fully qualified MAVEN_HOME=`cd "$MAVEN_HOME" && pwd` @@ -102,7 +115,7 @@ if [ ! -x "$JAVACMD" ] ; then exit 1 fi -CLASSWORLDS_JAR=`echo "${MAVEN_HOME}"/boot/plexus-classworlds-*.jar` +CLASSWORLDS_JAR=`build-classpath plexus-classworlds` CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher # For Cygwin, switch paths to Windows format before running java -- 2.20.1