72 lines
1.9 KiB
Diff
72 lines
1.9 KiB
Diff
From 8d6b4651e2be6156322d27d7c8715601a6b11cd2 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 | 17 ++++++++++-------
|
|
1 file changed, 10 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
|
|
index a3004f917..052df8f0c 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_ARGS (Optional) Arguments passed to Maven before CLI arguments.
|
|
# MAVEN_OPTS (Optional) Java runtime options used when Maven is executed.
|
|
# MAVEN_SKIP_RC (Optional) Flag to disable loading of mavenrc files.
|
|
@@ -30,20 +30,22 @@
|
|
|
|
if [ -z "$MAVEN_SKIP_RC" ] ; then
|
|
|
|
- if [ -f /usr/local/etc/mavenrc ] ; then
|
|
- . /usr/local/etc/mavenrc
|
|
- fi
|
|
-
|
|
if [ -f /etc/mavenrc ] ; then
|
|
. /etc/mavenrc
|
|
fi
|
|
|
|
+ if [ -z "$JAVA_HOME" ] ; then
|
|
+ . /etc/java/maven.conf
|
|
+ fi
|
|
+
|
|
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;
|
|
@@ -68,7 +70,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`
|
|
@@ -106,7 +109,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.40.1
|
|
|