updated parent pom and fixed errors reported by Checkstyle
git-svn-id: https://svn.apache.org/repos/asf/maven/sandbox/trunk@1639199 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/dist-tools/dist-tool-plugin/pom.xml b/dist-tools/dist-tool-plugin/pom.xml
index 02ef9ba..59badc8 100644
--- a/dist-tools/dist-tool-plugin/pom.xml
+++ b/dist-tools/dist-tool-plugin/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>24</version>
+ <version>25</version>
<relativePath>../../../pom/maven/pom.xml</relativePath>
</parent>
diff --git a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
index 1c59176..8d6de78 100644
--- a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
+++ b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
@@ -204,6 +204,7 @@
Date d1 = df.parse( date1 );
Date d2 = df.parse( date2 );
+ @SuppressWarnings( "checkstyle:magicnumber" )
long daysDifference = ( d1.getTime() - d2.getTime() ) / ( 24 * 60 * 60 * 1000 );
return Math.abs( daysDifference ) < 7; // ok for 7 days difference
}
diff --git a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java
index def8181..05991a8 100644
--- a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java
+++ b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/GetPrerequisites.java
@@ -40,7 +40,7 @@
/**
* Currently hard code should be somehow extracted from the configuration file....
*/
- public String[] pluginNames = {
+ public static final String[] PLUGIN_NAMES = {
"maven-acr-plugin",
"maven-ant-plugin",
"maven-antrun-plugin",
@@ -92,7 +92,7 @@
"maven-war-plugin",
};
- public String BASEURL = "http://maven.eu.apache.org/plugins/";
+ private static final String BASEURL = "http://maven.apache.org/plugins/";
public String getPluginInfoUrl( String pluginName )
{
@@ -120,10 +120,10 @@
}
Element tableInfo = select.get( 1 );
- Elements elementsByAttribute_a = tableInfo.getElementsByAttributeValue( "class", "a" );
- Elements elementsByAttribute_b = tableInfo.getElementsByAttributeValue( "class", "b" );
- String mavenVersion = elementsByAttribute_a.first().text();
- String jdkVersion = elementsByAttribute_b.first().text();
+ Elements elementsByAttributeA = tableInfo.getElementsByAttributeValue( "class", "a" );
+ Elements elementsByAttributeB = tableInfo.getElementsByAttributeValue( "class", "b" );
+ String mavenVersion = elementsByAttributeA.first().text();
+ String jdkVersion = elementsByAttributeB.first().text();
//FIXME: Sometimes it happens that the indexes are swapped (I don't know why...I have to find out why...)
if ( mavenVersion.startsWith( "JDK" ) )
@@ -156,7 +156,7 @@
{
List<PluginPrerequisites> result = new ArrayList<PluginPrerequisites>();
- for ( String pluginName : pluginNames )
+ for ( String pluginName : PLUGIN_NAMES )
{
try
{
diff --git a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ListPluginsPrerequisitesMojo.java b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ListPluginsPrerequisitesMojo.java
index 6301f36..d6311c8 100644
--- a/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ListPluginsPrerequisitesMojo.java
+++ b/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/ListPluginsPrerequisitesMojo.java
@@ -103,22 +103,22 @@
Collections.<ArtifactVersion>sort( sortedVersion );
- for ( ArtifactVersion mavenVersion : sortedVersion)
+ for ( ArtifactVersion mavenVersion : sortedVersion )
{
List<PluginPrerequisites> pluginsPrerequisites = groupedPrequisites.get( mavenVersion );
sink.tableRow();
sink.tableHeaderCell();
sink.rawText( "Maven Version Prerequisite " + mavenVersion + " (" + pluginsPrerequisites.size() + " / "
- + prerequisites.pluginNames.length + ")" );
+ + prerequisites.PLUGIN_NAMES.length + ")" );
sink.tableHeaderCell_();
sink.tableHeaderCell();
- sink.rawText( "Maven Version");
+ sink.rawText( "Maven Version" );
sink.tableHeaderCell_();
sink.tableHeaderCell();
- sink.rawText( "JDK Version");
+ sink.rawText( "JDK Version" );
sink.tableHeaderCell_();
sink.tableRow_();
