Repository: maven Updated Branches: refs/heads/master 562896a19 -> b01bf0c3d
MNG-5767 enforce use of maven.multiModuleProjectDirectory, fixed mvn*.bat Signed-off-by: Igor Fedorenko <ifedore...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/b01bf0c3 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/b01bf0c3 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/b01bf0c3 Branch: refs/heads/master Commit: b01bf0c3d4ba970742a0508ad40c399e45771b70 Parents: 562896a Author: Igor Fedorenko <ifedore...@apache.org> Authored: Thu Feb 26 11:45:29 2015 -0500 Committer: Igor Fedorenko <ifedore...@apache.org> Committed: Thu Feb 26 11:45:29 2015 -0500 ---------------------------------------------------------------------- apache-maven/src/bin/mvn.bat | 2 +- apache-maven/src/bin/mvnDebug.bat | 2 +- .../src/main/java/org/apache/maven/cli/MavenCli.java | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/b01bf0c3/apache-maven/src/bin/mvn.bat ---------------------------------------------------------------------- diff --git a/apache-maven/src/bin/mvn.bat b/apache-maven/src/bin/mvn.bat index abf793b..546842a 100644 --- a/apache-maven/src/bin/mvn.bat +++ b/apache-maven/src/bin/mvn.bat @@ -200,7 +200,7 @@ goto runm2 @REM Start MAVEN2 :runm2 set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" "-Dmaven.projectBasedir=%MAVEN_PROJECTBASEDIR%" %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS% +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS% if ERRORLEVEL 1 goto error goto end http://git-wip-us.apache.org/repos/asf/maven/blob/b01bf0c3/apache-maven/src/bin/mvnDebug.bat ---------------------------------------------------------------------- diff --git a/apache-maven/src/bin/mvnDebug.bat b/apache-maven/src/bin/mvnDebug.bat index 2b2cc18..6452638 100644 --- a/apache-maven/src/bin/mvnDebug.bat +++ b/apache-maven/src/bin/mvnDebug.bat @@ -204,7 +204,7 @@ goto runm2 @REM Start MAVEN2 :runm2 set CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" "-Dmaven.projectBasedir=%MAVEN_PROJECTBASEDIR%" %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS% +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %CLASSWORLDS_JAR% "-Dclassworlds.conf=%M2_HOME%\bin\m2.conf" "-Dmaven.home=%M2_HOME%" "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %CLASSWORLDS_LAUNCHER% %MAVEN_CMD_LINE_ARGS% if ERRORLEVEL 1 goto error goto end http://git-wip-us.apache.org/repos/asf/maven/blob/b01bf0c3/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java ---------------------------------------------------------------------- diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java index cd36832..4e7e072 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java @@ -312,6 +312,7 @@ public class MavenCli } void initialize( CliRequest cliRequest ) + throws ExitException { if ( cliRequest.workingDirectory == null ) { @@ -321,6 +322,12 @@ public class MavenCli if ( cliRequest.multiModuleProjectDirectory == null ) { String basedirProperty = System.getProperty( MULTIMODULE_PROJECT_DIRECTORY ); + if ( basedirProperty == null ) + { + System.err.format( "-D%s system propery is not set." + + " Check $M2_HOME environment variable and mvn script match.", MULTIMODULE_PROJECT_DIRECTORY ); + throw new ExitException( 1 ); + } File basedir = basedirProperty != null ? new File( basedirProperty ) : new File( "" ); try {
