Author: khmarbaise
Date: Sat Nov 8 16:25:21 2014
New Revision: 1637575
URL: http://svn.apache.org/r1637575
Log:
[MPIR-306] Upgrade to maven-plugins version 25 to 26
- Followup fixed checkstyle reported warnings/errors.
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=1637575&r1=1637574&r2=1637575&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
Sat Nov 8 16:25:21 2014
@@ -262,6 +262,10 @@ public abstract class AbstractProjectInf
// Protected methods
// ----------------------------------------------------------------------
+ /**
+ * @param coll The collection to be checked.
+ * @return true if coll is empty false otherwise.
+ */
protected boolean isEmpty( Collection<?> coll )
{
return coll == null || coll.isEmpty();
@@ -291,6 +295,10 @@ public abstract class AbstractProjectInf
return project;
}
+ /**
+ * @param pluginId The id of the plugin
+ * @return The information about the plugin.
+ */
protected Plugin getPlugin( String pluginId )
{
if ( ( getProject().getBuild() == null ) || (
getProject().getBuild().getPluginsAsMap() == null ) )
@@ -309,6 +317,11 @@ public abstract class AbstractProjectInf
return plugin;
}
+ /**
+ * @param pluginId The pluginId
+ * @param param The child which should be checked.
+ * @return The value of the dom tree.
+ */
protected String getPluginParameter( String pluginId, String param )
{
Plugin plugin = getPlugin( pluginId );
@@ -325,17 +338,29 @@ public abstract class AbstractProjectInf
return null;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
protected Renderer getSiteRenderer()
{
return siteRenderer;
}
+ /**
+ * @param locale The locale
+ * @param key The key to search for
+ * @return The text appropriate for the locale.
+ */
protected String getI18nString( Locale locale, String key )
{
return getI18N( locale ).getString( "project-info-report", locale,
"report." + getI18Nsection() + '.' + key );
}
+ /**
+ * @param locale The local.
+ * @return I18N for the locale
+ */
protected I18N getI18N( Locale locale )
{
if ( customBundle != null )
@@ -358,6 +383,9 @@ public abstract class AbstractProjectInf
return i18n;
}
+ /**
+ * @return The according string for the section.
+ */
protected abstract String getI18Nsection();
/** {@inheritDoc} */
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java?rev=1637575&r1=1637574&r2=1637575&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
Sat Nov 8 16:25:21 2014
@@ -126,15 +126,15 @@ public class PluginManagementReport
private final ArtifactRepository localRepository;
/**
- * @param log
- * @param sink
- * @param locale
- * @param i18n
- * @param plugins
- * @param project
- * @param mavenProjectBuilder
- * @param artifactFactory
- * @param localRepository
+ * @param log {@link #log}
+ * @param sink {@link Sink}
+ * @param locale {@link Locale}
+ * @param i18n {@link I18N}
+ * @param plugins {@link Plugin}
+ * @param project {@link MavenProject}
+ * @param mavenProjectBuilder {@link MavenProjectBuilder}
+ * @param artifactFactory {@link ArtifactFactory}
+ * @param localRepository {@link ArtifactRepository}
*/
public PluginManagementRenderer( Log log, Sink sink, Locale locale,
I18N i18n, List<Plugin> plugins,
MavenProject project,
MavenProjectBuilder mavenProjectBuilder,
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java?rev=1637575&r1=1637574&r2=1637575&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
Sat Nov 8 16:25:21 2014
@@ -19,6 +19,13 @@ package org.apache.maven.report.projecti
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -34,13 +41,6 @@ import org.apache.maven.project.ProjectB
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.StringUtils;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-
/**
* Generates the Project Plugins report.
*
@@ -127,16 +127,17 @@ public class PluginsReport
private final ArtifactRepository localRepository;
/**
- * @param log
- * @param sink
- * @param locale
- * @param i18n
- * @param plugins
- * @param reports
- * @param project
- * @param mavenProjectBuilder
- * @param artifactFactory
- * @param localRepository
+ * @param log {@link #log}
+ * @param sink {@link Sink}
+ * @param locale {@link Locale}
+ * @param i18n {@link I18N}
+ * @param plugins {@link Artifact}
+ * @param reports {@link Artifact}
+ * @param project {@link MavenProject}
+ * @param mavenProjectBuilder {@link MavenProjectBuilder}
+ * @param artifactFactory {@link ArtifactFactory}
+ * @param localRepository {@link ArtifactRepository}
+ *
*/
public PluginsRenderer( Log log, Sink sink, Locale locale, I18N i18n,
Set<Artifact> plugins,
Set<Artifact> reports, MavenProject project,
MavenProjectBuilder mavenProjectBuilder,
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java?rev=1637575&r1=1637574&r2=1637575&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
Sat Nov 8 16:25:21 2014
@@ -374,6 +374,10 @@ public class ProjectInfoReportUtils
return conn;
}
+ /**
+ * @param str The string to be checked.
+ * @return true if is number false otherwise.
+ */
public static boolean isNumber( String str )
{
if ( str.startsWith( "+" ) )
@@ -383,6 +387,11 @@ public class ProjectInfoReportUtils
return NumberUtils.isNumber( str );
}
+ /**
+ * @param str The string which should be converted.
+ * @param defaultValue The default value.
+ * @return Converted string.
+ */
public static float toFloat( String str, float defaultValue )
{
if ( str.startsWith( "+" ) )
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java?rev=1637575&r1=1637574&r2=1637575&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java
Sat Nov 8 16:25:21 2014
@@ -44,22 +44,34 @@ public class DependencyVersionMap
// Public methods
// ----------------------------------------------------------------------
+ /**
+ * Create an instance.
+ */
public DependencyVersionMap()
{
idsToNode = new HashMap<String, List<DependencyNode>>();
}
+ /**
+ * @param uniqueVersions {@link #uniqueVersions}
+ */
public void setUniqueVersions( boolean uniqueVersions )
{
this.uniqueVersions = uniqueVersions;
}
+ /**
+ * {@inheritDoc}
+ */
public boolean visit( DependencyNode node )
{
addDependency( node );
return !containsConflicts( node );
}
+ /**
+ * {@inheritDoc}
+ */
public boolean endVisit( DependencyNode node )
{
return true;
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java?rev=1637575&r1=1637574&r2=1637575&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/RepositoryUtils.java
Sat Nov 8 16:25:21 2014
@@ -84,16 +84,16 @@ public class RepositoryUtils
private final ArtifactRepository localRepository;
/**
- * @param log
- * @param wagonManager
- * @param settings
- * @param mavenProjectBuilder
- * @param factory
- * @param resolver
- * @param remoteRepositories
- * @param pluginRepositories
- * @param localRepository
- * @param repositoryMetadataManager
+ * @param log {@link Log}
+ * @param wagonManager {@link WagonManager}
+ * @param settings {@link Settings}
+ * @param mavenProjectBuilder {@link MavenProjectBuilder}
+ * @param factory {@link ArtifactFactory}
+ * @param resolver {@link ArtifactResolver}
+ * @param remoteRepositories {@link ArtifactRepository}
+ * @param pluginRepositories {@link ArtifactRepository}
+ * @param localRepository {@link ArtifactRepository}
+ * @param repositoryMetadataManager {@link RepositoryMetadataManager}
*/
public RepositoryUtils( Log log, WagonManager wagonManager, Settings
settings,
MavenProjectBuilder mavenProjectBuilder,
ArtifactFactory factory,
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java?rev=1637575&r1=1637574&r2=1637575&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java
Sat Nov 8 16:25:21 2014
@@ -103,7 +103,6 @@ public class SinkSerializingDependencyNo
* tokens.
*
* @param sink the writer to serialize to
- * @param tokens the tokens to use when serializing the dependency tree
*/
public SinkSerializingDependencyNodeVisitor( Sink sink )
{
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=1637575&r1=1637574&r2=1637575&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
Sat Nov 8 16:25:21 2014
@@ -174,19 +174,19 @@ public class DependenciesRenderer
/**
* Default constructor.
*
- * @param sink
- * @param locale
- * @param i18n
- * @param log
- * @param settings
- * @param dependencies
- * @param dependencyTreeNode
- * @param config
- * @param repoUtils
- * @param artifactFactory
- * @param mavenProjectBuilder
- * @param remoteRepositories
- * @param localRepository
+ * @param sink {@link Sink}
+ * @param locale {@link Locale}
+ * @param i18n {@link I18N}
+ * @param log {@link Log}
+ * @param settings {@link Settings}
+ * @param dependencies {@link Dependencies}
+ * @param dependencyTreeNode {@link DependencyNode}
+ * @param config {@link DependenciesReportConfiguration}
+ * @param repoUtils {@link RepositoryUtils}
+ * @param artifactFactory {@link ArtifactFactory}
+ * @param mavenProjectBuilder {@link MavenProjectBuilder}
+ * @param remoteRepositories {@link ArtifactRepository}
+ * @param localRepository {@link ArtifactRepository}
*/
public DependenciesRenderer( Sink sink, Locale locale, I18N i18n, Log log,
Settings settings,
Dependencies dependencies, DependencyNode
dependencyTreeNode,
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java?rev=1637575&r1=1637574&r2=1637575&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
Sat Nov 8 16:25:21 2014
@@ -75,16 +75,17 @@ public class DependencyManagementRendere
/**
* Default constructor
*
- * @param sink
- * @param locale
- * @param i18n
- * @param log
- * @param artifactFactory
- * @param dependencies
- * @param mavenProjectBuilder
- * @param remoteRepositories
- * @param localRepository
- * @param repoUtils
+ * @param sink {@link Sink}
+ * @param locale {@link Locale}
+ * @param i18n {@link I18N}
+ * @param log {@link Log}
+ * @param dependencies {@link ManagementDependencies}
+ * @param artifactMetadataSource {@link ArtifactMetadataSource}
+ * @param artifactFactory {@link ArtifactFactory}
+ * @param mavenProjectBuilder {@link MavenProjectBuilder}
+ * @param remoteRepositories {@link ArtifactRepository}
+ * @param localRepository {@link ArtifactRepository}
+ * @param repoUtils {@link RepositoryUtils}
*/
public DependencyManagementRenderer( Sink sink, Locale locale, I18N i18n,
Log log,
ManagementDependencies dependencies,
