From 8cb24423cc2fa4558cb5cd5bcdb9b2fe61c8569d Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Wed, 7 Jul 2010 18:07:53 +0000
Subject: [PATCH] Merged revisions 32496,32499,32501,32505 via svnmerge from
 https://svn.dev.java.net/svn/hudson/branches/rc

........
  r32496 | kohsuke | 2010-07-05 11:27:25 -0700 (Mon, 05 Jul 2010) | 1 line

  integrated a fix for SECURITY-4
........
  r32499 | kohsuke | 2010-07-05 14:19:34 -0700 (Mon, 05 Jul 2010) | 1 line

  [maven-release-plugin] prepare release hudson-1_365
........
  r32501 | kohsuke | 2010-07-05 14:19:48 -0700 (Mon, 05 Jul 2010) | 1 line

  [maven-release-plugin] prepare for next development iteration
........
  r32505 | kohsuke | 2010-07-05 15:29:51 -0700 (Mon, 05 Jul 2010) | 1 line

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


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@32558 71c3de6d-444a-0410-be80-ed276b4c234a
---
 cli/pom.xml               | 2 +-
 core/pom.xml              | 4 ++--
 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               | 4 ++--
 11 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/cli/pom.xml b/cli/pom.xml
index 85d1edd5e3..9cffa646c4 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.365-SNAPSHOT</version>
+    <version>1.366-SNAPSHOT</version>
   </parent>
   <artifactId>cli</artifactId>
   <name>Hudson CLI</name>
diff --git a/core/pom.xml b/core/pom.xml
index 10651aa0bb..7f0beb8de8 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.365-SNAPSHOT</version>
+    <version>1.366-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -356,7 +356,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler-jelly</artifactId>
-      <version>1.144</version>
+      <version>1.145</version>
       <exclusions>
         <exclusion>
           <groupId>commons-jelly</groupId>
diff --git a/debian/debian/changelog b/debian/debian/changelog
index 7fef46051c..527c5e7991 100644
--- a/debian/debian/changelog
+++ b/debian/debian/changelog
@@ -1,3 +1,9 @@
+hudson (1.365) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Mon, 05 Jul 2010 15:26:25 -0700
+
 hudson (1.364) 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 8aa8a5e54e..99e90e6f5d 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.365-SNAPSHOT</version>
+    <version>1.366-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml
index c2a88aced0..680bb9aae2 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.365-SNAPSHOT</version>
+    <version>1.366-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 47bf7ae779..49ac886873 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.365-SNAPSHOT</version>
+    <version>1.366-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 88d1f31325..c8622ce661 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
   
   <groupId>org.jvnet.hudson.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.365-SNAPSHOT</version>
+  <version>1.366-SNAPSHOT</version>
   <packaging>pom</packaging>
   
   <name>Hudson main module</name>
diff --git a/remoting/pom.xml b/remoting/pom.xml
index 45c174e67c..ba8f5b1821 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.365-SNAPSHOT</version>
+    <version>1.366-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/test/pom.xml b/test/pom.xml
index 812c25c973..d2cf6ca1df 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.365-SNAPSHOT</version>
+    <version>1.366-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 56a1641718..b03e64e7d2 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.365-SNAPSHOT</version>
+    <version>1.366-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-samples-plugin</artifactId>
diff --git a/war/pom.xml b/war/pom.xml
index 6c00b11d4a..598e4309e0 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.365-SNAPSHOT</version>
+    <version>1.366-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
@@ -126,7 +126,7 @@ THE SOFTWARE.
                 <resolveArtifact artifactId="remoting" tofile="${basedir}/target/generated-resources/WEB-INF/remoting.jar" />
                 <resolveArtifact artifactId="remoting" tofile="${basedir}/target/generated-resources/WEB-INF/slave.jar" />
                 <resolveArtifact groupId="${project.groupId}" artifactId="cli" classifier="jar-with-dependencies" version="${project.version}" type="jar" tofile="${basedir}/target/generated-resources/WEB-INF/hudson-cli.jar" />
-                <resolveArtifact groupId="org.jvnet.hudson.winstone" artifactId="winstone" version="0.9.10-hudson-20" type="jar" tofile="${basedir}/target/generated-resources/winstone.jar" />
+                <resolveArtifact groupId="org.jvnet.hudson.winstone" artifactId="winstone" version="0.9.10-hudson-21" type="jar" tofile="${basedir}/target/generated-resources/winstone.jar" />
 
                 <!-- bundled plugins -->
                 <resolveArtifact type="hpi" groupId="${project.groupId}" artifactId="maven-plugin" version="${project.version}" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/maven-plugin.hpi" />
-- 
GitLab