Merge branch 'master' into JENKINS-27256

* master: Updated changelog updated changelog as a part of the release [maven-release-plugin] prepare for next development iteration [maven-release-plugin] prepare release jenkins-1.604 Noting #1597 Noting #1593, #1579, move JENKINS-22346, #1558 Remove two fixes that were backported to RC JENKINS-27183 Avoid deadlock when using build-monitor-plugin
jenkinsci · Mar 16, 2015 · 7e50639 · 7e50639
2 parents 3f3bc34 + 11786d8
commit 7e50639
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 30 deletions.
diff --git a/changelog.html b/changelog.html
@@ -58,30 +58,26 @@
   <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.603>What's new in 1.603</a> <!--=DATE=--></h3>
+<h3><a name=v1.604>What's new in 1.604</a> (2015/03/15)</h3>
 <ul class=image>
+  <li class=rfe>
+    Added a switch (<tt>-Dhudson.model.User.allowNonExistentUserToLogin=true</tt>) to let users login even when the record is not found in the backend security realm.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22346">issue 22346</a>)
+  <li class=bug>
+    Avoid deadlock when using build-monitor-plugin.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-27183">issue 27183</a>)
   <li class=rfe>
     As security hardening, mark "remember me" cookie as HTTP only
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-27277">issue 27277</a>)
+  <li class="rfe">
+    Show displayName in build remote API.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-26723">issue 26723</a>)
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.602>What's new in 1.602</a> (2015/03/08)</h3>
 <ul class=image>
-  <li class="major bug">
-    Regression with environment variables in 1.600.
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-27188">issue 27188</a>)
-  <li class="major bug">
-    Errors with concurrent matrix builds since 1.597.
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-26739">issue 26739</a>)
   <li class="rfe">
-    Show displayName in build remote API.
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-26723">issue 26723</a>)
-  <li class=rfe>
-    Added a switch (<tt>-Dhudson.model.User.allowNonExistentUserToLogin=true</tt>) to let users login even when the record is not found in the backend security realm.
-    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-22346">issue 22346</a>)
+    Show Check Now button also on Available and Updates tabs of plugin manager.
+    (<a href="https://github.com/jenkinsci/jenkins/pull/1593">PR 1593</a>)
 </ul>
 <h3><a name=v1.601>What's new in 1.601</a> (2015/03/03)</h3>
 <ul class=image>
@@ -94,6 +90,9 @@ <h3><a name=v1.601>What's new in 1.601</a> (2015/03/03)</h3>
   <li class=bug>
     Errors in Dashboard View plugin since 1.597.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-26690">issue 26690</a>)
+  <li class=bug>
+    Robustness improvement when setting up Archive Artifacts programmatically.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-25779">issue 25779</a>)
   <li class="rfe">
     Map Queue.Item.id onto Run
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-27096">issue 27096</a>)

diff --git a/cli/pom.xml b/cli/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.604-SNAPSHOT</version>
+    <version>1.605-SNAPSHOT</version>
   </parent>
 
   <artifactId>cli</artifactId>

diff --git 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.604-SNAPSHOT</version>
+    <version>1.605-SNAPSHOT</version>
   </parent>
 
   <artifactId>jenkins-core</artifactId>

diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
@@ -216,6 +216,8 @@ protected void doSetName(String name) {
     protected void renameTo(final String newName) throws IOException {
         // always synchronize from bigger objects first
         final ItemGroup parent = getParent();
+        String oldName = this.name;
+        String oldFullName = getFullName();
         synchronized (parent) {
             synchronized (this) {
                 // sanity check
@@ -248,9 +250,6 @@ public Void call() throws IOException {
                     }
                 });
 
-
-                String oldName = this.name;
-                String oldFullName = getFullName();
                 File oldRoot = this.getRootDir();
 
                 doSetName(newName);
@@ -324,10 +323,9 @@ public Void call() throws IOException {
                 } catch (AbstractMethodError _) {
                     // ignore
                 }
-
-                ItemListener.fireLocationChange(this, oldFullName);
             }
         }
+        ItemListener.fireLocationChange(this, oldFullName);
     }
 
 

diff --git a/debian/debian/changelog b/debian/debian/changelog
@@ -1,3 +1,9 @@
+jenkins (1.604) unstable; urgency=low
+
+  * See http://jenkins-ci.org/changelog for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sun, 15 Mar 2015 12:22:07 -0700
+
 jenkins (1.602) unstable; urgency=low
 
   * See http://jenkins-ci.org/changelog for more details.

diff --git a/plugins/pom.xml b/plugins/pom.xml
@@ -12,7 +12,7 @@
   <groupId>org.jenkins-ci.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Jenkins plugin POM</name>
-  <version>1.604-SNAPSHOT</version>
+  <version>1.605-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <!--
@@ -41,19 +41,19 @@
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-war</artifactId>
       <type>war</type>
-      <version>1.604-SNAPSHOT</version>
+      <version>1.605-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-core</artifactId>
-      <version>1.604-SNAPSHOT</version>
+      <version>1.605-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>jenkins-test-harness</artifactId>
-      <version>1.604-SNAPSHOT</version>
+      <version>1.605-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!--

diff --git a/pom.xml b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
 
   <groupId>org.jenkins-ci.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.604-SNAPSHOT</version>
+  <version>1.605-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>Jenkins main module</name>

diff --git a/test/pom.xml b/test/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jenkins-ci.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.604-SNAPSHOT</version>
+    <version>1.605-SNAPSHOT</version>
   </parent>
 
   <artifactId>jenkins-test-harness</artifactId>

diff --git 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.604-SNAPSHOT</version>
+    <version>1.605-SNAPSHOT</version>
   </parent>
 
   <artifactId>jenkins-war</artifactId>