Author: khmarbaise
Date: Sat Nov 8 15:49:45 2014
New Revision: 1637574
URL: http://svn.apache.org/r1637574
Log:
[MPIR-306] Upgrade to maven-plugins version 25 to 26
- Followup fixed checkstyle reported errors which broke the build.
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/DependencyConvergenceReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.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/ScmReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.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=1637574&r1=1637573&r2=1637574&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 15:49:45 2014
@@ -206,8 +206,10 @@ public abstract class AbstractProjectInf
Artifact defaultSkin =
siteTool.getDefaultSkinArtifact( localRepository,
project.getRemoteArtifactRepositories() );
+ // CHECKSTYLE_OFF: LineLength
SiteRenderingContext siteContext =
siteRenderer.createContextForSkin( defaultSkin.getFile(),
attributes, model, getName( locale ), locale );
+ // CHECKSTYLE_ON: LineLength
RenderingContext context = new RenderingContext( outputDirectory,
filename );
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java?rev=1637574&r1=1637573&r2=1637574&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
Sat Nov 8 15:49:45 2014
@@ -210,7 +210,9 @@ public class DependencyConvergenceReport
* @param dependencyMap
* @return snapshots dependencies
*/
+ // CHECKSTYLE_OFF: LineLength
private List<ReverseDependencyLink> getSnapshotDependencies( Map<String,
List<ReverseDependencyLink>> dependencyMap )
+ // CHECKSTYLE_ON: LineLength
{
List<ReverseDependencyLink> snapshots = new
ArrayList<ReverseDependencyLink>();
for ( Map.Entry<String, List<ReverseDependencyLink>> entry :
dependencyMap.entrySet() )
@@ -359,7 +361,9 @@ public class DependencyConvergenceReport
* @param artifactMap
* @param version
*/
+ // CHECKSTYLE_OFF: LineLength
private void generateVersionDetails( Sink sink, Map<String,
List<ReverseDependencyLink>> artifactMap, String version )
+ // CHECKSTYLE_ON: LineLength
{
sink.numberedList( 0 ); // Use lower alpha numbering
List<ReverseDependencyLink> depList = artifactMap.get( version );
@@ -776,8 +780,10 @@ public class DependencyConvergenceReport
* @return DependencyAnalyzeResult contains conflicting dependencies map,
snapshot dependencies map and all
* dependencies map.
*/
+ // CHECKSTYLE_OFF: LineLength
private DependencyAnalyzeResult populateDependencyAnalyzeResult(
Map<String, List<ReverseDependencyLink>> conflictingDependencyMap,
Map<String, List<ReverseDependencyLink>> allDependencies )
+ // CHECKSTYLE_ON: LineLength
{
DependencyAnalyzeResult dependencyResult = new
DependencyAnalyzeResult();
@@ -816,11 +822,15 @@ public class DependencyConvergenceReport
dependencyList = new ArrayList<ReverseDependencyLink>();
}
+ // CHECKSTYLE_OFF: LineLength
dependencyList.add( new ReverseDependencyLink( toDependency(
dependencyNode.getArtifact() ), reactorProject ) );
+ // CHECKSTYLE_ON: LineLength
for ( DependencyNode workNode : nodes.subList( 1, nodes.size() ) )
{
+ // CHECKSTYLE_OFF: LineLength
dependencyList.add( new ReverseDependencyLink( toDependency(
workNode.getArtifact() ), reactorProject ) );
+ // CHECKSTYLE_ON: LineLength
}
conflictingDependencyMap.put( key, dependencyList );
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java?rev=1637574&r1=1637573&r2=1637574&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java
Sat Nov 8 15:49:45 2014
@@ -46,7 +46,8 @@ public class IssueTrackingReport
@Override
public void executeReport( Locale locale )
{
- IssueTrackingRenderer r = new IssueTrackingRenderer( getSink(),
getProject().getModel(), getI18N( locale ), locale );
+ IssueTrackingRenderer r =
+ new IssueTrackingRenderer( getSink(), getProject().getModel(),
getI18N( locale ), locale );
r.render();
}
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java?rev=1637574&r1=1637573&r2=1637574&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java
Sat Nov 8 15:49:45 2014
@@ -107,12 +107,12 @@ public class ModulesReport
String name = getI18nString( "header.name" );
String description = getI18nString( "header.description" );
- tableHeader( new String[] {name, description} );
+ tableHeader( new String[] { name, description } );
final String baseURL = project.getUrl();
-
+
// before MPIR-229 this was model.getModules(), which could have
uninherited/unresolved values
- // @todo also include modules which are not part of reactor, e.g.
caused by -pl
+ // @todo also include modules which are not part of reactor, e.g.
caused by -pl
List<MavenProject> modules = project.getCollectedProjects();
for ( MavenProject moduleProject : modules )
{
@@ -120,9 +120,10 @@ public class ModulesReport
final String moduleName = moduleProject.getName();
- final String moduleHref = getRelativeLink( baseURL,
moduleProject.getUrl(), moduleProject.getArtifactId() );
+ final String moduleHref =
+ getRelativeLink( baseURL, moduleProject.getUrl(),
moduleProject.getArtifactId() );
- tableRow( new String[] {linkedName( moduleName, moduleHref ),
moduleModel.getDescription()} );
+ tableRow( new String[] { linkedName( moduleName, moduleHref ),
moduleModel.getDescription() } );
}
endTable();
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=1637574&r1=1637573&r2=1637574&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 15:49:45 2014
@@ -203,10 +203,11 @@ public class ProjectInfoReportUtils
* @param localRepository not null
* @return the artifact url or null if an error occurred.
*/
+ // CHECKSTYLE_OFF: LineLength
public static String getArtifactUrl( ArtifactFactory factory, Artifact
artifact,
MavenProjectBuilder
mavenProjectBuilder,
- List<ArtifactRepository>
remoteRepositories,
- ArtifactRepository localRepository )
+ List<ArtifactRepository>
remoteRepositories, ArtifactRepository localRepository )
+ // CHECKSTYLE_ON: LineLength
{
if ( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
{
@@ -285,12 +286,19 @@ public class ProjectInfoReportUtils
conn.setReadTimeout( TIMEOUT );
// conn authorization
+ //@formatter:off
if ( settings.getServers() != null
&& !settings.getServers().isEmpty()
&& project != null
&& project.getDistributionManagement() != null
- && ( project.getDistributionManagement().getRepository() != null
|| project.getDistributionManagement().getSnapshotRepository() != null )
- && ( StringUtils.isNotEmpty(
project.getDistributionManagement().getRepository().getUrl() ) ||
StringUtils.isNotEmpty(
project.getDistributionManagement().getSnapshotRepository().getUrl() ) ) )
+ && (
+ project.getDistributionManagement().getRepository() !=
null
+ ||
project.getDistributionManagement().getSnapshotRepository() != null
+ )
+ && ( StringUtils.isNotEmpty(
project.getDistributionManagement().getRepository().getUrl() )
+ || StringUtils.isNotEmpty(
project.getDistributionManagement().getSnapshotRepository().getUrl() ) )
+ )
+ //@formatter:on
{
Server server = null;
if ( url.toString().contains(
project.getDistributionManagement().getRepository().getUrl() ) )
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java?rev=1637574&r1=1637573&r2=1637574&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
Sat Nov 8 15:49:45 2014
@@ -511,6 +511,7 @@ public class ScmReport
// CVS
+ // CHECKSTYLE_OFF: LineLength
/**
* Create the documentation to provide an anonymous access with a
<code>CVS</code> SCM. For example, generate
* the following command line:
@@ -525,6 +526,7 @@ public class ScmReport
* @see <a
*
href="https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115";>https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115</a>
*/
+ // CHECKSTYLE_ON: LineLength
private void anonymousAccessCVS( CvsScmProviderRepository cvsRepo )
{
paragraph( getI18nString( "anonymousaccess.cvs.intro" ) );
@@ -588,6 +590,7 @@ public class ScmReport
verbatimText( "$ hg clone " + hgRepo.getURI() );
}
+ // CHECKSTYLE_OFF: LineLength
/**
* Create the documentation to provide an developer access with a
<code>CVS</code> SCM. For example, generate
* the following command line:
@@ -602,6 +605,7 @@ public class ScmReport
* @see <a
*
href="https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115";>https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115</a>
*/
+ // CHECKSTYLE_ON: LineLength
private void developerAccessCVS( CvsScmProviderRepository cvsRepo )
{
paragraph( getI18nString( "devaccess.cvs.intro" ) );
@@ -655,6 +659,7 @@ public class ScmReport
// Perforce
+ // CHECKSTYLE_OFF: LineLength
/**
* Create the documentation to provide an developer access with a
<code>Perforce</code> SCM. For example,
* generate the following command line:
@@ -667,9 +672,11 @@ public class ScmReport
*
* @param perforceRepo
* @see <a
- *
href="http://www.perforce.com/perforce/doc.051/manuals/cmdref/index.html";>http://www.perforce.com/perforce
+ *
href="http://www.perforce.com/perforce/doc.051/manuals/cmdref/index.html";>http://www.perforce.com/
+ * perforce
* /doc.051/manuals/cmdref/index.html</>
*/
+ // CHECKSTYLE_ON: LineLength
private void developerAccessPerforce( PerforceScmProviderRepository
perforceRepo )
{
paragraph( getI18nString( "devaccess.perforce.intro" ) );
@@ -836,7 +843,9 @@ public class ScmReport
if ( !isIntroAdded )
{
- sb.append( "This SCM url '" ).append( scmUrl ).append(
"' is invalid due to the following errors:" );
+ sb.append( "This SCM url '" );
+ sb.append( scmUrl );
+ sb.append( "' is invalid due to the following errors:"
);
sb.append( SystemUtils.LINE_SEPARATOR );
isIntroAdded = true;
}
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java?rev=1637574&r1=1637573&r2=1637574&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
Sat Nov 8 15:49:45 2014
@@ -71,8 +71,10 @@ public class TeamListReport
@Override
public void executeReport( Locale locale )
{
+ // CHECKSTYLE_OFF: LineLength
TeamListRenderer r =
new TeamListRenderer( getSink(), project.getModel(), getI18N(
locale ), locale, getLog(), showAvatarImages );
+ // CHECKSTYLE_ON: LineLength
r.render();
}
@@ -147,6 +149,8 @@ public class TeamListReport
{
startSection( getI18nString( "intro.title" ) );
+ // CHECKSTYLE_OFF: LineLength
+
// To handle JS
StringBuilder javascript =
new StringBuilder( "function offsetDate(id, offset) {"
).append( SystemUtils.LINE_SEPARATOR );
@@ -162,6 +166,8 @@ public class TeamListReport
javascript.append( SystemUtils.LINE_SEPARATOR );
javascript.append( "function init(){" ).append(
SystemUtils.LINE_SEPARATOR );
+ // CHECKSTYLE_ON: LineLength
+
// Introduction
paragraph( getI18nString( "intro.description1" ) );
paragraph( getI18nString( "intro.description2" ) );
@@ -234,7 +240,11 @@ public class TeamListReport
}
// To handle JS
- javascript.append( "}" ).append( SystemUtils.LINE_SEPARATOR
).append( SystemUtils.LINE_SEPARATOR ).append( "window.onLoad = init();"
).append( SystemUtils.LINE_SEPARATOR );
+ javascript.append( "}" );
+ javascript.append( SystemUtils.LINE_SEPARATOR );
+ javascript.append( SystemUtils.LINE_SEPARATOR );
+ javascript.append( "window.onLoad = init();" );
+ javascript.append( SystemUtils.LINE_SEPARATOR );
javaScript( javascript.toString() );
endSection();
@@ -332,9 +342,12 @@ public class TeamListReport
sink.rawText( "<span id=\"" + type + "-" + rowId +
"\">" );
text( tz );
final long oneHoursInMilliSeconds = 3600000;
- String offSet = String.valueOf( TimeZone.getTimeZone(
tz ).getRawOffset() / oneHoursInMilliSeconds );
+ String offSet =
+ String.valueOf( TimeZone.getTimeZone( tz
).getRawOffset() / oneHoursInMilliSeconds );
+ // CHECKSTYLE_OFF: LineLength
javascript.append( " offsetDate('" ).append( type
).append( "-" ).append( rowId ).append( "', '" );
javascript.append( offSet ).append( "');" ).append(
SystemUtils.LINE_SEPARATOR );
+ // CHECKSTYLE_ON: LineLength
sink.rawText( "</span>" );
sink.tableCell_();
}
@@ -374,9 +387,11 @@ public class TeamListReport
}
else
{
+ // CHECKSTYLE_OFF: LineLength
text( member.getTimezone().trim() );
javascript.append( " offsetDate('" ).append(
type ).append( "-" ).append( rowId ).append( "', '" );
javascript.append( member.getTimezone() ).append(
"');" ).append( SystemUtils.LINE_SEPARATOR );
+ // CHECKSTYLE_ON: LineLength
}
}
sink.rawText( "</span>" );
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=1637574&r1=1637573&r2=1637574&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 15:49:45 2014
@@ -661,7 +661,9 @@ public class DependenciesRenderer
{
if ( titles != null && content.length != titles.length )
{
+ // CHECKSTYLE_OFF: LineLength
throw new IllegalArgumentException( "Length of title array
must equal the length of the content array" );
+ // CHECKSTYLE_ON: LineLength
}
for ( int i = 0; i < content.length; i++ )
@@ -1513,6 +1515,7 @@ public class DependenciesRenderer
return false;
}
+ // CHECKSTYLE_OFF: LineLength
/**
* Formats file length with the associated <a
href="https://en.wikipedia.org/wiki/Metric_prefix";>SI</a> prefix
* (GB, MB, kB) and using the pattern <code>###0.00</code> by default.
@@ -1522,6 +1525,7 @@ public class DependenciesRenderer
* @see <a
*
href="https://en.wikipedia.org/wiki/Octet_%28computing%29";>https://en.wikipedia.org/wiki/Octet_(computing)</a>
*/
+ // CHECKSTYLE_ON: LineLength
static class FileDecimalFormat
extends DecimalFormat
{
