You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2021/07/19 21:15:34 UTC

[maven-integration-testing] 01/01: [MNG-7189] Remove undocumented environment variable MAVEN_BASEDIR in startup scripts

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MNG-7189
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git

commit 3c3a1757c0475d35c93998a1211191180d857b4a
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Mon Jul 19 22:03:58 2021 +0200

    [MNG-7189] Remove undocumented environment variable MAVEN_BASEDIR in startup scripts
---
 .../test/java/org/apache/maven/it/MavenITmng5937MavenWrapper.java  | 7 -------
 .../org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java     | 3 ---
 2 files changed, 10 deletions(-)

diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5937MavenWrapper.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5937MavenWrapper.java
index 33dbb04..d7107c9 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5937MavenWrapper.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5937MavenWrapper.java
@@ -113,8 +113,6 @@ public class MavenITmng5937MavenWrapper
 
         unpack( testDir.toPath(), "bin" );
 
-        envVars.put( "MAVEN_BASEDIR", testDir.getAbsolutePath() );
-
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.setDebug( true );
@@ -130,8 +128,6 @@ public class MavenITmng5937MavenWrapper
 
         unpack( testDir.toPath(), "script" );
 
-        envVars.put( "MAVEN_BASEDIR", testDir.getAbsolutePath() );
-
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.setDebug( true );
@@ -147,8 +143,6 @@ public class MavenITmng5937MavenWrapper
 
         unpack( testDir.toPath(), "source" );
 
-        envVars.put( "MAVEN_BASEDIR", testDir.getAbsolutePath() );
-
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
         verifier.setDebug( true );
@@ -178,7 +172,6 @@ public class MavenITmng5937MavenWrapper
         }
 
         envVars.remove( "MVNW_REPOURL" );
-        envVars.put( "MAVEN_BASEDIR", testDir.getAbsolutePath() );
 
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setAutoclean( false );
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java
index 455d13d..a6d2056 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6118SubmoduleInvocation.java
@@ -49,9 +49,6 @@ public class MavenITmng6118SubmoduleInvocation extends AbstractMavenIntegrationT
     {
         super( "[4.0.0-alpha-1,)" );
         testDir = ResourceExtractor.simpleExtractResources( getClass(), RESOURCE_PATH );
-        // It seems MAVEN_BASEDIR isn't always properly set, so make sure to have the right value here
-        // as it is determined by the mvn script.
-        envVars.put( "MAVEN_BASEDIR", testDir.getAbsolutePath() );
     }
 
     /**