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 2015/10/22 14:26:38 UTC
svn commit: r1710002 -
/maven/plugins/trunk/maven-help-plugin/src/it/effective-pom_properties/verify.groovy
Author: michaelo
Date: Thu Oct 22 12:26:37 2015
New Revision: 1710002
URL: http://svn.apache.org/viewvc?rev=1710002&view=rev
Log:
[MPH-111] IT 'effective-pom_properties' fails if run with -Dinvoker.mergeUserSettings
Modified:
maven/plugins/trunk/maven-help-plugin/src/it/effective-pom_properties/verify.groovy
Modified: maven/plugins/trunk/maven-help-plugin/src/it/effective-pom_properties/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/it/effective-pom_properties/verify.groovy?rev=1710002&r1=1710001&r2=1710002&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/it/effective-pom_properties/verify.groovy (original)
+++ maven/plugins/trunk/maven-help-plugin/src/it/effective-pom_properties/verify.groovy Thu Oct 22 12:26:37 2015
@@ -20,7 +20,10 @@ def buildLog = new File(basedir, 'build.
assert buildLog.exists()
def LS = System.getProperty("line.separator")
-assert buildLog.text.contains('<properties>' + LS +
-' <maven.compiler.source>1.6</maven.compiler.source>' + LS +
-' <maven.compiler.target>1.6</maven.compiler.target>' + LS +
-' </properties>')
+assert buildLog.text.find(
+'(?s)' +
+' <properties>' + LS +
+' <maven\\.compiler\\.source>1\\.6</maven\\.compiler\\.source>' + LS +
+' <maven\\.compiler\\.target>1\\.6</maven\\.compiler\\.target>' + LS +
+'.*' +
+' </properties>') != null