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:06:02 UTC
svn commit: r1747917 - in /maven/shared/trunk/maven-project-utils: pom.xml
src/main/java/org/apache/maven/shared/project/runtime/MavenUtils.java
src/main/java/org/apache/maven/shared/project/utils/AnsiUtils.java
Author: hboutemy
Date: Sat Jun 11 17:06:02 2016
New Revision: 1747917
URL: http://svn.apache.org/viewvc?rev=1747917&view=rev
Log:
[MSHARED-552] added a utility to activate ANSI color only if Maven 3.4+
Added:
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/AnsiUtils.java (with props)
Modified:
maven/shared/trunk/maven-project-utils/pom.xml
maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/runtime/MavenUtils.java
Modified: maven/shared/trunk/maven-project-utils/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/pom.xml?rev=1747917&r1=1747916&r2=1747917&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/pom.xml (original)
+++ maven/shared/trunk/maven-project-utils/pom.xml Sat Jun 11 17:06:02 2016
@@ -70,6 +70,11 @@ under the License.
<version>${mavenVersion}</version>
</dependency>
<dependency>
+ <groupId>org.fusesource.jansi</groupId>
+ <artifactId>jansi</artifactId>
+ <version>1.12</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
Modified: maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/runtime/MavenUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/runtime/MavenUtils.java?rev=1747917&r1=1747916&r2=1747917&view=diff
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/runtime/MavenUtils.java (original)
+++ maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/runtime/MavenUtils.java Sat Jun 11 17:06:02 2016
@@ -61,4 +61,15 @@ public final class MavenUtils
return properties.getProperty( "version" ).trim();
}
+
+ /**
+ * Get Maven version as major.minor float
+ *
+ * @return
+ */
+ public static float getMavenVersionAsFloat()
+ {
+ String[] digits = getMavenVersion().split( "\\." );
+ return Float.parseFloat( digits[0] + '.' + digits[1] );
+ }
}
Added: maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/AnsiUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/AnsiUtils.java?rev=1747917&view=auto
==============================================================================
--- maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/AnsiUtils.java (added)
+++ maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/AnsiUtils.java Sat Jun 11 17:06:02 2016
@@ -0,0 +1,51 @@
+package org.apache.maven.shared.project.utils;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.shared.project.runtime.MavenUtils;
+import org.fusesource.jansi.Ansi;
+import org.fusesource.jansi.AnsiConsole;
+
+/**
+ * Ansi color utils, to enable colors only if Maven version is at least 3.4.
+ */
+public class AnsiUtils
+{
+ private static final float MINIMUM_MAVEN_VERSION = 3.4f; // color added in Maven 3.4.0: see MNG-3507
+
+ private AnsiUtils()
+ {
+ }
+
+ public static void systemInstall()
+ {
+ AnsiConsole.systemInstall();
+ if ( MavenUtils.getMavenVersionAsFloat() < MINIMUM_MAVEN_VERSION )
+ {
+ // ANSI color support was added in Maven 3.4.0: don't enable color if executing older Maven versions
+ Ansi.setEnabled( false );
+ }
+ }
+
+ public static void systemUninstall()
+ {
+ AnsiConsole.systemUninstall();
+ }
+}
Propchange: maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/AnsiUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/AnsiUtils.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/shared/trunk/maven-project-utils/src/main/java/org/apache/maven/shared/project/utils/AnsiUtils.java
------------------------------------------------------------------------------
svn:mime-type = text/plain