You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/05/22 23:58:43 UTC
[maven-release] branch master updated: [MRELEASE-1093] log mvn invocation additional arguments in dryRun mode
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/master by this push:
new 7fd09c30 [MRELEASE-1093] log mvn invocation additional arguments in dryRun mode
7fd09c30 is described below
commit 7fd09c3020aa85468730eb7964d0f9c72fc977dc
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Mon May 23 01:58:40 2022 +0200
[MRELEASE-1093] log mvn invocation additional arguments in dryRun mode
---
.../release/phase/AbstractRunGoalsPhase.java | 18 +++++++++++++--
.../release/phase/RunCompleteGoalsPhase.java | 6 ++---
.../shared/release/phase/RunPerformGoalsPhase.java | 8 +++----
.../shared/release/phase/RunPrepareGoalsPhase.java | 6 ++---
release.properties | 27 ----------------------
5 files changed, 23 insertions(+), 42 deletions(-)
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
index ec45e788..57323512 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
@@ -20,8 +20,10 @@ package org.apache.maven.shared.release.phase;
*/
import java.io.File;
+import java.util.List;
import java.util.Map;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.release.ReleaseExecutionException;
import org.apache.maven.shared.release.ReleaseResult;
import org.apache.maven.shared.release.config.ReleaseDescriptor;
@@ -51,7 +53,15 @@ public abstract class AbstractRunGoalsPhase
}
protected ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
- File workingDirectory, String additionalArguments )
+ List<MavenProject> reactorProjects, boolean logArguments )
+ throws ReleaseExecutionException
+ {
+ return execute( releaseDescriptor, releaseEnvironment, new File( releaseDescriptor.getWorkingDirectory() ),
+ getAdditionalArguments( releaseDescriptor ), logArguments );
+ }
+
+ protected ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
+ File workingDirectory, String additionalArguments, boolean logArguments )
throws ReleaseExecutionException
{
ReleaseResult result = new ReleaseResult();
@@ -62,7 +72,11 @@ public abstract class AbstractRunGoalsPhase
if ( !StringUtils.isEmpty( goals ) )
{
logInfo( result, "Executing goals '" + goals + "'..." );
- // TODO add additionalArguments?
+ if ( logArguments )
+ {
+ // logging arguments may log secrets: should be activated only on dryRun
+ logInfo( result, " with additional arguments: " + additionalArguments );
+ }
MavenExecutor mavenExecutor = mavenExecutors.get( releaseEnvironment.getMavenExecutorId() );
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java
index 6d9051dd..db481d7a 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java
@@ -23,7 +23,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
-import java.io.File;
import java.util.List;
import java.util.Map;
@@ -56,8 +55,7 @@ public class RunCompleteGoalsPhase
List<MavenProject> reactorProjects )
throws ReleaseExecutionException
{
- return execute( releaseDescriptor, releaseEnvironment, new File( releaseDescriptor.getWorkingDirectory() ),
- getAdditionalArguments( releaseDescriptor ) );
+ return execute( releaseDescriptor, releaseEnvironment, reactorProjects, false );
}
@Override
@@ -70,7 +68,7 @@ public class RunCompleteGoalsPhase
logInfo( result, "Executing completion goals - since this is simulation mode it is running against the "
+ "original project, not the rewritten ones" );
- execute( releaseDescriptor, releaseEnvironment, reactorProjects );
+ execute( releaseDescriptor, releaseEnvironment, reactorProjects, true );
return result;
}
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
index 40cc1feb..4c008788 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
@@ -99,11 +99,9 @@ public class RunPerformGoalsPhase
{
ReleaseResult result = new ReleaseResult();
- logDebug( result, "Additional arguments: " + additionalArguments );
- // TODO switch to Info?
-
- logInfo( result, "Executing perform goals '" + getGoals( releaseDescriptor )
+ logInfo( result, "Simulating perform goals '" + getGoals( releaseDescriptor )
+ "' - since this is simulation mode these goals are skipped." );
+ logInfo( result, " with additional arguments: " + additionalArguments );
return result;
}
@@ -140,7 +138,7 @@ public class RunPerformGoalsPhase
}
}
- return execute( releaseDescriptor, releaseEnvironment, workDirectory, additionalArguments );
+ return execute( releaseDescriptor, releaseEnvironment, workDirectory, additionalArguments, false );
}
@Override
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java
index a208c3e9..fa646ea3 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java
@@ -23,7 +23,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
-import java.io.File;
import java.util.List;
import java.util.Map;
@@ -55,8 +54,7 @@ public class RunPrepareGoalsPhase
List<MavenProject> reactorProjects )
throws ReleaseExecutionException
{
- return execute( releaseDescriptor, releaseEnvironment, new File( releaseDescriptor.getWorkingDirectory() ),
- getAdditionalArguments( releaseDescriptor ) );
+ return execute( releaseDescriptor, releaseEnvironment, reactorProjects, false );
}
@Override
@@ -69,7 +67,7 @@ public class RunPrepareGoalsPhase
logInfo( result, "Executing preparation goals - since this is simulation mode it is running against the "
+ "original project, not the rewritten ones" );
- execute( releaseDescriptor, releaseEnvironment, reactorProjects );
+ execute( releaseDescriptor, releaseEnvironment, reactorProjects, true );
return result;
}
diff --git a/release.properties b/release.properties
deleted file mode 100644
index bf54b52a..00000000
--- a/release.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-#release configuration
-#Sun May 08 16:33:56 CEST 2022
-scm.commentPrefix=[maven-release-plugin]
-exec.pomFileName=pom.xml
-pushChanges=true
-releaseStrategyId=default
-project.scm.org.apache.maven.release\:maven-release.url=https\://github.com/apache/maven-release/tree/${project.scm.tag}
-project.scm.org.apache.maven.release\:maven-release-semver-policy.empty=true
-remoteTagging=true
-scm.branchCommitComment=@{prefix} prepare branch @{releaseLabel}
-project.scm.org.apache.maven.release\:maven-release-oddeven-policy.empty=true
-project.scm.org.apache.maven.plugins\:maven-release-plugin.empty=true
-projectVersionPolicyId=default
-project.scm.org.apache.maven.release\:maven-release.connection=scm\:git\:https\://gitbox.apache.org/repos/asf/maven-release.git
-scm.url=scm\:git\:https\://gitbox.apache.org/repos/asf/maven-release.git
-scm.tagNameFormat=@{project.artifactId}-@{project.version}
-project.scm.org.apache.maven.release\:maven-release.developerConnection=scm\:git\:https\://gitbox.apache.org/repos/asf/maven-release.git
-pinExternals=false
-preparationGoals=clean verify
-scm.releaseCommitComment=@{prefix} prepare release @{releaseLabel}
-exec.snapshotReleasePluginAllowed=false
-scm.developmentCommitComment=@{prefix} prepare for next development iteration
-scm.rollbackCommitComment=@{prefix} rollback the release of @{releaseLabel}
-project.scm.org.apache.maven.release\:maven-release.tag=HEAD
-completedPhase=check-poms
-project.scm.org.apache.maven.release\:maven-release-manager.empty=true
-project.scm.org.apache.maven.release\:maven-release-api.empty=true