← 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/matrix/MatrixBuild.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/matrix/MatrixBuild.java
104
104
            return;
105
105
        }
106
106
        
107
 
        List<MatrixRun> runs = getRuns();
 
107
        List<MatrixRun> runs = getExactRuns();
108
108
        for(MatrixRun run : runs){
109
109
                why = run.getWhyKeepLog();
110
110
            if (why!=null) {
246
246
    @Override
247
247
    public String getWhyKeepLog() {
248
248
        MatrixBuild b = getNextBuild();
249
 
        if (b!=null && b.isPartial())
250
 
            return b.getDisplayName()+" depends on this";
 
249
        if (isLinkedBy(b))
 
250
            return Messages.MatrixBuild_depends_on_this(b.getDisplayName());
251
251
        return super.getWhyKeepLog();
252
252
    }
253
253
 
 
254
    /** 
 
255
     * @return True if another {@link MatrixBuild} build (passed as a parameter) depends on this build.
 
256
     * @since 1.481 
 
257
     */
 
258
    public boolean isLinkedBy(MatrixBuild b) {
 
259
        if(null == b)
 
260
                return false;
 
261
        for(MatrixConfiguration c : b.getParent().getActiveConfigurations()) {
 
262
            MatrixRun r = c.getNearestOldBuild(b.getNumber());
 
263
            if (r != null && r.getNumber()==getNumber())
 
264
                return true;
 
265
        }
 
266
        return false;
 
267
    }
 
268
    
254
269
    /**
255
270
     * True if this build didn't do a full build and it is depending on the result of the previous build.
256
271
     */