maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From micha...@apache.org
Subject [1/2] git commit: [MNG-5574] Write error/warning messages from mvn shell and batch scripts to stderr
Date Sat, 08 Feb 2014 15:57:26 GMT
Updated Branches:
  refs/heads/master 81619e6f1 -> b4a778035


[MNG-5574] Write error/warning messages from mvn shell and batch scripts
to stderr


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/088193ca
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/088193ca
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/088193ca

Branch: refs/heads/master
Commit: 088193ca4cc1a7a1e4838c424a0f2120300479fa
Parents: 8e2247d
Author: Michael Osipov <michaelo@apache.org>
Authored: Sat Feb 8 16:53:52 2014 +0100
Committer: Michael Osipov <michaelo@apache.org>
Committed: Sat Feb 8 16:53:52 2014 +0100

----------------------------------------------------------------------
 apache-maven/src/bin/mvn          |  6 +++---
 apache-maven/src/bin/mvn.bat      | 28 ++++++++++++++--------------
 apache-maven/src/bin/mvnDebug     |  6 +++---
 apache-maven/src/bin/mvnDebug.bat | 28 ++++++++++++++--------------
 apache-maven/src/bin/mvnyjp       |  8 ++++----
 5 files changed, 38 insertions(+), 38 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/088193ca/apache-maven/src/bin/mvn
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn b/apache-maven/src/bin/mvn
index 5479fb5..f790bc5 100755
--- a/apache-maven/src/bin/mvn
+++ b/apache-maven/src/bin/mvn
@@ -161,13 +161,13 @@ if [ -z "$JAVACMD" ] ; then
 fi
 
 if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
   exit 1
 fi
 
 if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
+  echo "Warning: JAVA_HOME environment variable is not set." >&2
 fi
 
 CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher

http://git-wip-us.apache.org/repos/asf/maven/blob/088193ca/apache-maven/src/bin/mvn.bat
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvn.bat b/apache-maven/src/bin/mvn.bat
index 42bd570..9540492 100644
--- a/apache-maven/src/bin/mvn.bat
+++ b/apache-maven/src/bin/mvn.bat
@@ -56,9 +56,9 @@ if "%OS%"=="WINNT" @setlocal
 if not "%JAVA_HOME%" == "" goto OkJHome
 
 echo.
-echo ERROR: JAVA_HOME not found in your environment.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
 echo.
 goto error
 
@@ -66,10 +66,10 @@ goto error
 if exist "%JAVA_HOME%\bin\java.exe" goto chkMHome
 
 echo.
-echo ERROR: JAVA_HOME is set to an invalid directory.
-echo JAVA_HOME = "%JAVA_HOME%"
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
 echo.
 goto error
 
@@ -81,9 +81,9 @@ if "%OS%"=="WINNT" SET "M2_HOME=%~dp0.."
 if not "%M2_HOME%"=="" goto valMHome
 
 echo.
-echo ERROR: M2_HOME not found in your environment.
-echo Please set the M2_HOME variable in your environment to match the
-echo location of the Maven installation
+echo Error: M2_HOME not found in your environment. >&2
+echo Please set the M2_HOME variable in your environment to match the >&2
+echo location of the Maven installation. >&2
 echo.
 goto error
 
@@ -98,10 +98,10 @@ goto stripMHome
 if exist "%M2_HOME%\bin\mvn.bat" goto init
 
 echo.
-echo ERROR: M2_HOME is set to an invalid directory.
-echo M2_HOME = "%M2_HOME%"
-echo Please set the M2_HOME variable in your environment to match the
-echo location of the Maven installation
+echo Error: M2_HOME is set to an invalid directory. >&2
+echo M2_HOME = "%M2_HOME%" >&2
+echo Please set the M2_HOME variable in your environment to match the >&2
+echo location of the Maven installation >&2
 echo.
 goto error
 @REM ==== END VALIDATION ====

http://git-wip-us.apache.org/repos/asf/maven/blob/088193ca/apache-maven/src/bin/mvnDebug
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvnDebug b/apache-maven/src/bin/mvnDebug
index a64929f..2c1853c 100755
--- a/apache-maven/src/bin/mvnDebug
+++ b/apache-maven/src/bin/mvnDebug
@@ -165,13 +165,13 @@ if [ -z "$JAVACMD" ] ; then
 fi
 
 if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
   exit 1
 fi
 
 if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
+  echo "Warning: JAVA_HOME environment variable is not set." >&2
 fi
 
 CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher

http://git-wip-us.apache.org/repos/asf/maven/blob/088193ca/apache-maven/src/bin/mvnDebug.bat
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvnDebug.bat b/apache-maven/src/bin/mvnDebug.bat
index 446afb2..b7b42b9 100644
--- a/apache-maven/src/bin/mvnDebug.bat
+++ b/apache-maven/src/bin/mvnDebug.bat
@@ -60,9 +60,9 @@ set MAVEN_DEBUG_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,ad
 if not "%JAVA_HOME%" == "" goto OkJHome
 
 echo.
-echo ERROR: JAVA_HOME not found in your environment.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation >&2
 echo.
 goto error
 
@@ -70,10 +70,10 @@ goto error
 if exist "%JAVA_HOME%\bin\java.exe" goto chkMHome
 
 echo.
-echo ERROR: JAVA_HOME is set to an invalid directory.
-echo JAVA_HOME = "%JAVA_HOME%"
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation >&2
 echo.
 goto error
 
@@ -85,9 +85,9 @@ if "%OS%"=="WINNT" SET "M2_HOME=%~dp0.."
 if not "%M2_HOME%"=="" goto valMHome
 
 echo.
-echo ERROR: M2_HOME not found in your environment.
-echo Please set the M2_HOME variable in your environment to match the
-echo location of the Maven installation
+echo Error: M2_HOME not found in your environment. >&2
+echo Please set the M2_HOME variable in your environment to match the >&2
+echo location of the Maven installation >&2
 echo.
 goto error
 
@@ -102,10 +102,10 @@ goto stripMHome
 if exist "%M2_HOME%\bin\mvn.bat" goto init
 
 echo.
-echo ERROR: M2_HOME is set to an invalid directory.
-echo M2_HOME = "%M2_HOME%"
-echo Please set the M2_HOME variable in your environment to match the
-echo location of the Maven installation
+echo Error: M2_HOME is set to an invalid directory. >&2
+echo M2_HOME = "%M2_HOME%" >&2
+echo Please set the M2_HOME variable in your environment to match the >&2
+echo location of the Maven installation >&2
 echo.
 goto error
 @REM ==== END VALIDATION ====

http://git-wip-us.apache.org/repos/asf/maven/blob/088193ca/apache-maven/src/bin/mvnyjp
----------------------------------------------------------------------
diff --git a/apache-maven/src/bin/mvnyjp b/apache-maven/src/bin/mvnyjp
index d80329a..f4d1154 100755
--- a/apache-maven/src/bin/mvnyjp
+++ b/apache-maven/src/bin/mvnyjp
@@ -169,13 +169,13 @@ if [ -z "$JAVACMD" ] ; then
 fi
 
 if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
   exit 1
 fi
 
 if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
+  echo "Warning: JAVA_HOME environment variable is not set." >&2
 fi
 
 CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
@@ -191,7 +191,7 @@ if $cygwin; then
 fi
 
 if [ ! -f "$YJPLIB" ]; then
-  echo "Error: Unable to autodetect the YJP library location. Please set YJPLIB variable"
+  echo "Error: Unable to autodetect the YJP library location. Please set YJPLIB variable"
>&2
   exit 1
 fi
 


Mime
View raw message