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 2018/06/17 10:27:21 UTC

[maven-project-info-reports-plugin] 01/01: [MPIR-323] Align Mojo class names, goals and output names

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch MPIR-323
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git

commit 16d5c82af4c0d4342932474c39936e74227357ef
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Jun 17 12:26:41 2018 +0200

    [MPIR-323] Align Mojo class names, goals and output names
---
 pom.xml                                            |  1 -
 src/it/MPIR-242/pom.xml                            |  2 +-
 src/it/MPIR-242/verify.groovy                      | 46 +++++++++++-----------
 src/it/full-pom/pom.xml                            | 10 ++---
 src/it/full-pom/verify.bsh                         | 20 +++++-----
 src/it/java-version/verify.groovy                  |  6 +--
 src/it/minimal-pom/verify.bsh                      | 12 +++---
 .../report/projectinfo/CiManagementReport.java     |  4 +-
 .../report/projectinfo/IssueManagementReport.java  |  4 +-
 .../maven/report/projectinfo/LicensesReport.java   |  4 +-
 .../report/projectinfo/MailingListsReport.java     |  4 +-
 .../apache/maven/report/projectinfo/ScmReport.java |  2 +-
 .../maven/report/projectinfo/SummaryReport.java    |  2 +-
 .../maven/report/projectinfo/TeamReport.java       |  4 +-
 src/site/apt/examples/custom-report.apt.vm         |  2 +-
 ...nfo-reports.apt.vm => selective-reports.apt.vm} | 10 ++---
 src/site/apt/index.apt.vm                          | 20 +++++-----
 src/site/site.xml                                  |  2 +-
 .../report/projectinfo/CiManagementReportTest.java |  6 +--
 .../projectinfo/IssueManagementReportTest.java     |  6 +--
 .../report/projectinfo/LicensesReportTest.java     | 12 +++---
 .../report/projectinfo/MailingListsReportTest.java | 10 ++---
 .../maven/report/projectinfo/ScmReportTest.java    |  4 +-
 .../report/projectinfo/SummaryReportTest.java      |  4 +-
 .../maven/report/projectinfo/TeamReportTest.java   |  6 +--
 25 files changed, 101 insertions(+), 102 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4e2b03f..a5b4652 100644
--- a/pom.xml
+++ b/pom.xml
@@ -482,7 +482,6 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>${project.version}</version>
       </plugin>
     </plugins>
   </reporting>
diff --git a/src/it/MPIR-242/pom.xml b/src/it/MPIR-242/pom.xml
index 3504a16..364c2e5 100644
--- a/src/it/MPIR-242/pom.xml
+++ b/src/it/MPIR-242/pom.xml
@@ -65,7 +65,7 @@
         <reportSets>
           <reportSet>
             <reports>
-              <report>license</report>
+              <report>licenses</report>
             </reports>
           </reportSet>
         </reportSets>
diff --git a/src/it/MPIR-242/verify.groovy b/src/it/MPIR-242/verify.groovy
index 2592c90..25de060 100644
--- a/src/it/MPIR-242/verify.groovy
+++ b/src/it/MPIR-242/verify.groovy
@@ -1,23 +1,23 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-File licensePage = new File( basedir, 'target/site/license.html' )
-assert licensePage.exists()
-// assert licensePage.text.contains( 'Свобода всему коду!' )
-// Raw UTF-8 bytes written by Doxia and converted from ISO-8859-5
-assert licensePage.text.contains( '&#x421;&#x432;&#x43e;&#x431;&#x43e;&#x434;&#x430; &#x432;&#x441;&#x435;&#x43c;&#x443; &#x43a;&#x43e;&#x434;&#x443;!' )
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+File licensesPage = new File( basedir, 'target/site/licenses.html' )
+assert licensesPage.exists()
+// assert licensesPage.text.contains( 'Свобода всему коду!' )
+// Raw UTF-8 bytes written by Doxia and converted from ISO-8859-5
+assert licensesPage.text.contains( '&#x421;&#x432;&#x43e;&#x431;&#x43e;&#x434;&#x430; &#x432;&#x441;&#x435;&#x43c;&#x443; &#x43a;&#x43e;&#x434;&#x443;!' )
diff --git a/src/it/full-pom/pom.xml b/src/it/full-pom/pom.xml
index 5a5a59e..7080b7c 100644
--- a/src/it/full-pom/pom.xml
+++ b/src/it/full-pom/pom.xml
@@ -201,16 +201,16 @@
             <reports>
               <report>index</report>
               <report>summary</report>
-              <report>license</report>
-              <report>project-team</report>
+              <report>licenses</report>
+              <report>team</report>
               <report>scm</report>
-              <report>issue-tracking</report>
-              <report>mailing-list</report>
+              <report>issue-management</report>
+              <report>mailing-lists</report>
               <report>dependency-info</report>
               <report>dependency-management</report>
               <report>dependencies</report>
               <report>dependency-convergence</report>
-              <report>cim</report>
+              <report>ci-management</report>
               <report>plugin-management</report>
               <report>plugins</report>
               <report>distribution-management</report>
diff --git a/src/it/full-pom/verify.bsh b/src/it/full-pom/verify.bsh
index d49f305..ba90103 100644
--- a/src/it/full-pom/verify.bsh
+++ b/src/it/full-pom/verify.bsh
@@ -32,17 +32,17 @@ try
     }
 
     String[] reports = { "index",                  // <report>index</report>
-                         "project-summary",        // <report>summary</report>
-                         "license",                // <report>license</report>
-                         "team-list",              // <report>project-team</report>
-                         "source-repository",      // <report>scm</report>
-                         "issue-tracking",         // <report>issue-tracking</report>
-                         "mail-lists",             // <report>mailing-list</report>
+                         "summary",                // <report>summary</report>
+                         "licenses",               // <report>licenses</report>
+                         "team",                   // <report>team</report>
+                         "scm",                    // <report>scm</report>
+                         "issue-management",       // <report>issue-management</report>
+                         "mailing-lists",          // <report>mailing-lists</report>
                          "dependency-info",        // <report>dependency-info</report>
                          "dependency-management",  // <report>dependency-management</report>
                          "dependencies",           // <report>dependencies</report>
                          "dependency-convergence", // <report>dependency-convergence</report>
-                         "integration",            // <report>cim</report>
+                         "ci-management",          // <report>ci-management</report>
                          "plugin-management",      // <report>plugin-management</report>
                          "plugins",                // <report>plugins</report>
                          "distribution-management" // <report>distribution-management</report>
@@ -83,11 +83,11 @@ try
         previousReportLink = link;
     }
 
-    File maillist = new File( siteDir, "mail-lists.html");
-    String content = FileUtils.fileRead( maillist, "UTF-8" );
+    File mailinglists = new File( siteDir, "mailing-lists.html");
+    String content = FileUtils.fileRead( mailinglists, "UTF-8" );
     if ( !content.contains( "mail list intro text foo" ) )
     {
-        System.err.println( "mail-lists.html doesn't contain mail list intro text foo" );
+        System.err.println( "mailing-lists.html doesn't contain mail list intro text foo" );
         return false;
     }
 
diff --git a/src/it/java-version/verify.groovy b/src/it/java-version/verify.groovy
index 319eaee..e65beba 100644
--- a/src/it/java-version/verify.groovy
+++ b/src/it/java-version/verify.groovy
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-assert new File( basedir, 'plugin/target/site/project-summary.html' ).text.contains( '<td>1.5</td>' )
-assert new File( basedir, 'pluginManagement/target/site/project-summary.html' ).text.contains( '<td>1.4</td>' )
-assert new File( basedir, 'property/target/site/project-summary.html' ).text.contains( '<td>1.3</td>' )
+assert new File( basedir, 'plugin/target/site/summary.html' ).text.contains( '<td>1.5</td>' )
+assert new File( basedir, 'pluginManagement/target/site/summary.html' ).text.contains( '<td>1.4</td>' )
+assert new File( basedir, 'property/target/site/summary.html' ).text.contains( '<td>1.3</td>' )
 
 return true;
\ No newline at end of file
diff --git a/src/it/minimal-pom/verify.bsh b/src/it/minimal-pom/verify.bsh
index 9d5e607..9ca4f99 100644
--- a/src/it/minimal-pom/verify.bsh
+++ b/src/it/minimal-pom/verify.bsh
@@ -35,17 +35,17 @@ try
                          "plugin-management",
                          "plugins",
                          "project-info",
-                         "project-summary"
+                         "summary"
                        };
 
     String[] skippedReports = { "dependencies",
                                 "integration",
-                                "issue-tracking",
-                                "license",
-                                "mail-lists",
-                                "source-repository",
+                                "issue-management",
+                                "licenses",
+                                "mailing-lists",
+                                "scm",
                                 "dependency-management",
-                                "team-list",
+                                "team",
                                 "distribution-management",
                                 "modules"
                               };
diff --git a/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java
index fad1d19..e6848a9 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/CiManagementReport.java
@@ -36,7 +36,7 @@ import java.util.Locale;
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton </a>
  * @since 2.0
  */
-@Mojo( name = "cim" )
+@Mojo( name = "ci-management" )
 public class CiManagementReport
     extends AbstractProjectInfoReport
 {
@@ -69,7 +69,7 @@ public class CiManagementReport
     /** {@inheritDoc} */
     public String getOutputName()
     {
-        return "integration";
+        return "ci-management";
     }
 
     @Override
diff --git a/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java b/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java
index e849c9c..4aff944 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/IssueManagementReport.java
@@ -34,7 +34,7 @@ import java.util.Locale;
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton </a>
  * @since 2.0
  */
-@Mojo( name = "issue-tracking" )
+@Mojo( name = "issue-management" )
 public class IssueManagementReport
     extends AbstractProjectInfoReport
 {
@@ -66,7 +66,7 @@ public class IssueManagementReport
     /** {@inheritDoc} */
     public String getOutputName()
     {
-        return "issue-tracking";
+        return "issue-management";
     }
 
     @Override
diff --git a/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java b/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java
index 15baca4..26d3484 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/LicensesReport.java
@@ -45,7 +45,7 @@ import java.util.regex.Pattern;
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @since 2.0
  */
-@Mojo( name = "license" )
+@Mojo( name = "licenses" )
 public class LicensesReport
     extends AbstractProjectInfoReport
 {
@@ -149,7 +149,7 @@ public class LicensesReport
      */
     public String getOutputName()
     {
-        return "license";
+        return "licenses";
     }
 
     @Override
diff --git a/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java b/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
index d2342f0..1b88289 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
@@ -39,7 +39,7 @@ import java.util.Locale;
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton </a>
  * @since 2.0
  */
-@Mojo( name = "mailing-list" )
+@Mojo( name = "mailing-lists" )
 public class MailingListsReport
     extends AbstractProjectInfoReport
 {
@@ -73,7 +73,7 @@ public class MailingListsReport
      */
     public String getOutputName()
     {
-        return "mail-lists";
+        return "mailing-lists";
     }
 
     @Override
diff --git a/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java b/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
index 1f8f196..c0258de 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
@@ -140,7 +140,7 @@ public class ScmReport
     /** {@inheritDoc} */
     public String getOutputName()
     {
-        return "source-repository";
+        return "scm";
     }
 
     @Override
diff --git a/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java b/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
index a99ce06..8d0102b 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/SummaryReport.java
@@ -61,7 +61,7 @@ public class SummaryReport
     /** {@inheritDoc} */
     public String getOutputName()
     {
-        return "project-summary";
+        return "summary";
     }
 
     @Override
diff --git a/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java b/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
index efd30e6..aa6df44 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/TeamReport.java
@@ -43,7 +43,7 @@ import org.codehaus.plexus.util.StringUtils;
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton </a>
  * @since 2.0
  */
-@Mojo( name = "project-team" )
+@Mojo( name = "team" )
 public class TeamReport
     extends AbstractProjectInfoReport
 {
@@ -93,7 +93,7 @@ public class TeamReport
      */
     public String getOutputName()
     {
-        return "team-list";
+        return "team";
     }
 
     @Override
diff --git a/src/site/apt/examples/custom-report.apt.vm b/src/site/apt/examples/custom-report.apt.vm
index 7049e68..89bd840 100644
--- a/src/site/apt/examples/custom-report.apt.vm
+++ b/src/site/apt/examples/custom-report.apt.vm
@@ -53,7 +53,7 @@ Customize the Text Reports
 
   To change texts in the reports, you should import the default Project Info report bundles from
   {{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/}}
-  and edit them. For example, if you want to modify the Mailing List introduction, you should edit the <<<report.mailing-lists.intro>>> property.
+  and edit them. For example, if you want to modify the Mailing Lists introduction, you should edit the <<<report.mailing-lists.intro>>> property.
 
   Extract of the default bundle {{{http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-reports.properties}project-info-reports.properties}}:
 
diff --git a/src/site/apt/examples/selective-project-info-reports.apt.vm b/src/site/apt/examples/selective-reports.apt.vm
similarity index 89%
rename from src/site/apt/examples/selective-project-info-reports.apt.vm
rename to src/site/apt/examples/selective-reports.apt.vm
index 03cb758..56eab95 100644
--- a/src/site/apt/examples/selective-project-info-reports.apt.vm
+++ b/src/site/apt/examples/selective-reports.apt.vm
@@ -44,11 +44,11 @@ Run Selective Reports
           <reportSet>
             <reports>
               <report>dependencies</report>
-              <report>project-team</report>
-              <report>mailing-list</report>
-              <report>cim</report>
-              <report>issue-tracking</report>
-              <report>license</report>
+              <report>team</report>
+              <report>mailing-lists</report>
+              <report>ci-management</report>
+              <report>issue-management</report>
+              <report>licenses</report>
               <report>scm</report>
             </reports>
           </reportSet>
diff --git a/src/site/apt/index.apt.vm b/src/site/apt/index.apt.vm
index e47439a..4831454 100644
--- a/src/site/apt/index.apt.vm
+++ b/src/site/apt/index.apt.vm
@@ -35,7 +35,7 @@ ${project.name}
 
  The Project Info Reports Plugin has the following goals:
 
-   * {{{./cim-mojo.html}project-info-reports:cim}} is used to generate the Project Continuous Integration
+   * {{{./ci-management-mojo.html}project-info-reports:ci-management}} is used to generate the Project Continuous Integration
    Management report.
 
    * {{{./dependencies-mojo.html}project-info-reports:dependencies}} is used to generate the Project Dependencies
@@ -58,13 +58,13 @@ ${project.name}
 
    * {{{./index-mojo.html}project-info-reports:index}} is used to generate the Project index page.
 
-   * {{{./issue-tracking-mojo.html}project-info-reports:issue-tracking}} is used to generate the Project Issue
+   * {{{./issue-management-mojo.html}project-info-reports:issue-management}} is used to generate the Project Issue
    Management report.
 
-   * {{{./license-mojo.html}project-info-reports:license}} is used to generate the Project Licenses report.
+   * {{{./licenses-mojo.html}project-info-reports:licenses}} is used to generate the Project Licenses report.
 
-   * {{{./mailing-list-mojo.html}project-info-reports:mailing-list}} is used to generate the Project Mailing
-   List report.
+   * {{{./mailing-lists-mojo.html}project-info-reports:mailing-lists}} is used to generate the Project Mailing
+   Lists report.
 
    * {{{./modules-mojo.html}project-info-reports:modules}} is used to generate the Project Modules report.
 
@@ -73,17 +73,17 @@ ${project.name}
 
    * {{{./plugins-mojo.html}project-info-reports:plugins}} is used to generate the Project Plugins report.
 
-   * {{{./project-team-mojo.html}project-info-reports:project-team}} is used to generate the Project Team report.
+   * {{{./team-mojo.html}project-info-reports:team}} is used to generate the Project Team report.
 
    * {{{./scm-mojo.html}project-info-reports:scm}} is used to generate the Project Source Code Management report.
 
    * {{{./summary-mojo.html}project-info-reports:summary}} is used to generate the Project Summary report.
 
-* Upcoming Incompatibility Notice
+* Incompatibility Notice
 
-  With the next major version (3.0) several mojos and output filenames will change fort alignment
-  with their corresponding elements in the POM. In other words, mojos will have the same names as
-  their POM counterparts. To make you aware of that, see the following table for the upcoming changes:
+  With the major version 3.0 several mojos and output filenames have been changed for alignment
+  with their corresponding elements in the POM. In other words, mojos have the same names as their
+  POM counterparts. To make you aware of that, see the following table for the upcoming changes:
 
 *----------------------*------------------------*------------------------------*-----------------------------*
 || Goal Name           || New Goal Name         || Output name                 || New Output Name            |
diff --git a/src/site/site.xml b/src/site/site.xml
index bd20b55..9fd21a8 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -33,7 +33,7 @@ under the License.
       <item name="Download" href="download.html"/>
     </menu>
     <menu name="Examples">
-      <item name="Run Selective Reports" href="examples/selective-project-info-reports.html"/>
+      <item name="Run Selective Reports" href="examples/selective-reports.html"/>
       <item name="Run Individual Reports" href="examples/individual-reports.html"/>
       <item name="Customize the SCM Report" href="examples/scm-report.html"/>
       <item name="Customize Text Reports" href="examples/custom-report.html"/>
diff --git a/src/test/java/org/apache/maven/report/projectinfo/CiManagementReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/CiManagementReportTest.java
index 53f3710..3b2b408 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/CiManagementReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/CiManagementReportTest.java
@@ -48,10 +48,10 @@ public class CiManagementReportTest
     public void testReport()
         throws Exception
     {
-        generateReport( "cim", "ci-management-plugin-config.xml" );
-        assertTrue( "Test html generated", getGeneratedReport( "integration.html" ).exists() );
+        generateReport( "ci-management", "ci-management-plugin-config.xml" );
+        assertTrue( "Test html generated", getGeneratedReport( "ci-management.html" ).exists() );
 
-        URL reportURL = getGeneratedReport( "integration.html" ).toURI().toURL();
+        URL reportURL = getGeneratedReport( "ci-management.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit
diff --git a/src/test/java/org/apache/maven/report/projectinfo/IssueManagementReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/IssueManagementReportTest.java
index 924573b..c0f77e0 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/IssueManagementReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/IssueManagementReportTest.java
@@ -49,10 +49,10 @@ public class IssueManagementReportTest
     public void testReport()
         throws Exception
     {
-        generateReport( "issue-tracking", "issue-management-plugin-config.xml" );
-        assertTrue( "Test html generated", getGeneratedReport( "issue-tracking.html" ).exists() );
+        generateReport( "issue-management", "issue-management-plugin-config.xml" );
+        assertTrue( "Test html generated", getGeneratedReport( "issue-management.html" ).exists() );
 
-        URL reportURL = getGeneratedReport( "issue-tracking.html" ).toURI().toURL();
+        URL reportURL = getGeneratedReport( "issue-management.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit
diff --git a/src/test/java/org/apache/maven/report/projectinfo/LicensesReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/LicensesReportTest.java
index 30a72b2..221e804 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/LicensesReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/LicensesReportTest.java
@@ -49,10 +49,10 @@ public class LicensesReportTest
     public void testReport()
         throws Exception
     {
-        generateReport( "license", "licenses-plugin-config.xml" );
-        assertTrue( "Test html generated", getGeneratedReport( "license.html" ).exists() );
+        generateReport( "licenses", "licenses-plugin-config.xml" );
+        assertTrue( "Test html generated", getGeneratedReport( "licenses.html" ).exists() );
 
-        URL reportURL = getGeneratedReport( "license.html" ).toURI().toURL();
+        URL reportURL = getGeneratedReport( "licenses.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit
@@ -84,10 +84,10 @@ public class LicensesReportTest
     public void testReportLinksOnly()
         throws Exception
     {
-        generateReport( "license", "licenses-plugin-config-linkonly.xml" );
-        assertTrue( "Test html generated", getGeneratedReport( "license.html" ).exists() );
+        generateReport( "licenses", "licenses-plugin-config-linkonly.xml" );
+        assertTrue( "Test html generated", getGeneratedReport( "licenses.html" ).exists() );
 
-        URL reportURL = getGeneratedReport( "license.html" ).toURI().toURL();
+        URL reportURL = getGeneratedReport( "licenses.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit
diff --git a/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java
index 1fe0f7d..27dd5c5 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java
@@ -53,10 +53,10 @@ public class MailingListsReportTest
     public void testReport()
         throws Exception
     {
-        generateReport( "mailing-list", "mailing-lists-plugin-config.xml" );
-        assertTrue( "Test html generated", getGeneratedReport( "mail-lists.html" ).exists() );
+        generateReport( "mailing-lists", "mailing-lists-plugin-config.xml" );
+        assertTrue( "Test html generated", getGeneratedReport( "mailing-lists.html" ).exists() );
 
-        URL reportURL = getGeneratedReport( "mail-lists.html" ).toURI().toURL();
+        URL reportURL = getGeneratedReport( "mailing-lists.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit
@@ -92,8 +92,8 @@ public class MailingListsReportTest
         {
             Locale.setDefault( Locale.FRENCH );
 
-            generateReport( "mailing-list", "mailing-lists-plugin-config.xml" );
-            assertTrue( "Test html generated", getGeneratedReport( "mail-lists.html" ).exists() );
+            generateReport( "mailing-lists", "mailing-lists-plugin-config.xml" );
+            assertTrue( "Test html generated", getGeneratedReport( "mailing-lists.html" ).exists() );
         }
         finally
         {
diff --git a/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java
index 58504cf..ea38fe0 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java
@@ -52,9 +52,9 @@ public class ScmReportTest
         throws Exception
     {
         generateReport( "scm", "scm-plugin-config.xml" );
-        assertTrue( "Test html generated", getGeneratedReport( "source-repository.html" ).exists() );
+        assertTrue( "Test html generated", getGeneratedReport( "scm.html" ).exists() );
 
-        URL reportURL = getGeneratedReport( "source-repository.html" ).toURI().toURL();
+        URL reportURL = getGeneratedReport( "scm.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit
diff --git a/src/test/java/org/apache/maven/report/projectinfo/SummaryReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/SummaryReportTest.java
index 2870218..8a876cd 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/SummaryReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/SummaryReportTest.java
@@ -49,9 +49,9 @@ public class SummaryReportTest
         throws Exception
     {
         generateReport( "summary", "summary-plugin-config.xml" );
-        assertTrue( "Test html generated", getGeneratedReport( "project-summary.html" ).exists() );
+        assertTrue( "Test html generated", getGeneratedReport( "summary.html" ).exists() );
 
-        URL reportURL = getGeneratedReport( "project-summary.html" ).toURI().toURL();
+        URL reportURL = getGeneratedReport( "summary.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit
diff --git a/src/test/java/org/apache/maven/report/projectinfo/TeamReportTest.java b/src/test/java/org/apache/maven/report/projectinfo/TeamReportTest.java
index 16beedb..3c4c18f 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/TeamReportTest.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/TeamReportTest.java
@@ -50,12 +50,12 @@ public class TeamReportTest
         throws Exception
     {
         File pluginXmlFile = new File( getBasedir(), "src/test/resources/plugin-configs/" + "team-plugin-config.xml" );
-        AbstractProjectInfoReport mojo  = createReportMojo( "project-team", pluginXmlFile );
+        AbstractProjectInfoReport mojo  = createReportMojo( "team", pluginXmlFile );
         setVariableValueToObject( mojo, "showAvatarImages", Boolean.TRUE );
        generateReport( mojo, pluginXmlFile);
-        assertTrue( "Test html generated", getGeneratedReport( "team-list.html" ).exists() );
+        assertTrue( "Test html generated", getGeneratedReport( "team.html" ).exists() );
 
-        URL reportURL = getGeneratedReport( "team-list.html" ).toURI().toURL();
+        URL reportURL = getGeneratedReport( "team.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit

-- 
To stop receiving notification emails like this one, please contact
michaelo@apache.org.