Merge pull request #7 from alvarolobato/JENKINS-38709

JENKINS-38709 - Merge previous console log filter instead of overriding it.
jenkinsci · Oct 27, 2016 · 1d71349 · 1d71349
2 parents c2d1365 + af60206
commit 1d71349
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepExecution.java b/src/main/java/org/jenkinsci/plugins/pipeline/maven/WithMavenStepExecution.java
@@ -51,6 +51,7 @@
 import org.jenkinsci.plugins.workflow.steps.AbstractStepExecutionImpl;
 import org.jenkinsci.plugins.workflow.steps.BodyExecution;
 import org.jenkinsci.plugins.workflow.steps.BodyExecutionCallback;
+import org.jenkinsci.plugins.workflow.steps.BodyInvoker;
 import org.jenkinsci.plugins.workflow.steps.EnvironmentExpander;
 import org.jenkinsci.plugins.workflow.steps.StepContext;
 import org.jenkinsci.plugins.workflow.steps.StepContextParameter;
@@ -133,7 +134,7 @@ public boolean start() throws Exception {
         setupJDK();
         setupMaven();
 
-        MavenConsoleFilter consFilter = new MavenConsoleFilter(getComputer().getDefaultCharset().name());
+        ConsoleLogFilter consFilter = BodyInvoker.mergeConsoleLogFilters(getContext().get(ConsoleLogFilter.class), new MavenConsoleFilter(getComputer().getDefaultCharset().name()));
         EnvironmentExpander envEx = EnvironmentExpander.merge(getContext().get(EnvironmentExpander.class), new ExpanderImpl(envOverride));
 
         body = getContext().newBodyInvoker().withContexts(envEx, consFilter).withCallback(new Callback(tempBinDir)).start();