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 2022/05/08 15:08:47 UTC
[maven-release] branch MRELEASE-1090 created (now 20c428ce)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch MRELEASE-1090
in repository https://gitbox.apache.org/repos/asf/maven-release.git
at 20c428ce [MRELEASE-1090] Drop usage of dead M2_HOME environment variable
This branch includes the following new commits:
new 20c428ce [MRELEASE-1090] Drop usage of dead M2_HOME environment variable
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-release] 01/01: [MRELEASE-1090] Drop usage of dead M2_HOME environment variable
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MRELEASE-1090
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit 20c428ceb21d968defbb06c803c4aa5d4ad29128
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun May 8 17:08:35 2022 +0200
[MRELEASE-1090] Drop usage of dead M2_HOME environment variable
This closes #123
---
.../shared/release/exec/ForkedMavenExecutor.java | 2 --
.../shared/release/exec/ForkedMavenExecutorTest.java | 7 +------
.../maven/plugins/release/AbstractReleaseMojo.java | 20 ++++++++++----------
src/site/apt/index.apt | 6 ------
4 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
index 240c62a1..463486d3 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java
@@ -112,8 +112,6 @@ public class ForkedMavenExecutor
cl.addEnvironment( "MAVEN_TERMINATE_CMD", "on" );
- cl.addEnvironment( "M2_HOME", mavenPath );
-
if ( settingsFile != null )
{
cl.createArg().setValue( "-s" );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
index 122bd17e..1420030e 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
@@ -109,7 +109,6 @@ public class ForkedMavenExecutorTest
verify( mockProcess ).waitFor();
verify( commandLineMock ).setWorkingDirectory( workingDirectory.getAbsolutePath() );
verify( commandLineMock ).addEnvironment( "MAVEN_TERMINATE_CMD", "on" );
- verify( commandLineMock ).addEnvironment( eq( "M2_HOME" ), isNull() );
verify( commandLineMock ).execute();
verify( commandLineMock, times( 3 ) ).createArg();
verify( valueArgument ).setValue( "clean" );
@@ -152,7 +151,6 @@ public class ForkedMavenExecutorTest
verify( mockProcess ).waitFor();
verify( commandLineMock ).setWorkingDirectory( workingDirectory.getAbsolutePath() );
verify( commandLineMock ).addEnvironment( "MAVEN_TERMINATE_CMD", "on" );
- verify( commandLineMock ).addEnvironment( eq( "M2_HOME" ), isNull() );
verify( commandLineMock ).execute();
verify( commandLineMock, times( 5 ) ).createArg();
verify( argMock ).setValue( "clean" );
@@ -198,7 +196,6 @@ public class ForkedMavenExecutorTest
verify( mockProcess ).waitFor();
verify( commandLineMock ).setWorkingDirectory( workingDirectory.getAbsolutePath() );
verify( commandLineMock ).addEnvironment( "MAVEN_TERMINATE_CMD", "on" );
- verify( commandLineMock ).addEnvironment( eq( "M2_HOME" ), isNull() );
verify( commandLineMock ).execute();
verify( commandLineMock, times( 4 ) ).createArg();
verify( argMock ).setValue( "clean" );
@@ -254,7 +251,6 @@ public class ForkedMavenExecutorTest
// verify( mockProcess ).exitValue();
verify( commandLineMock ).setWorkingDirectory( workingDirectory.getAbsolutePath() );
verify( commandLineMock ).addEnvironment( "MAVEN_TERMINATE_CMD", "on" );
- verify( commandLineMock ).addEnvironment( eq( "M2_HOME" ), isNull() );
verify( commandLineMock ).execute();
verify( commandLineMock, times( 3 ) ).createArg();
verify( argMock ).setValue( "clean" );
@@ -298,7 +294,6 @@ public class ForkedMavenExecutorTest
// verify
verify( commandLineMock ).setWorkingDirectory( workingDirectory.getAbsolutePath() );
verify( commandLineMock ).addEnvironment( "MAVEN_TERMINATE_CMD", "on" );
- verify( commandLineMock ).addEnvironment( eq( "M2_HOME" ), isNull() );
verify( commandLineMock ).execute();
verify( commandLineMock, times( 3 ) ).createArg();
verify( argMock ).setValue( "clean" );
@@ -372,4 +367,4 @@ public class ForkedMavenExecutorTest
assertNotEquals( "proxy_password", encryptedProxy.getPassword() );
}
}
-}
\ No newline at end of file
+}
diff --git a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
index 0266b6b9..e93ebd08 100644
--- a/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
+++ b/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/AbstractReleaseMojo.java
@@ -86,7 +86,7 @@ public abstract class AbstractReleaseMojo
private List<MavenProject> reactorProjects;
/**
- * The {@code M2_HOME} parameter to use for forked Maven invocations.
+ * The Maven home parameter to use for forked Maven invocations.
*
* @since 2.0-beta-8
*/
@@ -126,13 +126,13 @@ public abstract class AbstractReleaseMojo
/**
* The role-hint for the {@link org.apache.maven.shared.release.strategy.Strategy}
* implementation used to specify the phases per goal.
- *
+ *
* @since 3.0.0-M5
* @see org.apache.maven.shared.release.strategies.DefaultStrategy
*/
@Parameter( defaultValue = "default", property = "releaseStrategyId" )
private String releaseStrategyId;
-
+
/**
* Gets the environment settings configured for this release.
*
@@ -155,7 +155,7 @@ public abstract class AbstractReleaseMojo
protected ReleaseDescriptorBuilder createReleaseDescriptor()
{
ReleaseDescriptorBuilder descriptor = new ReleaseDescriptorBuilder();
-
+
descriptor.setInteractive( settings.isInteractiveMode() );
Path workingDirectory;
@@ -193,7 +193,7 @@ public abstract class AbstractReleaseMojo
if ( !profileIds.isEmpty() || StringUtils.isNotBlank( additionalProfiles ) )
{
List<String> profiles = new ArrayList<>( profileIds );
-
+
if ( additionalProfiles != null )
{
profiles.addAll( Arrays.asList( additionalProfiles.split( "," ) ) );
@@ -201,7 +201,7 @@ public abstract class AbstractReleaseMojo
descriptor.setActivateProfiles( profiles );
}
-
+
descriptor.setReleaseStrategyId( releaseStrategyId );
return descriptor;
@@ -256,7 +256,7 @@ public abstract class AbstractReleaseMojo
{
this.pomFileName = pomFileName;
}
-
+
/**
* Gets the list of projects in the build reactor.
*
@@ -283,12 +283,12 @@ public abstract class AbstractReleaseMojo
arguments = argument;
}
}
-
+
static Path getCommonBasedir( List<MavenProject> reactorProjects )
throws IOException
{
Path basePath = reactorProjects.get( 0 ).getBasedir().toPath();
-
+
for ( MavenProject reactorProject : reactorProjects )
{
Path matchPath = reactorProject.getBasedir().toPath();
@@ -298,7 +298,7 @@ public abstract class AbstractReleaseMojo
}
basePath = matchPath;
}
-
+
return basePath;
}
}
diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
index 1f0b5da6..cbdaf26c 100644
--- a/src/site/apt/index.apt
+++ b/src/site/apt/index.apt
@@ -42,9 +42,3 @@ Maven Release
*----------------------------------------------------------+----------------+
| {{{./maven-release-policies/maven-release-semver-policy/}maven-release-semver-policy}} | a version policy that enforce SemVer format and upgrades minor element for next development version
*----------------------------------------------------------+----------------+
-
-Notes for Developers
-
- There are tests in this project which require you to set the M2_HOME
- environment variable. Since many of the tests print error messages,
- it is easy to forget about this and then be puzzled.