From e886819ac8f4745dd9e1ad9c63a4f5d45a324940 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Mon, 10 Aug 2009 18:36:01 +0000
Subject: [PATCH] Merged revisions 20511,20544,20546,20549 via svnmerge from
 https://www.dev.java.net/svn/hudson/branches/rc

........
  r20511 | kohsuke | 2009-08-06 14:32:18 -0700 (Thu, 06 Aug 2009) | 1 line

  fixed the UI regression. Maybe boolean collapsing is not happens automatically, or and is defined in a strange way for non-booleans?
........
  r20544 | kohsuke | 2009-08-07 22:22:42 -0700 (Fri, 07 Aug 2009) | 1 line

  [maven-release-plugin] prepare release hudson-1_319
........
  r20546 | kohsuke | 2009-08-07 22:22:55 -0700 (Fri, 07 Aug 2009) | 1 line

  [maven-release-plugin] prepare for next development iteration
........
  r20549 | kohsuke | 2009-08-08 01:19:02 -0700 (Sat, 08 Aug 2009) | 1 line

  updated changelog as a part of the release
........


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@20596 71c3de6d-444a-0410-be80-ed276b4c234a
---
 cli/pom.xml                                                 | 2 +-
 core/pom.xml                                                | 2 +-
 .../main/resources/hudson/widgets/HistoryWidget/entry.jelly | 2 +-
 debian/changelog                                            | 6 ++++++
 maven-agent/pom.xml                                         | 2 +-
 maven-interceptor/pom.xml                                   | 2 +-
 maven-plugin/pom.xml                                        | 2 +-
 pom.xml                                                     | 2 +-
 remoting/pom.xml                                            | 2 +-
 test/pom.xml                                                | 2 +-
 war/pom.xml                                                 | 2 +-
 11 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index 237be557d1..765346e822 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.319-SNAPSHOT</version>
+    <version>1.320-SNAPSHOT</version>
   </parent>
   <artifactId>cli</artifactId>
   <name>Hudson CLI</name>
diff --git a/core/pom.xml b/core/pom.xml
index b7bf03e726..16d7c9d4d2 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.319-SNAPSHOT</version>
+    <version>1.320-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
index 9514a7ca9d..60b7390eb5 100644
--- a/core/src/main/resources/hudson/widgets/HistoryWidget/entry.jelly
+++ b/core/src/main/resources/hudson/widgets/HistoryWidget/entry.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:f="/lib/form" xmlns:i="jelly:fmt">
   <j:set var="link" value="${it.baseUrl}/${build.number}/" />
-  <j:set var="transitive" value="${it.firstTransientBuildKey and it.adapter.compare(build,it.firstTransientBuildKey) ge 0 ? 'transitive' : null}" />
+  <j:set var="transitive" value="${(it.firstTransientBuildKey!=null and (it.adapter.compare(build,it.firstTransientBuildKey) ge 0)) ? 'transitive' : null}" />
   <tr class="build-row ${transitive}">
     <td nowrap="nowrap">
       <img width="16" height="16" src="${imagesURL}/16x16/${build.buildStatusUrl}" alt="${build.iconColor.description}" tooltip="${build.iconColor.description}" /><st:nbsp/>
diff --git a/debian/changelog b/debian/changelog
index 8145d7c24b..7aa8c0f6e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hudson (1.319) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sat, 08 Aug 2009 01:07:46 -0700
+
 hudson (1.318) unstable; urgency=low
 
   * See http://hudson.dev.java.net/changelog.html for more details.
diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml
index ea03f4296d..29e8795b75 100644
--- a/maven-agent/pom.xml
+++ b/maven-agent/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.319-SNAPSHOT</version>
+    <version>1.320-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml
index 2845c98b45..e14cc43869 100644
--- a/maven-interceptor/pom.xml
+++ b/maven-interceptor/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.319-SNAPSHOT</version>
+    <version>1.320-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 3ac1d08c1e..4d6da5f738 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.319-SNAPSHOT</version>
+    <version>1.320-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index dc0cec2825..3d51d4fa27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
   
   <groupId>org.jvnet.hudson.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.319-SNAPSHOT</version>
+  <version>1.320-SNAPSHOT</version>
   <packaging>pom</packaging>
   
   <name>Hudson main module</name>
diff --git a/remoting/pom.xml b/remoting/pom.xml
index fc76968325..b652a0ab4b 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.319-SNAPSHOT</version>
+    <version>1.320-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/test/pom.xml b/test/pom.xml
index 1998fdb365..d52e701e4d 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.319-SNAPSHOT</version>
+    <version>1.320-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jvnet.hudson.main</groupId>
diff --git a/war/pom.xml b/war/pom.xml
index 881ebad58c..3486290763 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.319-SNAPSHOT</version>
+    <version>1.320-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
-- 
GitLab