You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2016/06/28 22:03:56 UTC

svn commit: r1750591 - in /maven/plugins/trunk/maven-site-plugin: pom.xml src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java

Author: hboutemy
Date: Tue Jun 28 22:03:56 2016
New Revision: 1750591

URL: http://svn.apache.org/viewvc?rev=1750591&view=rev
Log:
[MSITE-779] use new improved styled message API

Modified:
    maven/plugins/trunk/maven-site-plugin/pom.xml
    maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
    maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java

Modified: maven/plugins/trunk/maven-site-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/pom.xml?rev=1750591&r1=1750590&r2=1750591&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Tue Jun 28 22:03:56 2016
@@ -217,8 +217,8 @@ under the License.
     </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-project-utils</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
+      <artifactId>maven-shared-utils</artifactId>
+      <version>3.1.0-SNAPSHOT</version>
     </dependency>
 
     <!-- Maven -->

Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java?rev=1750591&r1=1750590&r2=1750591&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/ReportDocumentRenderer.java Tue Jun 28 22:03:56 2016
@@ -19,7 +19,7 @@ package org.apache.maven.plugins.site.re
  * under the License.
  */
 
-import static org.apache.maven.shared.project.utils.AnsiUtils.ansi;
+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -204,10 +204,10 @@ public class ReportDocumentRenderer
         Locale locale = siteRenderingContext.getLocale();
         String localReportName = report.getName( locale );
 
-        String msg = "Generating \"" + ansi().strong( localReportName ) + "\" report";
+        String msg = "Generating \"" + buffer().strong( localReportName ) + "\" report";
         // CHECKSTYLE_OFF: MagicNumber
         log.info( reportMojoInfo == null ? ( msg + '.' )
-                        : ( StringUtils.rightPad( msg, 40 ) + ansi().strong( " --- " ).mojo( reportMojoInfo ) ) );
+                        : ( StringUtils.rightPad( msg, 40 ) + buffer().strong( " --- " ).mojo( reportMojoInfo ) ) );
         // CHECKSTYLE_ON: MagicNumber
 
         // main sink

Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java?rev=1750591&r1=1750590&r2=1750591&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java Tue Jun 28 22:03:56 2016
@@ -41,7 +41,7 @@ import org.apache.maven.plugins.annotati
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.MavenReport;
 import org.apache.maven.reporting.exec.MavenReportExecution;
-import org.apache.maven.shared.project.utils.AnsiUtils;
+import org.apache.maven.shared.utils.logging.MessageUtils;
 
 /**
  * Generates the site for a single project.
@@ -128,7 +128,7 @@ public class SiteMojo
             Locale defaultLocale = localesList.get( 0 );
             Locale.setDefault( defaultLocale );
 
-            AnsiUtils.systemInstall(); // prepare JAnsi if not run with Maven 3.4+
+            MessageUtils.systemInstall(); // prepare JAnsi if not run with Maven 3.4+
             for ( Locale locale : localesList )
             {
                 renderLocale( locale, reports );
@@ -144,7 +144,7 @@ public class SiteMojo
         }
         finally
         {
-            AnsiUtils.systemUninstall();
+            MessageUtils.systemUninstall();
         }
     }