Blame SOURCES/0001-Adapt-mvn-script.patch

cc4084
From ea6096c4e36e4af01ba8a43aa9934aa013bf8841 Mon Sep 17 00:00:00 2001
cc4084
From: Michael Simacek <msimacek@redhat.com>
cc4084
Date: Wed, 1 Feb 2017 14:54:26 +0100
cc4084
Subject: [PATCH 1/5] Adapt mvn script
cc4084
cc4084
---
cc4084
 apache-maven/src/bin/mvn | 17 +++++++++++++++--
cc4084
 1 file changed, 15 insertions(+), 2 deletions(-)
cc4084
cc4084
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
cc4084
index a554c66..b9c5d32 100755
cc4084
--- a/apache-maven/src/bin/mvn
cc4084
+++ b/apache-maven/src/bin/mvn
cc4084
@@ -22,7 +22,7 @@
cc4084
 #
cc4084
 # Environment Variable Prerequisites
cc4084
 #
cc4084
-#   JAVA_HOME       Must point at your Java Development Kit installation.
cc4084
+#   JAVA_HOME       (Optional) Must point at your Java Development Kit installation.
cc4084
 #   MAVEN_OPTS      (Optional) Java runtime options used when Maven is executed.
cc4084
 #   MAVEN_SKIP_RC   (Optional) Flag to disable loading of mavenrc files.
cc4084
 # -----------------------------------------------------------------------------
cc4084
@@ -33,12 +33,24 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then
cc4084
     . /etc/mavenrc
cc4084
   fi
cc4084
 
cc4084
+  if [ -f /opt/rh/rh-maven36/root/etc/java/maven.conf ] ; then
cc4084
+    . /opt/rh/rh-maven36/root/etc/java/maven.conf
cc4084
+  fi
cc4084
+
cc4084
   if [ -f "$HOME/.mavenrc" ] ; then
cc4084
     . "$HOME/.mavenrc"
cc4084
   fi
cc4084
 
cc4084
 fi
cc4084
 
cc4084
+if [ -f /opt/rh/rh-maven36/root/usr/share/java-utils/java-functions ] ; then
cc4084
+  . /opt/rh/rh-maven36/root/usr/share/java-utils/java-functions
cc4084
+  set_jvm
cc4084
+  set_javacmd
cc4084
+fi
cc4084
+export JAVA_HOME
cc4084
+export JAVACMD
cc4084
+
cc4084
 # OS specific support. $var _must_ be set to either true or false.
cc4084
 cygwin=false;
cc4084
 mingw=false;
cc4084
@@ -63,7 +75,8 @@ done
cc4084
 
cc4084
 saveddir=`pwd`
cc4084
 
cc4084
-MAVEN_HOME=`dirname "$PRG"`/..
cc4084
+MAVEN_HOME="${_FEDORA_MAVEN_HOME:-`dirname "$PRG"`/..}"
cc4084
+unset _FEDORA_MAVEN_HOME
cc4084
 
cc4084
 # make it fully qualified
cc4084
 MAVEN_HOME=`cd "$MAVEN_HOME" && pwd`
cc4084
-- 
cc4084
2.21.0
cc4084