Merge branch 'rc' into security-rc

changelog.html

@@ -61,7 +61,17 @@ 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.586>What's new in 1.586</a> <!--=DATE=--></h3>
+<h3><a name=v1.587>What's new in 1.587</a> <!--=DATE=--></h3>
+<ul class=image>
+  <li class=bug>
+    Queue didn't always leave a trail for cancelled items properly
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-25314">issue 25314</a>)
+  <li class=bug>
+    JNA update for deprecated JNA-POSIX library.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-24527">issue 24527</a>)
+</ul>
+</div><!--=END=-->
+<h3><a name=v1.586>What's new in 1.586</a> (2014/10/26)</h3>
 <ul class=image>
   <li class=rfe>
     Bumping up JNA to 4.10. This is potentially a breaking change for plugins that depend on JNA 3.x
@@ -77,7 +87,6 @@ Upcoming changes</a>
     Existing <code>FileParameter</code>s should be handled as different values to avoid merging of queued builds
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-19017">issue 19017</a>)  
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.585>What's new in 1.585</a> (2014/10/19)</h3>
 <ul class=image>
   <li class=bug>

cli/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.586-SNAPSHOT</version>
+    <version>1.587-SNAPSHOT</version>
   </parent>
 
   <artifactId>cli</artifactId>

core/pom.xml

@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.586-SNAPSHOT</version>
+    <version>1.587-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -42,7 +42,7 @@ THE SOFTWARE.
 
   <properties>
     <staplerFork>true</staplerFork>
-    <stapler.version>1.231</stapler.version>
+    <stapler.version>1.233</stapler.version>
     <spring.version>2.5.6.SEC03</spring.version>
     <groovy.version>1.8.9</groovy.version>
   </properties>
@@ -102,7 +102,7 @@ THE SOFTWARE.
     <dependency> <!-- for compatibility only; all new code should use JNR -->
       <groupId>org.jruby.ext.posix</groupId>
       <artifactId>jna-posix</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.3-jenkins-1</version>
     </dependency>
     <dependency>
       <groupId>com.github.jnr</groupId>

core/src/main/java/hudson/FilePath.java

@@ -1668,6 +1668,7 @@ public final class FilePath implements Serializable {
 
     /**
      * Reads this file from the specific offset.
+     * @since 1.586
      */
     public InputStream readFromOffset(final long offset) throws IOException {
         if(channel ==null) {

core/src/main/java/hudson/model/Cause.java

@@ -137,7 +137,7 @@ public abstract class Cause {
     }
 
     /**
-     * A build is triggered by the completion of another build (AKA upstream build.)
+     * A build is triggered by another build (AKA upstream build.)
      */
     public static class UpstreamCause extends Cause {
 

core/src/main/java/hudson/model/Computer.java

@@ -470,9 +470,14 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
      *      is not yet gone.
      */
     public @CheckForNull Node getNode() {
-        if(nodeName==null)
-            return Jenkins.getInstance();
-        return Jenkins.getInstance().getNode(nodeName);
+        Jenkins j = Jenkins.getInstance();
+        if (j == null) {
+            return null;
+        }
+        if (nodeName == null) {
+            return j;
+        }
+        return j.getNode(nodeName);
     }
 
     @Exported

core/src/main/java/hudson/model/Queue.java

@@ -658,12 +658,7 @@ public class Queue extends ResourceController implements Saveable {
     
     public synchronized boolean cancel(Item item) {
         LOGGER.log(Level.FINE, "Cancelling {0} item#{1}", new Object[] {item.task, item.id});
-        boolean r = item.cancel(this);
-
-        LeftItem li = new LeftItem(item);
-        li.enter(this);
-
-        return r;
+        return item.cancel(this);
     }
 
     /**
@@ -1588,10 +1583,17 @@ public class Queue extends ResourceController implements Saveable {
         /**
          * Cancels this item, which updates {@link #future} to notify the listener, and
          * also leaves the queue.
+         *
+         * @return true
+         *      if the item was successfully cancelled.
          */
         /*package*/ boolean cancel(Queue q) {
             boolean r = leave(q);
-            if (r)  future.setAsCancelled();
+            if (r) {
+                future.setAsCancelled();
+                LeftItem li = new LeftItem(this);
+                li.enter(q);
+            }
             return r;
         }
 

core/src/main/resources/lib/hudson/failed-test.jelly

@@ -25,77 +25,7 @@ THE SOFTWARE.
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
   <st:documentation>
-    Display link to the failed test.
-    @since 1.538
-    <st:attribute name="url" type="String">
-      Path to the failed test.
-    </st:attribute>
-    <st:attribute name="result" type="TestObject">
-      Failed test object
-    </st:attribute>
+      DEPRECATED
   </st:documentation>
-    <st:once>
-      <script type="text/javascript">
-      <!-- TODO make sure load doesn't happen every time -->
-      function showFailureSummary(id,query) {
-        var element = document.getElementById(id)
-        element.style.display = "";
-        document.getElementById(id + "-showlink").style.display = "none";
-        document.getElementById(id + "-hidelink").style.display = "";
-
-        if (typeof query !== 'undefined') {
-          var rqo = new XMLHttpRequest();
-          rqo.open('GET', query, true);
-          rqo.onreadystatechange = function() { element.innerHTML = rqo.responseText; }
-          rqo.send(null);
-        }
-      }
-
-      function hideFailureSummary(id) {
-        document.getElementById(id).style.display = "none";
-        document.getElementById(id + "-showlink").style.display = "";
-        document.getElementById(id + "-hidelink").style.display = "none";
-      }
-    </script>
-    <style type="text/css">
-      .failure-summary {
-        margin-left: 2em;
-      }
-
-      .failure-summary h4 {
-        margin: 0.5em 0 0.5em 0;
-      }
-
-      .failure-summary h4 a {
-        text-decoration: none;
-        color: inherit;
-      }
-
-      .failure-summary h4 a img {
-        width: 8px;
-        height: 8px;
-      }
-
-      .failure-summary pre {
-        margin-left: 2em;
-      }
-    </style>
-  </st:once>
-  <j:set var="id" value="${h.jsStringEscape(url)}"/>
-  <j:set var="open" value="javascript:showFailureSummary('test-${id}','${url}/summary')"/>
-  <j:set var="close" value="javascript:hideFailureSummary('test-${id}')"/>
-  <a id="test-${id}-showlink" href="${open}" title="${%Show details}">
-    <l:icon class="icon-document-add icon-sm"/>
-  </a>
-  <a id="test-${id}-hidelink" href="${close}" title="${%Hide details}" style="display:none">
-    <l:icon class="icon-document-delete icon-sm"/>
-  </a>
-  <st:nbsp/>
-  <a href="${url}" class="model-link inside"><st:out value="${result.fullDisplayName}"/></a>
-  <j:forEach var="badge" items="${result.testActions}">
-    <st:include it="${badge}" page="badge.jelly" optional="true"/>
-  </j:forEach>
-  <div id="test-${id}" class="failure-summary" style="display: none;">
-    ${%Loading...}
-  </div>
+  <st:include page="/lib/hudson/test/failed-test.jelly"/>
 </j:jelly>

core/src/main/resources/lib/hudson/failed-test_pt_BR.properties

-# The MIT License
-#
-# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers
-#
-# 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.
-
-Hide\ details=Ocultar detalhes
-Loading...=Carregando...
-Show\ details=Exibir detalhes

debian/debian/changelog

+jenkins (1.586) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sun, 26 Oct 2014 20:50:22 -0700
+
 jenkins (1.585) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.

plugins/pom.xml

@@ -11,7 +11,7 @@
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Jenkins plugin POM</name>
-  <version>1.586-SNAPSHOT</version>
+  <version>1.587-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!--
@@ -40,19 +40,19 @@
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
       <type>war</type>
-      <version>1.586-SNAPSHOT</version>
+      <version>1.587-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
-      <version>1.586-SNAPSHOT</version>
+      <version>1.587-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1.586-SNAPSHOT</version>
+      <version>1.587-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!--

pom.xml

@@ -33,7 +33,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.586-SNAPSHOT</version>
+  <version>1.587-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>

test/pom.xml

@@ -29,7 +29,7 @@ THE SOFTWARE.
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jenkins-ci.main</groupId>
-    <version>1.586-SNAPSHOT</version>
+    <version>1.587-SNAPSHOT</version>
   </parent>
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>jenkins-test-harness</artifactId>
@@ -101,7 +101,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>junit</artifactId>
-      <version>1.0</version>
+      <version>1.2-beta-3</version>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>

war/pom.xml

@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.586-SNAPSHOT</version>
+    <version>1.587-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -370,7 +370,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>junit</artifactId>
-                  <version>1.0</version>
+                  <version>1.2-beta-3</version>
                   <type>hpi</type>
                 </artifactItem>
               </artifactItems>