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/24 06:36:06 UTC
[maven-release] branch master updated: [MRELEASE-1093] adapt IT check to new output
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 b36d8642 [MRELEASE-1093] adapt IT check to new output
b36d8642 is described below
commit b36d864240c3a272018ef43332c947d2a52266f9
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Tue May 24 08:35:53 2022 +0200
[MRELEASE-1093] adapt IT check to new output
---
.../apache/maven/shared/release/phase/AbstractRunGoalsPhase.java | 2 +-
maven-release-plugin/src/it/projects/perform/MRELEASE-459/pom.xml | 2 +-
.../src/it/projects/perform/MRELEASE-459/verify.groovy | 6 +++---
3 files changed, 5 insertions(+), 5 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 57323512..67d4aed6 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
@@ -72,7 +72,7 @@ public abstract class AbstractRunGoalsPhase
if ( !StringUtils.isEmpty( goals ) )
{
logInfo( result, "Executing goals '" + goals + "'..." );
- if ( logArguments )
+ if ( logArguments && ( additionalArguments != null ) )
{
// logging arguments may log secrets: should be activated only on dryRun
logInfo( result, " with additional arguments: " + additionalArguments );
diff --git a/maven-release-plugin/src/it/projects/perform/MRELEASE-459/pom.xml b/maven-release-plugin/src/it/projects/perform/MRELEASE-459/pom.xml
index 06c2cb26..a11d0024 100644
--- a/maven-release-plugin/src/it/projects/perform/MRELEASE-459/pom.xml
+++ b/maven-release-plugin/src/it/projects/perform/MRELEASE-459/pom.xml
@@ -21,7 +21,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugin.release.its</groupId>
- <artifactId>mrelease-759</artifactId>
+ <artifactId>mrelease-459</artifactId>
<version>1.0-SNAPSHOT</version>
<scm>
diff --git a/maven-release-plugin/src/it/projects/perform/MRELEASE-459/verify.groovy b/maven-release-plugin/src/it/projects/perform/MRELEASE-459/verify.groovy
index b6a4bbf3..7f09bf2f 100644
--- a/maven-release-plugin/src/it/projects/perform/MRELEASE-459/verify.groovy
+++ b/maven-release-plugin/src/it/projects/perform/MRELEASE-459/verify.groovy
@@ -20,11 +20,11 @@
File buildLog = new File( basedir, 'build.log' )
assert buildLog.exists()
-def addArgsExpr = /\Q[DEBUG] Additional arguments: \E(?:-Dhttps.protocols=TLSv1.2 )?-P(.+)\Q-DperformRelease=true -f pom.xml\E/
+def addArgsExpr = /\Q[INFO] with additional arguments: \E(?:-Dhttps.protocols=TLSv1.2 )?-P(.+)\Q-DperformRelease=true -f pom.xml\E/
def matcher = ( buildLog.getText() =~ addArgsExpr )
-// M2: [DEBUG] Additional arguments: -P custom-release -DperformRelease=true -f pom.xml
-// M3: [DEBUG] Additional arguments: -P it-repo,it-repo,custom-release -DperformRelease=true -f pom.xml
+// M2: [INFO] with additional arguments: -P custom-release -DperformRelease=true -f pom.xml
+// M3: [INFO] with additional arguments: -P it-repo,it-repo,custom-release -DperformRelease=true -f pom.xml
assert matcher.find()
assert matcher.getCount() == 1