diff --git a/utplsql-maven-plugin/src/main/java/org/utplsql/maven/plugin/UtPLSQLMojo.java b/utplsql-maven-plugin/src/main/java/org/utplsql/maven/plugin/UtPLSQLMojo.java index d25793c..1dbcfd2 100644 --- a/utplsql-maven-plugin/src/main/java/org/utplsql/maven/plugin/UtPLSQLMojo.java +++ b/utplsql-maven-plugin/src/main/java/org/utplsql/maven/plugin/UtPLSQLMojo.java @@ -16,6 +16,7 @@ import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.project.MavenProject; +import org.apache.maven.shared.utils.logging.MessageUtils; import org.utplsql.api.DBHelper; import org.utplsql.api.FileMapperOptions; import org.utplsql.api.JavaApiVersionInfo; @@ -61,14 +62,14 @@ public class UtPLSQLMojo extends AbstractMojo { protected boolean skipCompatibilityCheck; @Parameter - protected List reporters = new ArrayList(); + protected List reporters = new ArrayList<>(); @Parameter - protected List paths = new ArrayList(); + protected List paths = new ArrayList<>(); // Sources Configuration @Parameter - protected List sources = new ArrayList(); + protected List sources = new ArrayList<>(); @Parameter private String sourcesOwner; @@ -117,8 +118,8 @@ public class UtPLSQLMojo extends AbstractMojo { @Parameter(defaultValue = "${maven.test.failure.ignore}") protected boolean ignoreFailure; - // Color in the console, loaded by environment variables - private boolean colorConsole = PluginDefault.resolveColor(); + // Color in the console, bases on maven logging configuration + private boolean colorConsole = MessageUtils.isColorEnabled(); // Reporter Writer private ReporterWriter reporterWriter; diff --git a/utplsql-maven-plugin/src/main/java/org/utplsql/maven/plugin/helper/PluginDefault.java b/utplsql-maven-plugin/src/main/java/org/utplsql/maven/plugin/helper/PluginDefault.java index f645fcb..869747f 100644 --- a/utplsql-maven-plugin/src/main/java/org/utplsql/maven/plugin/helper/PluginDefault.java +++ b/utplsql-maven-plugin/src/main/java/org/utplsql/maven/plugin/helper/PluginDefault.java @@ -1,8 +1,6 @@ package org.utplsql.maven.plugin.helper; -import java.io.File; import java.util.Arrays; -import java.util.Map; import org.apache.maven.model.Resource; @@ -14,13 +12,6 @@ */ public class PluginDefault { - - private static final String STYLE_COLOR_PROPERTY = "style.color"; - - private static final String BATCH_MODE = "B"; - - private static final String LOG_FILE = "l"; - // Source Directory public static final String SOURCE_DIRECTORY = "src/main/plsql"; @@ -69,32 +60,4 @@ private static Resource buildDirectory(String directory, String includes) resource.setIncludes(Arrays.asList(includes)); return resource; } - - /** - * - * @return - */ - public static boolean resolveColor() - { - final Map env = System.getenv(); - String color = env.get(STYLE_COLOR_PROPERTY); - - if ("always".equals(color)) - { - return true; - } - - if ("never".equals(color)) - { - return false; - } - - if (env.containsKey(BATCH_MODE) || env.containsKey(LOG_FILE)) - { - return false; - } - - return false; - } - }