From 0fa32eac4eb2fdaf91b48e4aa2a53ade28891a5c Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 19 Oct 2014 21:51:18 -0700 Subject: [PATCH 01/15] the trunk is toward 1.587-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 a100512fc7..94d984f719 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 34269ed923..54867b87d5 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 diff --git a/plugins/pom.xml b/plugins/pom.xml index 55a6a495bf..055754734e 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 - 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"; - } - - - - - - - - - - - - - - - - + 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 b66bf89191..0000000000 --- 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/test/pom.xml b/test/pom.xml index e6530abda4..41d2957e58 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -101,7 +101,7 @@ THE SOFTWARE. org.jenkins-ci.plugins junit - 1.0 + 1.2-beta-3 org.mortbay.jetty diff --git a/war/pom.xml b/war/pom.xml index 0a9b9a708e..0ff2f617ae 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -370,7 +370,7 @@ THE SOFTWARE. org.jenkins-ci.plugins junit - 1.0 + 1.2-beta-3 hpi From 6d3d43275f91084868e20bdba8591a02e62233ca Mon Sep 17 00:00:00 2001 From: Craig Rodrigues Date: Sat, 25 Oct 2014 17:19:42 -0700 Subject: [PATCH 06/15] [FIXED JENKINS-24527] Update jna-posix to 1.0.3-jenkins-1 which uses JNA 4.1 --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index 54867b87d5..f86fdff0ec 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -102,7 +102,7 @@ THE SOFTWARE. org.jruby.ext.posix jna-posix - 1.0.3 + 1.0.3-jenkins-1 com.github.jnr From 4f24a0274fd41cd39d3e8c5d40ace20ecd2e46aa Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Sat, 25 Oct 2014 18:36:27 -0700 Subject: [PATCH 07/15] [JENKINS-24527] Noting merge of #1442. --- changelog.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog.html b/changelog.html index 8256834c0f..5ad81553a4 100644 --- a/changelog.html +++ b/changelog.html @@ -55,7 +55,9 @@ Upcoming changes From b4a9671c273bfa3a90f28bdf193e48f4dc737e64 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 26 Oct 2014 13:35:49 -0700 Subject: [PATCH 08/15] Integrated the newest Stapler version In particular, this includes pull request #39 from Matt that handles '$class' --- core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/pom.xml b/core/pom.xml index f86fdff0ec..cebd5cd384 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -42,7 +42,7 @@ THE SOFTWARE. true - 1.231 + 1.233 2.5.6.SEC03 1.8.9 From 300b6fa5197ae73d8331b1c1476aee5fd51e0398 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Sun, 26 Oct 2014 13:58:40 -0700 Subject: [PATCH 09/15] Forgotten @since. --- core/src/main/java/hudson/FilePath.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/java/hudson/FilePath.java b/core/src/main/java/hudson/FilePath.java index cf35b21fec..fd77ea8f6d 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) { From 9b36e2ae8dbbd2a7ab0d9d4bc9e24e305e33ecbc Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 26 Oct 2014 15:20:38 -0700 Subject: [PATCH 10/15] [FIXED JENKINS-25314] The original fix was made in 0c3d67097a3394fee7f0eb895c4350ea96887a02. In this fix, I'm also moving the code that creates LeftItem. It makes no sense that there's Item.cancel(Queue) and Queue.cancel(Item) and they do different things! --- changelog.html | 3 +++ core/src/main/java/hudson/model/Queue.java | 16 +++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/changelog.html b/changelog.html index 5ad81553a4..4134fc6440 100644 --- a/changelog.html +++ b/changelog.html @@ -55,6 +55,9 @@ Upcoming changes

What's new in 1.585 (2014/10/19)

  • From d7097269cf5f6fc05a83dfb056885b3555cc882c Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 26 Oct 2014 21:23:31 -0700 Subject: [PATCH 14/15] 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 4ac12482f1..857aa88b60 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. From 4c1d0a5f30532012af20ad66e4d5283a7ae2d730 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sun, 26 Oct 2014 21:31:06 -0700 Subject: [PATCH 15/15] creating an RC branch --- changelog.html | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/changelog.html b/changelog.html index 692be1a583..ae9a9b45ed 100644 --- a/changelog.html +++ b/changelog.html @@ -54,6 +54,14 @@ Upcoming changes + + + - - -

    What's new in 1.586 (2014/10/26)