[MDOCCK-30] Upgrade to maven-plugins parent version 27
- Cleaned up pom and let the parent do it's work.
- Fixed checkstyle reported issues.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1640443 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 08442dd..7fb454b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>25</version>
+ <version>27</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
@@ -58,7 +58,6 @@
<properties>
<mavenVersion>2.2.1</mavenVersion>
- <mavenPluginVersion>3.2</mavenPluginVersion>
</properties>
<dependencies>
@@ -90,7 +89,6 @@
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>${mavenPluginVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -139,35 +137,6 @@
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>${mavenPluginVersion}</version>
- <configuration>
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-descriptor</id>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>run-its</id>
diff --git a/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java b/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
index 2304a95..b9b5541 100644
--- a/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
+++ b/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
@@ -150,30 +150,30 @@
String siteHtml = IOUtil.toString( streamReader );
- if (!siteHtml.contains("href=\"index.html\""))
+ if ( !siteHtml.contains( "href=\"index.html\"" ) )
{
reporter.error( "site.xml is missing the link to: index.html \"Introduction\"." );
}
- if (!siteHtml.contains("href=\"usage.html\""))
+ if ( !siteHtml.contains( "href=\"usage.html\"" ) )
{
reporter.error( "site.xml is missing the link to: usage.html \"Usage\"." );
}
- if (!siteHtml.contains("href=\"plugin-info.html\""))
+ if ( !siteHtml.contains( "href=\"plugin-info.html\"" ) )
{
reporter.error( "site.xml is missing the link to: plugin-info.html \"Goals\"." );
}
- if (!siteHtml.contains("href=\"faq.html\""))
+ if ( !siteHtml.contains( "href=\"faq.html\"" ) )
{
reporter.error( "site.xml is missing the link to: faq.html \"FAQ\"." );
}
}
catch ( IOException e )
{
- reporter.error( "Unable to read site.xml file: \'" + siteXml.getAbsolutePath()
- + "\'.\nError: " + e.getMessage() );
+ reporter.error( "Unable to read site.xml file: \'" + siteXml.getAbsolutePath() + "\'.\nError: "
+ + e.getMessage() );
}
finally
{
@@ -193,9 +193,8 @@
reporter.error( "There is no \'usage\' file in your site directory (in apt|html|xml[.vm] format)." );
}
- // check for **/examples/**.(apt|html|xml)[.vm] or **/example*.(apt|html|xml)[.vm]
- if ( !findFiles( projectSiteDirectory, "**/examples/*" )
- && !findFiles( projectSiteDirectory, "**/example*" ) )
+ // check for **/examples/**.(apt|html|xml)[.vm] or **/example*.(apt|html|xml)[.vm]
+ if ( !findFiles( projectSiteDirectory, "**/examples/*" ) && !findFiles( projectSiteDirectory, "**/example*" ) )
{
reporter.error( "There are no example files in your site directory (in apt|html|xml[.vm] format)."
+ " They should either be called \'example*.(apt|html|xml)[.vm]\'"
@@ -211,7 +210,7 @@
/**
* Checks the project configured plugins if the required report plugins are present.
*
- * @param project MavenProject to check
+ * @param project MavenProject to check
* @param reporter listener
* @todo maybe this should be checked default for all project?
*/
