You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2016/02/28 00:31:54 UTC

svn commit: r1732680 [1/9] - in /maven/plugins/trunk/maven-project-info-reports-plugin/src: main/java/org/apache/maven/report/projectinfo/ main/java/org/apache/maven/report/projectinfo/dependencies/renderer/ main/resources/ test/java/org/apache/maven/r...

Author: michaelo
Date: Sat Feb 27 23:31:53 2016
New Revision: 1732680

URL: http://svn.apache.org/viewvc?rev=1732680&view=rev
Log:
[MPIR-341] Align mojo class names to element names in pom.xml

Massive cleanup and unification of report name patterns.

Added:
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IndexReport.java
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectIndexPageReport.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java
      - copied, changed from r1732655, 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/LicensesReport.java
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
      - copied, changed from r1732655, 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/test/java/org/apache/maven/report/projectinfo/CiManagementReportTest.java
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/CimReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/IndexReportTest.java
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/IssueManagementReportTest.java
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/IssueTrackingReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/LicensesReportTest.java
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/LicenseReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/SummaryReportTest.java
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectSummaryReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/TeamReportTest.java
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/TeamListReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/CiManagementStub.java
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/CimStub.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/IssueManagementStub.java
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/IssueTrackingStub.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/LicensesStub.java
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/LicenseStub.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/MailingListsStub.java
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/MailingListStub.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/TeamStub.java
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectTeamStub.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/ci-management-plugin-config.xml
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/cim-plugin-config.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/issue-management-plugin-config.xml
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/issue-tracking-plugin-config.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/licenses-plugin-config-linkonly.xml
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/license-plugin-config-linkonly.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/licenses-plugin-config.xml
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/license-plugin-config.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/mailing-lists-plugin-config.xml
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/mailing-list-plugin-config.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/team-plugin-config.xml
      - copied, changed from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/project-team-plugin-config.xml
Removed:
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.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/LicenseReport.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectIndexPageReport.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.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/test/java/org/apache/maven/report/projectinfo/CimReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/IssueTrackingReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/LicenseReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectSummaryReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/TeamListReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/CimStub.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/IssueTrackingStub.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/LicenseStub.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/MailingListStub.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectTeamStub.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/cim-plugin-config.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/issue-tracking-plugin-config.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/license-plugin-config-linkonly.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/license-plugin-config.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/mailing-list-plugin-config.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/project-team-plugin-config.xml
Modified:
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.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/dependencies/renderer/DependenciesRenderer.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_cs.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_de.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_es.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_fr.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_gl.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_hu.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_it.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_ja.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_ko.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_lt.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_nl.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_no.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_pl.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_pt.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_pt_BR.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_ru.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_sk.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_sv.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_tr.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_zh_CN.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports_zh_TW.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/dependency-convergence-plugin-config.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/dependency-management-plugin-config.xml
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/resources/plugin-configs/plugin-management-plugin-config.xml

Copied: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java (from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java?p2=maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java&p1=maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java&r1=1732655&r2=1732680&rev=1732680&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java Sat Feb 27 23:31:53 2016
@@ -31,14 +31,14 @@ import java.util.List;
 import java.util.Locale;
 
 /**
- * Generates the Project Continuous Integration System report.
+ * Generates the Project Continuous Integration Management report.
  *
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton </a>
  * @version $Id$
  * @since 2.0
  */
 @Mojo( name = "cim" )
-public class CimReport
+public class CiManagementReport
     extends AbstractProjectInfoReport
 {
     // ----------------------------------------------------------------------
@@ -61,7 +61,8 @@ public class CimReport
     @Override
     public void executeReport( Locale locale )
     {
-        CimRenderer r = new CimRenderer( getSink(), getProject().getModel(), getI18N( locale ), locale );
+        CiManagementRenderer r = new CiManagementRenderer( getSink(), getProject().getModel(),
+                                                              getI18N( locale ), locale );
 
         r.render();
     }
@@ -75,7 +76,7 @@ public class CimReport
     @Override
     protected String getI18Nsection()
     {
-        return "cim";
+        return "ci-management";
     }
 
     // ----------------------------------------------------------------------
@@ -85,12 +86,12 @@ public class CimReport
     /**
      * Internal renderer class
      */
-    private static class CimRenderer
+    private static class CiManagementRenderer
         extends AbstractProjectInfoRenderer
     {
         private Model model;
 
-        CimRenderer( Sink sink, Model model, I18N i18n, Locale locale )
+        CiManagementRenderer( Sink sink, Model model, I18N i18n, Locale locale )
         {
             super( sink, i18n, locale );
 
@@ -100,7 +101,7 @@ public class CimReport
         @Override
         protected String getI18Nsection()
         {
-            return "cim";
+            return "ci-management";
         }
 
         @Override
@@ -126,39 +127,39 @@ public class CimReport
             startSection( getI18nString( "overview.title" ) );
 
             sink.paragraph();
-            if ( isCimSystem( system, "anthill" ) )
+            if ( isCiManagementSystem( system, "anthill" ) )
             {
                 linkPatternedText( getI18nString( "anthill.intro" ) );
             }
-            else if ( isCimSystem( system, "bamboo" ) )
+            else if ( isCiManagementSystem( system, "bamboo" ) )
             {
                 linkPatternedText( getI18nString( "bamboo.intro" ) );
             }
-            else if ( isCimSystem( system, "buildforge" ) )
+            else if ( isCiManagementSystem( system, "buildforge" ) )
             {
                 linkPatternedText( getI18nString( "buildforge.intro" ) );
             }
-            else if ( isCimSystem( system, "continuum" ) )
+            else if ( isCiManagementSystem( system, "continuum" ) )
             {
                 linkPatternedText( getI18nString( "continuum.intro" ) );
             }
-            else if ( isCimSystem( system, "cruisecontrol" ) )
+            else if ( isCiManagementSystem( system, "cruisecontrol" ) )
             {
                 linkPatternedText( getI18nString( "cruisecontrol.intro" ) );
             }
-            else if ( isCimSystem( system, "hudson" ) )
+            else if ( isCiManagementSystem( system, "hudson" ) )
             {
                 linkPatternedText( getI18nString( "hudson.intro" ) );
             }
-            else if ( isCimSystem( system, "jenkins" ) )
+            else if ( isCiManagementSystem( system, "jenkins" ) )
             {
                 linkPatternedText( getI18nString( "jenkins.intro" ) );
             }
-            else if ( isCimSystem( system, "luntbuild" ) )
+            else if ( isCiManagementSystem( system, "luntbuild" ) )
             {
                 linkPatternedText( getI18nString( "luntbuild.intro" ) );
             }
-            else if ( isCimSystem( system, "travis" ) )
+            else if ( isCiManagementSystem( system, "travis" ) )
             {
                 linkPatternedText( getI18nString( "travis.intro" ) );
             }
@@ -221,25 +222,23 @@ public class CimReport
         }
 
         /**
-         * Checks if a CIM system is bugzilla, continuum...
+         * Checks if a CI management system is bugzilla, continuum...
          *
-         * @param connection
-         * @param cim
-         * @return true if the CIM system is bugzilla, continuum..., false otherwise.
+         * @return true if the CI management system is bugzilla, continuum..., false otherwise.
          */
-        private boolean isCimSystem( String connection, String cim )
+        private boolean isCiManagementSystem( String system, String actual )
         {
-            if ( StringUtils.isEmpty( connection ) )
+            if ( StringUtils.isEmpty( system ) )
             {
                 return false;
             }
 
-            if ( StringUtils.isEmpty( cim ) )
+            if ( StringUtils.isEmpty( actual ) )
             {
                 return false;
             }
 
-            return connection.toLowerCase( Locale.ENGLISH ).startsWith( cim.toLowerCase( Locale.ENGLISH ) );
+            return system.toLowerCase( Locale.ENGLISH ).startsWith( actual.toLowerCase( Locale.ENGLISH ) );
         }
     }
 }

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java?rev=1732680&r1=1732679&r2=1732680&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyInformationReport.java Sat Feb 27 23:31:53 2016
@@ -40,8 +40,6 @@ public final class DependencyInformation
     extends AbstractProjectInfoReport
 {
 
-    private static final String DEPENDENCY_INFO = "dependency-info";
-
     private static final String JAR_PACKAGING = "jar";
 
     /**
@@ -73,7 +71,7 @@ public final class DependencyInformation
      */
     public String getOutputName()
     {
-        return DEPENDENCY_INFO;
+        return "dependency-info";
     }
 
     /**
@@ -82,7 +80,7 @@ public final class DependencyInformation
     @Override
     protected String getI18Nsection()
     {
-        return DEPENDENCY_INFO;
+        return "dependency-info";
     }
 
     /**
@@ -128,7 +126,7 @@ public final class DependencyInformation
         @Override
         protected String getI18Nsection()
         {
-            return DEPENDENCY_INFO;
+            return "dependency-info";
         }
 
         /**

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java?rev=1732680&r1=1732679&r2=1732680&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyManagementReport.java Sat Feb 27 23:31:53 2016
@@ -135,7 +135,7 @@ public class DependencyManagementReport
     @Override
     protected String getI18Nsection()
     {
-        return "dependencyManagement";
+        return "dependency-management";
     }
 
     // ----------------------------------------------------------------------

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java?rev=1732680&r1=1732679&r2=1732680&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DistributionManagementReport.java Sat Feb 27 23:31:53 2016
@@ -73,7 +73,7 @@ public class DistributionManagementRepor
     @Override
     protected String getI18Nsection()
     {
-        return "distributionManagement";
+        return "distribution-management";
     }
 
     // ----------------------------------------------------------------------
@@ -98,7 +98,7 @@ public class DistributionManagementRepor
         @Override
         protected String getI18Nsection()
         {
-            return "distributionManagement";
+            return "distribution-management";
         }
 
         @Override

Copied: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IndexReport.java (from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectIndexPageReport.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IndexReport.java?p2=maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IndexReport.java&p1=maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectIndexPageReport.java&r1=1732655&r2=1732680&rev=1732680&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectIndexPageReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IndexReport.java Sat Feb 27 23:31:53 2016
@@ -30,7 +30,7 @@ import org.codehaus.plexus.i18n.I18N;
 import java.util.Locale;
 
 /**
- * Generates the project index page.
+ * Generates the project index report.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter </a>
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton </a>
@@ -38,7 +38,7 @@ import java.util.Locale;
  * @since 2.0
  */
 @Mojo( name = "index" )
-public class ProjectIndexPageReport
+public class IndexReport
     extends AbstractProjectInfoReport
 {
     // ----------------------------------------------------------------------

Copied: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java (from r1732655, 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/IssueManagementReport.java?p2=maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java&p1=maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java&r1=1732655&r2=1732680&rev=1732680&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/IssueManagementReport.java Sat Feb 27 23:31:53 2016
@@ -29,14 +29,14 @@ import org.codehaus.plexus.util.StringUt
 import java.util.Locale;
 
 /**
- * Generates the Project Issue Tracking report.
+ * Generates the Project Issue Management report.
  *
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton </a>
  * @version $Id$
  * @since 2.0
  */
 @Mojo( name = "issue-tracking" )
-public class IssueTrackingReport
+public class IssueManagementReport
     extends AbstractProjectInfoReport
 {
     // ----------------------------------------------------------------------
@@ -58,8 +58,8 @@ public class IssueTrackingReport
     @Override
     public void executeReport( Locale locale )
     {
-        IssueTrackingRenderer r =
-            new IssueTrackingRenderer( getSink(), getProject().getModel(), getI18N( locale ), locale );
+        IssueManagementRenderer r =
+            new IssueManagementRenderer( getSink(), getProject().getModel(), getI18N( locale ), locale );
 
         r.render();
     }
@@ -73,7 +73,7 @@ public class IssueTrackingReport
     @Override
     protected String getI18Nsection()
     {
-        return "issuetracking";
+        return "issue-management";
     }
 
     // ----------------------------------------------------------------------
@@ -83,12 +83,12 @@ public class IssueTrackingReport
     /**
      * Internal renderer class
      */
-    private static class IssueTrackingRenderer
+    private static class IssueManagementRenderer
         extends AbstractProjectInfoRenderer
     {
         private Model model;
 
-        IssueTrackingRenderer( Sink sink, Model model, I18N i18n, Locale locale )
+        IssueManagementRenderer( Sink sink, Model model, I18N i18n, Locale locale )
         {
             super( sink, i18n, locale );
 
@@ -98,7 +98,7 @@ public class IssueTrackingReport
         @Override
         protected String getI18Nsection()
         {
-            return "issuetracking";
+            return "issue-management";
         }
 
         @Override
@@ -165,22 +165,22 @@ public class IssueTrackingReport
          * Checks if a issue management system is Jira, bugzilla...
          *
          * @param system
-         * @param im
+         * @param actual
          * @return true if the issue management system is Jira, bugzilla, false otherwise.
          */
-        private boolean isIssueManagementSystem( String system, String im )
+        private boolean isIssueManagementSystem( String system, String actual )
         {
             if ( StringUtils.isEmpty( system ) )
             {
                 return false;
             }
 
-            if ( StringUtils.isEmpty( im ) )
+            if ( StringUtils.isEmpty( actual ) )
             {
                 return false;
             }
 
-            return system.toLowerCase( Locale.ENGLISH ).startsWith( im.toLowerCase( Locale.ENGLISH ) );
+            return system.toLowerCase( Locale.ENGLISH ).startsWith( actual.toLowerCase( Locale.ENGLISH ) );
         }
     }
 }

Copied: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java (from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java?p2=maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java&p1=maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java&r1=1732655&r2=1732680&rev=1732680&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java Sat Feb 27 23:31:53 2016
@@ -40,14 +40,14 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 /**
- * Generates the Project License report.
+ * Generates the Project Licenses report.
  *
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @version $Id$
  * @since 2.0
  */
 @Mojo( name = "license" )
-public class LicenseReport
+public class LicensesReport
     extends AbstractProjectInfoReport
 {
     // ----------------------------------------------------------------------
@@ -138,8 +138,8 @@ public class LicenseReport
     @Override
     public void executeReport( Locale locale )
     {
-        LicenseRenderer r =
-            new LicenseRenderer( getSink(), getProject(), getI18N( locale ), locale, settings,
+        LicensesRenderer r =
+            new LicensesRenderer( getSink(), getProject(), getI18N( locale ), locale, settings,
                                  linkOnly, licenseFileEncoding );
 
         r.render();
@@ -156,7 +156,7 @@ public class LicenseReport
     @Override
     protected String getI18Nsection()
     {
-        return "license";
+        return "licenses";
     }
 
     /**
@@ -220,7 +220,7 @@ public class LicenseReport
     /**
      * Internal renderer class
      */
-    private static class LicenseRenderer
+    private static class LicensesRenderer
         extends AbstractProjectInfoRenderer
     {
         private final MavenProject project;
@@ -231,7 +231,7 @@ public class LicenseReport
 
         private final String licenseFileEncoding;
 
-        LicenseRenderer( Sink sink, MavenProject project, I18N i18n, Locale locale, Settings settings,
+        LicensesRenderer( Sink sink, MavenProject project, I18N i18n, Locale locale, Settings settings,
                          boolean linkOnly, String licenseFileEncoding )
         {
             super( sink, i18n, locale );
@@ -248,7 +248,7 @@ public class LicenseReport
         @Override
         protected String getI18Nsection()
         {
-            return "license";
+            return "licenses";
         }
 
         @Override

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=1732680&r1=1732679&r2=1732680&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 Feb 27 23:31:53 2016
@@ -92,7 +92,7 @@ public class PluginManagementReport
     @Override
     protected String getI18Nsection()
     {
-        return "pluginManagement";
+        return "plugin-management";
     }
 
     @Override
@@ -165,7 +165,7 @@ public class PluginManagementReport
         @Override
         protected String getI18Nsection()
         {
-            return "pluginManagement";
+            return "plugin-management";
         }
 
         @Override
@@ -248,9 +248,9 @@ public class PluginManagementReport
         private String[] getPluginTableHeader()
         {
             // reused key...
-            String groupId = getI18nString( "dependencyManagement", "column.groupId" );
-            String artifactId = getI18nString( "dependencyManagement", "column.artifactId" );
-            String version = getI18nString( "dependencyManagement", "column.version" );
+            String groupId = getI18nString( "dependency-management", "column.groupId" );
+            String artifactId = getI18nString( "dependency-management", "column.artifactId" );
+            String version = getI18nString( "dependency-management", "column.version" );
             return new String[] { groupId, artifactId, version };
         }
 

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=1732680&r1=1732679&r2=1732680&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 Feb 27 23:31:53 2016
@@ -192,7 +192,7 @@ public class PluginsReport
             List<GAV> list = isPlugins ? GAV.pluginsToGAV( plugins ) : GAV.reportPluginsToGAV( reports, project );
             String[] tableHeader = getPluginTableHeader();
 
-            startSection( getI18nString( isPlugins ? "title" : "report.title" ) );
+            startSection( getI18nString( isPlugins ? "build.title" : "report.title" ) );
 
             if ( list == null || list.isEmpty() )
             {
@@ -248,9 +248,9 @@ public class PluginsReport
         private String[] getPluginTableHeader()
         {
             // reused key...
-            String groupId = getI18nString( "dependencyManagement", "column.groupId" );
-            String artifactId = getI18nString( "dependencyManagement", "column.artifactId" );
-            String version = getI18nString( "dependencyManagement", "column.version" );
+            String groupId = getI18nString( "dependency-management", "column.groupId" );
+            String artifactId = getI18nString( "dependency-management", "column.artifactId" );
+            String version = getI18nString( "dependency-management", "column.version" );
             return new String[] { groupId, artifactId, version };
         }
 
@@ -342,7 +342,7 @@ public class PluginsReport
          * <li>search similar (same groupId and artifactId) mojo in the build/pluginManagement section of the pom,</li>
          * <li>default value is RELEASE.</li>
          * </ol>
-         * 
+         *
          * @param reportPlugin the report plugin to resolve the version
          * @param project the current project
          * @return the report plugin version
@@ -383,7 +383,7 @@ public class PluginsReport
 
         /**
          * Search similar (same groupId and artifactId) plugin as a given report plugin.
-         * 
+         *
          * @param reportPlugin the report plugin to search for a similar plugin
          * @param plugins the candidate plugins
          * @return the first similar plugin

Copied: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java (from r1732655, maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java?p2=maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java&p1=maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java&r1=1732655&r2=1732680&rev=1732680&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java Sat Feb 27 23:31:53 2016
@@ -34,14 +34,14 @@ import java.io.IOException;
 import java.util.Locale;
 
 /**
- * Generates the project information reports summary.
+ * Generates the project summary report.
  *
  * @author Edwin Punzalan
  * @version $Id$
  * @since 2.0
  */
 @Mojo( name = "summary" )
-public class ProjectSummaryReport
+public class SummaryReport
     extends AbstractProjectInfoReport
 {
     // ----------------------------------------------------------------------

Copied: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java (from r1732655, 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/TeamReport.java?p2=maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java&p1=maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java&r1=1732655&r2=1732680&rev=1732680&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/TeamReport.java Sat Feb 27 23:31:53 2016
@@ -45,7 +45,7 @@ import org.codehaus.plexus.util.StringUt
  * @since 2.0
  */
 @Mojo( name = "project-team" )
-public class TeamListReport
+public class TeamReport
     extends AbstractProjectInfoReport
 {
     /**
@@ -54,7 +54,8 @@ public class TeamListReport
      * <p/>
      * Future versions of this plugin may choose to implement different strategies for resolving avatar images, possibly
      * using different providers.
-     *
+     *<p>
+     *<strong>Note</strong>: This property will be renamed to {@code tteam.showAvatarImages} in 3.0.
      * @since 2.6
      */
     @Parameter( property = "teamlist.showAvatarImages", defaultValue = "true" )
@@ -81,8 +82,8 @@ public class TeamListReport
     public void executeReport( Locale locale )
     {
         // CHECKSTYLE_OFF: LineLength
-        TeamListRenderer r =
-            new TeamListRenderer( getSink(), project.getModel(), getI18N( locale ), locale, getLog(), showAvatarImages );
+        ProjectTeamRenderer r =
+            new ProjectTeamRenderer( getSink(), project.getModel(), getI18N( locale ), locale, getLog(), showAvatarImages );
         // CHECKSTYLE_ON: LineLength
 
         r.render();
@@ -99,7 +100,7 @@ public class TeamListReport
     @Override
     protected String getI18Nsection()
     {
-        return "team-list";
+        return "team";
     }
 
     // ----------------------------------------------------------------------
@@ -109,7 +110,7 @@ public class TeamListReport
     /**
      * Internal renderer class
      */
-    private static class TeamListRenderer
+    private static class ProjectTeamRenderer
         extends AbstractProjectInfoRenderer
     {
         private static final String PROPERTIES = "properties";
@@ -138,7 +139,7 @@ public class TeamListReport
 
         private final boolean showAvatarImages;
 
-        TeamListRenderer( Sink sink, Model model, I18N i18n, Locale locale, Log log, boolean showAvatarImages )
+        ProjectTeamRenderer( Sink sink, Model model, I18N i18n, Locale locale, Log log, boolean showAvatarImages )
         {
             super( sink, i18n, locale );
 
@@ -150,7 +151,7 @@ public class TeamListReport
         @Override
         protected String getI18Nsection()
         {
-            return "team-list";
+            return "team";
         }
 
         @Override

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=1732680&r1=1732679&r2=1732680&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 Feb 27 23:31:53 2016
@@ -380,7 +380,7 @@ public class DependenciesRenderer
         String version = getI18nString( "column.version" );
         String classifier = getI18nString( "column.classifier" );
         String type = getI18nString( "column.type" );
-        String license = getI18nString( "column.license" );
+        String license = getI18nString( "column.licenses" );
         String optional = getI18nString( "column.optional" );
 
         if ( withClassifier )
@@ -1042,7 +1042,7 @@ public class DependenciesRenderer
 
                 sink.paragraph();
                 sink.bold();
-                sink.text( getI18nString( "license", "title" ) + ": " );
+                sink.text( getI18nString( "licenses", "title" ) + ": " );
                 sink.bold_();
                 if ( !licenses.isEmpty() )
                 {
@@ -1080,7 +1080,7 @@ public class DependenciesRenderer
                 }
                 else
                 {
-                    sink.text( getI18nString( "license", "nolicense" ) );
+                    sink.text( getI18nString( "licenses", "nolicense" ) );
 
                     licenseMap.put( unknownLicenseMessage, artifactName );
                 }

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=1732680&r1=1732679&r2=1732680&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 Feb 27 23:31:53 2016
@@ -113,7 +113,7 @@ public class DependencyManagementRendere
     @Override
     protected String getI18Nsection()
     {
-        return "dependencyManagement";
+        return "dependency-management";
     }
 
     @Override

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports.properties?rev=1732680&r1=1732679&r2=1732680&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports.properties Sat Feb 27 23:31:53 2016
@@ -15,35 +15,35 @@
 # specific language governing permissions and limitations
 # under the License.
 
-report.cim.access                                                  = Access
-report.cim.anthill.intro                                           = This project uses {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
-report.cim.bamboo.intro                                            = This project uses {Bamboo, http://www.atlassian.com/software/bamboo/}.
-report.cim.buildforge.intro                                        = This project uses {Build Forge, http://www-306.ibm.com/software/awdtools/buildforge/enterprise/}.
-report.cim.continuum.intro                                         = This project uses {Continuum, http://continuum.apache.org/}.
-report.cim.cruisecontrol.intro                                     = This project uses {CruiseControl, http://cruisecontrol.sourceforge.net/}.
-report.cim.description                                             = This is a link to the definitions of all continuous integration processes that builds and tests code on a frequent, regular basis.
-report.cim.general.intro                                           = This project uses Continuous Integration System.
-report.cim.hudson.intro                                            = This project uses {Hudson, http://hudson-ci.org/}.
-report.cim.jenkins.intro                                           = This project uses {Jenkins, http://jenkins-ci.org/}.
-report.cim.luntbuild.intro                                         = This project uses {Luntbuild, http://luntbuild.javaforge.com/}.
-report.cim.travis.intro                                            = This project uses {Travis CI, https://travis-ci.org/}.
-report.cim.name                                                    = Continuous Integration
-report.cim.nocim                                                   = No continuous integration management system is defined. Please check back at a later date.
-report.cim.notifiers.column.address                                = Address
-report.cim.notifiers.column.configuration                          = Configuration
-report.cim.notifiers.column.type                                   = Type
-report.cim.notifiers.intro                                         = Configuration for notifying developers/users when a build is unsuccessful, including user information and notification mode.
-report.cim.notifiers.nolist                                        = No notifiers are defined. Please check back at a later date.
-report.cim.notifiers.title                                         = Notifiers
-report.cim.nourl                                                   = No url to the continuous integration system is defined.
-report.cim.overview.title                                          = Overview
-report.cim.title                                                   = Continuous Integration
-report.cim.url                                                     = The following is a link to the continuous integration system used by the project:
+report.ci-management.access                                        = Access
+report.ci-management.anthill.intro                                 = This project uses {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
+report.ci-management.bamboo.intro                                  = This project uses {Bamboo, http://www.atlassian.com/software/bamboo/}.
+report.ci-management.buildforge.intro                              = This project uses {Build Forge, http://www-306.ibm.com/software/awdtools/buildforge/enterprise/}.
+report.ci-management.continuum.intro                               = This project uses {Continuum, http://continuum.apache.org/}.
+report.ci-management.cruisecontrol.intro                           = This project uses {CruiseControl, http://cruisecontrol.sourceforge.net/}.
+report.ci-management.description                                   = This is a link to the definitions of all continuous integration processes that builds and tests code on a frequent, regular basis.
+report.ci-management.general.intro                                 = This project uses Continuous Integration System.
+report.ci-management.hudson.intro                                  = This project uses {Hudson, http://hudson-ci.org/}.
+report.ci-management.jenkins.intro                                 = This project uses {Jenkins, http://jenkins-ci.org/}.
+report.ci-management.luntbuild.intro                               = This project uses {Luntbuild, http://luntbuild.javaforge.com/}.
+report.ci-management.travis.intro                                  = This project uses {Travis CI, https://travis-ci.org/}.
+report.ci-management.name                                          = CI Management
+report.ci-management.nocim                                         = No continuous integration management system is defined. Please check back at a later date.
+report.ci-management.notifiers.column.address                      = Address
+report.ci-management.notifiers.column.configuration                = Configuration
+report.ci-management.notifiers.column.type                         = Type
+report.ci-management.notifiers.intro                               = Configuration for notifying developers/users when a build is unsuccessful, including user information and notification mode.
+report.ci-management.notifiers.nolist                              = No notifiers are defined. Please check back at a later date.
+report.ci-management.notifiers.title                               = Notifiers
+report.ci-management.nourl                                         = No url to the continuous integration system is defined.
+report.ci-management.overview.title                                = Overview
+report.ci-management.title                                         = CI Management
+report.ci-management.url                                           = The following is a link to the continuous integration system used by the project:
 report.dependencies.column.artifactId                              = ArtifactId
 report.dependencies.column.classifier                              = Classifier
 report.dependencies.column.description                             = Description
 report.dependencies.column.groupId                                 = GroupId
-report.dependencies.column.license                                 = License
+report.dependencies.column.licenses                                = Licenses
 report.dependencies.column.optional                                = Optional
 report.dependencies.column.isOptional                              = Yes
 report.dependencies.column.isNotOptional                           = No
@@ -130,27 +130,27 @@ report.dependency-info.title
 report.dependency-info.description                                 = This document describes how to to include this project as a dependency using various dependency management tools.
 report.index.nodescription                                         = There is currently no description associated with this project.
 report.index.title                                                 = About
-report.issuetracking.bugzilla.intro                                = This project uses {Bugzilla, http://www.bugzilla.org/}.
-report.issuetracking.custom.intro                                  = This project uses %issueManagementSystem% to manage its issues.
-report.issuetracking.description                                   = This document provides information on the issue management system used in this project.
-report.issuetracking.general.intro                                 = This project uses an Issue Management System to manage its issues.
-report.issuetracking.intro                                         = Issues, bugs, and feature requests should be submitted to the following issue tracking system for this project.
-report.issuetracking.jira.intro                                    = This project uses {JIRA, http://www.atlassian.com/software/jira}.
-report.issuetracking.name                                          = Issue Tracking
-report.issuetracking.noissueManagement                             = No issue management system is defined. Please check back at a later date.
-report.issuetracking.overview.title                                = Overview
-report.issuetracking.scarab.intro                                  = This project uses {Scarab, http://scarab.tigris.org/}.
-report.issuetracking.title                                         = Issue Tracking
-report.license.description                                         = This document lists the project license(s).
-report.license.multiple                                            = This project is provided under multiple licenses:
-report.license.name                                                = Project License
-report.license.nolicense                                           = No license is defined for this project.
-report.license.overview.intro                                      = Typically the licenses listed for the project are that of the project itself, and not of dependencies.
-report.license.overview.title                                      = Overview
-report.license.originalText                                        = [Original text]
-report.license.copy                                                = Copy of the license follows:
-report.license.title                                               = Project License
-report.license.unnamed                                             = Unnamed
+report.issue-management.bugzilla.intro                             = This project uses {Bugzilla, http://www.bugzilla.org/}.
+report.issue-management.custom.intro                               = This project uses %issueManagementSystem% to manage its issues.
+report.issue-management.description                                = This document provides information on the issue management system used in this project.
+report.issue-management.general.intro                              = This project uses an issue management system to manage its issues.
+report.issue-management.intro                                      = Issues, bugs, and feature requests should be submitted to the following issue management system for this project.
+report.issue-management.jira.intro                                 = This project uses {JIRA, http://www.atlassian.com/software/jira}.
+report.issue-management.name                                       = Issue Management
+report.issue-management.noissueManagement                          = No issue management system is defined. Please check back at a later date.
+report.issue-management.overview.title                             = Overview
+report.issue-management.scarab.intro                               = This project uses {Scarab, http://scarab.tigris.org/}.
+report.issue-management.title                                      = Issue Management
+report.licenses.description                                        = This document lists the project license(s).
+report.licenses.multiple                                           = This project is provided under multiple licenses:
+report.licenses.name                                               = Licenses
+report.licenses.nolicense                                          = No licenses are defined for this project.
+report.licenses.overview.intro                                     = Typically the licenses listed for the project are that of the project itself, and not of dependencies.
+report.licenses.overview.title                                     = Overview
+report.licenses.originalText                                       = [Original text]
+report.licenses.copy                                               = Copy of the license follows:
+report.licenses.title                                              = Project Licenses
+report.licenses.unnamed                                            = Unnamed
 report.mailing-lists.column.archive                                = Archive
 report.mailing-lists.column.name                                   = Name
 report.mailing-lists.column.otherArchives                          = Other Archives
@@ -192,8 +192,8 @@ report.scm.devaccess.svn.intro1.svn
 report.scm.devaccess.svn.intro1.svnssh                             = Committers must checkout the Subversion repository via SVN+SSH.
 report.scm.devaccess.svn.intro2                                    = To commit changes to the repository, execute the following command to commit your changes (svn will prompt you for your password):
 report.scm.devaccess.title                                         = Developer Access
-report.scm.general.intro                                           = This project uses a Source Content Management System to manage its source code.
-report.scm.name                                                    = Source Repository
+report.scm.general.intro                                           = This project uses a source code management system to manage its source code.
+report.scm.name                                                    = Source Code Management
 report.scm.noscm                                                   = No source configuration management system is defined. Please check back at a later date.
 report.scm.overview.title                                          = Overview
 report.scm.git.intro                                               = This project uses {Git, http://git-scm.com/} to manage its source code. Instructions on Git use can be found at {http://git-scm.com/documentation,http://git-scm.com/documentation}.
@@ -201,8 +201,8 @@ report.scm.hg.intro
 report.scm.perforce.intro                                          = This project uses {Perforce, http://www.perforce.com/} to manage its source code. Instructions on Perforce use can be found at {http://www.perforce.com/perforce/doc.051/manuals/cmdref/index.html, http://www.perforce.com/perforce/doc.051/manuals/cmdref/index.html}.
 report.scm.starteam.intro                                          = This project uses {Starteam, http://www.borland.com/us/products/starteam/} to manage its source code.
 report.scm.svn.intro                                               = This project uses {Subversion, http://subversion.apache.org/} to manage its source code. Instructions on Subversion use can be found at {http://svnbook.red-bean.com/, http://svnbook.red-bean.com/}.
-report.scm.title                                                   = Source Repository
-report.scm.webaccess.nourl                                         = There is no browsable version of the source repository listed for this project. Please check back again later.
+report.scm.title                                                   = Source Code Management
+report.scm.webaccess.nourl                                         = There is no browsable version of the source code repository listed for this project. Please check back again later.
 report.scm.webaccess.title                                         = Web Browser Access
 report.scm.webaccess.url                                           = The following is a link to a browsable version of the source repository:
 report.summary.build.artifactid                                    = ArtifactId
@@ -217,7 +217,7 @@ report.summary.general.description
 report.summary.general.homepage                                    = Homepage
 report.summary.general.name                                        = Name
 report.summary.general.title                                       = Project Information
-report.summary.name                                                = Project Summary
+report.summary.name                                                = Summary
 report.summary.organization.name                                   = Name
 report.summary.organization.title                                  = Project Organization
 report.summary.organization.url                                    = URL
@@ -225,61 +225,62 @@ report.summary.noorganization
 report.summary.title                                               = Project Summary
 report.summary.value                                               = Value
 report.summary.download                                            = Download
-report.team-list.contributors.actualtime                           = Actual Time (GMT)
-report.team-list.contributors.email                                = Email
-report.team-list.contributors.intro                                = The following additional people have contributed to this project through the way of suggestions, patches or documentation.
-report.team-list.contributors.image                                = Image
-report.team-list.contributors.name                                 = Name
-report.team-list.contributors.organization                         = Organization
-report.team-list.contributors.organizationurl                      = Organization URL
-report.team-list.contributors.properties                           = Properties
-report.team-list.contributors.roles                                = Roles
-report.team-list.contributors.timezone                             = Time Zone
-report.team-list.contributors.title                                = Contributors
-report.team-list.contributors.url                                  = URL
-report.team-list.description                                       = This document provides information on the members of this project. These are the individuals who have contributed to the project in one form or another.
-report.team-list.developers.actualtime                             = Actual Time (GMT)
-report.team-list.developers.email                                  = Email
-report.team-list.developers.image                                  = Image
-report.team-list.developers.id                                     = Id
-report.team-list.developers.intro                                  = The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.
-report.team-list.developers.name                                   = Name
-report.team-list.developers.organization                           = Organization
-report.team-list.developers.organizationurl                        = Organization URL
-report.team-list.developers.properties                             = Properties
-report.team-list.developers.roles                                  = Roles
-report.team-list.developers.timezone                               = Time Zone
-report.team-list.developers.title                                  = Members
-report.team-list.developers.url                                    = URL
-report.team-list.intro.description1                                = A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.
-report.team-list.intro.description2                                = The team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.
-report.team-list.intro.title                                       = The Team
-report.team-list.name                                              = Project Team
-report.team-list.nocontributor                                     = There are no contributors listed for this project. Please check back again later.
-report.team-list.nodeveloper                                       = There are no developers working on this project.
-report.team-list.title                                             = Project Team
-report.dependencyManagement.name                                   = Dependency Management
-report.dependencyManagement.description                            = This document lists the dependencies that are defined through dependencyManagement.
-report.dependencyManagement.title                                  = Project Dependency Management
-report.dependencyManagement.nolist                                 = There are no dependencies in the DependencyManagement of this project.
-report.dependencyManagement.column.groupId                         = GroupId
-report.dependencyManagement.column.artifactId                      = ArtifactId
-report.dependencyManagement.column.version                         = Version
-report.dependencyManagement.column.classifier                      = Classifier
-report.dependencyManagement.column.type                            = Type
-report.dependencyManagement.column.license                         = License
-report.dependencyManagement.intro.compile                          = The following is a list of compile dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to compile and run the submodule:
-report.dependencyManagement.intro.provided                         = The following is a list of provided dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to compile the submodule, but should be provided by default when using the library:
-report.dependencyManagement.intro.runtime                          = The following is a list of runtime dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to run the submodule:
-report.dependencyManagement.intro.system                           = The following is a list of system dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to compile the submodule:
-report.dependencyManagement.intro.test                             = The following is a list of test dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to compile and run unit tests for the submodule:
-report.pluginManagement.nolist                                     = There are no plugins defined in the PluginManagement part of this project.
-report.pluginManagement.name                                       = Plugin Management
-report.pluginManagement.description                                = This document lists the plugins that are defined through pluginManagement.
-report.pluginManagement.title                                      = Project Plugin Management
-report.plugins.name                                                = Project Plugins
+report.team.contributors.actualtime                                = Actual Time (GMT)
+report.team.contributors.email                                     = Email
+report.team.contributors.intro                                     = The following additional people have contributed to this project through the way of suggestions, patches or documentation.
+report.team.contributors.image                                     = Image
+report.team.contributors.name                                      = Name
+report.team.contributors.organization                              = Organization
+report.team.contributors.organizationurl                           = Organization URL
+report.team.contributors.properties                                = Properties
+report.team.contributors.roles                                     = Roles
+report.team.contributors.timezone                                  = Time Zone
+report.team.contributors.title                                     = Contributors
+report.team.contributors.url                                       = URL
+report.team.description                                            = This document provides information on the members of this project. These are the individuals who have contributed to the project in one form or another.
+report.team.developers.actualtime                                  = Actual Time (GMT)
+report.team.developers.email                                       = Email
+report.team.developers.image                                       = Image
+report.team.developers.id                                          = Id
+report.team.developers.intro                                       = The following is a list of developers with commit privileges that have directly contributed to the project in one way or another.
+report.team.developers.name                                        = Name
+report.team.developers.organization                                = Organization
+report.team.developers.organizationurl                             = Organization URL
+report.team.developers.properties                                  = Properties
+report.team.developers.roles                                       = Roles
+report.team.developers.timezone                                    = Time Zone
+report.team.developers.title                                       = Members
+report.team.developers.url                                         = URL
+report.team.intro.description1                                     = A successful project requires many people to play many roles. Some members write code or documentation, while others are valuable as testers, submitting patches and suggestions.
+report.team.intro.description2                                     = The project team is comprised of Members and Contributors. Members have direct access to the source of a project and actively evolve the code-base. Contributors improve the project through submission of patches and suggestions to the Members. The number of Contributors to the project is unbounded. Get involved today. All contributions to the project are greatly appreciated.
+report.team.intro.title                                            = Project Team
+report.team.name                                                   = Team
+report.team.nocontributor                                          = There are no contributors listed for this project. Please check back again later.
+report.team.nodeveloper                                            = There are no developers working on this project.
+report.team.title                                                  = Project Team
+report.dependency-management.name                                  = Dependency Management
+report.dependency-management.description                           = This document lists the dependencies that are defined through dependencyManagement.
+report.dependency-management.title                                 = Project Dependency Management
+report.dependency-management.nolist                                = There are no dependencies in the DependencyManagement of this project.
+report.dependency-management.column.groupId                        = GroupId
+report.dependency-management.column.artifactId                     = ArtifactId
+report.dependency-management.column.version                        = Version
+report.dependency-management.column.classifier                     = Classifier
+report.dependency-management.column.type                           = Type
+report.dependency-management.column.license                        = License
+report.dependency-management.intro.compile                         = The following is a list of compile dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to compile and run the submodule:
+report.dependency-management.intro.provided                        = The following is a list of provided dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to compile the submodule, but should be provided by default when using the library:
+report.dependency-management.intro.runtime                         = The following is a list of runtime dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to run the submodule:
+report.dependency-management.intro.system                          = The following is a list of system dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to compile the submodule:
+report.dependency-management.intro.test                            = The following is a list of test dependencies in the DependencyManagement of this project. These dependencies can be included in the submodules to compile and run unit tests for the submodule:
+report.plugin-management.nolist                                    = There are no plugins defined in the PluginManagement part of this project.
+report.plugin-management.name                                      = Plugin Management
+report.plugin-management.description                               = This document lists the plugins that are defined through pluginManagement.
+report.plugin-management.title                                     = Project Plugin Management
+report.plugins.name                                                = Plugins
 report.plugins.description                                         = This document lists the build plugins and the report plugins used by this project.
-report.plugins.title                                               = Project Build Plugins
+report.plugins.title                                               = Project Plugins
+report.plugins.build.title                                         = Project Build Plugins
 report.plugins.report.title                                        = Project Report Plugins
 report.plugins.nolist                                              = There are no plugins defined in the Build part of this project.
 report.plugins.report.nolist                                       = There are no plugins reports defined in the Reporting part of this project.
@@ -290,20 +291,20 @@ report.modules.title
 report.modules.intro                                               = This project has declared the following modules:
 report.modules.header.name                                         = Name
 report.modules.header.description                                  = Description
-report.distributionManagement.name                                 = Distribution Management
-report.distributionManagement.description                          = This document provides informations on the distribution management of this project.
-report.distributionManagement.title                                = Project Distribution Management
-report.distributionManagement.nodistributionmanagement             = No distribution management is defined for this project.
-report.distributionManagement.overview.title                       = Overview
-report.distributionManagement.overview.intro                       = The following is the distribution management information used by this project.
-report.distributionManagement.downloadURL                          = Download URL
-report.distributionManagement.repository                           = Repository
-report.distributionManagement.snapshotRepository                   = Snapshot Repository
-report.distributionManagement.site                                 = Site
-report.distributionManagement.relocation                           = Relocation
-report.distributionManagement.field                                = Field
-report.distributionManagement.value                                = Value
-report.distributionManagement.relocation.groupid                   = GroupId
-report.distributionManagement.relocation.artifactid                = ArtifactId
-report.distributionManagement.relocation.version                   = Version
-report.distributionManagement.relocation.message                   = Message
+report.distribution-management.name                                = Distribution Management
+report.distribution-management.description                         = This document provides informations on the distribution management of this project.
+report.distribution-management.title                               = Project Distribution Management
+report.distribution-management.nodistributionmanagement            = No distribution management is defined for this project.
+report.distribution-management.overview.title                      = Overview
+report.distribution-management.overview.intro                      = The following is the distribution management information used by this project.
+report.distribution-management.downloadURL                         = Download URL
+report.distribution-management.repository                          = Repository
+report.distribution-management.snapshotRepository                  = Snapshot Repository
+report.distribution-management.site                                = Site
+report.distribution-management.relocation                          = Relocation
+report.distribution-management.field                               = Field
+report.distribution-management.value                               = Value
+report.distribution-management.relocation.groupid                  = GroupId
+report.distribution-management.relocation.artifactid               = ArtifactId
+report.distribution-management.relocation.version                  = Version
+report.distribution-management.relocation.message                  = Message