From cb381ffd76f2b561290766e625be814a026b4717 Mon Sep 17 00:00:00 2001 From: Jason van Zyl Date: Mon, 1 Jan 2007 00:46:11 +0000 Subject: [PATCH] MNG-2729 use the basedir specified in the execution request, don't use the system property git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@491514 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/maven/DefaultMaven.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java index 614595f470..cc542769f2 100644 --- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java +++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java @@ -764,13 +764,10 @@ public class DefaultMaven { List files = Collections.EMPTY_LIST; - File userDir = new File( System.getProperty( "user.dir" ) ); + File userDir = new File( request.getBaseDirectory() ); + if ( request.useReactor() ) { - // TODO: should we now include the pom.xml in the current directory? -// String includes = System.getProperty( "maven.reactor.includes", "**/" + POMv4 ); -// String excludes = System.getProperty( "maven.reactor.excludes", POMv4 ); - String includes = System.getProperty( "maven.reactor.includes", "**/" + POMv4 + ",**/" + RELEASE_POMv4 ); String excludes = System.getProperty( "maven.reactor.excludes", POMv4 + "," + RELEASE_POMv4 );