svn commit: r1565725 - in /maven/plugin-tools/trunk: maven-plugin-tools-javadoc/src/it/basic/verify.bsh pom.xml

[rf...@apache.org]

Author: rfscholte
Date: Fri Feb  7 16:52:28 2014
New Revision: 1565725

URL: http://svn.apache.org/r1565725
Log:
[MPLUGIN-258] IT failures with Jdk 8 (EA)
upgrade m-invopker-p to 1.8

Modified:
    maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/it/basic/verify.bsh
    maven/plugin-tools/trunk/pom.xml

Modified: maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/it/basic/verify.bsh
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/it/basic/verify.bsh?rev=1565725&r1=1565724&r2=1565725&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/it/basic/verify.bsh (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/it/basic/verify.bsh Fri Feb  7 16:52:28 2014
@@ -44,14 +44,17 @@ if ( html.toLowerCase( Locale.ENGLISH ).
 }
 
 System.out.println( "Checking for documentation of mojo fields" );
-String mojoField = "<dl><dt><b>" + MojoParameterFieldTaglet.HEADER
-    + ":</b></dt><dd><dl><dt><b>default-value:</b></dt>"
-    + "<dd>value</dd><dt><b>expression:</b></dt><dd>${project.build.directory}</dd><dt><b>alias:</b>"
-    + "</dt><dd>myAlias</dd></dl></dd><dt><b>" + MojoReadOnlyFieldTaglet.HEADER + "</b></dt><dd></dd><dt><b>"
-    + MojoRequiredFieldTaglet.HEADER + "</b></dt><dd>" + "</dd></dl>";
-if ( html.toLowerCase( Locale.ENGLISH ).indexOf( ( mojoField ).toLowerCase( Locale.ENGLISH ) ) < 0 )
+// order has changed between JDK7 and JDK8
+String mojoField = Pattern.quote("<dl><dt><b>"  + MojoParameterFieldTaglet.HEADER + ":</b></dt><dd><dl>" )
+    + "(" + Pattern.quote( "<dt><b>expression:</b></dt><dd>${project.build.directory}</dd>" )
+    + "|" + Pattern.quote( "<dt><b>default-value:</b></dt><dd>value</dd>" )
+    + "|" + Pattern.quote( "<dt><b>alias:</b></dt><dd>myAlias</dd>" )
+    + "){3}" + Pattern.quote("</dl></dd><dt><b>" + MojoReadOnlyFieldTaglet.HEADER + "</b></dt><dd>" )
+    + Pattern.quote( "</dd><dt><b>" + MojoRequiredFieldTaglet.HEADER + "</b></dt><dd></dd></dl>");
+if ( !Pattern.compile( mojoField, Pattern.CASE_INSENSITIVE ).matcher( html ).find() )
 {
-    throw new IllegalStateException( "Mojo field doc wrong" );
+    System.out.println( mojoField );
+    throw new IllegalStateException( "Mojo field doc wrong!!!" );
 }
 
 mojoField = "<dl><dt><b>" + MojoComponentFieldTaglet.HEADER + ":</b></dt><dd><dl><dt><b>role:</b>"

Modified: maven/plugin-tools/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/pom.xml?rev=1565725&r1=1565724&r2=1565725&view=diff
==============================================================================
--- maven/plugin-tools/trunk/pom.xml (original)
+++ maven/plugin-tools/trunk/pom.xml Fri Feb  7 16:52:28 2014
@@ -165,7 +165,7 @@
     <pluginTestingHarnessVersion>1.2</pluginTestingHarnessVersion>
     <mavenVersion>2.2.1</mavenVersion>
     <antVersion>1.7.1</antVersion>
-    <mavenInvokerPluginVersion>1.6</mavenInvokerPluginVersion>
+    <mavenInvokerPluginVersion>1.8</mavenInvokerPluginVersion>
 
     <maven.pluginTools.siteFilePath>${maven.site.cache}/maven-scm-${project.version}</maven.pluginTools.siteFilePath>
     <maven.pluginTools.siteUrlDeployment>file://${maven.pluginTools.siteFilePath}</maven.pluginTools.siteUrlDeployment>