Author: bentmann
Date: Thu Dec 16 20:03:37 2010
New Revision: 1050135
URL: http://svn.apache.org/viewvc?rev=1050135&view=rev
Log:
[MNG-4937] Allow the platform scripts to avoid loading mavenrc content
Submitted by: Jason Dillon
Modified:
maven/maven-3/trunk/apache-maven/src/bin/mvn
maven/maven-3/trunk/apache-maven/src/bin/mvn.bat
maven/maven-3/trunk/apache-maven/src/bin/mvnDebug
maven/maven-3/trunk/apache-maven/src/bin/mvnDebug.bat
maven/maven-3/trunk/apache-maven/src/bin/mvnyjp
Modified: maven/maven-3/trunk/apache-maven/src/bin/mvn
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/mvn?rev=1050135&r1=1050134&r2=1050135&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/mvn (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/mvn Thu Dec 16 20:03:37 2010
@@ -31,14 +31,19 @@
# MAVEN_OPTS - parameters passed to the Java VM when running Maven
# e.g. to debug Maven itself, use
# set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
# ----------------------------------------------------------------------------
-if [ -f /etc/mavenrc ] ; then
- . /etc/mavenrc
-fi
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
-if [ -f "$HOME/.mavenrc" ] ; then
- . "$HOME/.mavenrc"
fi
# OS specific support. $var _must_ be set to either true or false.
Modified: maven/maven-3/trunk/apache-maven/src/bin/mvn.bat
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/mvn.bat?rev=1050135&r1=1050134&r2=1050135&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/mvn.bat (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/mvn.bat Thu Dec 16 20:03:37 2010
@@ -30,6 +30,7 @@
@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
@REM e.g. to debug Maven itself, use
@REM set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+...@rem MAVEN_SKIP_RC - flag to disable loading of mavenrc files
@REM
----------------------------------------------------------------------------
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
@@ -41,7 +42,9 @@
if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+:skipRcPre
set ERROR_CODE=0
@@ -179,7 +182,11 @@ goto postExec
@endlocal & set ERROR_CODE=%ERROR_CODE%
:postExec
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+:skipRcPost
+
@REM pause the batch file if MAVEN_BATCH_PAUSE is set to 'on'
if "%MAVEN_BATCH_PAUSE%" == "on" pause
Modified: maven/maven-3/trunk/apache-maven/src/bin/mvnDebug
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/mvnDebug?rev=1050135&r1=1050134&r2=1050135&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/mvnDebug (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/mvnDebug Thu Dec 16 20:03:37 2010
@@ -31,18 +31,23 @@
# MAVEN_OPTS - parameters passed to the Java VM when running Maven
# e.g. to debug Maven itself, use
# set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
# ----------------------------------------------------------------------------
MAVEN_DEBUG_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"
echo Preparing to Execute Maven in Debug Mode
-if [ -f /etc/mavenrc ] ; then
- . /etc/mavenrc
-fi
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
-if [ -f "$HOME/.mavenrc" ] ; then
- . "$HOME/.mavenrc"
fi
# OS specific support. $var _must_ be set to either true or false.
Modified: maven/maven-3/trunk/apache-maven/src/bin/mvnDebug.bat
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/mvnDebug.bat?rev=1050135&r1=1050134&r2=1050135&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/mvnDebug.bat (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/mvnDebug.bat Thu Dec 16 20:03:37
2010
@@ -30,6 +30,7 @@
@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
@REM e.g. to debug Maven itself, use
@REM set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+...@rem MAVEN_SKIP_RC - flag to disable loading of mavenrc files
@REM
----------------------------------------------------------------------------
@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
@@ -43,7 +44,9 @@
if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+:skipRcPre
set ERROR_CODE=0
@@ -183,7 +186,11 @@ goto postExec
@endlocal & set ERROR_CODE=%ERROR_CODE%
:postExec
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+:skipRcPost
+
@REM pause the batch file if MAVEN_BATCH_PAUSE is set to 'on'
if "%MAVEN_BATCH_PAUSE%" == "on" pause
Modified: maven/maven-3/trunk/apache-maven/src/bin/mvnyjp
URL:
http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/src/bin/mvnyjp?rev=1050135&r1=1050134&r2=1050135&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/src/bin/mvnyjp (original)
+++ maven/maven-3/trunk/apache-maven/src/bin/mvnyjp Thu Dec 16 20:03:37 2010
@@ -31,6 +31,7 @@
# MAVEN_OPTS - parameters passed to the Java VM when running Maven
# e.g. to debug Maven itself, use
# set MAVEN_OPTS=-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
# ----------------------------------------------------------------------------
QUOTED_ARGS=""
@@ -41,12 +42,16 @@ while [ "$1" != "" ] ; do
done
-if [ -f /etc/mavenrc ] ; then
- . /etc/mavenrc
-fi
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+ if [ -f /etc/mavenrc ] ; then
+ . /etc/mavenrc
+ fi
+
+ if [ -f "$HOME/.mavenrc" ] ; then
+ . "$HOME/.mavenrc"
+ fi
-if [ -f "$HOME/.mavenrc" ] ; then
- . "$HOME/.mavenrc"
fi
# OS specific support. $var _must_ be set to either true or false.
