diff --git a/jenkins-plugin/pom.xml b/jenkins-plugin/pom.xml index d92e37976..c6c25866a 100644 --- a/jenkins-plugin/pom.xml +++ b/jenkins-plugin/pom.xml @@ -57,6 +57,7 @@ + 2.145 3.6.6 -SNAPSHOT 2.2.6 @@ -103,6 +104,11 @@ HikariCP 3.1.0 + + org.jenkins-ci.plugins + ansicolor + 0.6.1-SNAPSHOT + org.jenkins-ci.plugins.workflow workflow-job @@ -518,7 +524,7 @@ org.kohsuke.stapler stapler - 1.254 + 1.254.1 org.apache.commons diff --git a/jenkins-plugin/src/main/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepExecution2.java b/jenkins-plugin/src/main/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepExecution2.java index f8dfa8aed..11f24025a 100644 --- a/jenkins-plugin/src/main/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepExecution2.java +++ b/jenkins-plugin/src/main/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepExecution2.java @@ -51,6 +51,9 @@ import hudson.model.Node; import hudson.model.Run; import hudson.model.TaskListener; +import hudson.plugins.ansicolor.AnsiColorConsoleLogFilter; +import hudson.plugins.ansicolor.AnsiColorMap; +import hudson.plugins.ansicolor.ColorizedAction; import hudson.slaves.WorkspaceList; import hudson.tasks.Maven; import hudson.tasks.Maven.MavenInstallation; @@ -222,11 +225,11 @@ protected boolean doStart() throws Exception { ConsoleLogFilter originalFilter = getContext().get(ConsoleLogFilter.class); ConsoleLogFilter maskSecretsFilter = MaskPasswordsConsoleLogFilter.newMaskPasswordsConsoleLogFilter(credentials, getComputer().getDefaultCharset()); - MavenColorizerConsoleLogFilter mavenColorizerFilter = new MavenColorizerConsoleLogFilter(getComputer().getDefaultCharset().name()); + //ConsoleLogFilter mavenColorizerFilter = new MavenColorizerConsoleLogFilter(getComputer().getDefaultCharset().name()); + + ConsoleLogFilter newFilter = BodyInvoker.mergeConsoleLogFilters(originalFilter, maskSecretsFilter); + build.replaceAction(new ColorizedAction(AnsiColorMap.DefaultName)); - ConsoleLogFilter newFilter = BodyInvoker.mergeConsoleLogFilters( - BodyInvoker.mergeConsoleLogFilters(originalFilter, maskSecretsFilter), - mavenColorizerFilter); EnvironmentExpander envEx = EnvironmentExpander.merge(getContext().get(EnvironmentExpander.class), new ExpanderImpl(envOverride)); @@ -357,6 +360,7 @@ private void setupMaven(@Nonnull Collection credentials) throws IOE // MAVEN_CONFIG StringBuilder mavenConfig = new StringBuilder(); mavenConfig.append("--batch-mode "); + mavenConfig.append("-Dstyle.color=always "); mavenConfig.append("--show-version "); if (StringUtils.isNotEmpty(settingsFilePath)) { mavenConfig.append("--settings \"" + settingsFilePath + "\" ");