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

« back to all changes in this revision

Viewing changes to core/src/main/java/hudson/model/ItemGroupMixIn.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:
203
203
        Util.copyFile(Items.getConfigFile(src).getFile(),Items.getConfigFile(result).getFile());
204
204
 
205
205
        // reload from the new config
206
 
        result = (T)Items.load(parent,result.getRootDir());
 
206
        Items.updatingByXml.set(true);
 
207
        try {
 
208
            result = (T)Items.load(parent,result.getRootDir());
 
209
        } finally {
 
210
            Items.updatingByXml.set(false);
 
211
        }
207
212
        result.onCopiedFrom(src);
208
213
 
209
214
        add(result);
224
229
            IOUtils.copy(xml,configXml);
225
230
 
226
231
            // load it
227
 
            TopLevelItem result = (TopLevelItem)Items.load(parent,configXml.getParentFile());
 
232
            TopLevelItem result;
 
233
            Items.updatingByXml.set(true);
 
234
            try {
 
235
                result = (TopLevelItem)Items.load(parent,configXml.getParentFile());
 
236
            } finally {
 
237
                Items.updatingByXml.set(false);
 
238
            }
228
239
            add(result);
229
240
 
230
241
            ItemListener.fireOnCreated(result);