Author: michaelo
Date: Sun Nov 30 21:13:47 2014
New Revision: 1642605
URL: http://svn.apache.org/r1642605
Log:
[MPMD-197] Update dependencies and resolve minor Java warnings
Contributed-by: Jeremy Landis
Modified:
maven/plugins/trunk/maven-pmd-plugin/pom.xml
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/CustomConfigurationMavenProjectStub.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultArtifactHandlerStub.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/InvalidFormatMavenProjectStub.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/PmdPluginArtifactStub.java
Modified: maven/plugins/trunk/maven-pmd-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/pom.xml?rev=1642605&r1=1642604&r2=1642605&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-pmd-plugin/pom.xml Sun Nov 30 21:13:47 2014
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>26</version>
+ <version>27</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
@@ -87,7 +87,7 @@ under the License.
<maven.compiler.source>${javaVersion}</maven.compiler.source>
<maven.compiler.target>${javaVersion}</maven.compiler.target>
<pmdVersion>5.2.1</pmdVersion>
- <sitePluginVersion>3.3</sitePluginVersion>
+ <sitePluginVersion>3.4</sitePluginVersion>
<mavenPluginVersion>3.2</mavenPluginVersion>
<projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion>
</properties>
@@ -180,7 +180,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.9</version>
+ <version>3.0.21</version>
</dependency>
<!-- pmd -->
@@ -209,7 +209,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.2</version>
+ <version>1.3</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -217,14 +217,6 @@ under the License.
<build>
<pluginManagement>
<plugins>
- <plugin><!-- TODO remove when upgrading parent pom to version 27 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${maven.compiler.source}</source>
- <target>${maven.compiler.target}</target>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
@@ -261,7 +253,6 @@ under the License.
<plugin>
<groupId>org.codehaus.modello</groupId>
<artifactId>modello-maven-plugin</artifactId>
- <version>1.4.1</version>
<configuration>
<useJava5>true</useJava5>
<models>
@@ -294,12 +285,12 @@ under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.6</version>
+ <version>1.12</version>
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
<artifactId>java16</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
</signature>
</configuration>
<executions>
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java?rev=1642605&r1=1642604&r2=1642605&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/AbstractPmdReport.java
Sun Nov 30 21:13:47 2014
@@ -208,6 +208,7 @@ public abstract class AbstractPmdReport
/**
* {@inheritDoc}
*/
+ @Override
protected MavenProject getProject()
{
return project;
@@ -216,6 +217,7 @@ public abstract class AbstractPmdReport
/**
* {@inheritDoc}
*/
+ @Override
protected Renderer getSiteRenderer()
{
return siteRenderer;
@@ -367,7 +369,7 @@ public abstract class AbstractPmdReport
File sourceDirectory = finfo.getSourceDirectory();
if ( sourceDirectory.isDirectory() && !excludeRootFiles.contains(
sourceDirectory ) )
{
- @SuppressWarnings( "unchecked" ) List<File> newfiles =
+ List<File> newfiles =
FileUtils.getFiles( sourceDirectory, including, excluding
);
for ( File newfile : newfiles )
{
@@ -405,7 +407,7 @@ public abstract class AbstractPmdReport
*/
private String getExcludes()
{
- @SuppressWarnings( "unchecked" ) Collection<String> patterns =
+ Collection<String> patterns =
new LinkedHashSet<String>( FileUtils.getDefaultExcludesAsList() );
if ( excludes != null )
{
@@ -426,6 +428,7 @@ public abstract class AbstractPmdReport
/**
* {@inheritDoc}
*/
+ @Override
public boolean canGenerateReport()
{
if ( aggregate && !project.isExecutionRoot() )
@@ -462,6 +465,7 @@ public abstract class AbstractPmdReport
/**
* {@inheritDoc}
*/
+ @Override
protected String getOutputDirectory()
{
return outputDirectory.getAbsolutePath();
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java?rev=1642605&r1=1642604&r2=1642605&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdReport.java
Sun Nov 30 21:13:47 2014
@@ -113,6 +113,7 @@ public class CpdReport
/**
* {@inheritDoc}
*/
+ @Override
public void executeReport( Locale locale )
throws MavenReportException
{
@@ -154,6 +155,7 @@ public class CpdReport
}
}
+ @Override
public boolean canGenerateReport()
{
if ( skip )
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java?rev=1642605&r1=1642604&r2=1642605&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/CpdViolationCheckMojo.java
Sun Nov 30 21:13:47 2014
@@ -85,6 +85,7 @@ public class CpdViolationCheckMojo
/**
* {@inheritDoc}
*/
+ @Override
protected void printError( Duplication item, String severity )
{
int lines = item.getLines();
@@ -110,6 +111,7 @@ public class CpdViolationCheckMojo
/**
* {@inheritDoc}
*/
+ @Override
protected List<Duplication> getErrorDetails( File cpdFile )
throws XmlPullParserException, IOException
{
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java?rev=1642605&r1=1642604&r2=1642605&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
Sun Nov 30 21:13:47 2014
@@ -197,6 +197,7 @@ public class PmdReport
/**
* {@inheritDoc}
*/
+ @Override
public void executeReport( Locale locale )
throws MavenReportException
{
@@ -237,6 +238,7 @@ public class PmdReport
}
}
+ @Override
public boolean canGenerateReport()
{
if ( skip )
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java?rev=1642605&r1=1642604&r2=1642605&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
Sun Nov 30 21:13:47 2014
@@ -47,6 +47,7 @@ public class CpdReportTest
/**
* {@inheritDoc}
*/
+ @Override
protected void setUp()
throws Exception
{
@@ -251,6 +252,7 @@ public class CpdReportTest
matches = tMatch;
}
+ @Override
public Iterator<Match> getMatches()
{
return matches;
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java?rev=1642605&r1=1642604&r2=1642605&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
Sun Nov 30 21:13:47 2014
@@ -39,6 +39,7 @@ public class PmdReportTest
/**
* {@inheritDoc}
*/
+ @Override
protected void setUp()
throws Exception
{
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/CustomConfigurationMavenProjectStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/CustomConfigurationMavenProjectStub.java?rev=1642605&r1=1642604&r2=1642605&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/CustomConfigurationMavenProjectStub.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/CustomConfigurationMavenProjectStub.java
Sun Nov 30 21:13:47 2014
@@ -22,6 +22,7 @@ package org.apache.maven.plugin.pmd.stub
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
+import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.Scm;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
@@ -40,7 +41,7 @@ public class CustomConfigurationMavenPro
{
private Build build;
- private List reportPlugins = new ArrayList();
+ private List<ReportPlugin> reportPlugins = new ArrayList<ReportPlugin>();
public CustomConfigurationMavenProjectStub()
{
@@ -78,7 +79,7 @@ public class CustomConfigurationMavenPro
setReportPlugins( model.getReporting().getPlugins() );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( basedir +
"/src/test/resources/unit/custom-configuration/custom/configuration" );
setCompileSourceRoots( compileSourceRoots );
@@ -90,24 +91,27 @@ public class CustomConfigurationMavenPro
}
/** {@inheritDoc} */
+ @Override
public void setBuild( Build build )
{
this.build = build;
}
/** {@inheritDoc} */
+ @Override
public Build getBuild()
{
return build;
}
- public void setReportPlugins( List plugins )
+ public void setReportPlugins( List<ReportPlugin> plugins )
{
this.reportPlugins = plugins;
}
/** {@inheritDoc} */
- public List getReportPlugins()
+ @Override
+ public List<ReportPlugin> getReportPlugins()
{
return reportPlugins;
}
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultArtifactHandlerStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultArtifactHandlerStub.java?rev=1642605&r1=1642604&r2=1642605&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultArtifactHandlerStub.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultArtifactHandlerStub.java
Sun Nov 30 21:13:47 2014
@@ -31,6 +31,7 @@ public class DefaultArtifactHandlerStub
private String language;
/** {@inheritDoc} */
+ @Override
public String getLanguage()
{
if ( language == null )
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java?rev=1642605&r1=1642604&r2=1642605&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java
Sun Nov 30 21:13:47 2014
@@ -22,6 +22,7 @@ package org.apache.maven.plugin.pmd.stub
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
+import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.Scm;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
@@ -38,7 +39,7 @@ import java.util.List;
public class DefaultConfigurationMavenProjectStub
extends MavenProjectStub
{
- private List reportPlugins = new ArrayList();
+ private List<ReportPlugin> reportPlugins = new ArrayList<ReportPlugin>();
private Build build;
@@ -78,7 +79,7 @@ public class DefaultConfigurationMavenPr
setReportPlugins( model.getReporting().getPlugins() );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( basedir +
"/src/test/resources/unit/default-configuration/def/configuration" );
setCompileSourceRoots( compileSourceRoots );
@@ -91,24 +92,27 @@ public class DefaultConfigurationMavenPr
}
- public void setReportPlugins( List plugins )
+ public void setReportPlugins( List<ReportPlugin> plugins )
{
this.reportPlugins = plugins;
}
/** {@inheritDoc} */
- public List getReportPlugins()
+ @Override
+ public List<ReportPlugin> getReportPlugins()
{
return reportPlugins;
}
/** {@inheritDoc} */
+ @Override
public void setBuild( Build build )
{
this.build = build;
}
/** {@inheritDoc} */
+ @Override
public Build getBuild()
{
return build;
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/InvalidFormatMavenProjectStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/InvalidFormatMavenProjectStub.java?rev=1642605&r1=1642604&r2=1642605&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/InvalidFormatMavenProjectStub.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/InvalidFormatMavenProjectStub.java
Sun Nov 30 21:13:47 2014
@@ -74,7 +74,7 @@ public class InvalidFormatMavenProjectSt
setBuild( build );
String basedir = getBasedir().getAbsolutePath();
- List compileSourceRoots = new ArrayList();
+ List<String> compileSourceRoots = new ArrayList<String>();
compileSourceRoots.add( basedir +
"/src/test/resources/unit/invalid-format/invalid/format" );
setCompileSourceRoots( compileSourceRoots );
@@ -87,12 +87,14 @@ public class InvalidFormatMavenProjectSt
}
/** {@inheritDoc} */
+ @Override
public void setBuild( Build build )
{
this.build = build;
}
/** {@inheritDoc} */
+ @Override
public Build getBuild()
{
return build;
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/PmdPluginArtifactStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/PmdPluginArtifactStub.java?rev=1642605&r1=1642604&r2=1642605&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/PmdPluginArtifactStub.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/PmdPluginArtifactStub.java
Sun Nov 30 21:13:47 2014
@@ -52,36 +52,42 @@ public class PmdPluginArtifactStub
}
/** {@inheritDoc} */
+ @Override
public void setGroupId( String groupId )
{
this.groupId = groupId;
}
/** {@inheritDoc} */
+ @Override
public String getGroupId()
{
return groupId;
}
/** {@inheritDoc} */
+ @Override
public void setArtifactId( String artifactId )
{
this.artifactId = artifactId;
}
/** {@inheritDoc} */
+ @Override
public String getArtifactId()
{
return artifactId;
}
/** {@inheritDoc} */
+ @Override
public void setVersion( String version )
{
this.version = version;
}
/** {@inheritDoc} */
+ @Override
public String getVersion()
{
return version;
@@ -98,24 +104,28 @@ public class PmdPluginArtifactStub
}
/** {@inheritDoc} */
+ @Override
public VersionRange getVersionRange()
{
return versionRange;
}
/** {@inheritDoc} */
+ @Override
public void setVersionRange( VersionRange versionRange )
{
this.versionRange = versionRange;
}
/** {@inheritDoc} */
+ @Override
public ArtifactHandler getArtifactHandler()
{
return handler;
}
/** {@inheritDoc} */
+ @Override
public void setArtifactHandler( ArtifactHandler handler )
{
this.handler = handler;
