You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@maven.apache.org by rf...@apache.org on 2012/12/02 19:08:19 UTC

svn commit: r1416219 - /maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-459/verify.groovy

Author: rfscholte
Date: Sun Dec  2 18:08:19 2012
New Revision: 1416219

URL: http://svn.apache.org/viewvc?rev=1416219&view=rev
Log:
Fix IT for M2

Modified:
    maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-459/verify.groovy

Modified: maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-459/verify.groovy
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-459/verify.groovy?rev=1416219&r1=1416218&r2=1416219&view=diff
==============================================================================
--- maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-459/verify.groovy (original)
+++ maven/release/trunk/maven-release-plugin/src/it/projects/perform/MRELEASE-459/verify.groovy Sun Dec  2 18:08:19 2012
@@ -20,4 +20,13 @@
 File buildLog = new File( basedir, 'build.log' )
 assert buildLog.exists()
 
-assert 1 == buildLog.getText().count("[DEBUG] Additional arguments: -P custom-release -DperformRelease=true -f pom.xml")
+def addArgsExpr = /\Q[DEBUG] Additional arguments: -P\E(.+)\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 
+
+assert matcher.find()
+assert matcher.getCount() == 1
+
+assert matcher[0][1].contains( "custom-release" )