Move determining the baseDirectory to DefaultMavenExecutionRequest

infosupport · May 24, 2020 · 3c3ec2d · 3c3ec2d
1 parent 18ca544
commit 3c3ec2d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java b/maven-core/src/main/java/org/apache/maven/execution/DefaultMavenExecutionRequest.java
@@ -676,7 +676,7 @@ public MavenExecutionRequest setPomFile( String pomFilename )
     {
         if ( pomFilename != null )
         {
-            pom = new File( pomFilename );
+            this.setPom( new File( pomFilename ) );
         }
 
         return this;
@@ -687,6 +687,11 @@ public MavenExecutionRequest setPom( File pom )
     {
         this.pom = pom;
 
+        if ( this.pom != null && this.pom.getParentFile() != null )
+        {
+            this.setBaseDirectory( this.pom.getParentFile() );
+        }
+
         return this;
     }
 

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
@@ -1361,11 +1361,6 @@ private MavenExecutionRequest populateRequest( CliRequest cliRequest, MavenExecu
         request.addActiveProfiles( profileActivation.activeProfiles );
         request.addInactiveProfiles( profileActivation.inactiveProfiles );
 
-        if ( ( request.getPom() != null ) && ( request.getPom().getParentFile() != null ) )
-        {
-            request.setBaseDirectory( request.getPom().getParentFile() );
-        }
-
         String localRepoProperty = request.getUserProperties().getProperty( MavenCli.LOCAL_REPO_PROPERTY );
 
         if ( localRepoProperty == null )