~ubuntu-branches/ubuntu/trusty/jenkins/trusty

« back to all changes in this revision

Viewing changes to core/src/main/java/hudson/util/DescribableList.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
* 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:
31
31
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
32
32
import com.thoughtworks.xstream.mapper.Mapper;
33
33
import hudson.model.AbstractProject;
34
 
import hudson.model.DependecyDeclarer;
 
34
import jenkins.model.DependencyDeclarer;
35
35
import hudson.model.DependencyGraph;
36
36
import hudson.model.Describable;
37
37
import hudson.model.Descriptor;
204
204
    }
205
205
 
206
206
    /**
207
 
     * Picks up {@link DependecyDeclarer}s and allow it to build dependencies.
 
207
     * Picks up {@link DependencyDeclarer}s and allow it to build dependencies.
208
208
     */
209
209
    public void buildDependencyGraph(AbstractProject owner,DependencyGraph graph) {
210
210
        for (Object o : this) {
211
 
            if (o instanceof DependecyDeclarer) {
212
 
                DependecyDeclarer dd = (DependecyDeclarer) o;
 
211
            if (o instanceof DependencyDeclarer) {
 
212
                DependencyDeclarer dd = (DependencyDeclarer) o;
213
213
                dd.buildDependencyGraph(owner,graph);
214
214
            }
215
215
        }