stephenc
/
maven-plugin-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[MPLUGIN-258] IT failures with Jdk 8 (EA) 

upgrade m-invopker-p to 1.8

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1565725 13f79535-47bb-0310-9956-ffa450edef68
master
Robert Scholte 2014-02-07 16:52:28 +00:00
parent dfd7b1b1ae
commit 60184b7dbd
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
maven-plugin-tools-javadoc/src/it/basic/verify.bsh
View File

@ -44,14 +44,17 @@ if ( html.toLowerCase( Locale.ENGLISH ).indexOf( ( mojoType ).toLowerCase( Local
}
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>"

2
pom.xml
View File

@ -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>