From cf6bfd7a8d7b81a72821f8c324eed8d7fe19b726 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Sat, 15 May 2010 13:41:27 +0000
Subject: [PATCH] Merged revisions 31054,31056,31060 via svnmerge from
 https://www.dev.java.net/svn/hudson/branches/rc

........
  r31054 | kohsuke | 2010-05-14 21:03:35 -0700 (Fri, 14 May 2010) | 1 line

  [maven-release-plugin] prepare release hudson-1_358
........
  r31056 | kohsuke | 2010-05-14 21:03:49 -0700 (Fri, 14 May 2010) | 1 line

  [maven-release-plugin] prepare for next development iteration
........
  r31060 | kohsuke | 2010-05-14 21:56:00 -0700 (Fri, 14 May 2010) | 1 line

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


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@31065 71c3de6d-444a-0410-be80-ed276b4c234a
---
 cli/pom.xml               | 2 +-
 core/pom.xml              | 8 ++++----
 debian/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 +-
 ui-samples-plugin/pom.xml | 2 +-
 war/pom.xml               | 2 +-
 11 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index 3dbba13718..f24ec58cfa 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.358-SNAPSHOT</version>
+    <version>1.359-SNAPSHOT</version>
   </parent>
   <artifactId>cli</artifactId>
   <name>Hudson CLI</name>
diff --git a/core/pom.xml b/core/pom.xml
index 93e072c62f..0ad2bdbe59 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.358-SNAPSHOT</version>
+    <version>1.359-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -126,11 +126,11 @@ THE SOFTWARE.
                 </tstamp>
                 <property name="build.type" value="private" /> <!-- override for "rc" build -->
                 <pathconvert property="version.rc">
-                  <path path="${version}"/>
-                  <chainedmapper><flattenmapper/><globmapper from="*-SNAPSHOT" to="*-RC"/></chainedmapper>
+                  <path path="${version}" />
+                  <chainedmapper><flattenmapper /><globmapper from="*-SNAPSHOT" to="*-RC" /></chainedmapper>
                 </pathconvert>
                 <condition property="build.version" value="${version.rc} (${now})">
-                  <equals arg1="${build.type}" arg2="rc"/>
+                  <equals arg1="${build.type}" arg2="rc" />
                 </condition>
                 <property name="build.version" value="${version} (${build.type}-${now}-${user.name})" />
                 <!-- default to release version -->
diff --git a/debian/debian/changelog b/debian/debian/changelog
index 9014412be6..2974976216 100644
--- a/debian/debian/changelog
+++ b/debian/debian/changelog
@@ -1,3 +1,9 @@
+hudson (1.358) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Fri, 14 May 2010 21:54:00 -0700
+
 hudson (1.357) 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 ed2330cd6d..6b4489b2e2 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.358-SNAPSHOT</version>
+    <version>1.359-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml
index 30726c5b7b..8b1237eade 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.358-SNAPSHOT</version>
+    <version>1.359-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 69d17b5b72..a5ec3fff33 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.358-SNAPSHOT</version>
+    <version>1.359-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 66ce9fec9d..d03cb6869a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
   
   <groupId>org.jvnet.hudson.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.358-SNAPSHOT</version>
+  <version>1.359-SNAPSHOT</version>
   <packaging>pom</packaging>
   
   <name>Hudson main module</name>
diff --git a/remoting/pom.xml b/remoting/pom.xml
index f5b5f73f79..d63bf26c63 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.358-SNAPSHOT</version>
+    <version>1.359-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/test/pom.xml b/test/pom.xml
index 063319c068..d5f4e90dbe 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.358-SNAPSHOT</version>
+    <version>1.359-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jvnet.hudson.main</groupId>
diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml
index d9aaa964f6..02f2a536a6 100644
--- a/ui-samples-plugin/pom.xml
+++ b/ui-samples-plugin/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.358-SNAPSHOT</version>
+    <version>1.359-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-samples-plugin</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index f035cfc6da..860093b0d6 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.358-SNAPSHOT</version>
+    <version>1.359-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
-- 
GitLab