You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2007/05/28 23:31:50 UTC

svn commit: r542322 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src: main/java/org/apache/maven/report/projectinfo/ main/resources/ test/java/org/apache/maven/report/projectinfo/stubs/

Author: vsiveton
Date: Mon May 28 14:31:49 2007
New Revision: 542322

URL: http://svn.apache.org/viewvc?view=rev&rev=542322
Log:
MPIR-28: improve convergence report

o improved the alignment: autodetect the table width
o append ":" char in several properties, not in java
o updated the convergence test case

Modified:
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_hu.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ja.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ko.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_no.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_CN.properties
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/SubProject1Stub.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/SubProject2Stub.java

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java?view=diff&rev=542322&r1=542321&r2=542322
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java Mon May 28 14:31:49 2007
@@ -25,7 +25,12 @@
 import org.apache.maven.reporting.MavenReportException;
 import org.codehaus.plexus.util.StringUtils;
 
+import java.awt.Font;
+import java.awt.GraphicsEnvironment;
+import java.awt.Toolkit;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
@@ -38,12 +43,19 @@
  * Generates the Dependency Convergence report for reactor builds.
  *
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
+ * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton </a>
+ * @version $Id $
  * @goal dependency-convergence
  * @aggregator
  */
 public class DependencyConvergenceReport
     extends AbstractProjectInfoReport
 {
+    private static final int PERCENTAGE = 100;
+
+    private static final List SUPPORTED_FONT_FAMILY_NAMES = Arrays.asList( GraphicsEnvironment
+        .getLocalGraphicsEnvironment().getAvailableFontFamilyNames() );
+
     /**
      * The projects in the current build. The effective-POM for
      * each of these projects will written.
@@ -54,23 +66,33 @@
      */
     private List reactorProjects;
 
-    private static final int PERCENTAGE = 100;
-
+    /**
+     * @see org.apache.maven.reporting.AbstractMavenReport#getOutputName()
+     */
     public String getOutputName()
     {
         return "dependency-convergence";
     }
 
+    /**
+     * @see org.apache.maven.reporting.AbstractMavenReport#getName(java.util.Locale)
+     */
     public String getName( Locale locale )
     {
         return getI18nString( locale, "name" );
     }
 
+    /**
+     * @see org.apache.maven.reporting.AbstractMavenReport#getDescription(java.util.Locale)
+     */
     public String getDescription( Locale locale )
     {
         return getI18nString( locale, "description" );
     }
 
+    /**
+     * @see org.apache.maven.reporting.AbstractMavenReport#executeReport(java.util.Locale)
+     */
     protected void executeReport( Locale locale )
         throws MavenReportException
     {
@@ -95,21 +117,38 @@
         // legend
         generateLegend( locale, sink );
 
+        sink.lineBreak();
+
         // stats
         generateStats( locale, sink, dependencyMap );
 
+        sink.section1_();
+
         // convergence
         generateConvergence( locale, sink, dependencyMap );
 
-        sink.section1_();
-
         sink.body_();
         sink.flush();
     }
 
+    /**
+     * Generate the convergenec table for all dependencies
+     *
+     * @param locale
+     * @param sink
+     * @param dependencyMap
+     */
     private void generateConvergence( Locale locale, Sink sink, Map dependencyMap )
     {
+        sink.section2();
+
+        sink.sectionTitle2();
         sink.text( getI18nString( locale, "convergence.caption" ) );
+        sink.sectionTitle2_();
+
+        // To know the cell width for version
+        String biggestVersion = getBiggestStringVersion( dependencyMap );
+        int cellWidth = getMavenTableCell( biggestVersion );
 
         Iterator it = dependencyMap.keySet().iterator();
         while ( it.hasNext() )
@@ -117,18 +156,27 @@
             String key = (String) it.next();
             List depList = (List) dependencyMap.get( key );
 
-            sink.section2();
-            sink.sectionTitle2();
+            sink.section3();
+            sink.sectionTitle3();
             sink.text( key );
-            sink.sectionTitle2_();
+            sink.sectionTitle3_();
 
-            generateDependencyDetails( sink, depList );
+            generateDependencyDetails( sink, depList, cellWidth );
 
-            sink.section2_();
+            sink.section3_();
         }
+
+        sink.section2_();
     }
 
-    private void generateDependencyDetails( Sink sink, List depList )
+    /**
+     * Generate the detail table for a given dependency
+     *
+     * @param sink
+     * @param depList
+     * @param cellWidth
+     */
+    private void generateDependencyDetails( Sink sink, List depList, int cellWidth )
     {
         sink.table();
 
@@ -136,7 +184,7 @@
 
         sink.tableRow();
 
-        sink.tableCell();
+        sink.tableCell( "15px" ); // according /images/icon_success_sml.gif and /images/icon_error_sml.gif
         if ( artifactMap.size() > 1 )
         {
             iconError( sink );
@@ -150,12 +198,13 @@
         sink.tableCell();
 
         sink.table();
+
         Iterator it = artifactMap.keySet().iterator();
         while ( it.hasNext() )
         {
             String version = (String) it.next();
             sink.tableRow();
-            sink.tableCell();
+            sink.tableCell( String.valueOf( cellWidth ) + "px" );
             sink.text( version );
             sink.tableCell_();
 
@@ -218,16 +267,24 @@
         return uniqueArtifactMap;
     }
 
+    /**
+     * Generate the legend table
+     *
+     * @param locale
+     * @param sink
+     */
     private void generateLegend( Locale locale, Sink sink )
     {
         sink.table();
         sink.tableCaption();
-        sink.text( getI18nString( locale, "legend" ) + ":" );
+        sink.bold();
+        sink.text( getI18nString( locale, "legend" ) );
+        sink.bold_();
         sink.tableCaption_();
 
         sink.tableRow();
 
-        sink.tableCell();
+        sink.tableCell( "15px" ); // according /images/icon_success_sml.gif
         iconSuccess( sink );
         sink.tableCell_();
         sink.tableCell();
@@ -238,7 +295,7 @@
 
         sink.tableRow();
 
-        sink.tableCell();
+        sink.tableCell( "15px" ); // according /images/icon_error_sml.gif
         iconError( sink );
         sink.tableCell_();
         sink.tableCell();
@@ -250,6 +307,13 @@
         sink.table_();
     }
 
+    /**
+     * Generate the statistic table
+     *
+     * @param locale
+     * @param sink
+     * @param dependencyMap
+     */
     private void generateStats( Locale locale, Sink sink, Map dependencyMap )
     {
         int depCount = dependencyMap.size();
@@ -267,14 +331,29 @@
 
         int convergence = (int) ( ( (double) depCount / (double) artifactCount ) * PERCENTAGE );
 
+        // To know the header cell width
+        List l = new ArrayList();
+        l.add( getI18nString( locale, "stats.subprojects" ) );
+        l.add( getI18nString( locale, "stats.dependencies" ) );
+        l.add( getI18nString( locale, "stats.artifacts" ) );
+        l.add( getI18nString( locale, "stats.snapshots" ) );
+        l.add( getI18nString( locale, "stats.convergence" ) );
+        l.add( getI18nString( locale, "stats.readyrelease" ) );
+
+        String biggest = getBiggestString( l );
+        String headerCellWidth = getMavenTableHeaderCell( biggest ) + "px";
+
+        // Create report
         sink.table();
         sink.tableCaption();
+        sink.bold();
         sink.text( getI18nString( locale, "stats.caption" ) );
+        sink.bold_();
         sink.tableCaption_();
 
         sink.tableRow();
-        sink.tableHeaderCell();
-        sink.text( getI18nString( locale, "stats.subprojects" ) + ":" );
+        sink.tableHeaderCell( headerCellWidth );
+        sink.text( getI18nString( locale, "stats.subprojects" ) );
         sink.tableHeaderCell_();
         sink.tableCell();
         sink.text( String.valueOf( reactorProjects.size() ) );
@@ -282,8 +361,8 @@
         sink.tableRow_();
 
         sink.tableRow();
-        sink.tableHeaderCell();
-        sink.text( getI18nString( locale, "stats.dependencies" ) + ":" );
+        sink.tableHeaderCell( headerCellWidth );
+        sink.text( getI18nString( locale, "stats.dependencies" ) );
         sink.tableHeaderCell_();
         sink.tableCell();
         sink.text( String.valueOf( depCount ) );
@@ -291,8 +370,8 @@
         sink.tableRow_();
 
         sink.tableRow();
-        sink.tableHeaderCell();
-        sink.text( getI18nString( locale, "stats.artifacts" ) + ":" );
+        sink.tableHeaderCell( headerCellWidth );
+        sink.text( getI18nString( locale, "stats.artifacts" ) );
         sink.tableHeaderCell_();
         sink.tableCell();
         sink.text( String.valueOf( artifactCount ) );
@@ -300,8 +379,8 @@
         sink.tableRow_();
 
         sink.tableRow();
-        sink.tableHeaderCell();
-        sink.text( getI18nString( locale, "stats.snapshots" ) + ":" );
+        sink.tableHeaderCell( headerCellWidth );
+        sink.text( getI18nString( locale, "stats.snapshots" ) );
         sink.tableHeaderCell_();
         sink.tableCell();
         sink.text( String.valueOf( snapshotCount ) );
@@ -309,11 +388,10 @@
         sink.tableRow_();
 
         sink.tableRow();
-        sink.tableHeaderCell();
-        sink.text( getI18nString( locale, "stats.convergence" ) + ":" );
+        sink.tableHeaderCell( headerCellWidth );
+        sink.text( getI18nString( locale, "stats.convergence" ) );
         sink.tableHeaderCell_();
         sink.tableCell();
-
         if ( convergence < PERCENTAGE )
         {
             iconError( sink );
@@ -323,7 +401,6 @@
             iconSuccess( sink );
         }
         sink.nonBreakingSpace();
-
         sink.bold();
         sink.text( String.valueOf( convergence ) + "%" );
         sink.bold_();
@@ -331,8 +408,8 @@
         sink.tableRow_();
 
         sink.tableRow();
-        sink.tableHeaderCell();
-        sink.text( getI18nString( locale, "stats.readyrelease" ) + ":" );
+        sink.tableHeaderCell( headerCellWidth );
+        sink.text( getI18nString( locale, "stats.readyrelease" ) );
         sink.tableHeaderCell_();
         sink.tableCell();
         if ( convergence >= PERCENTAGE && snapshotCount <= 0 )
@@ -457,6 +534,9 @@
             return project;
         }
 
+        /**
+         * @see java.lang.Object#toString()
+         */
         public String toString()
         {
             return project.getId();
@@ -466,6 +546,9 @@
     private static class ProjectComparator
         implements Comparator
     {
+        /**
+         * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
+         */
         public int compare( Object o1, Object o2 )
         {
             if ( o1 instanceof ReverseDependencyLink && o2 instanceof ReverseDependencyLink )
@@ -474,10 +557,8 @@
                 ReverseDependencyLink p2 = (ReverseDependencyLink) o2;
                 return p1.getProject().getId().compareTo( p2.getProject().getId() );
             }
-            else
-            {
-                return 0;
-            }
+
+            return 0;
         }
     }
 
@@ -490,4 +571,149 @@
         return reactorProjects.size() > 1;
     }
 
+    /**
+     * @param dependencyMap a map with <code>version</code> as key
+     * @return the biggest string of <code>version</code>
+     */
+    private String getBiggestStringVersion( Map dependencyMap )
+    {
+        String biggestVersion = "";
+
+        Iterator it = dependencyMap.keySet().iterator();
+        while ( it.hasNext() )
+        {
+            String key = (String) it.next();
+            List depList = (List) dependencyMap.get( key );
+            Map artifactMap = getSortedUniqueArtifactMap( depList );
+
+            String biggestTmp = getBiggestString( artifactMap.keySet() );
+            if ( biggestVersion.length() < biggestTmp.length() )
+            {
+                biggestVersion = biggestTmp;
+            }
+        }
+
+        return biggestVersion;
+    }
+
+    /**
+     * @param l a collection of String
+     * @return the biggest <code>String</code> in the collection
+     */
+    private static String getBiggestString( Collection l )
+    {
+        String biggest = "";
+
+        Iterator it = l.iterator();
+        while ( it.hasNext() )
+        {
+            String text = (String) it.next();
+            if ( biggest.length() < text.length() )
+            {
+                biggest = text;
+            }
+        }
+
+        return biggest;
+    }
+
+    /**
+     * The header cell style has the following hierarchy:
+     * <pre>
+     * html > body .composite > div #bodyColumn > div #contentBox > div .section > div .section > table .bodyTable > tbody > tr .a > td > table .bodyTable > tbody > tr .b > td
+     * </pre>
+     * Extract from <code>maven-theme.css</code>:
+     * <pre>
+     * body, td, select, input, li{
+     *   font-family: Verdana, Helvetica, Arial, sans-serif;
+     *   font-size: 13px;
+     * }
+     * </pre>
+     *
+     * @param s a String
+     * @return the total advance width for showing the specified <code>String</code> using the Maven table cell.
+     * @see #getStringWidth(String, int, int)
+     */
+    private static int getMavenTableCell( String s )
+    {
+        return getStringWidth( s, Font.PLAIN, 13 );
+    }
+
+    /**
+     * The header cell style has the following hierarchy:
+     * <pre>
+     * html > body .composite > div #bodyColumn > div #contentBox > div .section > table .bodyTable > tbody > tr .a > th
+     * </pre>
+     * Extract from <code>maven-theme.css</code>:
+     * <pre>
+     * body, td, select, input, li{
+     *   font-family: Verdana, Helvetica, Arial, sans-serif;
+     *   font-size: 13px;
+     * }
+     * table.bodyTable th{
+     *   color: white;
+     *   background-color: #bbbbbb;
+     *   text-align: left;
+     *   font-weight: bold;
+     * }
+     * </pre>
+     *
+     * @param s a String
+     * @return the total advance width for showing the specified <code>String</code> using the Maven table header cell.
+     * @see #getStringWidth(String, int, int)
+     */
+    private static int getMavenTableHeaderCell( String s )
+    {
+        return getStringWidth( s, Font.BOLD, 13 );
+    }
+
+    /**
+     * @param s a String
+     * @param style an AWT style
+     * @param size an AWT size
+     * @return the total advance width for showing the specified <code>String</code> depending
+     * the Maven CSS, ie the font family and the specified <code>style</code> and <code>size</code>.
+     * @see #getMavenFontFamily()
+     */
+    private static int getStringWidth( String s, int style, int size )
+    {
+        Font font = new Font( getMavenFontFamily(), style, size );
+
+        return Toolkit.getDefaultToolkit().getFontMetrics( font ).stringWidth( s );
+    }
+
+    /**
+     * Extract from <code>maven-theme.css</code>:
+     * <pre>
+     * body, td, select, input, li{
+     *   font-family: Verdana, Helvetica, Arial, sans-serif;
+     *   font-size: 13px;
+     * }
+     * </pre>
+     *
+     * @todo maybe use batik-css to parse the maven-theme.css
+     *
+     * @return a AWT font family name
+     */
+    private static String getMavenFontFamily()
+    {
+        if ( SUPPORTED_FONT_FAMILY_NAMES.contains( "Verdana" ) )
+        {
+            return "Verdana";
+        }
+        else if ( SUPPORTED_FONT_FAMILY_NAMES.contains( "Helvetica" ) )
+        {
+            return "Helvetica";
+        }
+        else if ( SUPPORTED_FONT_FAMILY_NAMES.contains( "Arial" ) )
+        {
+            return "Arial";
+        }
+        else if ( SUPPORTED_FONT_FAMILY_NAMES.contains( "SansSerif" ) )
+        {
+            return "SansSerif";
+        }
+
+        return "Default";
+    }
 }

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties?view=diff&rev=542322&r1=542321&r2=542322
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties Mon May 28 14:31:49 2007
@@ -89,21 +89,21 @@
 report.dependencies.unamed                                         = Unamed
 report.dependency-convergence.convergence.caption                  = Dependencies used in sub-projects
 report.dependency-convergence.description                          = This document presents the convergence of dependency versions across the entire project, and its sub modules.
-report.dependency-convergence.legend                               = Legend
+report.dependency-convergence.legend                               = Legend:
 report.dependency-convergence.legend.different                     = At least one project has a differing version of the dependency.
 report.dependency-convergence.legend.shared                        = All projects share one version of the dependency.
 report.dependency-convergence.name                                 = Dependency Convergence
-report.dependency-convergence.stats.artifacts                      = Number of unique artifacts (NOA)
-report.dependency-convergence.stats.caption                        = Statistics
-report.dependency-convergence.stats.convergence                    = Convergence (NOD/NOA)
-report.dependency-convergence.stats.dependencies                   = Number of dependencies (NOD)
-report.dependency-convergence.stats.readyrelease                   = Ready for Release (100% Convergence and no SNAPSHOTS)
+report.dependency-convergence.stats.artifacts                      = Number of unique artifacts (NOA):
+report.dependency-convergence.stats.caption                        = Statistics:
+report.dependency-convergence.stats.convergence                    = Convergence (NOD/NOA):
+report.dependency-convergence.stats.dependencies                   = Number of dependencies (NOD):
+report.dependency-convergence.stats.readyrelease                   = Ready for Release (100% Convergence and no SNAPSHOTS):
 report.dependency-convergence.stats.readyrelease.error             = Error
 report.dependency-convergence.stats.readyrelease.error.convergence = You do not have 100% convergence.
 report.dependency-convergence.stats.readyrelease.error.snapshots   = You have SNAPSHOT dependencies.
 report.dependency-convergence.stats.readyrelease.success           = Success
-report.dependency-convergence.stats.snapshots                      = Number of SNAPSHOT artifacts (NOS)
-report.dependency-convergence.stats.subprojects                    = Number of sub-projects
+report.dependency-convergence.stats.snapshots                      = Number of SNAPSHOT artifacts (NOS):
+report.dependency-convergence.stats.subprojects                    = Number of sub-projects:
 report.dependency-convergence.title                                = Reactor Dependency Convergence
 report.index.nodescription                                         = There is currently no description associated with this project.
 report.index.title                                                 = About

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties?view=diff&rev=542322&r1=542321&r2=542322
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties Mon May 28 14:31:49 2007
@@ -154,21 +154,21 @@
 
 report.dependency-convergence.convergence.caption=In Unter-Projekten verwendete Abh\u00E4ngigkeiten
 report.dependency-convergence.description=Dieses Dokument informiert \u00FCber die Konvergenz der Versionen von Abh\u00E4ngigkeiten des gesamten Projektes inklusive seiner Module.
-report.dependency-convergence.legend=Legende
+report.dependency-convergence.legend=Legende:
 report.dependency-convergence.legend.different=Mindestens ein Projekt verwendet eine andere Version der Abh\u00E4ngigkeit.
 report.dependency-convergence.legend.shared=Alle Projekte verwenden dieselbe Version der Abh\u00E4ngigkeit.
 report.dependency-convergence.name=Konvergenz der Abh\u00E4ngigkeiten
-report.dependency-convergence.stats.artifacts=Anzahl eindeutiger Artifacts (NOA)
-report.dependency-convergence.stats.caption=Statistik
-report.dependency-convergence.stats.convergence=Konvergenz (NOD/NOA)
-report.dependency-convergence.stats.dependencies=Anzahl Abh\u00E4ngigkeiten (NOD)
-report.dependency-convergence.stats.readyrelease=Bereit zur Ver\u00F6ffentlichung (100% Konvergenz und keine SNAPSHOTS)
+report.dependency-convergence.stats.artifacts=Anzahl eindeutiger Artifacts (NOA):
+report.dependency-convergence.stats.caption=Statistik:
+report.dependency-convergence.stats.convergence=Konvergenz (NOD/NOA):
+report.dependency-convergence.stats.dependencies=Anzahl Abh\u00E4ngigkeiten (NOD):
+report.dependency-convergence.stats.readyrelease=Bereit zur Ver\u00F6ffentlichung (100% Konvergenz und keine SNAPSHOTS):
 report.dependency-convergence.stats.readyrelease.error=Fehler
 report.dependency-convergence.stats.readyrelease.error.convergence=Keine 100% Konvergenz.
 report.dependency-convergence.stats.readyrelease.error.snapshots=SNAPSHOT Abh\u00E4ngigkeiten.
 report.dependency-convergence.stats.readyrelease.success=Erfolg
-report.dependency-convergence.stats.snapshots=Anzahl SNAPSHOT Artifacts (NOS)
-report.dependency-convergence.stats.subprojects=Anzahl Unter-Projekte
+report.dependency-convergence.stats.snapshots=Anzahl SNAPSHOT Artifacts (NOS):
+report.dependency-convergence.stats.subprojects=Anzahl Unter-Projekte:
 report.dependency-convergence.title=Reactor Abh\u00E4ngigkeits Konvergenz
 
 report.index.title=Willkommen bei

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties?view=diff&rev=542322&r1=542321&r2=542322
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties Mon May 28 14:31:49 2007
@@ -68,21 +68,21 @@
 report.dependencies.unamed                                         = Non-sp\u00E9cifi\u00E9
 report.dependency-convergence.convergence.caption                  = D\u00E9pendances utilis\u00E9es dans les sous-projets
 report.dependency-convergence.description                          = Ce document pr\u00E9sente la convergence des versions des d\u00E9pendances au sein de l\u0092ensemble du projet et de ses sous-modules.
-report.dependency-convergence.legend                               = L\u00E9gende
+report.dependency-convergence.legend                               = L\u00E9gende:
 report.dependency-convergence.legend.different                     = Au moins un projet a une d\u00E9pendance de version diff\u00E9rente.
 report.dependency-convergence.legend.shared                        = Tous les projets partagent une d\u00E9pendance de version.
 report.dependency-convergence.name                                 = Convergence des d\u00E9pendances
-report.dependency-convergence.stats.artifacts                      = Nombre d\u0092artefacts uniques (NOA)
-report.dependency-convergence.stats.caption                        = Statistiques
-report.dependency-convergence.stats.convergence                    = Convergence (NOD/NOA)
-report.dependency-convergence.stats.dependencies                   = Nombre de d\u00E9pendances (NOD)
-report.dependency-convergence.stats.readyrelease                   = Pr\u00EAt pour la release (100% de convergence et aucun SNAPSHOT)
+report.dependency-convergence.stats.artifacts                      = Nombre d\u0092artefacts uniques (NOA):
+report.dependency-convergence.stats.caption                        = Statistiques:
+report.dependency-convergence.stats.convergence                    = Convergence (NOD/NOA):
+report.dependency-convergence.stats.dependencies                   = Nombre de d\u00E9pendances (NOD):
+report.dependency-convergence.stats.readyrelease                   = Pr\u00EAt pour la release (100% de convergence et aucun SNAPSHOT):
 report.dependency-convergence.stats.readyrelease.error             = Erreur
 report.dependency-convergence.stats.readyrelease.error.convergence = Vous n\u0092avez pas la convergence \u00E0 100%.
 report.dependency-convergence.stats.readyrelease.error.snapshots   = Vous avez des d\u00E9pendances de type SNAPSHOT.
 report.dependency-convergence.stats.readyrelease.success           = Succ\u00E8s
-report.dependency-convergence.stats.snapshots                      = Nombre d\u0092artefacts SNAPSHOT (NOS)
-report.dependency-convergence.stats.subprojects                    = Nombre de sous-projets
+report.dependency-convergence.stats.snapshots                      = Nombre d\u0092artefacts SNAPSHOT (NOS):
+report.dependency-convergence.stats.subprojects                    = Nombre de sous-projets:
 report.dependency-convergence.title                                = R\u00E9action de la convergence des d\u00E9pendances
 report.index.nodescription                                         = Il n\u0092y a aucune description actuellement li\u00E9e \u00E0 ce projet.
 report.index.title                                                 = Bienvenue dans le projet

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_hu.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_hu.properties?view=diff&rev=542322&r1=542321&r2=542322
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_hu.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_hu.properties Mon May 28 14:31:49 2007
@@ -54,7 +54,7 @@
 report.dependencies.graph.tables.licenses                          = Licence
 report.dependencies.graph.tables.notAttached                       = Nincs csatolva
 report.dependencies.graph.tables.title                             = F\u00C3\u00BCgg\u00C5\u0091s\u00C3\u00A9gek list\u00C3\u00A1ja
-report.dependencies.graph.tables.unknown                           = 
+report.dependencies.graph.tables.unknown                           =
 report.dependencies.graph.title                                    = F\u00C3\u00BCgg\u00C5\u0091s\u00C3\u00A9gi gr\u00C3\u00A1f
 report.dependencies.graph.tree.title                               = F\u00C3\u00BCgg\u00C5\u0091s\u00C3\u00A9gi fa
 report.dependencies.graph.url.default                              = Nincs URL
@@ -68,21 +68,21 @@
 report.dependencies.title                                          = Projekt f\u00C3\u00BCgg\u00C5\u0091s\u00C3\u00A9gek
 report.dependency-convergence.convergence.caption                  = Al-projektek f\u00C3\u00BCgg\u00C5\u0091s\u00C3\u00A9gei
 report.dependency-convergence.description                          = Ez a dokumentum \u00C3\u00ADrja le a teljes projekt f\u00C3\u00BCgg\u00C5\u0091s\u00C3\u00A9geit az al-modulokat is bele\u00C3\u00A9rtve.
-report.dependency-convergence.legend                               = Magyar\u00C3\u00A1zat
+report.dependency-convergence.legend                               = Magyar\u00C3\u00A1zat:
 report.dependency-convergence.legend.different                     = Legal\u00C3\u00A1bb egy projektben m\u00C3\u00A1s a f\u00C3\u00BCgg\u00C5\u0091s\u00C3\u00A9g verzi\u00C3\u00B3ja.
 report.dependency-convergence.legend.shared                        = Minden projekt ugyanazt a verzi\u00C3\u00B3t haszn\u00C3\u00A1lja a f\u00C3\u00BCgg\u00C5\u0091s\u00C3\u00A9gb\u00C5\u0091l.
 report.dependency-convergence.name                                 = F\u00C3\u00BCgg\u00C5\u0091s\u00C3\u00A9gek
-report.dependency-convergence.stats.artifacts                      = Egyedi eszk\u00C3\u00B6z\u00C3\u00B6k sz\u00C3\u00A1ma (Number of unique artifacts, NOA)
-report.dependency-convergence.stats.caption                        = Statisztika
-report.dependency-convergence.stats.convergence                    = Konvergencia (NOD/NOA)
-report.dependency-convergence.stats.dependencies                   = A f\u00C3\u00BCgg\u00C5\u0091s\u00C3\u00A9gek sz\u00C3\u00A1ma (Number of dependencies, NOD)
-report.dependency-convergence.stats.readyrelease                   = Kiad\u00C3\u00A1sra k\u00C3\u00A9sz (100%-os konvergencia \u00C3\u00A9s nincsenek SNAPSHOT-ok)
+report.dependency-convergence.stats.artifacts                      = Egyedi eszk\u00C3\u00B6z\u00C3\u00B6k sz\u00C3\u00A1ma (Number of unique artifacts, NOA):
+report.dependency-convergence.stats.caption                        = Statisztika:
+report.dependency-convergence.stats.convergence                    = Konvergencia (NOD/NOA):
+report.dependency-convergence.stats.dependencies                   = A f\u00C3\u00BCgg\u00C5\u0091s\u00C3\u00A9gek sz\u00C3\u00A1ma (Number of dependencies, NOD):
+report.dependency-convergence.stats.readyrelease                   = Kiad\u00C3\u00A1sra k\u00C3\u00A9sz (100%-os konvergencia \u00C3\u00A9s nincsenek SNAPSHOT-ok):
 report.dependency-convergence.stats.readyrelease.error             = Hiba
 report.dependency-convergence.stats.readyrelease.error.convergence = A konvergencia nem 100%-os.
 report.dependency-convergence.stats.readyrelease.error.snapshots   = Nincsenek SNAPSHOT f\u00C3\u00BCgg\u00C5\u0091s\u00C3\u00A9gek.
 report.dependency-convergence.stats.readyrelease.success           = Siker
-report.dependency-convergence.stats.snapshots                      = Snapshot-ok sz\u00C3\u00A1ma(Number of SNAPSHOT artifacts, NOS)
-report.dependency-convergence.stats.subprojects                    = Al-projektek sz\u00C3\u00A1ma
+report.dependency-convergence.stats.snapshots                      = Snapshot-ok sz\u00C3\u00A1ma(Number of SNAPSHOT artifacts, NOS):
+report.dependency-convergence.stats.subprojects                    = Al-projektek sz\u00C3\u00A1ma:
 report.dependency-convergence.title                                = F\u00C3\u00BCgg\u00C5\u0091s\u00C3\u00A9gek
 report.index.nodescription                                         = A projektr\u00C5\u0091l nincs le\u00C3\u00ADr\u00C3\u00A1s.
 report.index.title                                                 = A projektr\u00C5\u0091l

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ja.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ja.properties?view=diff&rev=542322&r1=542321&r2=542322
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ja.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ja.properties Mon May 28 14:31:49 2007
@@ -51,7 +51,7 @@
 report.dependencies.graph.tables.licenses                          = \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u30E9\u30A4\u30BB\u30F3\u30B9
 report.dependencies.graph.tables.notAttached                       = \u975E\u6DFB\u4ED8
 report.dependencies.graph.tables.title                             = \u4F9D\u5B58\u95A2\u4FC2\u4E00\u89A7
-report.dependencies.graph.tables.unknown                           = 
+report.dependencies.graph.tables.unknown                           =
 report.dependencies.graph.title                                    = \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u4F9D\u5B58\u95A2\u4FC2\u30B0\u30E9\u30D5
 report.dependencies.graph.tree.title                               = \u4F9D\u5B58\u95A2\u4FC2\u30C4\u30EA\u30FC
 report.dependencies.intro                                          = \u4EE5\u4E0B\u306F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F9D\u5B58\u95A2\u4FC2\u306E\u30EA\u30B9\u30C8\u3067\u3059\u3002 \u3053\u308C\u3089\u306E\u4F9D\u5B58\u95A2\u4FC2\u306F\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u3092\u30B3\u30F3\u30D1\u30A4\u30EB\u3001\u5B9F\u884C\u3059\u308B\u306E\u306B\u5FC5\u8981\u3067\u3059\u3002
@@ -65,21 +65,21 @@
 report.dependencies.title                                          = \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F9D\u5B58\u95A2\u4FC2
 report.dependency-convergence.convergence.caption                  = \u30B5\u30D6\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3067\u4F7F\u7528\u3055\u308C\u3066\u3044\u308B\u4F9D\u5B58\u95A2\u4FC2
 report.dependency-convergence.description                          = \u3053\u306E\u6587\u66F8\u306F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u5168\u4F53\u3068\u305D\u306E\u30B5\u30D6\u30E2\u30B8\u30E5\u30FC\u30EB\u306B\u6E21\u3063\u3066\u3001\u4E00\u8CAB\u3057\u3066\u540C\u3058\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u4F9D\u5B58\u95A2\u4FC2\u304C\u4F7F\u308F\u308C\u3066\u3044\u308B\u304B\u3069\u3046\u304B\u3092\u793A\u3057\u307E\u3059\u3002
-report.dependency-convergence.legend                               = \u51E1\u4F8B
+report.dependency-convergence.legend                               = \u51E1\u4F8B:
 report.dependency-convergence.legend.different                     = \u5C11\u306A\u304F\u3068\u3082\u4E00\u3064\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u9055\u3046\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u4F9D\u5B58\u95A2\u4FC2\u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002
 report.dependency-convergence.legend.shared                        = \u5168\u3066\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F\u540C\u3058\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u4F9D\u5B58\u95A2\u4FC2\u3092\u5171\u6709\u3057\u3066\u3044\u307E\u3059\u3002
 report.dependency-convergence.name                                 = \u4F9D\u5B58\u95A2\u4FC2\u306E\u4E00\u81F4\u5EA6
-report.dependency-convergence.stats.artifacts                      = \u4E00\u610F\u306E\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u306E\u6570 (NOA)
-report.dependency-convergence.stats.caption                        = \u7D71\u8A08
-report.dependency-convergence.stats.convergence                    = \u4E00\u81F4\u5EA6 (NOD/NOA)
-report.dependency-convergence.stats.dependencies                   = \u4F9D\u5B58\u95A2\u4FC2\u306E\u6570 (NOD)
-report.dependency-convergence.stats.readyrelease                   = \u30EA\u30EA\u30FC\u30B9\u6E96\u5099\u5B8C\u4E86 (100% \u306E\u4E00\u81F4\u5EA6\u3068\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u306E\u4E0D\u4F7F\u7528)
+report.dependency-convergence.stats.artifacts                      = \u4E00\u610F\u306E\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u306E\u6570 (NOA):
+report.dependency-convergence.stats.caption                        = \u7D71\u8A08:
+report.dependency-convergence.stats.convergence                    = \u4E00\u81F4\u5EA6 (NOD/NOA):
+report.dependency-convergence.stats.dependencies                   = \u4F9D\u5B58\u95A2\u4FC2\u306E\u6570 (NOD):
+report.dependency-convergence.stats.readyrelease                   = \u30EA\u30EA\u30FC\u30B9\u6E96\u5099\u5B8C\u4E86 (100% \u306E\u4E00\u81F4\u5EA6\u3068\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u306E\u4E0D\u4F7F\u7528):
 report.dependency-convergence.stats.readyrelease.error             = \u30A8\u30E9\u30FC
 report.dependency-convergence.stats.readyrelease.error.convergence = \u4E00\u81F4\u5EA6\u304C 100% \u306B\u306A\u3063\u3066\u3044\u307E\u305B\u3093\u3002
 report.dependency-convergence.stats.readyrelease.error.snapshots   = \u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u4F9D\u5B58\u95A2\u4FC2\u304C\u4F7F\u308F\u308C\u3066\u3044\u307E\u3059\u3002
 report.dependency-convergence.stats.readyrelease.success           = \u6210\u529F
-report.dependency-convergence.stats.snapshots                      = \u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u306E\u6570 (NOS)
-report.dependency-convergence.stats.subprojects                    = \u30B5\u30D6\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u6570
+report.dependency-convergence.stats.snapshots                      = \u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u30A2\u30FC\u30C6\u30A3\u30D5\u30A1\u30AF\u30C8\u306E\u6570 (NOS):
+report.dependency-convergence.stats.subprojects                    = \u30B5\u30D6\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u6570:
 report.dependency-convergence.title                                = \u30EA\u30A2\u30AF\u30BF\u306E\u4F9D\u5B58\u95A2\u4FC2\u306E\u4E00\u81F4\u5EA6
 report.index.nodescription                                         = \u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306B\u3064\u3044\u3066\u306E\u8AAC\u660E\u306F\u73FE\u5728\u7528\u610F\u3055\u308C\u3066\u3044\u307E\u305B\u3093\u3002
 report.index.title                                                 = \u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306B\u3064\u3044\u3066

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ko.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ko.properties?view=diff&rev=542322&r1=542321&r2=542322
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ko.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ko.properties Mon May 28 14:31:49 2007
@@ -89,21 +89,21 @@
 report.dependencies.unamed                                         = \uba85\uba85 \uc548\ub428
 report.dependency-convergence.convergence.caption                  = \ud558\uc704 \ud504\ub85c\uc81d\ud2b8\uc5d0\uc11c \uc0ac\uc6a9\ub418\ub294 \uc758\uc874\ubb3c
 report.dependency-convergence.description                          = \uc774 \ubb38\uc11c\ub294 \uc804 \ud504\ub85c\uc81d\ud2b8\uc5d0 \uac78\uccd0 \uc9d1\uc911(Convergence)\ud55c \uc758\uc874\ubb3c \ubc84\uc804\uc5d0 \ub300\ud574 \uc124\uba85\ud569\ub2c8\ub2e4. \ub610\ud55c \ud558\uc704 \ubaa8\ub4c8\ub4e4\uc5d0 \ub300\ud574\uc11c\ub3c4 \uc124\uba85\ud569\ub2c8\ub2e4.
-report.dependency-convergence.legend                               = \ud654\uc81c
+report.dependency-convergence.legend                               = \ud654\uc81c:
 report.dependency-convergence.legend.different                     = \ucd5c\uc18c \ud558\ub098 \uc774\uc0c1\uc758 \ud504\ub85c\uc81d\ud2b8\uac00 \uc758\uc874\ubb3c\uc5d0 \ub300\ud574 \ub2e4\ub978 \ubc84\uc804\uc744 \uac00\uc9c0\uace0 \uc788\uc2b5\ub2c8\ub2e4.
 report.dependency-convergence.legend.shared                        = \ubaa8\ub4e0 \ud504\ub85c\uc81d\ud2b8\ub4e4\uc774 \ud558\ub098\uc758 \uc758\uc874\ubb3c \ubc84\uc804\uc744 \uacf5\uc720\ud558\uace0 \uc788\uc2b5\ub2c8\ub2e4.
 report.dependency-convergence.name                                 = \uc758\uc874\ubb3c\uc758 \uc9d1\uc911
-report.dependency-convergence.stats.artifacts                      = \uc720\uc77c \uc0b0\ucd9c\ubb3c\ub4e4\uc758 \uac1c\uc218 (NOA)
-report.dependency-convergence.stats.caption                        = \ud1b5\uacc4
-report.dependency-convergence.stats.convergence                    = \uc9d1\uc911 (NOD/NOA)
-report.dependency-convergence.stats.dependencies                   = \uc758\uc874\ubb3c \uac1c\uc218 (NOD)
-report.dependency-convergence.stats.readyrelease                   = \ub9b4\ub9ac\uc988 \uc900\ube44 (100% \uc9d1\uc911 \ubc0f \uc2a4\ub0c5\uc0f7 \uc5c6\uc74c)
+report.dependency-convergence.stats.artifacts                      = \uc720\uc77c \uc0b0\ucd9c\ubb3c\ub4e4\uc758 \uac1c\uc218 (NOA):
+report.dependency-convergence.stats.caption                        = \ud1b5\uacc4:
+report.dependency-convergence.stats.convergence                    = \uc9d1\uc911 (NOD/NOA):
+report.dependency-convergence.stats.dependencies                   = \uc758\uc874\ubb3c \uac1c\uc218 (NOD):
+report.dependency-convergence.stats.readyrelease                   = \ub9b4\ub9ac\uc988 \uc900\ube44 (100% \uc9d1\uc911 \ubc0f \uc2a4\ub0c5\uc0f7 \uc5c6\uc74c):
 report.dependency-convergence.stats.readyrelease.error             = \uc624\ub958
 report.dependency-convergence.stats.readyrelease.error.convergence = 100% \uc9d1\uc911 \uc0c1\ud0dc\uac00 \uc544\ub2d9\ub2c8\ub2e4.
 report.dependency-convergence.stats.readyrelease.error.snapshots   = \uc2a4\ub0c5\uc0f7 \uc758\uc874\ubb3c\uc774 \uc788\uc2b5\ub2c8\ub2e4.
 report.dependency-convergence.stats.readyrelease.success           = \uc131\uacf5
-report.dependency-convergence.stats.snapshots                      = \uc2a4\ub0c5\uc0f7 \uc0b0\ucd9c\ubb3c \uac1c\uc218 (NOS)
-report.dependency-convergence.stats.subprojects                    = \ud558\uc704 \ud504\ub85c\uc81d\ud2b8 \uac1c\uc218
+report.dependency-convergence.stats.snapshots                      = \uc2a4\ub0c5\uc0f7 \uc0b0\ucd9c\ubb3c \uac1c\uc218 (NOS):
+report.dependency-convergence.stats.subprojects                    = \ud558\uc704 \ud504\ub85c\uc81d\ud2b8 \uac1c\uc218:
 report.dependency-convergence.title                                = \ubc18\uc751\uc790 \uc758\uc874\ubb3c \uc9d1\uc911 (Reactor Dependency Convergence)
 report.index.nodescription                                         = \uc774 \ud504\ub85c\uc81d\ud2b8\uc640 \uad00\ub828\ub41c \uc124\uba85\uc774 \ud604\uc7ac \uc5c6\uc2b5\ub2c8\ub2e4.
 report.index.title                                                 = \uc815\ubcf4

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_no.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_no.properties?view=diff&rev=542322&r1=542321&r2=542322
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_no.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_no.properties Mon May 28 14:31:49 2007
@@ -54,7 +54,7 @@
 report.dependencies.graph.tables.licenses                          = Lisens
 report.dependencies.graph.tables.notAttached                       = Ikke vedlagt
 report.dependencies.graph.tables.title                             = Avhengighets liste
-report.dependencies.graph.tables.unknown                           = 
+report.dependencies.graph.tables.unknown                           =
 report.dependencies.graph.title                                    = Prosjektavhengighets kart
 report.dependencies.graph.tree.title                               = Anhengighets tre
 report.dependencies.graph.url.default                              = Ingen URL definert
@@ -68,21 +68,21 @@
 report.dependencies.title                                          = Prosjekt avhengigheter
 report.dependency-convergence.convergence.caption                  = Avhengigheter brukt i sub-prosjekter
 report.dependency-convergence.description                          = Dette dokumentet presenterer sammenfallet av avhengighets versjoner p\u00E5 tvers av hele prosjektet, og det sub moduler.
-report.dependency-convergence.legend                               = 
+report.dependency-convergence.legend                               = Sagn:
 report.dependency-convergence.legend.different                     = Minst et prosjekt har en annen versjon av avhengigheten.
 report.dependency-convergence.legend.shared                        = Alle prosjekter deler en versjon av avhengigheten.
 report.dependency-convergence.name                                 = Avhengighets sammenfall
-report.dependency-convergence.stats.artifacts                      = Antall unike artifakter (NOA)
-report.dependency-convergence.stats.caption                        = Statistikk
-report.dependency-convergence.stats.convergence                    = Sammenfall (NOD/NOA)
-report.dependency-convergence.stats.dependencies                   = Antall avhengigheter (NOD)
-report.dependency-convergence.stats.readyrelease                   = Klar for slipp (100% sammenfall og ingen SNAPSHOTS)
+report.dependency-convergence.stats.artifacts                      = Antall unike artifakter (NOA):
+report.dependency-convergence.stats.caption                        = Statistikk:
+report.dependency-convergence.stats.convergence                    = Sammenfall (NOD/NOA):
+report.dependency-convergence.stats.dependencies                   = Antall avhengigheter (NOD):
+report.dependency-convergence.stats.readyrelease                   = Klar for slipp (100% sammenfall og ingen SNAPSHOTS):
 report.dependency-convergence.stats.readyrelease.error             = Feil
 report.dependency-convergence.stats.readyrelease.error.convergence = Du har ikke 100% sammenfall.
 report.dependency-convergence.stats.readyrelease.error.snapshots   = Du har SNAPSHOT avhengigheter
 report.dependency-convergence.stats.readyrelease.success           = Suksess
-report.dependency-convergence.stats.snapshots                      = Antall SNAPSHOT artifakter (NOS)
-report.dependency-convergence.stats.subprojects                    = Antall sub prosjekter
+report.dependency-convergence.stats.snapshots                      = Antall SNAPSHOT artifakter (NOS):
+report.dependency-convergence.stats.subprojects                    = Antall sub prosjekter:
 report.dependency-convergence.title                                = Reactor Avhengighets sammenfall
 report.index.nodescription                                         = Det er for \u00F8yeblikket inegn beskrivelse forbundet med dette prosjektet.
 report.index.title                                                 = Om

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties?view=diff&rev=542322&r1=542321&r2=542322
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties Mon May 28 14:31:49 2007
@@ -44,7 +44,7 @@
 report.dependencies.column.version                                 = Vers\u00C3\u00A3o
 report.dependencies.description                                    = Este documento enumera as depend\u00C3\u00AAncias , bem como fornece informa\u00C3\u00A7\u00C3\u00B5es de cada depend\u00C3\u00AAncia.
 report.dependencies.graph.tables.licenses                          = Licen\u00E7as
-report.dependencies.graph.tables.unknown                           = 
+report.dependencies.graph.tables.unknown                           =
 report.dependencies.intro                                          = A lista abaixo \u00C3\u00A9 a lista de depend\u00C3\u00AAncia deste projeto. Cada depend\u00C3\u00AAncia \u00C3\u00A9 necess\u00C3\u00A1ria para a compila\u00C3\u00A7\u00C3\u00A3o e execu\u00C3\u00A7\u00C3\u00A3o da aplica\u00C3\u00A7\u00C3\u00A3o.
 report.dependencies.intro.compile                                  = Esta \u00C3\u00A9 a lista de depend\u00C3\u00AAncia de execu\u00C3\u00A7\u00C3\u00A3o. Estas depend\u00C3\u00AAncias s\u00C3\u00A3o necess\u00C3\u00A1rias para a compila\u00C3\u00A7\u00C3\u00A3o e execu\u00C3\u00A7\u00C3\u00A3o da aplica\u00C3\u00A7\u00C3\u00A3o:
 report.dependencies.intro.provided                                 = Esta \u00C3\u00A9 a lista de depend\u00C3\u00AAncias deste projeto. Estas depend\u00C3\u00AAncias s\u00C3\u00A3o necess\u00C3\u00A1rias somente para a compila\u00C3\u00A7\u00C3\u00A3o e execu\u00C3\u00A7\u00C3\u00A3o dos testes unit\u00C3\u00A1rios:
@@ -55,21 +55,21 @@
 report.dependencies.title                                          = Depend\u00C3\u00AAncias do Projeto
 report.dependency-convergence.convergence.caption                  = Depend\u00C3\u00AAncias utilizadas em subprojetos
 report.dependency-convergence.description                          = Este documento apresenta a converg\u00C3\u00AAncia das vers\u00C3\u00B5es dentro do projeto e seus subm\u00C3\u00B3dulos.
-report.dependency-convergence.legend                               = Legenda
+report.dependency-convergence.legend                               = Legenda:
 report.dependency-convergence.legend.different                     = Pelo menos um projeto tem uma vers\u00C3\u00A3o diferente das demais.
 report.dependency-convergence.legend.shared                        = Todos os projetos compartilham a vers\u00C3\u00A3o da depend\u00C3\u00AAncia.
 report.dependency-convergence.name                                 = Converg\u00C3\u00AAncia de Depend\u00C3\u00AAncia
-report.dependency-convergence.stats.artifacts                      = N\u00C3\u00BAmero de artefatos \u00C3\u00BAnicos (NOA)
-report.dependency-convergence.stats.caption                        = Estat\u00C3\u00ADsticas
-report.dependency-convergence.stats.convergence                    = Converg\u00C3\u00AAncia (NOD/NOA)
-report.dependency-convergence.stats.dependencies                   = N\u00C3\u00BAmero de depend\u00C3\u00AAncias (NOD)
-report.dependency-convergence.stats.readyrelease                   = Pronto para Libera\u00C3\u00A7\u00C3\u00A3o (100% de Converg\u00C3\u00AAncia e nenhum SNAPSHOTS)
+report.dependency-convergence.stats.artifacts                      = N\u00C3\u00BAmero de artefatos \u00C3\u00BAnicos (NOA):
+report.dependency-convergence.stats.caption                        = Estat\u00C3\u00ADsticas:
+report.dependency-convergence.stats.convergence                    = Converg\u00C3\u00AAncia (NOD/NOA):
+report.dependency-convergence.stats.dependencies                   = N\u00C3\u00BAmero de depend\u00C3\u00AAncias (NOD):
+report.dependency-convergence.stats.readyrelease                   = Pronto para Libera\u00C3\u00A7\u00C3\u00A3o (100% de Converg\u00C3\u00AAncia e nenhum SNAPSHOTS):
 report.dependency-convergence.stats.readyrelease.error             = Erro
 report.dependency-convergence.stats.readyrelease.error.convergence = Voc\u00C3\u00AA n\u00C3\u00A3o tem 100% de converg\u00C3\u00AAncia.
-report.dependency-convergence.stats.readyrelease.error.snapshots   = Voc\u00C3\u00AA tem depend\u00C3\u00AAncias SNAPSHOT .
+report.dependency-convergence.stats.readyrelease.error.snapshots   = Voc\u00C3\u00AA tem depend\u00C3\u00AAncias SNAPSHOT.
 report.dependency-convergence.stats.readyrelease.success           = Sucesso
-report.dependency-convergence.stats.snapshots                      = Numero de artefatos SNAPSHOT  (NOS)
-report.dependency-convergence.stats.subprojects                    = Numero de subprojetos
+report.dependency-convergence.stats.snapshots                      = Numero de artefatos SNAPSHOT (NOS):
+report.dependency-convergence.stats.subprojects                    = Numero de subprojetos:
 report.dependency-convergence.title                                = Converg\u00C3\u00AAncia de vers\u00C3\u00A3o de depend\u00C3\u00AAncia
 report.index.nodescription                                         = Atualmente, n\u00C3\u00A3o h\u00C3\u00A1 uma descri\u00C3\u00A7\u00C3\u00A3o atribu\u00C3\u00ADda a este projeto.
 report.index.title                                                 = Bem vindo a

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_CN.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_CN.properties?view=diff&rev=542322&r1=542321&r2=542322
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_CN.properties (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_CN.properties Mon May 28 14:31:49 2007
@@ -44,7 +44,7 @@
 report.dependencies.column.version                                 = \u7248\u672C
 report.dependencies.description                                    = \u8FD9\u4E00\u6587\u6863\u5217\u51FA\u4E86\u9879\u76EE\u7684\u4F9D\u8D56\u5E76\u63D0\u4F9B\u4E86\u6BCF\u4E2A\u4F9D\u8D56\u7684\u76F8\u5173\u4FE1\u606F\u3002
 report.dependencies.graph.tables.licenses                          = \u6267\u7167
-report.dependencies.graph.tables.unknown                           = 
+report.dependencies.graph.tables.unknown                           =
 report.dependencies.intro                                          = \u4EE5\u4E0B\u662F\u672C\u9879\u76EE\u4E2D\u7684\u4F9D\u8D56\u5217\u8868.\u7F16\u8BD1\u548C\u8FD0\u884C\u5E94\u7528\u65F6\u9700\u8981\u4EE5\u4E0B\u8FD9\u4E9B\u4F9D\u8D56:
 report.dependencies.intro.compile                                  = \u4EE5\u4E0B\u662F\u8FD9\u4E00\u9879\u76EE\u7684\u7F16\u8BD1\u4F9D\u8D56\u5217\u8868\u3002\u7F16\u8BD1\u548C\u8FD0\u884C\u672C\u5E94\u7528\u9700\u8981\u8FD9\u4E9B\u4F9D\u8D56\u3002
 report.dependencies.intro.provided                                 = \u4EE5\u4E0B\u662F\u8FD9\u4E00\u9879\u76EE\u7684\u5DF2\u63D0\u4F9B\u7684\u4F9D\u8D56\u5217\u8868\u3002\u7F16\u8BD1\u672C\u5E94\u7528\u65F6\u9700\u8981\u8FD9\u4E9B\u4F9D\u8D56,\u4F46\u8FD9\u4E9B\u4F9D\u8D56\u5E93\u5728\u4F7F\u7528\u65F6\u4F1A\u9ED8\u8BA4\u63D0\u4F9B\u3002
@@ -56,21 +56,21 @@
 report.dependencies.title                                          = \u9879\u76EE\u4F9D\u8D56
 report.dependency-convergence.convergence.caption                  = \u5B50\u9879\u76EE\u4E2D\u4F7F\u7528\u7684\u4F9D\u8D56
 report.dependency-convergence.description                          = \u672C\u6587\u6863\u63D0\u4F9B\u4E86\u6574\u4E2A\u9879\u76EE\u4EE5\u53CA\u9879\u76EE\u7684\u5B50\u6A21\u5757\u4E2D\u6240\u6709\u4F9D\u8D56\u7684\u7248\u672C\u4E00\u81F4\u6027\u4FE1\u606F\u3002
-report.dependency-convergence.legend                               = \u8BF4\u660E
+report.dependency-convergence.legend                               = \u8BF4\u660E:
 report.dependency-convergence.legend.different                     = \u81F3\u5C11\u4E00\u4E2A\u9879\u76EE\u4F7F\u7528\u4E86\u4E0D\u540C\u7248\u672C\u7684\u4F9D\u8D56.
 report.dependency-convergence.legend.shared                        = \u6240\u6709\u7684\u9879\u76EE\u4F7F\u7528\u7EDF\u4E00\u7248\u672C\u7684\u4F9D\u8D56\u3002
 report.dependency-convergence.name                                 = \u4F9D\u8D56\u4E00\u81F4\u6027
-report.dependency-convergence.stats.artifacts                      = \u4E0D\u540C\u7684artifact\u6570\u76EE(NOA)
-report.dependency-convergence.stats.caption                        = \u7EDF\u8BA1
-report.dependency-convergence.stats.convergence                    = \u4E00\u81F4\u6027(NOD/NOA)
-report.dependency-convergence.stats.dependencies                   = \u4F9D\u8D56\u7684\u6570\u76EE(NOD)
-report.dependency-convergence.stats.readyrelease                   = \u9002\u5408\u53D1\u5E03(100%\u7684\u4F9D\u8D56\u4E00\u81F4\u6027\u5E76\u4E14\u6CA1\u6709\u4F7F\u7528\u5FEB\u7167\u7248\u672C\u7684\u4F9D\u8D56)
+report.dependency-convergence.stats.artifacts                      = \u4E0D\u540C\u7684artifact\u6570\u76EE(NOA):
+report.dependency-convergence.stats.caption                        = \u7EDF\u8BA1:
+report.dependency-convergence.stats.convergence                    = \u4E00\u81F4\u6027(NOD/NOA):
+report.dependency-convergence.stats.dependencies                   = \u4F9D\u8D56\u7684\u6570\u76EE(NOD):
+report.dependency-convergence.stats.readyrelease                   = \u9002\u5408\u53D1\u5E03(100%\u7684\u4F9D\u8D56\u4E00\u81F4\u6027\u5E76\u4E14\u6CA1\u6709\u4F7F\u7528\u5FEB\u7167\u7248\u672C\u7684\u4F9D\u8D56):
 report.dependency-convergence.stats.readyrelease.error             = \u9519\u8BEF
 report.dependency-convergence.stats.readyrelease.error.convergence = \u4F60\u672A\u80FD\u8FBE\u5230100%\u7684\u4F9D\u8D56\u4E00\u81F4\u6027\u3002
 report.dependency-convergence.stats.readyrelease.error.snapshots   = \u4F60\u4F7F\u7528\u4E86\u5FEB\u7167\u7248\u672C\u7684\u4F9D\u8D56\u3002
 report.dependency-convergence.stats.readyrelease.success           = \u6210\u529F
-report.dependency-convergence.stats.snapshots                      = \u5FEB\u7167\u7248\u672C\u7684artifact\u6570\u76EE(NOS)
-report.dependency-convergence.stats.subprojects                    = \u5B50\u9879\u76EE\u7684\u6570\u76EE
+report.dependency-convergence.stats.snapshots                      = \u5FEB\u7167\u7248\u672C\u7684artifact\u6570\u76EE(NOS):
+report.dependency-convergence.stats.subprojects                    = \u5B50\u9879\u76EE\u7684\u6570\u76EE:
 report.dependency-convergence.title                                = \u5806\u5F0F\u4F9D\u8D56\u4E00\u81F4\u6027(Reactor Dependency Convergence)
 report.index.nodescription                                         = \u76EE\u524D\u6CA1\u6709\u5BF9\u672C\u9879\u76EE\u7684\u63CF\u8FF0\u3002
 report.index.title                                                 = \u6B22\u8FCE\u6765\u5230

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/SubProject1Stub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/SubProject1Stub.java?view=diff&rev=542322&r1=542321&r2=542322
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/SubProject1Stub.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/SubProject1Stub.java Mon May 28 14:31:49 2007
@@ -1,8 +1,5 @@
 package org.apache.maven.report.projectinfo.stubs;
 
-import java.util.Collections;
-import java.util.List;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,6 +19,12 @@
  * under the License.
  */
 
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Dependency;
+
 /**
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @version $Id $
@@ -42,6 +45,12 @@
      */
     public List getDependencies()
     {
-        return Collections.EMPTY_LIST;
+        Dependency d = new Dependency();
+        d.setGroupId( "junit" );
+        d.setArtifactId( "junit" );
+        d.setVersion( "3.8.1" );
+        d.setScope( Artifact.SCOPE_COMPILE );
+
+        return Collections.singletonList( d );
     }
 }

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/SubProject2Stub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/SubProject2Stub.java?view=diff&rev=542322&r1=542321&r2=542322
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/SubProject2Stub.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/SubProject2Stub.java Mon May 28 14:31:49 2007
@@ -1,8 +1,5 @@
 package org.apache.maven.report.projectinfo.stubs;
 
-import java.util.Collections;
-import java.util.List;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,6 +19,12 @@
  * under the License.
  */
 
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.model.Dependency;
+
 /**
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @version $Id $
@@ -42,6 +45,12 @@
      */
     public List getDependencies()
     {
-        return Collections.EMPTY_LIST;
+        Dependency d = new Dependency();
+        d.setGroupId( "junit" );
+        d.setArtifactId( "junit" );
+        d.setVersion( "3.8.1" );
+        d.setScope( Artifact.SCOPE_COMPILE );
+
+        return Collections.singletonList( d );
     }
 }