From 87e2a7e8d5ac995a05b82c1e7839285102c111d0 Mon Sep 17 00:00:00 2001
From: ikedam <devld@ikedam.jp>
Date: Tue, 10 Dec 2013 23:53:38 +0900
Subject: [PATCH 01/36] [FIXED JENKINS-19976] Enable plugins to load classes
 from optionally depending plugins even without restarting after depended ones
 installed.

---
 .../java/hudson/ClassicPluginStrategy.java    | 44 +++++++++++++++++++
 core/src/main/java/hudson/PluginManager.java  | 17 +++++++
 core/src/main/java/hudson/PluginStrategy.java |  8 ++++
 3 files changed, 69 insertions(+)

diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index f60166f34e..0cedd1ea25 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -377,6 +377,45 @@ public class ClassicPluginStrategy implements PluginStrategy {
         plugin.getPlugin().start();
     }
 
+    /**
+     * Called when a plugin is deployed, and there is a plugin optionally depending on that plugin.
+     * The class loader of the existing depending plugin should be updated
+     * to load classes from the newly deployed plugin.
+     * 
+     * @param depender the plugin to update its class loader
+     * @param dependee
+     * @see hudson.PluginStrategy#updateDependency(hudson.PluginWrapper, hudson.PluginWrapper)
+     */
+    @Override
+    public void updateDependency(PluginWrapper depender, PluginWrapper dependee) {
+        DependencyClassLoader classLoader = findAncestorDependencyClassLoader(depender.classLoader);
+        if (classLoader != null) {
+            classLoader.updateTransientDependencies();
+            LOGGER.log(Level.INFO, "Updated dependency of {0}", depender.getShortName());
+        }
+    }
+
+    private DependencyClassLoader findAncestorDependencyClassLoader(ClassLoader classLoader)
+    {
+        for (; classLoader != null; classLoader = classLoader.getParent()) {
+            if (classLoader instanceof DependencyClassLoader) {
+                return (DependencyClassLoader)classLoader;
+            }
+            
+            if (classLoader instanceof AntClassLoader) {
+                // AntClassLoaders hold parents not only as AntClassLoader#getParent()
+                // but also as AntClassLoader#getConfiguredParent()
+                DependencyClassLoader ret = findAncestorDependencyClassLoader(
+                        ((AntClassLoader)classLoader).getConfiguredParent()
+                );
+                if (ret != null) {
+                    return ret;
+                }
+            }
+        }
+        return null;
+    }
+
     private static File resolve(File base, String relative) {
         File rel = new File(relative);
         if(rel.isAbsolute())
@@ -523,6 +562,11 @@ public class ClassicPluginStrategy implements PluginStrategy {
             this.dependencies = dependencies;
         }
 
+        private void updateTransientDependencies() {
+            // This will be recalculated at the next time.
+            transientDependencies = null;
+        }
+
         private List<PluginWrapper> getTransitiveDependencies() {
             if (transientDependencies==null) {
                 CyclicGraphDetector<PluginWrapper> cgd = new CyclicGraphDetector<PluginWrapper>() {
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index dc657a9a0b..64371a5dd4 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -450,6 +450,23 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
         } catch (ReactorException e) {
             throw new IOException("Failed to initialize "+ sn +" plugin",e);
         }
+        
+        // recalculate dependencies of plugins optionally depending the newly deployed one.
+        for (PluginWrapper depender: plugins) {
+            if (depender.equals(p)) {
+                // skip itself.
+                continue;
+            }
+            for (Dependency d: depender.getOptionalDependencies()) {
+                if (d.shortName.equals(p.getShortName())) {
+                    // this plugin depends on the newly loaded one!
+                    // recalculate dependencies!
+                    getPluginStrategy().updateDependency(depender, p);
+                    break;
+                }
+            }
+        }
+        
         LOGGER.info("Plugin " + sn + " dynamically installed");
     }
 
diff --git a/core/src/main/java/hudson/PluginStrategy.java b/core/src/main/java/hudson/PluginStrategy.java
index 6024c3571f..d61e23732a 100644
--- a/core/src/main/java/hudson/PluginStrategy.java
+++ b/core/src/main/java/hudson/PluginStrategy.java
@@ -77,4 +77,12 @@ public interface PluginStrategy extends ExtensionPoint {
 	 * @since 1.400
 	 */
 	<T> List<ExtensionComponent<T>> findComponents(Class<T> type, Hudson hudson);
+    
+    /**
+     * Called when a plugin that is depended by another plugin is newly deployed.
+     * 
+     * @param depender plugin depending on dependee.
+     * @param dependee newly loaded plugin.
+     */
+    void updateDependency(PluginWrapper depender, PluginWrapper dependee);
 }

From 8fde2e18a3a6da843d7719844e1fdd737e652c74 Mon Sep 17 00:00:00 2001
From: ikedam <devld@ikedam.jp>
Date: Thu, 12 Dec 2013 00:10:32 +0900
Subject: [PATCH 02/36] [JENKINS-19976] Tests for the behavior of loading a
 depended plugin dynamically.

---
 .../test/java/hudson/PluginManagerTest.java   | 101 ++++++++++++++++++
 1 file changed, 101 insertions(+)

diff --git a/test/src/test/java/hudson/PluginManagerTest.java b/test/src/test/java/hudson/PluginManagerTest.java
index 6add26b107..ed0b50565d 100644
--- a/test/src/test/java/hudson/PluginManagerTest.java
+++ b/test/src/test/java/hudson/PluginManagerTest.java
@@ -41,6 +41,7 @@ import org.jvnet.hudson.test.recipes.WithPlugin;
 import org.jvnet.hudson.test.recipes.WithPluginManager;
 
 import java.io.File;
+import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.Collections;
@@ -222,4 +223,104 @@ public class PluginManagerTest extends HudsonTestCase {
         // TODO required plugin installed but inactive
     }
 
+    // plugin "depender" optionally depends on plugin "dependee".
+    // they are written like this:
+    // dummy.comp.depender.Depender:
+    //   public class Depender {
+    //     public static String getValue() {
+    //       if (Jenkins.getInstance().getPlugin("dependee") != null) {
+    //         return Dependee.getValue();
+    //       }
+    //       return "depender";
+    //     }
+    //   }
+    // 
+    // dummy.comp.dependee.Dependee:
+    //   public class Dependee {
+    //     public static String getValue() {
+    //       return "dependee";
+    //     }
+    //   }
+    
+    
+    /**
+     * call dummy.comp.depender.Depender.getValue().
+     * 
+     * @return
+     * @throws Exception
+     */
+    private String callDependerValue() throws Exception {
+        Class<?> c = jenkins.getPluginManager().uberClassLoader.loadClass("dummy.comp.depender.Depender");
+        Method m = c.getMethod("getValue");
+        return (String)m.invoke(null);
+    }
+    
+    /**
+     * Load "dependee" and then load "depender".
+     * Asserts that "depender" can access to "dependee".
+     * 
+     * @throws Exception
+     */
+    public void testInstallDependingPluginWithoutRestart() throws Exception {
+        // Load dependee.
+        {
+            String target = "dependee.hpi";
+            URL src = getClass().getClassLoader().getResource(String.format("plugins/%s", target));
+            File dest = new File(jenkins.getRootDir(), String.format("plugins/%s", target));
+            FileUtils.copyURLToFile(src, dest);
+            jenkins.pluginManager.dynamicLoad(dest);
+        }
+        
+        // before load depender, failed to call Depender.getValue()
+        try {
+            callDependerValue();
+            fail();
+        } catch( Exception e ) {
+        }
+        
+        // Load depender.
+        {
+            String target = "depender.hpi";
+            URL src = getClass().getClassLoader().getResource(String.format("plugins/%s", target));
+            File dest = new File(jenkins.getRootDir(), String.format("plugins/%s", target));
+            FileUtils.copyURLToFile(src, dest);
+            jenkins.pluginManager.dynamicLoad(dest);
+        }
+        
+        // depender successfully access to dependee.
+        assertEquals("dependee", callDependerValue());
+    }
+    
+    /**
+     * Load "depender" and then load "dependee".
+     * Asserts that "depender" can access to "dependee".
+     * 
+     * @throws Exception
+     */
+    public void testInstallDependedPluginWithoutRestart() throws Exception {
+        // Load depender.
+        {
+            String target = "depender.hpi";
+            URL src = getClass().getClassLoader().getResource(String.format("plugins/%s", target));
+            File dest = new File(jenkins.getRootDir(), String.format("plugins/%s", target));
+            FileUtils.copyURLToFile(src, dest);
+            jenkins.pluginManager.dynamicLoad(dest);
+        }
+        
+        // before load dependee, depender does not access to dependee.
+        assertEquals("depender", callDependerValue());
+        
+        // Load dependee.
+        {
+            String target = "dependee.hpi";
+            URL src = getClass().getClassLoader().getResource(String.format("plugins/%s", target));
+            File dest = new File(jenkins.getRootDir(), String.format("plugins/%s", target));
+            FileUtils.copyURLToFile(src, dest);
+            jenkins.pluginManager.dynamicLoad(dest);
+        }
+        
+        // depender successfully access to dependee.
+        assertEquals("dependee", callDependerValue());
+    }
+
 }

From 536bac6425b465ad98650083ba81655265e5508f Mon Sep 17 00:00:00 2001
From: ikedam <devld@ikedam.jp>
Date: Thu, 12 Dec 2013 22:17:42 +0900
Subject: [PATCH 03/36] [JENKINS-19976] Added tests how dynamic load works for
 @Extension.

---
 .../test/java/hudson/PluginManagerTest.java   | 49 ++++++++++++++-----
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/test/src/test/java/hudson/PluginManagerTest.java b/test/src/test/java/hudson/PluginManagerTest.java
index ed0b50565d..62a0f9a264 100644
--- a/test/src/test/java/hudson/PluginManagerTest.java
+++ b/test/src/test/java/hudson/PluginManagerTest.java
@@ -225,7 +225,17 @@ public class PluginManagerTest extends HudsonTestCase {
 
     // plugin "depender" optionally depends on plugin "dependee".
     // they are written like this:
-    // dummy.comp.depender.Depender:
+    // org.jenkinsci.plugins.dependencytest.dependee:
+    //   public class Dependee {
+    //     public static String getValue() {
+    //       return "dependee";
+    //     }
+    //   }
+    //   
+    //   public abstract class DependeeExtensionPoint implements ExtensionPoint {
+    //   }
+    //   
+    // org.jenkinsci.plugins.dependencytest.depender:
     //   public class Depender {
     //     public static String getValue() {
     //       if (Jenkins.getInstance().getPlugin("dependee") != null) {
@@ -234,23 +244,20 @@ public class PluginManagerTest extends HudsonTestCase {
     //       return "depender";
     //     }
     //   }
-    // 
-    // dummy.comp.dependee.Dependee:
-    //   public class Dependee {
-    //     public static String getValue() {
-    //       return "dependee";
-    //     }
+    //   
+    //   @Extension(optional=true)
+    //   public class DependerExtension extends DependeeExtensionPoint {
     //   }
     
     
     /**
-     * call dummy.comp.depender.Depender.getValue().
+     * call org.jenkinsci.plugins.dependencytest.depender.Depender.getValue().
      * 
      * @return
      * @throws Exception
      */
     private String callDependerValue() throws Exception {
-        Class<?> c = jenkins.getPluginManager().uberClassLoader.loadClass("dummy.comp.depender.Depender");
+        Class<?> c = jenkins.getPluginManager().uberClassLoader.loadClass("org.jenkinsci.plugins.dependencytest.depender.Depender");
         Method m = c.getMethod("getValue");
         return (String)m.invoke(null);
     }
@@ -271,13 +278,16 @@ public class PluginManagerTest extends HudsonTestCase {
             jenkins.pluginManager.dynamicLoad(dest);
         }
         
-        // before load depender, failed to call Depender.getValue()
+        // before load depender, of course failed to call Depender.getValue()
         try {
             callDependerValue();
             fail();
-        } catch( Exception e ) {
+        } catch (ClassNotFoundException _) {
         }
         
+        // No extensions exist.
+        assertTrue(jenkins.getExtensionList("org.jenkinsci.plugins.dependencytest.dependee.DependeeExtensionPoint").isEmpty());
+        
         // Load depender.
         {
             String target = "depender.hpi";
@@ -287,8 +297,12 @@ public class PluginManagerTest extends HudsonTestCase {
             jenkins.pluginManager.dynamicLoad(dest);
         }
         
-        // depender successfully access to dependee.
+        // (MUST) Not throws an exception
+        // (SHOULD) depender successfully accesses to dependee.
         assertEquals("dependee", callDependerValue());
+        
+        // Extension in depender is loaded.
+        assertFalse(jenkins.getExtensionList("org.jenkinsci.plugins.dependencytest.dependee.DependeeExtensionPoint").isEmpty());
     }
     
     /**
@@ -310,6 +324,13 @@ public class PluginManagerTest extends HudsonTestCase {
         // before load dependee, depender does not access to dependee.
         assertEquals("depender", callDependerValue());
         
+        // before load dependee, of course failed to list extensions for dependee.
+        try {
+            jenkins.getExtensionList("org.jenkinsci.plugins.dependencytest.dependee.DependeeExtensionPoint");
+            fail();
+        } catch( ClassNotFoundException _ ){
+        }
+        
         // Load dependee.
         {
             String target = "dependee.hpi";
@@ -321,6 +342,10 @@ public class PluginManagerTest extends HudsonTestCase {
         
         // depender successfully access to dependee.
         assertEquals("dependee", callDependerValue());
+        
+        // No extensions exist.
+        // extensions in depender is not loaded.
+        assertTrue(jenkins.getExtensionList("org.jenkinsci.plugins.dependencytest.dependee.DependeeExtensionPoint").isEmpty());
     }
 
 }

From 2c047e0264a03465a3c017abf86c035a011c2479 Mon Sep 17 00:00:00 2001
From: ikedam <devld@ikedam.jp>
Date: Thu, 12 Dec 2013 22:24:50 +0900
Subject: [PATCH 04/36] [JENKINS-19976] Added plugins to test dynamic loading.

---
 test/src/test/resources/plugins/dependee.hpi | Bin 0 -> 4672 bytes
 test/src/test/resources/plugins/depender.hpi | Bin 0 -> 5505 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test/src/test/resources/plugins/dependee.hpi
 create mode 100644 test/src/test/resources/plugins/depender.hpi

diff --git a/test/src/test/resources/plugins/dependee.hpi b/test/src/test/resources/plugins/dependee.hpi
new file mode 100644
index 0000000000000000000000000000000000000000..0459ae63727d9427b4fe44137ef88d90413c3338
GIT binary patch
literal 4672
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

literal 0
HcmV?d00001

diff --git a/test/src/test/resources/plugins/depender.hpi b/test/src/test/resources/plugins/depender.hpi
new file mode 100644
index 0000000000000000000000000000000000000000..bebd4b6943a835bdf14eeaae5cb0768862779a37
GIT binary patch
literal 5505
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

literal 0
HcmV?d00001


From 38f670cf39224c40752e47e279710afeebc585e7 Mon Sep 17 00:00:00 2001
From: ikedam <devld@ikedam.jp>
Date: Fri, 13 Dec 2013 23:00:06 +0900
Subject: [PATCH 05/36] [JENKINS-19976] Fixed confusing comments.

---
 test/src/test/java/hudson/PluginManagerTest.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/src/test/java/hudson/PluginManagerTest.java b/test/src/test/java/hudson/PluginManagerTest.java
index 62a0f9a264..b068598c94 100644
--- a/test/src/test/java/hudson/PluginManagerTest.java
+++ b/test/src/test/java/hudson/PluginManagerTest.java
@@ -297,8 +297,7 @@ public class PluginManagerTest extends HudsonTestCase {
             jenkins.pluginManager.dynamicLoad(dest);
         }
         
-        // (MUST) Not throws an exception
-        // (SHOULD) depender successfully accesses to dependee.
+        // depender successfully accesses to dependee.
         assertEquals("dependee", callDependerValue());
         
         // Extension in depender is loaded.
@@ -340,7 +339,8 @@ public class PluginManagerTest extends HudsonTestCase {
             jenkins.pluginManager.dynamicLoad(dest);
         }
         
-        // depender successfully access to dependee.
+        // (MUST) Not throws an exception
+        // (SHOULD) depender successfully accesses to dependee.
         assertEquals("dependee", callDependerValue());
         
         // No extensions exist.

From ad0144f51f3bf5c104ce12bc3235bee807db9e75 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Mon, 17 Mar 2014 11:08:16 -0700
Subject: [PATCH 06/36] making the version more machine discoverable

---
 core/src/main/resources/hudson/AboutJenkins/index.jelly | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/resources/hudson/AboutJenkins/index.jelly b/core/src/main/resources/hudson/AboutJenkins/index.jelly
index 8b43cd979f..259b52e9f1 100644
--- a/core/src/main/resources/hudson/AboutJenkins/index.jelly
+++ b/core/src/main/resources/hudson/AboutJenkins/index.jelly
@@ -27,7 +27,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
   <l:layout title="${%about(app.VERSION)}" norefresh="true">
     <l:main-panel>
-      <h1>${%about(app.VERSION)}</h1>
+      <h1 version="${app.VERSION}">${%about(app.VERSION)}</h1>
       <p>
         ${%blurb}
       </p>

From 5de6a8d06dbc2fe7e34bf8fb531c6588bbc77db8 Mon Sep 17 00:00:00 2001
From: Oleg Nenashev <o.v.nenashev@gmail.com>
Date: Mon, 17 Mar 2014 22:30:58 +0400
Subject: [PATCH 07/36] [JENKINS-21190] - lib/layout/layout.jelly: Interpret
 norefresh=="false" as "autorefresh is enabled"

The fix allows to explicitly disable automatic page refreshes in the @View extensions.
Resolves https://issues.jenkins-ci.org/browse/JENKINS-21190

Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>
---
 core/src/main/java/hudson/model/View.java              | 9 +++++++++
 core/src/main/resources/hudson/model/View/index.jelly  | 2 +-
 core/src/main/resources/lib/layout/breadcrumbBar.jelly | 2 +-
 core/src/main/resources/lib/layout/layout.jelly        | 5 ++---
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java
index 0a418e1310..fee18dd273 100644
--- a/core/src/main/java/hudson/model/View.java
+++ b/core/src/main/java/hudson/model/View.java
@@ -373,6 +373,15 @@ public abstract class View extends AbstractModelObject implements AccessControll
         return true;
     }
     
+    /**
+     * Enables or disables automatic refreshes of the view.
+     * By default, automatic refreshes are enabled.
+     * @since TODO: define a version
+     */
+    public boolean isAutomaticRefreshEnabled() {
+        return true;
+    }
+    
     /**
      * If true, only show relevant executors
      */
diff --git a/core/src/main/resources/hudson/model/View/index.jelly b/core/src/main/resources/hudson/model/View/index.jelly
index 464262f320..b74f00dc4d 100644
--- a/core/src/main/resources/hudson/model/View/index.jelly
+++ b/core/src/main/resources/hudson/model/View/index.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
-    <l:layout title="${it.class.name=='hudson.model.AllView' ? '%Dashboard' : it.viewName}${not empty it.ownerItemGroup.fullDisplayName?' ['+it.ownerItemGroup.fullDisplayName+']':''}">
+    <l:layout title="${it.class.name=='hudson.model.AllView' ? '%Dashboard' : it.viewName}${not empty it.ownerItemGroup.fullDisplayName?' ['+it.ownerItemGroup.fullDisplayName+']':''}" norefresh="${!it.automaticRefreshEnabled}">
       <j:set var="view" value="${it}"/> <!-- expose view to the scripts we include from owner -->
         <st:include page="sidepanel.jelly" />
         <l:main-panel>
diff --git a/core/src/main/resources/lib/layout/breadcrumbBar.jelly b/core/src/main/resources/lib/layout/breadcrumbBar.jelly
index f00fb45e99..ef1b411328 100644
--- a/core/src/main/resources/lib/layout/breadcrumbBar.jelly
+++ b/core/src/main/resources/lib/layout/breadcrumbBar.jelly
@@ -40,7 +40,7 @@ THE SOFTWARE.
       <div class="top-sticker noedge">
         <div class="top-sticker-inner">
           <div id="right-top-nav">
-            <j:if test="${norefresh==null}">
+            <j:if test="${norefresh==null or norefresh==false}">
               <div id="right-top-nav">
                 <div class="smallfont">
                   <j:choose>
diff --git a/core/src/main/resources/lib/layout/layout.jelly b/core/src/main/resources/lib/layout/layout.jelly
index 95d73c8d01..46acef6e2b 100644
--- a/core/src/main/resources/lib/layout/layout.jelly
+++ b/core/src/main/resources/lib/layout/layout.jelly
@@ -34,7 +34,7 @@ THE SOFTWARE.
       Title of the HTML page. Rendered into &lt;title> tag.
     </st:attribute>
     <st:attribute name="norefresh">
-      If non-null, auto refresh is disabled on this page.
+      If non-null and not "false", auto refresh is disabled on this page.
       This is necessary for pages that include forms.
     </st:attribute>
     <st:attribute name="css" deprecated="true">
@@ -67,8 +67,7 @@ ${h.initPageVariables(context)}
   which I suspect can end up creating sessions for wrong resource types (such as static resources.)
 -->
 <j:set var="_" value="${request.getSession()}"/>
-<j:set var="_" value="${h.configureAutoRefresh(request, response, attrs.norefresh!=null)}"/>
-
+<j:set var="_" value="${h.configureAutoRefresh(request, response, attrs.norefresh!=null and !attrs.norefresh.equals(false))}"/>
   <j:if test="${request.servletPath=='/' || request.servletPath==''}">
     ${h.advertiseHeaders(response)}
     <j:forEach var="pd" items="${h.pageDecorators}">

From 4bb0f98901e2836688ae6c56b9f112c105bc1c54 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 17 Mar 2014 17:54:48 -0400
Subject: [PATCH 08/36] [FIXED JENKINS-21190] [FIXED JENKINS-21191] Noting
 merge of #1082.

---
 changelog.html                            | 4 ++++
 core/src/main/java/hudson/model/View.java | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changelog.html b/changelog.html
index 6b4c00901e..739732fe96 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,6 +55,10 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=rfe>
+    Ability for custom view types to disable automatic refresh.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-21190">issue 21190</a>)
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-21191">issue 21191</a>)
   <li class=rfe>
     Option to download metadata directly from Jenkins rather than going through the browser.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-19081">issue 19081</a>)
diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java
index 0ceb57c20c..1055028131 100644
--- a/core/src/main/java/hudson/model/View.java
+++ b/core/src/main/java/hudson/model/View.java
@@ -377,7 +377,7 @@ public abstract class View extends AbstractModelObject implements AccessControll
     /**
      * Enables or disables automatic refreshes of the view.
      * By default, automatic refreshes are enabled.
-     * @since TODO: define a version
+     * @since 1.557
      */
     public boolean isAutomaticRefreshEnabled() {
         return true;

From 71f3acfc3c1ccdd4e761c5a47e4738bcaf8df3b6 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Tue, 18 Mar 2014 14:35:25 -0700
Subject: [PATCH 09/36] The intent was for this code to move into the
 doReload() method

Not sure why it didn't in ce7e6390ee29ab59ebff92a8f3033c9e5ef02f4e.
---
 core/src/main/java/hudson/model/AbstractItem.java | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
index 92f369b7f9..b5045ad49f 100644
--- a/core/src/main/java/hudson/model/AbstractItem.java
+++ b/core/src/main/java/hudson/model/AbstractItem.java
@@ -605,18 +605,9 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
 
             // try to reflect the changes by reloading
             doReload();
-            new XmlFile(Items.XSTREAM, out.getTemporaryFile()).unmarshal(this);
-            Items.whileUpdatingByXml(new Callable<Void,IOException>() {
-                @Override public Void call() throws IOException {
-                    onLoad(getParent(), getRootDir().getName());
-                    return null;
-                }
-            });
-            Jenkins.getInstance().rebuildDependencyGraphAsync();
 
             // if everything went well, commit this new version
             out.commit();
-            SaveableListener.fireOnChange(this, getConfigFile());
         } finally {
             out.abort(); // don't leave anything behind
         }

From 2bf23c0ef4f6582383c943729f961ac9b3c31adc Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Tue, 18 Mar 2014 15:53:51 -0700
Subject: [PATCH 10/36] Revert "The intent was for this code to move into the
 doReload() method"

This reverts commit 71f3acfc3c1ccdd4e761c5a47e4738bcaf8df3b6.
Test regressions
---
 core/src/main/java/hudson/model/AbstractItem.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
index b5045ad49f..92f369b7f9 100644
--- a/core/src/main/java/hudson/model/AbstractItem.java
+++ b/core/src/main/java/hudson/model/AbstractItem.java
@@ -605,9 +605,18 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
 
             // try to reflect the changes by reloading
             doReload();
+            new XmlFile(Items.XSTREAM, out.getTemporaryFile()).unmarshal(this);
+            Items.whileUpdatingByXml(new Callable<Void,IOException>() {
+                @Override public Void call() throws IOException {
+                    onLoad(getParent(), getRootDir().getName());
+                    return null;
+                }
+            });
+            Jenkins.getInstance().rebuildDependencyGraphAsync();
 
             // if everything went well, commit this new version
             out.commit();
+            SaveableListener.fireOnChange(this, getConfigFile());
         } finally {
             out.abort(); // don't leave anything behind
         }

From 2b9cfe3a475cc5851fe91d33a917f3db1e33ef23 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Wed, 19 Mar 2014 11:34:10 -0400
Subject: [PATCH 11/36] updateByXml need not call reload; just causes
 duplicated work. See comments in ce7e639; and note reverted 71f3acf.

---
 core/src/main/java/hudson/model/AbstractItem.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
index 92f369b7f9..24ea48a3ee 100644
--- a/core/src/main/java/hudson/model/AbstractItem.java
+++ b/core/src/main/java/hudson/model/AbstractItem.java
@@ -604,7 +604,6 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
             }
 
             // try to reflect the changes by reloading
-            doReload();
             new XmlFile(Items.XSTREAM, out.getTemporaryFile()).unmarshal(this);
             Items.whileUpdatingByXml(new Callable<Void,IOException>() {
                 @Override public Void call() throws IOException {

From b261ab212270179fd286588534e9771dfb15f5fe Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Wed, 19 Mar 2014 14:41:26 -0400
Subject: [PATCH 12/36] Clearer diagnosis for JENKINS-12543 and similar issues.

---
 .../handlers/GenericItemOptionHandler.java    | 21 +++++++++++++++++--
 core/src/main/java/jenkins/model/Jenkins.java |  2 +-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/cli/handlers/GenericItemOptionHandler.java b/core/src/main/java/hudson/cli/handlers/GenericItemOptionHandler.java
index 502d65f925..e27bb32dc8 100644
--- a/core/src/main/java/hudson/cli/handlers/GenericItemOptionHandler.java
+++ b/core/src/main/java/hudson/cli/handlers/GenericItemOptionHandler.java
@@ -26,7 +26,11 @@ package hudson.cli.handlers;
 
 import hudson.model.Item;
 import hudson.model.Items;
+import hudson.security.ACL;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import jenkins.model.Jenkins;
+import org.acegisecurity.Authentication;
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
 import org.kohsuke.args4j.OptionDef;
@@ -43,6 +47,8 @@ import org.kohsuke.args4j.spi.Setter;
  */
 public abstract class GenericItemOptionHandler<T extends Item> extends OptionHandler<T> {
 
+    private static final Logger LOGGER = Logger.getLogger(GenericItemOptionHandler.class.getName());
+
     protected GenericItemOptionHandler(CmdLineParser parser, OptionDef option, Setter<T> setter) {
         super(parser, option, setter);
     }
@@ -50,10 +56,21 @@ public abstract class GenericItemOptionHandler<T extends Item> extends OptionHan
     protected abstract Class<T> type();
 
     @Override public int parseArguments(Parameters params) throws CmdLineException {
-        Jenkins j = Jenkins.getInstance();
-        String src = params.getParameter(0);
+        final Jenkins j = Jenkins.getInstance();
+        final String src = params.getParameter(0);
         T s = j.getItemByFullName(src, type());
         if (s == null) {
+            final Authentication who = Jenkins.getAuthentication();
+            ACL.impersonate(ACL.SYSTEM, new Runnable() {
+                @Override public void run() {
+                    Item actual = j.getItemByFullName(src);
+                    if (actual == null) {
+                        LOGGER.log(Level.FINE, "really no item exists named {0}", src);
+                    } else {
+                        LOGGER.log(Level.WARNING, "running as {0} could not find {1} of {2}", new Object[] {who.getPrincipal(), actual, type()});
+                    }
+                }
+            });
             T nearest = Items.findNearest(type(), src, j);
             if (nearest != null) {
                 throw new CmdLineException(owner, "No such job '" + src + "'; perhaps you meant '" + nearest.getFullName() + "'?");
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 37f7fcbb35..883f1ee125 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -3392,7 +3392,7 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
      * Gets the {@link Authentication} object that represents the user
      * associated with the current request.
      */
-    public static Authentication getAuthentication() {
+    public static @Nonnull Authentication getAuthentication() {
         Authentication a = SecurityContextHolder.getContext().getAuthentication();
         // on Tomcat while serving the login page, this is null despite the fact
         // that we have filters. Looking at the stack trace, Tomcat doesn't seem to

From aaa50018eef14910eefc939b6fd4b0b9b0c6e0bd Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Wed, 19 Mar 2014 14:42:17 -0400
Subject: [PATCH 13/36] list-jobs should print names, not display names, since
 people expect to be able to feed the results into other CLI commands.

---
 core/src/main/java/hudson/cli/ListJobsCommand.java  |  2 +-
 .../test/java/hudson/cli/ListJobsCommandTest.java   | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/hudson/cli/ListJobsCommand.java b/core/src/main/java/hudson/cli/ListJobsCommand.java
index bdb64208d5..97ea8d2967 100644
--- a/core/src/main/java/hudson/cli/ListJobsCommand.java
+++ b/core/src/main/java/hudson/cli/ListJobsCommand.java
@@ -82,7 +82,7 @@ public class ListJobsCommand extends CLICommand {
 
         // Print all jobs.
         for (TopLevelItem item : jobs) {
-            stdout.println(item.getDisplayName());
+            stdout.println(item.getName());
         }
 
         return 0;
diff --git a/core/src/test/java/hudson/cli/ListJobsCommandTest.java b/core/src/test/java/hudson/cli/ListJobsCommandTest.java
index 9e636015d2..910e1948ca 100644
--- a/core/src/test/java/hudson/cli/ListJobsCommandTest.java
+++ b/core/src/test/java/hudson/cli/ListJobsCommandTest.java
@@ -3,34 +3,25 @@ package hudson.cli;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.powermock.api.mockito.PowerMockito.mock;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
 import static org.powermock.api.mockito.PowerMockito.when;
 import hudson.matrix.MatrixConfiguration;
 import hudson.matrix.MatrixProject;
-import hudson.model.AbstractProject;
 import hudson.model.Item;
 import hudson.model.ItemGroup;
 import hudson.model.TopLevelItem;
-import hudson.model.TopLevelItemDescriptor;
-import hudson.model.ViewGroup;
 import hudson.model.ViewTest.CompositeView;
 import hudson.model.View;
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
 import java.io.PrintStream;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 
-import javax.annotation.CheckForNull;
-import javax.servlet.ServletException;
 
 import jenkins.model.Jenkins;
 import jenkins.model.ModifiableTopLevelItemGroup;
@@ -41,8 +32,6 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.jvnet.hudson.test.Bug;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
 import org.mockito.Mockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
@@ -109,6 +98,7 @@ public class ListJobsCommandTest {
 
         final TopLevelItem job = job("job");
         final TopLevelItem nestedJob = job("nestedJob");
+        when(nestedJob.getDisplayName()).thenReturn("Nested Job");
         when(job.hasPermission(Item.READ)).thenReturn(true);
         when(nestedJob.hasPermission(Item.READ)).thenReturn(true);
         when(job.getRelativeNameFrom((ItemGroup<TopLevelItem>) folder)).thenReturn("job");
@@ -194,6 +184,7 @@ public class ListJobsCommandTest {
 
         final TopLevelItem item = mock(TopLevelItem.class);
 
+        when(item.getName()).thenReturn(name);
         when(item.getDisplayName()).thenReturn(name);
 
         return item;

From 8078894e56495de6687541ca6344dda1bd3ab18a Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Wed, 19 Mar 2014 14:59:24 -0400
Subject: [PATCH 14/36] Comment.

---
 core/src/main/java/hudson/model/AbstractItem.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
index 24ea48a3ee..3e6135b031 100644
--- a/core/src/main/java/hudson/model/AbstractItem.java
+++ b/core/src/main/java/hudson/model/AbstractItem.java
@@ -671,6 +671,7 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet
     @CLIResolver
     public static AbstractItem resolveForCLI(
             @Argument(required=true,metaVar="NAME",usage="Job name") String name) throws CmdLineException {
+        // TODO can this (and its pseudo-override in AbstractProject) share code with GenericItemOptionHandler, used for explicit CLICommand’s rather than CLIMethod’s?
         AbstractItem item = Jenkins.getInstance().getItemByFullName(name, AbstractItem.class);
         if (item==null)
             throw new CmdLineException(null,Messages.AbstractItem_NoSuchJobExists(name,AbstractProject.findNearest(name).getFullName()));

From 8861563bd1e7fc28c5686f0dc9552529cfdfbf45 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Wed, 19 Mar 2014 16:03:41 -0400
Subject: [PATCH 15/36] [FIXED JENKINS-22262] CopyJobCommand and
 CreateJobCommand were doing incorrect permission checks.

---
 changelog.html                                |  3 +
 .../main/java/hudson/cli/CopyJobCommand.java  |  1 -
 .../java/hudson/cli/CreateJobCommand.java     |  3 -
 .../java/hudson/model/ItemGroupMixIn.java     |  3 +
 .../java/hudson/cli/CopyJobCommandTest.java   | 84 ++++++++++++++++--
 .../java/hudson/cli/CreateJobCommandTest.java | 87 +++++++++++++++++++
 6 files changed, 172 insertions(+), 9 deletions(-)
 create mode 100644 test/src/test/java/hudson/cli/CreateJobCommandTest.java

diff --git a/changelog.html b/changelog.html
index 739732fe96..f0d4d2e7b6 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,6 +55,9 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    Corrected permission checks for <code>copy-job</code> and <code>create-job</code> CLI commands.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22262">issue 22262</a>)
   <li class=rfe>
     Ability for custom view types to disable automatic refresh.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-21190">issue 21190</a>)
diff --git a/core/src/main/java/hudson/cli/CopyJobCommand.java b/core/src/main/java/hudson/cli/CopyJobCommand.java
index 8d1c86676c..7d83fa99a0 100644
--- a/core/src/main/java/hudson/cli/CopyJobCommand.java
+++ b/core/src/main/java/hudson/cli/CopyJobCommand.java
@@ -51,7 +51,6 @@ public class CopyJobCommand extends CLICommand {
 
     protected int run() throws Exception {
         Jenkins jenkins = Jenkins.getInstance();
-        jenkins.checkPermission(Item.CREATE);
 
         if (jenkins.getItemByFullName(dst)!=null) {
             stderr.println("Job '"+dst+"' already exists");
diff --git a/core/src/main/java/hudson/cli/CreateJobCommand.java b/core/src/main/java/hudson/cli/CreateJobCommand.java
index 02dd6ae55e..1e1b807c5e 100644
--- a/core/src/main/java/hudson/cli/CreateJobCommand.java
+++ b/core/src/main/java/hudson/cli/CreateJobCommand.java
@@ -23,8 +23,6 @@
  */
 package hudson.cli;
 
-import hudson.model.ModifiableItemGroup;
-import hudson.model.TopLevelItem;
 import jenkins.model.Jenkins;
 import hudson.Extension;
 import hudson.model.Item;
@@ -48,7 +46,6 @@ public class CreateJobCommand extends CLICommand {
 
     protected int run() throws Exception {
         Jenkins h = Jenkins.getInstance();
-        h.checkPermission(Item.CREATE);
 
         if (h.getItemByFullName(name)!=null) {
             stderr.println("Job '"+name+"' already exists");
diff --git a/core/src/main/java/hudson/model/ItemGroupMixIn.java b/core/src/main/java/hudson/model/ItemGroupMixIn.java
index 0b975851b4..57ae57f9b2 100644
--- a/core/src/main/java/hudson/model/ItemGroupMixIn.java
+++ b/core/src/main/java/hudson/model/ItemGroupMixIn.java
@@ -206,6 +206,7 @@ public abstract class ItemGroupMixIn {
     @SuppressWarnings({"unchecked"})
     public synchronized <T extends TopLevelItem> T copy(T src, String name) throws IOException {
         acl.checkPermission(Item.CREATE);
+        src.checkPermission(Item.EXTENDED_READ);
 
         T result = (T)createProject(src.getDescriptor(),name,false);
 
@@ -235,6 +236,7 @@ public abstract class ItemGroupMixIn {
         if (parent.getItem(name) != null) {
             throw new IllegalArgumentException(parent.getDisplayName() + " already contains an item '" + name + "'");
         }
+        // TODO what if we have no DISCOVER permission on the existing job?
 
         // place it as config.xml
         File configXml = Items.getConfigFile(getRootDirFor(name)).getFile();
@@ -269,6 +271,7 @@ public abstract class ItemGroupMixIn {
         Jenkins.getInstance().getProjectNamingStrategy().checkName(name);
         if(parent.getItem(name)!=null)
             throw new IllegalArgumentException("Project of the name "+name+" already exists");
+        // TODO problem with DISCOVER as noted above
 
         TopLevelItem item = type.newInstance(parent, name);
         try {
diff --git a/test/src/test/java/hudson/cli/CopyJobCommandTest.java b/test/src/test/java/hudson/cli/CopyJobCommandTest.java
index 40957ccca5..175fe555c5 100644
--- a/test/src/test/java/hudson/cli/CopyJobCommandTest.java
+++ b/test/src/test/java/hudson/cli/CopyJobCommandTest.java
@@ -25,26 +25,38 @@
 package hudson.cli;
 
 import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+import static hudson.cli.CLICommandInvoker.Matcher.*;
+import hudson.model.AbstractItem;
 import hudson.model.FreeStyleProject;
+import hudson.model.Item;
+import hudson.model.Job;
+import hudson.model.User;
+import hudson.security.ACL;
+import hudson.security.AuthorizationStrategy;
+import hudson.security.SparseACL;
+import java.util.Collection;
+import java.util.Collections;
+import jenkins.model.Jenkins;
+import org.acegisecurity.acls.sid.PrincipalSid;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.jvnet.hudson.test.Bug;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.MockFolder;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-
-import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently;
-
 @SuppressWarnings("DM_DEFAULT_ENCODING")
 public class CopyJobCommandTest {
 
     @Rule public JenkinsRule j = new JenkinsRule();
+    private CLICommand copyJobCommand;
     private CLICommandInvoker command;
 
     @Before public void setUp() {
-        command = new CLICommandInvoker(j, new CopyJobCommand());
+        copyJobCommand = new CopyJobCommand();
+        command = new CLICommandInvoker(j, copyJobCommand);
     }
 
     @Test public void copyBetweenFolders() throws Exception {
@@ -60,6 +72,68 @@ public class CopyJobCommandTest {
         // TODO test copying from/to root, or into nonexistent folder
     }
 
+    @Bug(22262)
+    @Test public void folderPermissions() throws Exception {
+        final MockFolder d1 = j.createFolder("d1");
+        final FreeStyleProject p = d1.createProject(FreeStyleProject.class, "p");
+        final MockFolder d2 = j.createFolder("d2");
+        // alice has no real permissions. bob has READ on everything but no more. charlie has CREATE on d2 but not EXTENDED_READ on p. debbie has both.
+        final SparseACL rootACL = new SparseACL(null);
+        rootACL.add(new PrincipalSid("alice"), Jenkins.READ, true);
+        rootACL.add(new PrincipalSid("bob"), Jenkins.READ, true);
+        rootACL.add(new PrincipalSid("charlie"), Jenkins.READ, true);
+        rootACL.add(new PrincipalSid("debbie"), Jenkins.READ, true);
+        final SparseACL d1ACL = new SparseACL(null);
+        d1ACL.add(new PrincipalSid("bob"), Item.READ, true);
+        d1ACL.add(new PrincipalSid("charlie"), Item.READ, true);
+        d1ACL.add(new PrincipalSid("debbie"), Item.READ, true);
+        final SparseACL pACL = new SparseACL(null);
+        pACL.add(new PrincipalSid("bob"), Item.READ, true);
+        pACL.add(new PrincipalSid("charlie"), Item.READ, true);
+        pACL.add(new PrincipalSid("debbie"), Item.READ, true);
+        pACL.add(new PrincipalSid("debbie"), Item.EXTENDED_READ, true);
+        final SparseACL d2ACL = new SparseACL(null);
+        d2ACL.add(new PrincipalSid("bob"), Item.READ, true);
+        d2ACL.add(new PrincipalSid("charlie"), Item.READ, true);
+        d2ACL.add(new PrincipalSid("charlie"), Item.CREATE, true);
+        d2ACL.add(new PrincipalSid("debbie"), Item.READ, true);
+        d2ACL.add(new PrincipalSid("debbie"), Item.CREATE, true);
+        j.jenkins.setSecurityRealm(j.createDummySecurityRealm());
+        j.jenkins.setAuthorizationStrategy(new AuthorizationStrategy() {
+            @Override public ACL getRootACL() {
+                return rootACL;
+            }
+            @Override public ACL getACL(Job<?, ?> project) {
+                if (project == p) {
+                    return pACL;
+                } else {
+                    throw new AssertionError(project);
+                }
+            }
+            @Override public ACL getACL(AbstractItem item) {
+                if (item == d1) {
+                    return d1ACL;
+                } else if (item == d2) {
+                    return d2ACL;
+                } else {
+                    throw new AssertionError(item);
+                }
+            }
+            @Override public Collection<String> getGroups() {
+                return Collections.emptySet();
+            }
+        });
+        copyJobCommand.setTransportAuth(User.get("alice").impersonate());
+        assertThat(command.invokeWithArgs("d1/p", "d2/p"), failedWith(-1));
+        copyJobCommand.setTransportAuth(User.get("bob").impersonate());
+        assertThat(command.invokeWithArgs("d1/p", "d2/p"), failedWith(-1));
+        copyJobCommand.setTransportAuth(User.get("charlie").impersonate());
+        assertThat(command.invokeWithArgs("d1/p", "d2/p"), failedWith(-1));
+        copyJobCommand.setTransportAuth(User.get("debbie").impersonate());
+        assertThat(command.invokeWithArgs("d1/p", "d2/p"), succeededSilently());
+        assertNotNull(d2.getItem("p"));
+    }
+
     // hold off build until saved only makes sense on the UI with config screen shown after copying;
     // expect the CLI copy command to leave the job buildable
     @Test public void copiedJobIsBuildable() throws Exception {
diff --git a/test/src/test/java/hudson/cli/CreateJobCommandTest.java b/test/src/test/java/hudson/cli/CreateJobCommandTest.java
new file mode 100644
index 0000000000..81a82fa307
--- /dev/null
+++ b/test/src/test/java/hudson/cli/CreateJobCommandTest.java
@@ -0,0 +1,87 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2014 Jesse Glick.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package hudson.cli;
+
+import static hudson.cli.CLICommandInvoker.Matcher.failedWith;
+import static hudson.cli.CLICommandInvoker.Matcher.succeededSilently;
+import hudson.model.AbstractItem;
+import hudson.model.Item;
+import hudson.model.User;
+import hudson.security.ACL;
+import hudson.security.AuthorizationStrategy;
+import hudson.security.SparseACL;
+import java.io.ByteArrayInputStream;
+import java.util.Collection;
+import java.util.Collections;
+import jenkins.model.Jenkins;
+import org.acegisecurity.acls.sid.PrincipalSid;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.*;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.Bug;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.MockFolder;
+
+public class CreateJobCommandTest {
+
+    @Rule public JenkinsRule r = new JenkinsRule();
+
+    @Bug(22262)
+    @Test public void folderPermissions() throws Exception {
+        CLICommand cmd = new CreateJobCommand();
+        CLICommandInvoker invoker = new CLICommandInvoker(r, cmd);
+        final MockFolder d = r.createFolder("d");
+        final SparseACL rootACL = new SparseACL(null);
+        rootACL.add(new PrincipalSid("alice"), Jenkins.READ, true);
+        rootACL.add(new PrincipalSid("bob"), Jenkins.READ, true);
+        final SparseACL dACL = new SparseACL(null);
+        dACL.add(new PrincipalSid("alice"), Item.READ, true);
+        dACL.add(new PrincipalSid("bob"), Item.READ, true);
+        dACL.add(new PrincipalSid("bob"), Item.CREATE, true);
+        r.jenkins.setSecurityRealm(r.createDummySecurityRealm());
+        r.jenkins.setAuthorizationStrategy(new AuthorizationStrategy() {
+            @Override public ACL getRootACL() {
+                return rootACL;
+            }
+            @Override public ACL getACL(AbstractItem item) {
+                if (item == d) {
+                    return dACL;
+                } else {
+                    throw new AssertionError(item);
+                }
+            }
+            @Override public Collection<String> getGroups() {
+                return Collections.emptySet();
+            }
+        });
+        cmd.setTransportAuth(User.get("alice").impersonate());
+        assertThat(invoker.withStdin(new ByteArrayInputStream("<project/>".getBytes("US-ASCII"))).invokeWithArgs("d/p"), failedWith(-1));
+        cmd.setTransportAuth(User.get("bob").impersonate());
+        assertThat(invoker.withStdin(new ByteArrayInputStream("<project/>".getBytes("US-ASCII"))).invokeWithArgs("d/p"), succeededSilently());
+        assertNotNull(d.getItem("p"));
+    }
+
+}

From 1755b7aa956db2ff51cebb81b56429e95ac79f17 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Wed, 19 Mar 2014 16:59:19 -0400
Subject: [PATCH 16/36] @RequirePOST

---
 core/src/main/java/hudson/diagnosis/OldDataMonitor.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
index bb05a4b485..339874db04 100644
--- a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
+++ b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
@@ -53,6 +53,7 @@ import java.util.logging.Logger;
 import org.kohsuke.stapler.HttpRedirect;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
+import org.kohsuke.stapler.interceptor.RequirePOST;
 
 /**
  * Tracks whether any data structure changes were corrected when loading XML,
@@ -242,6 +243,7 @@ public class OldDataMonitor extends AdministrativeMonitor {
     /**
      * Depending on whether the user said "yes" or "no", send him to the right place.
      */
+    @RequirePOST
     public HttpResponse doAct(StaplerRequest req, StaplerResponse rsp) throws IOException {
         if (req.hasParameter("no")) {
             disable(true);
@@ -255,6 +257,7 @@ public class OldDataMonitor extends AdministrativeMonitor {
      * Save all or some of the files to persist data in the new forms.
      * Remove those items from the data map.
      */
+    @RequirePOST
     public synchronized HttpResponse doUpgrade(StaplerRequest req, StaplerResponse rsp) throws IOException {
         String thruVerParam = req.getParameter("thruVer");
         VersionNumber thruVer = thruVerParam.equals("all") ? null : new VersionNumber(thruVerParam);
@@ -275,6 +278,7 @@ public class OldDataMonitor extends AdministrativeMonitor {
      * Save all files containing only unreadable data (no data upgrades), which discards this data.
      * Remove those items from the data map.
      */
+    @RequirePOST
     public synchronized HttpResponse doDiscard(StaplerRequest req, StaplerResponse rsp) throws IOException {
         updating = true;
         for (Iterator<Map.Entry<Saveable,VersionRange>> it = data.entrySet().iterator(); it.hasNext();) {

From 83f825e8c4f7913b70b877b3a00f4dc6f4638b98 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Thu, 20 Mar 2014 11:43:40 -0700
Subject: [PATCH 17/36] Protect the common thread pool against poorly written
 tasks that do not restore original context classloader.

Reference: RM-2329 in CloudBees
---
 core/src/main/java/hudson/model/Computer.java |  6 +-
 .../util/ContextResettingExecutorService.java | 54 ++++++++++++
 .../util/InterceptingExecutorService.java     | 84 +++++++++++++++++++
 3 files changed, 143 insertions(+), 1 deletion(-)
 create mode 100644 core/src/main/java/jenkins/util/ContextResettingExecutorService.java
 create mode 100644 core/src/main/java/jenkins/util/InterceptingExecutorService.java

diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index 43fa1c37c2..2260fc5cf4 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/core/src/main/java/hudson/model/Computer.java
@@ -60,6 +60,7 @@ import hudson.util.RunList;
 import hudson.util.Futures;
 import hudson.util.NamingThreadFactory;
 import jenkins.model.Jenkins;
+import jenkins.util.ContextResettingExecutorService;
 import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.stapler.StaplerRequest;
@@ -1062,7 +1063,10 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
         private static final long serialVersionUID = 1L;
     }
 
-    public static final ExecutorService threadPoolForRemoting = Executors.newCachedThreadPool(new ExceptionCatchingThreadFactory(new NamingThreadFactory(new DaemonThreadFactory(), "Computer.threadPoolForRemoting")));
+    public static final ExecutorService threadPoolForRemoting = new ContextResettingExecutorService(
+            Executors.newCachedThreadPool(
+                    new ExceptionCatchingThreadFactory(
+                            new NamingThreadFactory(new DaemonThreadFactory(), "Computer.threadPoolForRemoting"))));
 
 //
 //
diff --git a/core/src/main/java/jenkins/util/ContextResettingExecutorService.java b/core/src/main/java/jenkins/util/ContextResettingExecutorService.java
new file mode 100644
index 0000000000..8492719491
--- /dev/null
+++ b/core/src/main/java/jenkins/util/ContextResettingExecutorService.java
@@ -0,0 +1,54 @@
+package jenkins.util;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+
+/**
+ * {@link ExecutorService} wrapper that resets the context classloader.
+ *
+ * This protects an executor service from poorly written callable that doesn't restore
+ * thread states correctly.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class ContextResettingExecutorService extends InterceptingExecutorService {
+    public ContextResettingExecutorService(ExecutorService base) {
+        super(base);
+    }
+
+    @Override
+    protected Runnable wrap(final Runnable r) {
+        return new Runnable() {
+            @Override
+            public void run() {
+                Thread t = Thread.currentThread();
+                String name = t.getName();
+                ClassLoader cl = t.getContextClassLoader();
+                try {
+                    r.run();
+                } finally {
+                    t.setName(name);
+                    t.setContextClassLoader(cl);
+                }
+            }
+        };
+    }
+
+    @Override
+    protected <V> Callable<V> wrap(final Callable<V> r) {
+        return new Callable<V>() {
+            @Override
+            public V call() throws Exception {
+                Thread t = Thread.currentThread();
+                String name = t.getName();
+                ClassLoader cl = t.getContextClassLoader();
+                try {
+                    return r.call();
+                } finally {
+                    t.setName(name);
+                    t.setContextClassLoader(cl);
+                }
+            }
+        };
+    }
+}
diff --git a/core/src/main/java/jenkins/util/InterceptingExecutorService.java b/core/src/main/java/jenkins/util/InterceptingExecutorService.java
new file mode 100644
index 0000000000..8af246cd05
--- /dev/null
+++ b/core/src/main/java/jenkins/util/InterceptingExecutorService.java
@@ -0,0 +1,84 @@
+package jenkins.util;
+
+import com.google.common.util.concurrent.ForwardingExecutorService;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * {@link ExecutorService} that wraps all the tasks that run inside.
+ *
+ * @author Kohsuke Kawaguchi
+ * @since 1.557
+ */
+public abstract class InterceptingExecutorService extends ForwardingExecutorService {
+    private final ExecutorService base;
+
+    public InterceptingExecutorService(ExecutorService base) {
+        this.base = base;
+    }
+
+    protected abstract Runnable wrap(Runnable r);
+
+    protected abstract <V> Callable<V> wrap(Callable<V> r);
+
+    @Override
+    protected ExecutorService delegate() {
+        return base;
+    }
+
+    @Override
+    public <T> Future<T> submit(Callable<T> task) {
+        return super.submit(wrap(task));
+    }
+
+    @Override
+    public <T> Future<T> submit(Runnable task, T result) {
+        return super.submit(wrap(task), result);
+    }
+
+    @Override
+    public Future<?> submit(Runnable task) {
+        return super.submit(wrap(task));
+    }
+
+    @Override
+    public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks) throws InterruptedException {
+        return super.invokeAll(wrap(tasks));
+    }
+
+    @Override
+    public <T> List<Future<T>> invokeAll(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException {
+        return super.invokeAll(wrap(tasks), timeout, unit);
+    }
+
+    @Override
+    public <T> T invokeAny(Collection<? extends Callable<T>> tasks) throws InterruptedException, ExecutionException {
+        return super.invokeAny(wrap(tasks));
+    }
+
+    @Override
+    public <T> T invokeAny(Collection<? extends Callable<T>> tasks, long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+        return super.invokeAny(wrap(tasks), timeout, unit);
+    }
+
+    @Override
+    public void execute(Runnable command) {
+        super.execute(wrap(command));
+    }
+
+    private <T> Collection<Callable<T>> wrap(Collection<? extends Callable<T>> callables) {
+        List<Callable<T>> r = new ArrayList<Callable<T>>();
+        for (Callable<T> c : callables) {
+            r.add(wrap(c));
+        }
+        return r;
+    }
+}

From 3a58db356e46c832b3643cf7db9c4f7de2b3894d Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Fri, 21 Mar 2014 10:08:59 -0400
Subject: [PATCH 18/36] instance-identity 1.4

---
 changelog.html | 2 ++
 war/pom.xml    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/changelog.html b/changelog.html
index f0d4d2e7b6..6bb96981a6 100644
--- a/changelog.html
+++ b/changelog.html
@@ -58,6 +58,8 @@ Upcoming changes</a>
   <li class=bug>
     Corrected permission checks for <code>copy-job</code> and <code>create-job</code> CLI commands.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22262">issue 22262</a>)
+  <li class=bug>
+    <code>identity.key</code>, used to secure some communications with Jenkins, now stored encrypted with the master key.
   <li class=rfe>
     Ability for custom view types to disable automatic refresh.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-21190">issue 21190</a>)
diff --git a/war/pom.xml b/war/pom.xml
index 199893bc10..d1a6ad4e4a 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -109,7 +109,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>
       <artifactId>instance-identity</artifactId>
-      <version>1.3</version>
+      <version>1.4</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.modules</groupId>

From 585eb87c2d1fdd93c585efca2b993ad734afdb20 Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Fri, 21 Mar 2014 11:53:17 -0700
Subject: [PATCH 19/36] [FIXED JENKINS-18537]

Integrated the new version of XStream that contains the fix.
---
 changelog.html | 3 +++
 core/pom.xml   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changelog.html b/changelog.html
index 6bb96981a6..2267bd1439 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,6 +55,9 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    Fixed <tt>ArrayIndexOutOfBoundsException</tt> in XStream with Oracle JDK8 release version
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-18537">issue 18537</a>)
   <li class=bug>
     Corrected permission checks for <code>copy-job</code> and <code>create-job</code> CLI commands.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22262">issue 22262</a>)
diff --git a/core/pom.xml b/core/pom.xml
index 1f49ef4c6e..af4f56e168 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -219,7 +219,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jvnet.hudson</groupId>
       <artifactId>xstream</artifactId>
-      <version>1.4.4-jenkins-5</version>
+      <version>1.4.7-jenkins-1</version>
     </dependency>
     <dependency>
       <groupId>jfree</groupId>

From 10eca374e5eba48f6639077b747ca18c405bc967 Mon Sep 17 00:00:00 2001
From: Daniel Beck <daniel-beck@users.noreply.github.com>
Date: Fri, 21 Mar 2014 20:59:54 +0100
Subject: [PATCH 20/36] Noted 724f9e0 in 1.552

---
 changelog.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changelog.html b/changelog.html
index 2267bd1439..9c8db904ed 100644
--- a/changelog.html
+++ b/changelog.html
@@ -139,6 +139,8 @@ Upcoming changes</a>
   <li class=bug>
     Expensive symlink-related calls on Windows can be simplified.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-20534">issue 20534</a>)
+  <li class=rfe>
+    Improve detection of broken reverse proxy setups.
 </ul>
 <h3><a name=v1.551>What's new in 1.551</a> (2014/02/14)</h3>
 <ul class=image>

From 8508fc365ac9faa4fa6ccee116e820c0455f0988 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Fri, 21 Mar 2014 18:13:51 -0400
Subject: [PATCH 21/36] [JENKINS-19544] Whether or not we manage to save an
 object with old data, be sure to remove it from the list, and continue with
 other objects. Otherwise a bug like JENKINS-20950 can prevent *anything* from
 being saved, and holds references to all the old data.

---
 .../java/hudson/diagnosis/OldDataMonitor.java |  26 +++++--
 .../hudson/diagnosis/OldDataMonitorTest.java  |  67 ++++++++++++++++++
 .../OldDataMonitorTest/robustness.zip         | Bin 0 -> 461 bytes
 3 files changed, 86 insertions(+), 7 deletions(-)
 create mode 100644 test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
 create mode 100644 test/src/test/resources/hudson/diagnosis/OldDataMonitorTest/robustness.zip

diff --git a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
index 339874db04..3a349e43c4 100644
--- a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
+++ b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
@@ -68,6 +68,10 @@ public class OldDataMonitor extends AdministrativeMonitor {
     private HashMap<Saveable,VersionRange> data = new HashMap<Saveable,VersionRange>();
     private boolean updating = false;
 
+    static OldDataMonitor get(Jenkins j) {
+        return (OldDataMonitor) j.getAdministrativeMonitor("OldData");
+    }
+
     public OldDataMonitor() {
         super("OldData");
     }
@@ -86,7 +90,7 @@ public class OldDataMonitor extends AdministrativeMonitor {
     }
 
     private static void remove(Saveable obj, boolean isDelete) {
-        OldDataMonitor odm = (OldDataMonitor) Jenkins.getInstance().getAdministrativeMonitor("OldData");
+        OldDataMonitor odm = get(Jenkins.getInstance());
         synchronized (odm) {
             if (odm.updating) return; // Skip during doUpgrade or doDiscard
             odm.data.remove(obj);
@@ -130,7 +134,7 @@ public class OldDataMonitor extends AdministrativeMonitor {
      * @param version Hudson release when the data structure changed.
      */
     public static void report(Saveable obj, String version) {
-        OldDataMonitor odm = (OldDataMonitor) Jenkins.getInstance().getAdministrativeMonitor("OldData");
+        OldDataMonitor odm = get(Jenkins.getInstance());
         synchronized (odm) {
             try {
                 VersionRange vr = odm.data.get(obj);
@@ -184,7 +188,7 @@ public class OldDataMonitor extends AdministrativeMonitor {
             }
             return;
         }
-        OldDataMonitor odm = (OldDataMonitor) j.getAdministrativeMonitor("OldData");
+        OldDataMonitor odm = get(j);
         synchronized (odm) {
             VersionRange vr = odm.data.get(obj);
             if (vr != null) vr.extra = buf.toString();
@@ -258,7 +262,7 @@ public class OldDataMonitor extends AdministrativeMonitor {
      * Remove those items from the data map.
      */
     @RequirePOST
-    public synchronized HttpResponse doUpgrade(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public synchronized HttpResponse doUpgrade(StaplerRequest req, StaplerResponse rsp) {
         String thruVerParam = req.getParameter("thruVer");
         VersionNumber thruVer = thruVerParam.equals("all") ? null : new VersionNumber(thruVerParam);
         updating = true;
@@ -266,8 +270,12 @@ public class OldDataMonitor extends AdministrativeMonitor {
             Map.Entry<Saveable,VersionRange> entry = it.next();
             VersionNumber version = entry.getValue().max;
             if (version != null && (thruVer == null || !version.isNewerThan(thruVer))) {
-                entry.getKey().save();
                 it.remove();
+                try {
+                    entry.getKey().save();
+                } catch (Exception x) {
+                    LOGGER.log(Level.WARNING, "failed to save " + entry.getKey(), x);
+                }
             }
         }
         updating = false;
@@ -279,13 +287,17 @@ public class OldDataMonitor extends AdministrativeMonitor {
      * Remove those items from the data map.
      */
     @RequirePOST
-    public synchronized HttpResponse doDiscard(StaplerRequest req, StaplerResponse rsp) throws IOException {
+    public synchronized HttpResponse doDiscard(StaplerRequest req, StaplerResponse rsp) {
         updating = true;
         for (Iterator<Map.Entry<Saveable,VersionRange>> it = data.entrySet().iterator(); it.hasNext();) {
             Map.Entry<Saveable,VersionRange> entry = it.next();
             if (entry.getValue().max == null) {
-                entry.getKey().save();
                 it.remove();
+                try {
+                    entry.getKey().save();
+                } catch (Exception x) {
+                    LOGGER.log(Level.WARNING, "failed to save " + entry.getKey(), x);
+                }
             }
         }
         updating = false;
diff --git a/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java b/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
new file mode 100644
index 0000000000..27448d276e
--- /dev/null
+++ b/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
@@ -0,0 +1,67 @@
+/*
+ * The MIT License
+ *
+ * Copyright 2014 Jesse Glick.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package hudson.diagnosis;
+
+import hudson.model.FreeStyleProject;
+import hudson.model.InvisibleAction;
+import java.util.Collections;
+import static org.junit.Assert.*;
+import org.junit.Rule;
+import org.junit.Test;
+import org.jvnet.hudson.test.Bug;
+import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.recipes.LocalData;
+
+public class OldDataMonitorTest {
+
+    @Rule public JenkinsRule r = new JenkinsRule();
+
+    @Bug(19544)
+    @LocalData
+    @Test public void robustness() throws Exception {
+        OldDataMonitor odm = OldDataMonitor.get(r.jenkins);
+        FreeStyleProject p = r.jenkins.getItemByFullName("busted", FreeStyleProject.class);
+        assertNotNull(p);
+        /*
+        System.err.println(p.getActions());
+        for (Map.Entry<Saveable,OldDataMonitor.VersionRange> entry : odm.getData().entrySet()) {
+            System.err.println(entry.getKey());
+            System.err.println(entry.getValue());
+            System.err.println(entry.getValue().extra);
+        }
+        */
+        assertEquals(Collections.singleton(p), odm.getData().keySet());
+        odm.doDiscard(null, null);
+        assertEquals(Collections.emptySet(), odm.getData().keySet());
+        // did not manage to save p, but at least we are not holding onto a reference to it anymore
+    }
+
+    public static final class BadAction extends InvisibleAction {
+        private Object writeReplace() {
+            throw new IllegalStateException("broken");
+        }
+    }
+
+}
diff --git a/test/src/test/resources/hudson/diagnosis/OldDataMonitorTest/robustness.zip b/test/src/test/resources/hudson/diagnosis/OldDataMonitorTest/robustness.zip
new file mode 100644
index 0000000000000000000000000000000000000000..0ac07d03a49096b82e97aeb395805183f6e1f1cb
GIT binary patch
literal 461
zcmWIWW@h1HVBlb2SkPPQ!hi%=8CV#y@{@}7|D9rB2!JcInt-Z|2dD+CEUC1(BsE1J
zRb?WhSWzud1qh3wsZ7q#OUq2xtH{l<DJaU%N=+`Y<5EztNlY%u%+D(Zv4Omd(v;%-
zJiV06#Pq!U;>=<_|C|(;#F9kc{JhMP{GyQ5;*xk>r^FOTur7V5uDtxb)QU`?d-6*3
zkYsH1;fCAj!|V+3W@O@Gz#RraS0e$W5J70e7A6Qi>OdxH2%+jk4<m%mKs23*5DV~T
RWdo^W2EwgCnu!s_0{|=FU%~(Y

literal 0
HcmV?d00001


From 681a8ff3070736610f338972ba433379723346fb Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Fri, 21 Mar 2014 18:58:03 -0400
Subject: [PATCH 22/36] [FIXED JENKINS-19544] When OldDataMonitor is reported a
 Run, just remember the ID rather than holding a strong reference.

---
 changelog.html                                |   3 +
 .../java/hudson/diagnosis/OldDataMonitor.java | 127 +++++++++++++-----
 .../hudson/diagnosis/OldDataMonitorTest.java  |  24 ++++
 3 files changed, 123 insertions(+), 31 deletions(-)

diff --git a/changelog.html b/changelog.html
index 9c8db904ed..721f5e71e5 100644
--- a/changelog.html
+++ b/changelog.html
@@ -63,6 +63,9 @@ Upcoming changes</a>
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22262">issue 22262</a>)
   <li class=bug>
     <code>identity.key</code>, used to secure some communications with Jenkins, now stored encrypted with the master key.
+  <li class=bug>
+    Memory leaks in the old data monitor.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-19544">issue 19544</a>)
   <li class=rfe>
     Ability for custom view types to disable automatic refresh.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-21190">issue 21190</a>)
diff --git a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
index 3a349e43c4..b9e18d1b68 100644
--- a/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
+++ b/core/src/main/java/hudson/diagnosis/OldDataMonitor.java
@@ -23,13 +23,13 @@
  */
 package hudson.diagnosis;
 
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import hudson.Extension;
 import hudson.XmlFile;
 import hudson.model.AdministrativeMonitor;
-import hudson.model.ManagementLink;
-import jenkins.model.Jenkins;
-import hudson.Extension;
 import hudson.model.Item;
 import hudson.model.Job;
+import hudson.model.ManagementLink;
 import hudson.model.Run;
 import hudson.model.Saveable;
 import hudson.model.listeners.ItemListener;
@@ -37,22 +37,21 @@ import hudson.model.listeners.RunListener;
 import hudson.model.listeners.SaveableListener;
 import hudson.util.RobustReflectionConverter;
 import hudson.util.VersionNumber;
-import org.kohsuke.stapler.StaplerRequest;
-import org.kohsuke.stapler.StaplerResponse;
-import com.thoughtworks.xstream.converters.UnmarshallingContext;
-
 import java.io.IOException;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.TreeSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.annotation.CheckForNull;
+import jenkins.model.Jenkins;
 import org.kohsuke.stapler.HttpRedirect;
 import org.kohsuke.stapler.HttpResponse;
 import org.kohsuke.stapler.HttpResponses;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerResponse;
 import org.kohsuke.stapler.interceptor.RequirePOST;
 
 /**
@@ -63,9 +62,9 @@ import org.kohsuke.stapler.interceptor.RequirePOST;
  */
 @Extension
 public class OldDataMonitor extends AdministrativeMonitor {
-    private static Logger LOGGER = Logger.getLogger(OldDataMonitor.class.getName());
+    private static final Logger LOGGER = Logger.getLogger(OldDataMonitor.class.getName());
 
-    private HashMap<Saveable,VersionRange> data = new HashMap<Saveable,VersionRange>();
+    private HashMap<SaveableReference,VersionRange> data = new HashMap<SaveableReference,VersionRange>();
     private boolean updating = false;
 
     static OldDataMonitor get(Jenkins j) {
@@ -86,17 +85,24 @@ public class OldDataMonitor extends AdministrativeMonitor {
     }
 
     public synchronized Map<Saveable,VersionRange> getData() {
-        return Collections.unmodifiableMap(data);
+        Map<Saveable,VersionRange> r = new HashMap<Saveable,VersionRange>();
+        for (Map.Entry<SaveableReference,VersionRange> entry : data.entrySet()) {
+            Saveable s = entry.getKey().get();
+            if (s != null) {
+                r.put(s, entry.getValue());
+            }
+        }
+        return r;
     }
 
     private static void remove(Saveable obj, boolean isDelete) {
         OldDataMonitor odm = get(Jenkins.getInstance());
         synchronized (odm) {
             if (odm.updating) return; // Skip during doUpgrade or doDiscard
-            odm.data.remove(obj);
+            odm.data.remove(referTo(obj));
             if (isDelete && obj instanceof Job<?,?>)
                 for (Run r : ((Job<?,?>)obj).getBuilds())
-                    odm.data.remove(r);
+                    odm.data.remove(referTo(r));
         }
     }
 
@@ -137,9 +143,10 @@ public class OldDataMonitor extends AdministrativeMonitor {
         OldDataMonitor odm = get(Jenkins.getInstance());
         synchronized (odm) {
             try {
-                VersionRange vr = odm.data.get(obj);
+                SaveableReference ref = referTo(obj);
+                VersionRange vr = odm.data.get(ref);
                 if (vr != null) vr.add(version);
-                else            odm.data.put(obj, new VersionRange(version, null));
+                else            odm.data.put(ref, new VersionRange(version, null));
             } catch (IllegalArgumentException ex) {
                 LOGGER.log(Level.WARNING, "Bad parameter given to OldDataMonitor", ex);
             }
@@ -190,9 +197,10 @@ public class OldDataMonitor extends AdministrativeMonitor {
         }
         OldDataMonitor odm = get(j);
         synchronized (odm) {
-            VersionRange vr = odm.data.get(obj);
+            SaveableReference ref = referTo(obj);
+            VersionRange vr = odm.data.get(ref);
             if (vr != null) vr.extra = buf.toString();
-            else            odm.data.put(obj, new VersionRange(null, buf.toString()));
+            else            odm.data.put(ref, new VersionRange(null, buf.toString()));
         }
     }
 
@@ -266,16 +274,12 @@ public class OldDataMonitor extends AdministrativeMonitor {
         String thruVerParam = req.getParameter("thruVer");
         VersionNumber thruVer = thruVerParam.equals("all") ? null : new VersionNumber(thruVerParam);
         updating = true;
-        for (Iterator<Map.Entry<Saveable,VersionRange>> it = data.entrySet().iterator(); it.hasNext();) {
-            Map.Entry<Saveable,VersionRange> entry = it.next();
+        for (Iterator<Map.Entry<SaveableReference,VersionRange>> it = data.entrySet().iterator(); it.hasNext();) {
+            Map.Entry<SaveableReference,VersionRange> entry = it.next();
             VersionNumber version = entry.getValue().max;
             if (version != null && (thruVer == null || !version.isNewerThan(thruVer))) {
                 it.remove();
-                try {
-                    entry.getKey().save();
-                } catch (Exception x) {
-                    LOGGER.log(Level.WARNING, "failed to save " + entry.getKey(), x);
-                }
+                tryToSave(entry.getKey());
             }
         }
         updating = false;
@@ -289,25 +293,86 @@ public class OldDataMonitor extends AdministrativeMonitor {
     @RequirePOST
     public synchronized HttpResponse doDiscard(StaplerRequest req, StaplerResponse rsp) {
         updating = true;
-        for (Iterator<Map.Entry<Saveable,VersionRange>> it = data.entrySet().iterator(); it.hasNext();) {
-            Map.Entry<Saveable,VersionRange> entry = it.next();
+        for (Iterator<Map.Entry<SaveableReference,VersionRange>> it = data.entrySet().iterator(); it.hasNext();) {
+            Map.Entry<SaveableReference,VersionRange> entry = it.next();
             if (entry.getValue().max == null) {
                 it.remove();
-                try {
-                    entry.getKey().save();
-                } catch (Exception x) {
-                    LOGGER.log(Level.WARNING, "failed to save " + entry.getKey(), x);
-                }
+                tryToSave(entry.getKey());
             }
         }
         updating = false;
         return HttpResponses.forwardToPreviousPage();
     }
 
+    private void tryToSave(SaveableReference ref) {
+        Saveable s = ref.get();
+        if (s != null) {
+            try {
+                s.save();
+            } catch (Exception x) {
+                LOGGER.log(Level.WARNING, "failed to save " + s, x);
+            }
+        }
+    }
+
     public HttpResponse doIndex(StaplerResponse rsp) throws IOException {
         return new HttpRedirect("manage");
     }
 
+    /** Reference to a saveable object that need not actually hold it in heap. */
+    private interface SaveableReference {
+        @CheckForNull Saveable get();
+        // must also define equals, hashCode
+    }
+
+    private static SaveableReference referTo(Saveable s) {
+        if (s instanceof Run) {
+            return new RunSaveableReference((Run) s);
+        } else {
+            return new SimpleSaveableReference(s);
+        }
+    }
+
+    private static final class SimpleSaveableReference implements SaveableReference {
+        private final Saveable instance;
+        SimpleSaveableReference(Saveable instance) {
+            this.instance = instance;
+        }
+        @Override public Saveable get() {
+            return instance;
+        }
+        @Override public int hashCode() {
+            return instance.hashCode();
+        }
+        @Override public boolean equals(Object obj) {
+            return obj instanceof SimpleSaveableReference && instance.equals(((SimpleSaveableReference) obj).instance);
+        }
+    }
+
+    // could easily make an ItemSaveableReference, but Jenkins holds all these strongly, so why bother
+
+    private static final class RunSaveableReference implements SaveableReference {
+        private final String id;
+        RunSaveableReference(Run<?,?> r) {
+            id = r.getExternalizableId();
+        }
+        @Override public Saveable get() {
+            try {
+                return Run.fromExternalizableId(id);
+            } catch (IllegalArgumentException x) {
+                // Typically meaning the job or build was since deleted.
+                LOGGER.log(Level.FINE, null, x);
+                return null;
+            }
+        }
+        @Override public int hashCode() {
+            return id.hashCode();
+        }
+        @Override public boolean equals(Object obj) {
+            return obj instanceof RunSaveableReference && id.equals(((RunSaveableReference) obj).id);
+        }
+    }
+
     @Extension
     public static class ManagementLinkImpl extends ManagementLink {
         @Override
diff --git a/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java b/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
index 27448d276e..23d7c5b74e 100644
--- a/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
+++ b/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
@@ -24,14 +24,17 @@
 
 package hudson.diagnosis;
 
+import hudson.model.FreeStyleBuild;
 import hudson.model.FreeStyleProject;
 import hudson.model.InvisibleAction;
+import java.lang.ref.WeakReference;
 import java.util.Collections;
 import static org.junit.Assert.*;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Bug;
 import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.MemoryAssert;
 import org.jvnet.hudson.test.recipes.LocalData;
 
 public class OldDataMonitorTest {
@@ -58,10 +61,31 @@ public class OldDataMonitorTest {
         // did not manage to save p, but at least we are not holding onto a reference to it anymore
     }
 
+    @Bug(19544)
+    @Test public void memory() throws Exception {
+        FreeStyleProject p = r.createFreeStyleProject("p");
+        FreeStyleBuild b = r.assertBuildStatusSuccess(p.scheduleBuild2(0));
+        b.addAction(new BadAction2());
+        b.save();
+        r.jenkins.getQueue().clearLeftItems();
+        p._getRuns().purgeCache();
+        b = p.getBuildByNumber(1);
+        assertEquals(Collections.singleton(b), OldDataMonitor.get(r.jenkins).getData().keySet());
+        WeakReference<?> ref = new WeakReference<Object>(b);
+        b = null;
+        MemoryAssert.assertGC(ref);
+    }
+
     public static final class BadAction extends InvisibleAction {
         private Object writeReplace() {
             throw new IllegalStateException("broken");
         }
     }
 
+    public static final class BadAction2 extends InvisibleAction {
+        private Object readResolve() {
+            throw new IllegalStateException("broken");
+        }
+    }
+
 }

From 559c0ea4fd04b5ba30e4d9cbda4eea04765ce087 Mon Sep 17 00:00:00 2001
From: Harald Albers <github@folk.de>
Date: Sun, 23 Mar 2014 18:32:11 +0100
Subject: [PATCH 23/36] restored messages that got lost because of changed
 message key

---
 .../model/JenkinsLocationConfiguration/config_da.properties     | 2 +-
 .../model/JenkinsLocationConfiguration/config_de.properties     | 2 +-
 .../model/JenkinsLocationConfiguration/config_fr.properties     | 2 +-
 .../model/JenkinsLocationConfiguration/config_nl.properties     | 2 +-
 .../model/JenkinsLocationConfiguration/config_pt_BR.properties  | 2 +-
 .../model/JenkinsLocationConfiguration/config_ru.properties     | 2 +-
 .../model/JenkinsLocationConfiguration/config_tr.properties     | 2 +-
 .../model/JenkinsLocationConfiguration/config_zh_CN.properties  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_da.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_da.properties
index 731a6249df..e11f63bcbd 100644
--- a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_da.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_da.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-System\ Admin\ E-mail\ Address=Systemadministratorens E-mail adresse
+System\ Admin\ e-mail\ address=Systemadministratorens E-mail adresse
 Jenkins\ URL=Jenkins URL
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_de.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_de.properties
index 3bd361d5b6..2725c20fa9 100644
--- a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_de.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_de.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-System\ Admin\ E-mail\ Address=E-Mail-Adresse des Systemadministrators
+System\ Admin\ e-mail\ address=E-Mail-Adresse des Systemadministrators
 Jenkins\ URL=Jenkins URL
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_fr.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_fr.properties
index b3ccab7f21..2e497ebf26 100644
--- a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_fr.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_fr.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-System\ Admin\ E-mail\ Address=Adresse email de l''administrateur syst\u00cbme
+System\ Admin\ e-mail\ address=Adresse email de l''administrateur syst\u00cbme
 Jenkins\ URL=URL de Jenkins
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_nl.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_nl.properties
index ed081a0ab9..3ab4377618 100644
--- a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_nl.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_nl.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-System\ Admin\ E-mail\ Address=E-mail systeemadministrator
+System\ Admin\ e-mail\ address=E-mail systeemadministrator
 Jenkins\ URL=Jenkins URL
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_pt_BR.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_pt_BR.properties
index baa1a85448..363ea7274a 100644
--- a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_pt_BR.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_pt_BR.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-System\ Admin\ E-mail\ Address=Endere\u00e7o de e-mail do administrador do sistema
+System\ Admin\ e-mail\ address=Endere\u00e7o de e-mail do administrador do sistema
 Jenkins\ URL=URL do Jenkins
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_ru.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_ru.properties
index b9c41aa46a..5496e8f601 100644
--- a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_ru.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_ru.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-System\ Admin\ E-mail\ Address=\u0410\u0434\u0440\u0435\u0441 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430
+System\ Admin\ e-mail\ address=\u0410\u0434\u0440\u0435\u0441 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430
 Jenkins\ URL=Jenkins URL
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_tr.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_tr.properties
index 4b5c74527a..6559200e04 100644
--- a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_tr.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_tr.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-System\ Admin\ E-mail\ Address=Sistem\ Admin\ e-posta\ Adresi
+System\ Admin\ e-mail\ address=Sistem\ Admin\ e-posta\ Adresi
 Jenkins\ URL=Jenkins\ URL'i
diff --git a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_zh_CN.properties b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_zh_CN.properties
index c3df1aaf79..17eefe6d81 100644
--- a/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_zh_CN.properties
+++ b/core/src/main/resources/jenkins/model/JenkinsLocationConfiguration/config_zh_CN.properties
@@ -20,5 +20,5 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-System\ Admin\ E-mail\ Address=\u7cfb\u7edf\u7ba1\u7406\u5458\u90ae\u4ef6\u5730\u5740
+System\ Admin\ e-mail\ address=\u7cfb\u7edf\u7ba1\u7406\u5458\u90ae\u4ef6\u5730\u5740
 Jenkins\ URL=Jenkins URL

From 8a79519aeb6bfd9802997dddae7cf9f3e5772d6c Mon Sep 17 00:00:00 2001
From: Harald Albers <github@folk.de>
Date: Sun, 23 Mar 2014 18:57:53 +0100
Subject: [PATCH 24/36] updated German localization

---
 .../hudson/model/Computer/index_de.properties |  7 +++---
 .../hudson/scheduler/Messages_de.properties   |  1 +
 .../hudson/tasks/Messages_de.properties       |  2 +-
 .../hudson/tools/Messages_de.properties       |  6 +++--
 .../DownloadSettings/config_de.properties     | 24 +++++++++++++++++++
 .../DownloadSettings/help-useBrowser.html     |  3 ++-
 .../DownloadSettings/help-useBrowser_de.html  | 12 ++++++++++
 7 files changed, 48 insertions(+), 7 deletions(-)
 create mode 100644 core/src/main/resources/jenkins/model/DownloadSettings/config_de.properties
 create mode 100644 core/src/main/resources/jenkins/model/DownloadSettings/help-useBrowser_de.html

diff --git a/core/src/main/resources/hudson/model/Computer/index_de.properties b/core/src/main/resources/hudson/model/Computer/index_de.properties
index b7dc328116..dca46e7df0 100644
--- a/core/src/main/resources/hudson/model/Computer/index_de.properties
+++ b/core/src/main/resources/hudson/model/Computer/index_de.properties
@@ -1,9 +1,10 @@
-submit.temporarilyOffline=Knoten wieder anschalten
+Created\ by=Erstellt von
 anonymous\ user=Anonymer Benutzer
+submit.temporarilyOffline=Knoten wieder anschalten
 submit.not.temporarilyOffline=Knoten temporär abschalten
 submit.updateOfflineCause=Offline Grund aktualisieren
-title.no_manual_launch=Dieser Knoten verwendet die Verfügbarkeitsregel "{0}". \
-  Dies bedeutet momentan, daß der Knoten offline ist.
+title.no_manual_launch=Dieser Knoten verwendet die Verf\u00FCgbarkeitsregel "{0}". \
+  Dies bedeutet momentan, dass der Knoten offline ist.
 Labels\:=Labels:
 title.projects_tied_on=Projekte, die an {0} gebunden sind 
 None=Keine
diff --git a/core/src/main/resources/hudson/scheduler/Messages_de.properties b/core/src/main/resources/hudson/scheduler/Messages_de.properties
index 908ae639c7..1cf8093e68 100644
--- a/core/src/main/resources/hudson/scheduler/Messages_de.properties
+++ b/core/src/main/resources/hudson/scheduler/Messages_de.properties
@@ -24,5 +24,6 @@ BaseParser.StartEndReversed=Meinten Sie {0}-{1}?
 BaseParser.MustBePositive=Schrittweite muss positiv sein, ist aber {0}
 BaseParser.OutOfRange={0} ist ein ungültiger Wert. Muss zwischen {1} und {2} liegen.
 CronTab.do_you_really_mean_every_minute_when_you=Meinen sie mit "{0}" wirklich "jede Minute"? Vielleicht meinen Sie eher "{1}"
+CronTab.short_cycles_in_the_day_of_month_field_w=Kleine Schrittweiten im Tag-Feld führen am Monatsende zu Unregelmäßigkeiten.
 CronTab.spread_load_evenly_by_using_rather_than_=Verwenden Sie zur gleichmäßigen Lastverteilung "{0}" statt "{1}"
 CronTabList.InvalidInput=Ungültige Eingabe: "{0}": {1}
diff --git a/core/src/main/resources/hudson/tasks/Messages_de.properties b/core/src/main/resources/hudson/tasks/Messages_de.properties
index 71f07cac41..9ddd192b1a 100644
--- a/core/src/main/resources/hudson/tasks/Messages_de.properties
+++ b/core/src/main/resources/hudson/tasks/Messages_de.properties
@@ -35,7 +35,7 @@ ArtifactArchiver.FailedToArchive=Artefakte konnten nicht archiviert werden: {0}
 ArtifactArchiver.NoIncludes=Es sind keine Artefakte zur Archivierung konfiguriert.\n\u00DCberpr\u00FCfen Sie, ob in den Einstellungen ein Dateisuchmuster angegeben ist.\nWenn Sie alle Dateien archivieren m\u00F6chten, geben Sie "**" an.
 ArtifactArchiver.NoMatchFound=Keine Artefakte gefunden, die mit dem Dateisuchmuster "{0}" übereinstimmen. Ein Konfigurationsfehler?
 
-BatchFile.DisplayName=Windows Batch Datei ausführen
+BatchFile.DisplayName=Windows Batch-Datei ausführen
 
 BuildTrigger.Disabled={0} ist deaktiviert. Keine Auslösung des Builds.
 BuildTrigger.DisplayName=Weitere Projekte bauen
diff --git a/core/src/main/resources/hudson/tools/Messages_de.properties b/core/src/main/resources/hudson/tools/Messages_de.properties
index 89eea1db63..5fde3fe027 100644
--- a/core/src/main/resources/hudson/tools/Messages_de.properties
+++ b/core/src/main/resources/hudson/tools/Messages_de.properties
@@ -21,9 +21,10 @@
 # THE SOFTWARE.
 
 ToolLocationNodeProperty.displayName=Verzeichnisse von Hilfsprogrammen anpassen
-CommandInstaller.DescriptorImpl.displayName=Kommando ausführen
+CommandInstaller.DescriptorImpl.displayName=Shell-Kommando ausführen
 CommandInstaller.no_command=Ein Kommando muss angegeben werden.
-CommandInstaller.no_toolHome=Ein Stammverzeichnis muß angegeben werden.
+CommandInstaller.no_toolHome=Ein Stammverzeichnis muss angegeben werden.
+BatchCommandInstaller.DescriptorImpl.displayName=Windows Batch-Datei ausführen
 ZipExtractionInstaller.DescriptorImpl.displayName=Entpacke *.zip/*.tar.gz-Archiv
 ZipExtractionInstaller.bad_connection=Der Server verweigerte den Verbindungsaufbau
 ZipExtractionInstaller.malformed_url=Ungültige URL
@@ -33,4 +34,5 @@ JDKInstaller.DescriptorImpl.displayName=Installiere von java.sun.com
 JDKInstaller.DescriptorImpl.doCheckId=JDK-ID definieren
 JDKInstaller.DescriptorImpl.doCheckAcceptLicense=Sie müssen der Lizenzvereinbarung zustimmen, um das JDK herunterzuladen.
 JDKInstaller.FailedToInstallJDK=JDK konnte nicht installiert werden.
+JDKInstaller.RequireOracleAccount=F\u00FCr die Installation des JDK ben\u00F6tigen Sie einen Oracle Account. <a href\="{0}" target\="_new">Bitte geben Sie Benutzername/Passwort ein</a>
 JDKInstaller.UnableToInstallUntilLicenseAccepted=JDK kann nicht automatisch installiert werden, solange die Lizenzvereinbarung nicht akzeptiert wurde. 
diff --git a/core/src/main/resources/jenkins/model/DownloadSettings/config_de.properties b/core/src/main/resources/jenkins/model/DownloadSettings/config_de.properties
new file mode 100644
index 0000000000..2d8110051f
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/DownloadSettings/config_de.properties
@@ -0,0 +1,24 @@
+# The MIT License
+# 
+# Copyright (c) 2014, Harald Albers
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+Download\ Preferences = Downloads
+Use\ Browser = Browser verwenden
diff --git a/core/src/main/resources/jenkins/model/DownloadSettings/help-useBrowser.html b/core/src/main/resources/jenkins/model/DownloadSettings/help-useBrowser.html
index 2336961826..ffe6606008 100644
--- a/core/src/main/resources/jenkins/model/DownloadSettings/help-useBrowser.html
+++ b/core/src/main/resources/jenkins/model/DownloadSettings/help-useBrowser.html
@@ -1,5 +1,6 @@
 <div>
-    Check to force the user’s browser to download metadata rather than Jenkins itself doing it.
+    Check to force the user’s browser to download metadata (lists of available plugins, tools etc.)
+    rather than Jenkins itself doing it.
     Actual file downloads (plugins, tools) will still happen from Jenkins itself,
     but this can be used to at least <em>see</em> new metadata when Jenkins cannot access the Internet
     (but your own browser can, perhaps using some special proxy that Jenkins is not configured to use).
diff --git a/core/src/main/resources/jenkins/model/DownloadSettings/help-useBrowser_de.html b/core/src/main/resources/jenkins/model/DownloadSettings/help-useBrowser_de.html
new file mode 100644
index 0000000000..7db0c3ad49
--- /dev/null
+++ b/core/src/main/resources/jenkins/model/DownloadSettings/help-useBrowser_de.html
@@ -0,0 +1,12 @@
+<div>
+    Aktivieren Sie diese Einstellung, wenn Sie Metadaten (Listen verfügbarer Plugins, 
+    Tools etc.) anstelle von Jenkins selbst mit dem Browser herunterladen möchten.
+    
+    Die Downloads der in den Metadaten beschriebenen Dateien werden nach wie vor von 
+    Jenkins übernommen.
+    
+    Diese Einstellung ist nützlich, wenn Jenkins ohne Internetzugriff betrieben wird,
+    Sie aber über Ihren Browser durch besondere Proxy- oder Firewalleinstellungen auf 
+    das Internet zugreifen können.
+    In diesen Fällen können Sie neue Metadaten zumindest <em>sehen</em>.
+</div>

From c0bff5d7bc25c023b49cac5a14e851929a09638b Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sun, 23 Mar 2014 20:32:26 -0700
Subject: [PATCH 25/36] [maven-release-plugin] prepare release jenkins-1.556

---
 cli/pom.xml     | 2 +-
 core/pom.xml    | 2 +-
 plugins/pom.xml | 8 ++++----
 pom.xml         | 2 +-
 test/pom.xml    | 2 +-
 war/pom.xml     | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index e82d87c8d9..cc03ab1671 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.556-SNAPSHOT</version>
+    <version>1.556</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 201605e6d4..5d5b13992a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.556-SNAPSHOT</version>
+    <version>1.556</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 96de7845f2..b61b488c8c 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -11,7 +11,7 @@
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Jenkins plugin POM</name>
-  <version>1.556-SNAPSHOT</version>
+  <version>1.556</version>
   <packaging>pom</packaging>
 
   <!--
@@ -39,19 +39,19 @@
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
       <type>war</type>
-      <version>1.556-SNAPSHOT</version>
+      <version>1.556</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
-      <version>1.556-SNAPSHOT</version>
+      <version>1.556</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1.556-SNAPSHOT</version>
+      <version>1.556</version>
       <scope>test</scope>
     </dependency>
     <!--
diff --git a/pom.xml b/pom.xml
index eb6d6a632f..72283e5709 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.556-SNAPSHOT</version>
+  <version>1.556</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
diff --git a/test/pom.xml b/test/pom.xml
index 60354c0801..f1b2f5e918 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.556-SNAPSHOT</version>
+    <version>1.556</version>
   </parent>
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-test-harness</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index be6133bec5..561b19311a 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.556-SNAPSHOT</version>
+    <version>1.556</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

From eed92fa616488fb28aa8927b1a455f056e106a9a Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sun, 23 Mar 2014 20:32:27 -0700
Subject: [PATCH 26/36] [maven-release-plugin] prepare for next development
 iteration

---
 cli/pom.xml     | 2 +-
 core/pom.xml    | 2 +-
 plugins/pom.xml | 8 ++++----
 pom.xml         | 2 +-
 test/pom.xml    | 2 +-
 war/pom.xml     | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index cc03ab1671..b888d7aaec 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.556</version>
+    <version>1.557-SNAPSHOT</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 5d5b13992a..1f49ef4c6e 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.556</version>
+    <version>1.557-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/plugins/pom.xml b/plugins/pom.xml
index b61b488c8c..eff68aacb3 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -11,7 +11,7 @@
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Jenkins plugin POM</name>
-  <version>1.556</version>
+  <version>1.557-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!--
@@ -39,19 +39,19 @@
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
       <type>war</type>
-      <version>1.556</version>
+      <version>1.557-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
-      <version>1.556</version>
+      <version>1.557-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1.556</version>
+      <version>1.557-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!--
diff --git a/pom.xml b/pom.xml
index 72283e5709..737f6a8c19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.556</version>
+  <version>1.557-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
diff --git a/test/pom.xml b/test/pom.xml
index f1b2f5e918..48ed4c35c4 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.556</version>
+    <version>1.557-SNAPSHOT</version>
   </parent>
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-test-harness</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 561b19311a..199893bc10 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.556</version>
+    <version>1.557-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

From 85cd278dcd2557b2a7c55960a9cc28f7a53b7b7c Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Sun, 23 Mar 2014 20:44:01 -0700
Subject: [PATCH 27/36] updated changelog for release

---
 changelog.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/changelog.html b/changelog.html
index a43437a5be..669c0ef691 100644
--- a/changelog.html
+++ b/changelog.html
@@ -61,7 +61,10 @@ Upcoming changes</a>
 
 <!-- these changes are controlled by the release process. DO NOT MODIFY -->
 <div id="rc" style="display:none;"><!--=BEGIN=-->
-<h3><a name=v1.556>What's new in 1.556</a> <!--=DATE=--></h3>
+<h3><a name=v1.557>What's new in 1.557</a> <!--=DATE=--></h3>
+<!--=RC-CHANGES=-->
+</div><!--=END=-->
+<h3><a name=v1.556>What's new in 1.556</a> (2014/03/23)</h3>
 <ul class=image>
   <li class=rfe>
     Access through API token and SSH key login now fully retains group memberships.
@@ -72,7 +75,6 @@ Upcoming changes</a>
   <li class=rfe>
     Job can be reloaded individually from disk with "job/FOO/reload" URL or "reload-job" CLI command
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.555>What's new in 1.555</a> (2014/03/16)</h3>
 <ul class=image>
   <li class=bug>

From 56b360d6f34a1091a8bf5b73f22baca4072560ef Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 24 Mar 2014 10:10:52 -0400
Subject: [PATCH 28/36] [JENKINS-19976] Touch-ups to PR #1054.

---
 changelog.html                                    |  3 +++
 .../main/java/hudson/ClassicPluginStrategy.java   |  9 ---------
 core/src/main/java/hudson/PluginManager.java      |  6 +++++-
 core/src/main/java/hudson/PluginStrategy.java     |  6 ++++--
 test/src/test/java/hudson/PluginManagerTest.java  | 15 ++++++++-------
 5 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/changelog.html b/changelog.html
index 721f5e71e5..154d84209c 100644
--- a/changelog.html
+++ b/changelog.html
@@ -63,6 +63,9 @@ Upcoming changes</a>
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22262">issue 22262</a>)
   <li class=bug>
     <code>identity.key</code>, used to secure some communications with Jenkins, now stored encrypted with the master key.
+  <li class=bug>
+    When dynamically loading a plugin which another loaded plugin already had an optional dependency on, class loading errors could result before restart.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-19976">issue 19976</a>)
   <li class=bug>
     Memory leaks in the old data monitor.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-19544">issue 19544</a>)
diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
index 18cbb3e0fa..f321605afe 100644
--- a/core/src/main/java/hudson/ClassicPluginStrategy.java
+++ b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -377,15 +377,6 @@ public class ClassicPluginStrategy implements PluginStrategy {
         plugin.getPlugin().start();
     }
 
-    /**
-     * Called when a plugin is deployed, and there is a plugin optionally depending on that plugin.
-     * The class loader of the existing depending plugin should be updated
-     * to load classes from the newly deployed plugin.
-     * 
-     * @param depender the plugin to update its class loader
-     * @param dependee
-     * @see hudson.PluginStrategy#updateDependency(hudson.PluginWrapper, hudson.PluginWrapper)
-     */
     @Override
     public void updateDependency(PluginWrapper depender, PluginWrapper dependee) {
         DependencyClassLoader classLoader = findAncestorDependencyClassLoader(depender.classLoader);
diff --git a/core/src/main/java/hudson/PluginManager.java b/core/src/main/java/hudson/PluginManager.java
index d77f12087d..17900b6309 100644
--- a/core/src/main/java/hudson/PluginManager.java
+++ b/core/src/main/java/hudson/PluginManager.java
@@ -464,7 +464,11 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
                 if (d.shortName.equals(p.getShortName())) {
                     // this plugin depends on the newly loaded one!
                     // recalculate dependencies!
-                    getPluginStrategy().updateDependency(depender, p);
+                    try {
+                        getPluginStrategy().updateDependency(depender, p);
+                    } catch (AbstractMethodError x) {
+                        LOGGER.log(WARNING, "{0} does not yet implement updateDependency", getPluginStrategy().getClass());
+                    }
                     break;
                 }
             }
diff --git a/core/src/main/java/hudson/PluginStrategy.java b/core/src/main/java/hudson/PluginStrategy.java
index d61e23732a..e599812e4a 100644
--- a/core/src/main/java/hudson/PluginStrategy.java
+++ b/core/src/main/java/hudson/PluginStrategy.java
@@ -79,10 +79,12 @@ public interface PluginStrategy extends ExtensionPoint {
 	<T> List<ExtensionComponent<T>> findComponents(Class<T> type, Hudson hudson);
     
     /**
-     * Called when a plugin that is depended by another plugin is newly deployed.
-     * 
+     * Called when a plugin is installed, but there was already a plugin installed which optionally depended on that plugin.
+     * The class loader of the existing depending plugin should be updated
+     * to load classes from the newly installed plugin.
      * @param depender plugin depending on dependee.
      * @param dependee newly loaded plugin.
+     * @since 1.557
      */
     void updateDependency(PluginWrapper depender, PluginWrapper dependee);
 }
diff --git a/test/src/test/java/hudson/PluginManagerTest.java b/test/src/test/java/hudson/PluginManagerTest.java
index b068598c94..4f50aec47f 100644
--- a/test/src/test/java/hudson/PluginManagerTest.java
+++ b/test/src/test/java/hudson/PluginManagerTest.java
@@ -33,13 +33,6 @@ import hudson.model.UpdateSite;
 import hudson.scm.SubversionSCM;
 import hudson.util.FormValidation;
 import hudson.util.PersistedList;
-import org.apache.commons.io.FileUtils;
-import org.apache.tools.ant.filters.StringInputStream;
-import org.jvnet.hudson.test.HudsonTestCase;
-import org.jvnet.hudson.test.Url;
-import org.jvnet.hudson.test.recipes.WithPlugin;
-import org.jvnet.hudson.test.recipes.WithPluginManager;
-
 import java.io.File;
 import java.lang.reflect.Method;
 import java.net.URL;
@@ -47,6 +40,13 @@ import java.net.URLClassLoader;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Future;
+import org.apache.commons.io.FileUtils;
+import org.apache.tools.ant.filters.StringInputStream;
+import org.jvnet.hudson.test.Bug;
+import org.jvnet.hudson.test.HudsonTestCase;
+import org.jvnet.hudson.test.Url;
+import org.jvnet.hudson.test.recipes.WithPlugin;
+import org.jvnet.hudson.test.recipes.WithPluginManager;
 
 /**
  * @author Kohsuke Kawaguchi
@@ -310,6 +310,7 @@ public class PluginManagerTest extends HudsonTestCase {
      * 
      * @throws Exception
      */
+    @Bug(19976)
     public void testInstallDependedPluginWithoutRestart() throws Exception {
         // Load depender.
         {

From f82f0bb9f6cbf682a1b157a80a7d51d40efd4bbc Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 24 Mar 2014 11:55:54 -0400
Subject: [PATCH 29/36] testEnterCredential observed to fail due to offline
 mirror. Since downloading tool metadata seems inessential for the test,
 leaving it disabled as is the default. 503 Service Unavailable for
 http://mirrors.jenkins-ci.org/updates/updates/hudson.tasks.Ant.AntInstaller.json?id=hudson.tasks.Ant.AntInstaller&version=1.557-SNAPSHOT%2520(private-03%252F24%252F2014%252014%253A15%2520GMT-jenkins)

---
 test/src/test/java/hudson/tools/JDKInstallerTest.java | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/test/src/test/java/hudson/tools/JDKInstallerTest.java b/test/src/test/java/hudson/tools/JDKInstallerTest.java
index 29d168c1d2..95ead8b937 100644
--- a/test/src/test/java/hudson/tools/JDKInstallerTest.java
+++ b/test/src/test/java/hudson/tools/JDKInstallerTest.java
@@ -2,7 +2,6 @@ package hudson.tools;
 
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import hudson.model.DownloadService;
 import hudson.tools.JDKInstaller.DescriptorImpl;
 import org.jvnet.hudson.test.HudsonTestCase;
 import hudson.model.JDK;
@@ -31,13 +30,10 @@ import org.xml.sax.SAXException;
  * @author Kohsuke Kawaguchi
  */
 public class JDKInstallerTest extends HudsonTestCase {
-    boolean old;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        old = DownloadService.neverUpdate;
-        DownloadService.neverUpdate = false;
 
         File f = new File(new File(System.getProperty("user.home")),".jenkins-ci.org");
         if (!f.exists()) {
@@ -61,12 +57,6 @@ public class JDKInstallerTest extends HudsonTestCase {
         }
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        DownloadService.neverUpdate = old;
-        super.tearDown();
-    }
-
     public void testEnterCredential() throws Exception {
         HtmlPage p = createWebClient().goTo("/descriptorByName/hudson.tools.JDKInstaller/enterCredential");
         HtmlForm form = p.getFormByName("postCredential");

From 8c9430f155f81f4c9ef4a3e6376e9442a8b1ccf6 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 24 Mar 2014 12:03:43 -0400
Subject: [PATCH 30/36] Cannot call setResult during finalization phase. From a
 random failure of BuildTriggerTest.testMavenBuildTrigger:
 java.lang.AssertionError 	at hudson.model.Run.setResult(Run.java:425) 
 at
 hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:722)
 	at
 hudson.maven.MavenModuleSetBuild$MavenModuleSetBuildExecution.cleanUp(MavenModuleSetBuild.java:1054)
 	at hudson.model.Run.execute(Run.java:1733) 	at
 hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:519) 	at
 hudson.model.ResourceController.execute(ResourceController.java:88) 	at
 hudson.model.Executor.run(Executor.java:231)

---
 core/src/main/java/hudson/model/AbstractBuild.java | 4 +++-
 core/src/main/java/hudson/model/Run.java           | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java
index 1c829dc42a..0588c63ea5 100644
--- a/core/src/main/java/hudson/model/AbstractBuild.java
+++ b/core/src/main/java/hudson/model/AbstractBuild.java
@@ -719,7 +719,9 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
                         String msg = "Publisher " + bs.getClass().getName() + " aborted due to exception";
                         e.printStackTrace(listener.error(msg));
                         LOGGER.log(WARNING, msg, e);
-                        setResult(Result.FAILURE);
+                        if (phase) {
+                            setResult(Result.FAILURE);
+                        }
                     }
             }
             return r;
diff --git a/core/src/main/java/hudson/model/Run.java b/core/src/main/java/hudson/model/Run.java
index 8afa2bf8fc..a045fb6141 100644
--- a/core/src/main/java/hudson/model/Run.java
+++ b/core/src/main/java/hudson/model/Run.java
@@ -422,7 +422,7 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
 
     public void setResult(Result r) {
         // state can change only when we are building
-        assert state==State.BUILDING;
+        assert state==State.BUILDING : state;
 
         // result can only get worse
         if(result==null) {

From fa496c7bf228ecb243acf0135106f18f27132c6f Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 24 Mar 2014 12:12:10 -0400
Subject: [PATCH 31/36] Null safety during failing tests
 (BuildTriggerTest.testMavenBuildTrigger in this case).
 java.lang.NullPointerException 	at
 hudson.model.Job.getBuildDir(Job.java:790) 	at
 hudson.model.Run.getRootDir(Run.java:993) 	at
 hudson.model.Run.getLogFile(Run.java:1306) 	at
 hudson.model.Run.execute(Run.java:1664) 	at
 hudson.maven.MavenBuild.access$900(MavenBuild.java:94) 	at
 hudson.maven.MavenBuild$ProxyImpl2.close(MavenBuild.java:636) 	at
 hudson.maven.AbstractMavenBuilder.end(AbstractMavenBuilder.java:106) 	at
 hudson.maven.MavenModuleSetBuild$MavenModuleSetBuildExecution.doRun(MavenModuleSetBuild.java:839)
 	at
 hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:523)
 	at hudson.model.Run.execute(Run.java:1688) 	at
 hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:519) 	at
 hudson.model.ResourceController.execute(ResourceController.java:88) 	at
 hudson.model.Executor.run(Executor.java:231) java.lang.NullPointerException 
 at hudson.model.BuildStepListener.all(BuildStepListener.java:31) 	at
 hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:739)
 	at
 hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:714)
 	at
 hudson.maven.MavenModuleSetBuild$MavenModuleSetBuildExecution.cleanUp(MavenModuleSetBuild.java:1054)
 	at hudson.model.Run.execute(Run.java:1733) 	at
 hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:519) 	at
 hudson.model.ResourceController.execute(ResourceController.java:88) 	at
 hudson.model.Executor.run(Executor.java:231)

---
 core/src/main/java/hudson/model/BuildStepListener.java | 3 +--
 core/src/main/java/hudson/model/Job.java               | 6 +++++-
 core/src/main/java/jenkins/model/Jenkins.java          | 5 +++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/hudson/model/BuildStepListener.java b/core/src/main/java/hudson/model/BuildStepListener.java
index 03f36a0f20..7d9ba256ed 100644
--- a/core/src/main/java/hudson/model/BuildStepListener.java
+++ b/core/src/main/java/hudson/model/BuildStepListener.java
@@ -5,8 +5,6 @@ import hudson.ExtensionPoint;
 import hudson.tasks.BuildStep;
 import jenkins.model.Jenkins;
 
-import java.util.List;
-
 /**
  * Receives events that happen as a build executes {@link BuildStep}s.
  * @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
@@ -28,6 +26,7 @@ public abstract class BuildStepListener implements ExtensionPoint {
      * Returns all the registered {@link BuildStepListener}s.
      */
     public static ExtensionList<BuildStepListener> all() {
+        // TODO should have a null-safe version when Jenkins.getInstance() is null; would require changes in ExtensionList
         return Jenkins.getInstance().getExtensionList(BuildStepListener.class);
     }
 }
diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java
index 56734c0e9f..8818c9e764 100644
--- a/core/src/main/java/hudson/model/Job.java
+++ b/core/src/main/java/hudson/model/Job.java
@@ -787,7 +787,11 @@ public abstract class Job<JobT extends Job<JobT, RunT>, RunT extends Run<JobT, R
      * @see RunMap
      */
     public File getBuildDir() {
-        return Jenkins.getInstance().getBuildDirFor(this);
+        Jenkins j = Jenkins.getInstance();
+        if (j == null) {
+            return new File(getRootDir(), "builds");
+        }
+        return j.getBuildDirFor(this);
     }
 
     /**
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 883f1ee125..5ec8026ab8 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -701,7 +701,12 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
         }
     };
 
+    /**
+     * Gets the Jenkins singleton.
+     * @return the instance, or null if Jenkins has not been started, or was already shut down
+     */
     @CLIResolver
+    @CheckForNull
     public static Jenkins getInstance() {
         return HOLDER.getInstance();
     }

From a01ebae1a4783566e42d74c4edaaf1dc3ed8a43e Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 24 Mar 2014 13:01:29 -0400
Subject: [PATCH 32/36] =?UTF-8?q?[JENKINS-22326]=20Calling=20into=20foreig?=
 =?UTF-8?q?n=20code=20from=20a=20toString=20method,=20like=20Queue.Item.ge?=
 =?UTF-8?q?tWhy=20=E2=86=92=20QueueTaskDispatcher,=20is=20unsafe.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/src/main/java/hudson/model/Queue.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index c14bbe316c..5bc7c18ae2 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/core/src/main/java/hudson/model/Queue.java
@@ -1516,7 +1516,7 @@ public class Queue extends ResourceController implements Saveable {
 
         @Override
         public String toString() {
-            return getClass().getName() + ':' + task + ':' + getWhy();
+            return getClass().getName() + ':' + task + ':' + id;
         }
 
         /**

From dd5a3b1465d837436eea94b366524fe13da034d6 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Mon, 24 Mar 2014 13:41:54 -0400
Subject: [PATCH 33/36] @RandomlyFails

---
 .../test/java/hudson/diagnosis/OldDataMonitorTest.java    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java b/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
index 23d7c5b74e..1274950ae8 100644
--- a/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
+++ b/test/src/test/java/hudson/diagnosis/OldDataMonitorTest.java
@@ -29,16 +29,23 @@ import hudson.model.FreeStyleProject;
 import hudson.model.InvisibleAction;
 import java.lang.ref.WeakReference;
 import java.util.Collections;
+import jenkins.model.lazy.BuildReference;
 import static org.junit.Assert.*;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.Bug;
 import org.jvnet.hudson.test.JenkinsRule;
 import org.jvnet.hudson.test.MemoryAssert;
+import org.jvnet.hudson.test.RandomlyFails;
 import org.jvnet.hudson.test.recipes.LocalData;
 
 public class OldDataMonitorTest {
 
+    static {
+        // To make memory run faster:
+        System.setProperty(BuildReference.DefaultHolderFactory.MODE_PROPERTY, "weak");
+    }
+
     @Rule public JenkinsRule r = new JenkinsRule();
 
     @Bug(19544)
@@ -61,6 +68,7 @@ public class OldDataMonitorTest {
         // did not manage to save p, but at least we are not holding onto a reference to it anymore
     }
 
+    @RandomlyFails("actually it is robustness() that is claimed to fail, with an InterruptedException in before(), perhaps because memory() took many minutes to run")
     @Bug(19544)
     @Test public void memory() throws Exception {
         FreeStyleProject p = r.createFreeStyleProject("p");

From 65eebe962001d7d4a928c440085813b2620d91ca Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Mon, 24 Mar 2014 21:37:29 -0700
Subject: [PATCH 34/36] updated changelog as a part of the release

---
 debian/debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/debian/changelog b/debian/debian/changelog
index 8a93f93083..d65103eb8c 100644
--- a/debian/debian/changelog
+++ b/debian/debian/changelog
@@ -1,3 +1,9 @@
+jenkins (1.556) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Mon, 24 Mar 2014 21:11:39 -0700
+
 jenkins (1.555) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.

From 5c42a627d043148bee7c9ca0372032db51d5587d Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Mon, 24 Mar 2014 21:46:58 -0700
Subject: [PATCH 35/36] creating an RC branch

---
 changelog.html | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/changelog.html b/changelog.html
index cdc7bf6420..f648262f89 100644
--- a/changelog.html
+++ b/changelog.html
@@ -54,6 +54,14 @@ Upcoming changes</a>
 
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
+<ul class=image>
+  <li class=>
+</ul>
+</div><!--=TRUNK-END=-->
+
+<!-- these changes are controlled by the release process. DO NOT MODIFY -->
+<div id="rc" style="display:none;"><!--=BEGIN=-->
+<h3><a name=v1.557>What's new in 1.557</a> <!--=DATE=--></h3>
 <ul class=image>
   <li class=bug>
     Fixed <tt>ArrayIndexOutOfBoundsException</tt> in XStream with Oracle JDK8 release version
@@ -77,12 +85,6 @@ Upcoming changes</a>
     Option to download metadata directly from Jenkins rather than going through the browser.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-19081">issue 19081</a>)
 </ul>
-</div><!--=TRUNK-END=-->
-
-<!-- these changes are controlled by the release process. DO NOT MODIFY -->
-<div id="rc" style="display:none;"><!--=BEGIN=-->
-<h3><a name=v1.557>What's new in 1.557</a> <!--=DATE=--></h3>
-<!--=RC-CHANGES=-->
 </div><!--=END=-->
 <h3><a name=v1.556>What's new in 1.556</a> (2014/03/23)</h3>
 <ul class=image>

From 1f8a8edbbc3fd43807718ca46c057128ae906a8a Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Mon, 24 Mar 2014 21:47:08 -0700
Subject: [PATCH 36/36] the trunk is toward 1.558-SNAPSHOT

---
 cli/pom.xml     | 2 +-
 core/pom.xml    | 2 +-
 plugins/pom.xml | 8 ++++----
 pom.xml         | 2 +-
 test/pom.xml    | 2 +-
 war/pom.xml     | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index b888d7aaec..15b7993c45 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.557-SNAPSHOT</version>
+    <version>1.558-SNAPSHOT</version>
   </parent>
 
   <artifactId>cli</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index af4f56e168..cceb1a3ab9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.557-SNAPSHOT</version>
+    <version>1.558-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/plugins/pom.xml b/plugins/pom.xml
index eff68aacb3..ca25228453 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -11,7 +11,7 @@
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Jenkins plugin POM</name>
-  <version>1.557-SNAPSHOT</version>
+  <version>1.558-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!--
@@ -39,19 +39,19 @@
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
       <type>war</type>
-      <version>1.557-SNAPSHOT</version>
+      <version>1.558-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
-      <version>1.557-SNAPSHOT</version>
+      <version>1.558-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1.557-SNAPSHOT</version>
+      <version>1.558-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!--
diff --git a/pom.xml b/pom.xml
index 737f6a8c19..2d270c97de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.557-SNAPSHOT</version>
+  <version>1.558-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>
diff --git a/test/pom.xml b/test/pom.xml
index 48ed4c35c4..e7e346d1cc 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.557-SNAPSHOT</version>
+    <version>1.558-SNAPSHOT</version>
   </parent>
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-test-harness</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index d1a6ad4e4a..21229d6eb7 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.557-SNAPSHOT</version>
+    <version>1.558-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>