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/11 17:07:02 UTC
svn commit: r1747918 - in /maven/plugins/trunk/maven-site-plugin: pom.xml
src/main/java/org/apache/maven/plugins/site/render/SiteMojo.java
Author: hboutemy
Date: Sat Jun 11 17:07:02 2016
New Revision: 1747918
URL: http://svn.apache.org/viewvc?rev=1747918&view=rev
Log:
[MSITE-779] use AnsiUtils from MSHARED-552 to enable colors only with Maven 3.4+
Modified:
maven/plugins/trunk/maven-site-plugin/pom.xml
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=1747918&r1=1747917&r2=1747918&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/pom.xml Sat Jun 11 17:07:02 2016
@@ -220,6 +220,11 @@ under the License.
<artifactId>jansi</artifactId>
<version>1.12</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-project-utils</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
<!-- Maven -->
<dependency>
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=1747918&r1=1747917&r2=1747918&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 Sat Jun 11 17:07:02 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.fusesource.jansi.AnsiConsole;
+import org.apache.maven.shared.project.utils.AnsiUtils;
/**
* Generates the site for a single project.
@@ -128,7 +128,7 @@ public class SiteMojo
Locale defaultLocale = localesList.get( 0 );
Locale.setDefault( defaultLocale );
- AnsiConsole.systemInstall(); // prepare JAnsi if not run with Maven 3.4+
+ AnsiUtils.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
{
- AnsiConsole.systemUninstall();
+ AnsiUtils.systemUninstall();
}
}