diff --git a/changelog.html b/changelog.html
index 8256834c0f27b8b0ac59c922115f24fa07a1efe6..ae9a9b45edeaded3a5fecc9ac25a5007a1003155 100644
--- a/changelog.html
+++ b/changelog.html
@@ -61,7 +61,17 @@ Upcoming changes
-
+
+
+ -
+ Queue didn't always leave a trail for cancelled items properly
+ (issue 25314)
+
-
+ JNA update for deprecated JNA-POSIX library.
+ (issue 24527)
+
+
+
-
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
Existing
FileParameter
s should be handled as different values to avoid merging of queued builds
(issue 19017)
-
-
diff --git a/cli/pom.xml b/cli/pom.xml
index a100512fc7fb64d369475df5c25de46304b295b3..94d984f719a658d2c8ab22ef28308c461254ed82 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -5,7 +5,7 @@
pom
org.jenkins-ci.main
- 1.586-SNAPSHOT
+ 1.587-SNAPSHOT
cli
diff --git a/core/pom.xml b/core/pom.xml
index 34269ed923adb0a7a7f1bcaf0e1d6b152c0ec50e..cebd5cd384600c97e0eb79ff14486c59982122d0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
org.jenkins-ci.main
pom
- 1.586-SNAPSHOT
+ 1.587-SNAPSHOT
../pom.xml
@@ -42,7 +42,7 @@ THE SOFTWARE.
true
- 1.231
+ 1.233
2.5.6.SEC03
1.8.9
@@ -102,7 +102,7 @@ THE SOFTWARE.
org.jruby.ext.posix
jna-posix
- 1.0.3
+ 1.0.3-jenkins-1
com.github.jnr
diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java
index cf35b21feca8e22f615c84e3c64b2b27c3dc1ee7..fd77ea8f6df0ec5474253ec9060c9a07b992bcb9 100644
--- a/core/src/main/java/hudson/FilePath.java
+++ b/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) {
diff --git a/core/src/main/java/hudson/model/Cause.java b/core/src/main/java/hudson/model/Cause.java
index e650be33ede09004f819c5b95d2e90e0e0dad29a..37dbcee4ca753fdb5fa11f88eac7626fe77d5e9f 100644
--- a/core/src/main/java/hudson/model/Cause.java
+++ b/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 {
diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
index fff4a7765ed59174992a55fdf03a724eeba93c6c..e26e0f118e590ccd831b712c8a3b29752daef1fc 100644
--- a/core/src/main/java/hudson/model/Computer.java
+++ b/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
diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
index da478515f448c5758468882688c68fbbb8342ec6..3b7247d5f9a9f73a27825aeb99b2aea463a35a9f 100644
--- a/core/src/main/java/hudson/model/Queue.java
+++ b/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;
}
diff --git a/core/src/main/resources/lib/hudson/failed-test.jelly b/core/src/main/resources/lib/hudson/failed-test.jelly
index 9070ad535935451c300de554644faf3e060e1629..dbd8c5b8e9ca75210c32b2f2cede79d2b6ac1c91 100644
--- a/core/src/main/resources/lib/hudson/failed-test.jelly
+++ b/core/src/main/resources/lib/hudson/failed-test.jelly
@@ -25,77 +25,7 @@ THE SOFTWARE.
- Display link to the failed test.
- @since 1.538
-
- Path to the failed test.
-
-
- Failed test object
-
+ DEPRECATED
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${%Loading...}
-
+
diff --git a/core/src/main/resources/lib/hudson/failed-test_pt_BR.properties b/core/src/main/resources/lib/hudson/failed-test_pt_BR.properties
deleted file mode 100644
index b66bf89191a3d6796290aa73d1a3ba3436402c7a..0000000000000000000000000000000000000000
--- a/core/src/main/resources/lib/hudson/failed-test_pt_BR.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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
diff --git a/debian/debian/changelog b/debian/debian/changelog
index 4ac12482f18b7b8f7764292d1a60190f761e1af4..857aa88b601e3ee2c897bb53ed55c61ef3e196fe 100644
--- a/debian/debian/changelog
+++ b/debian/debian/changelog
@@ -1,3 +1,9 @@
+jenkins (1.586) unstable; urgency=low
+
+ * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi Sun, 26 Oct 2014 20:50:22 -0700
+
jenkins (1.585) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 55a6a495bfe0b86de54f53124455fc7bd88674f5..055754734ee76a98e2e6c501c206730b98706360 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -11,7 +11,7 @@
org.jenkins-ci.plugins
plugin
Jenkins plugin POM
- 1.586-SNAPSHOT
+ 1.587-SNAPSHOT
pom