← Back to branch summary

~ubuntu-branches/ubuntu/saucy/jenkins/saucy-proposed

« back to all changes in this revision

Viewing changes to core/src/main/java/hudson/tasks/BuildWrapper.java

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-08-13 12:35:19 UTC
  • mfrom: (1.1.13)
  • Revision ID: package-import@ubuntu.com-20130813123519-tizgfxcr70trl7r0
Tags: 1.509.2+dfsg-1
http://bugs.debian.org/706725
http://bugs.debian.org/701163
http://bugs.debian.org/704848
* New upstream release (Closes: #706725):
  - d/control: Update versioned BD's:
    * jenkins-executable-war >= 1.28.
    * jenkins-instance-identity >= 1.3.
    * libjenkins-remoting-java >= 2.23.
    * libjenkins-winstone-java >= 0.9.10-jenkins-44.
    * libstapler-java >= 1.207.
    * libjenkins-json-java >= 2.4-jenkins-1.
    * libstapler-adjunct-timeline-java >= 1.4.
    * libstapler-adjunct-codemirror-java >= 1.2.
    * libmaven-hpi-plugin-java >= 1.93.
    * libjenkins-xstream-java >= 1.4.4-jenkins-3.
  - d/maven.rules: Map to older version of animal-sniffer-maven-plugin.
  - Add patch for compatibility with guava >= 0.14.
  - Add patch to exclude asm4 dependency via jnr-posix.
  - Fixes the following security vulnerabilities:
    CVE-2013-2034, CVE-2013-2033, CVE-2013-2034, CVE-2013-1808
* d/patches/*: Switch to using git patch-queue for managing patches.
* De-duplicate jars between libjenkins-java and jenkins-external-job-monitor
  (Closes: #701163):
  - d/control: Add dependency between jenkins-external-job-monitor ->
    libjenkins-java.
  - d/rules: 
    Drop installation of jenkins-core in jenkins-external-job-monitor.
  - d/jenkins-external-job-monitor.{links,install}: Link to jenkins-core
    in /usr/share/java instead of included version.
* Wait longer for jenkins to stop during restarts (Closes: #704848):
  - d/jenkins.init: Re-sync init script from upstream codebase.

Show diffs side-by-side

added added

removed removed

Lines of Context:
core/src/main/java/hudson/tasks/BuildWrapper.java
27
27
import hudson.Launcher;
28
28
import hudson.DescriptorExtensionList;
29
29
import hudson.LauncherDecorator;
 
30
import hudson.console.ConsoleLogFilter;
30
31
import hudson.model.*;
31
32
import hudson.model.Run.RunnerAbortedException;
 
33
import hudson.util.ArgumentListBuilder;
32
34
import jenkins.model.Jenkins;
33
35
 
34
36
import java.io.IOException;
194
196
     * 
195
197
     * <p>
196
198
     * The default implementation is no-op, which just returns the {@code logger} parameter as-is.
197
 
     *
 
199
     * <p>({@link ArgumentListBuilder#add(String, boolean)} is a simpler way to suppress a single password.)
198
200
     * @param build
199
201
     *      The build in progress for which this {@link BuildWrapper} is called. Never null.
200
202
     * @param logger
207
209
     *      If a fatal error is detected but the implementation handled it gracefully, throw this exception
208
210
     *      to suppress stack trace.
209
211
     * @since 1.374
 
212
     * @see ConsoleLogFilter
210
213
     */
211
214
    public OutputStream decorateLogger(AbstractBuild build, OutputStream logger) throws IOException, InterruptedException, RunnerAbortedException {
212
215
        return logger;