From 247eafd819d6092661ebc57c54815acd20abd3de Mon Sep 17 00:00:00 2001

From: Michael Simacek <msimacek@redhat.com>

Date: Wed, 1 Feb 2017 14:54:26 +0100

Subject: [PATCH 1/4] Adapt mvn script

---

 apache-maven/src/bin/mvn | 9 +++++++--

 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn

index a554c6617..739501af4 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,16 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then

     . /etc/mavenrc

   fi

+  . /etc/java/maven.conf

+

   if [ -f "$HOME/.mavenrc" ] ; then

     . "$HOME/.mavenrc"

   fi

 fi

+export JAVA_HOME

+

 # OS specific support. $var _must_ be set to either true or false.

 cygwin=false;

 mingw=false;

@@ -63,7 +67,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`

-- 

2.21.0