[MRELEASE-1093] adapt IT check to new output

apache · May 24, 2022 · b36d864 · b36d864
1 parent 07965ca
commit b36d864
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...se-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java b/...se-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
@@ -72,7 +72,7 @@ protected ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnv
             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
@@ -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
@@ -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