Merged revisions 33821,33823,33825,33829 via svnmerge from

https://www.dev.java.net/svn/hudson/branches/rc

........
  r33821 | kohsuke | 2010-08-13 20:05:10 -0700 (Fri, 13 Aug 2010) | 1 line
  
  label serialization should include all the subtypes.
........
  r33823 | kohsuke | 2010-08-13 21:03:34 -0700 (Fri, 13 Aug 2010) | 1 line
  
  [maven-release-plugin] prepare release hudson-1_372
........
  r33825 | kohsuke | 2010-08-13 21:03:45 -0700 (Fri, 13 Aug 2010) | 1 line
  
  [maven-release-plugin] prepare for next development iteration
........
  r33829 | kohsuke | 2010-08-13 22:04:49 -0700 (Fri, 13 Aug 2010) | 1 line
  
  updated changelog as a part of the release
........


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@33863 71c3de6d-444a-0410-be80-ed276b4c234a

cli/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.372-SNAPSHOT</version>
+    <version>1.373-SNAPSHOT</version>
   </parent>
   <artifactId>cli</artifactId>
   <name>Hudson CLI</name>

core/pom.xml

@@ -28,7 +28,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.372-SNAPSHOT</version>
+    <version>1.373-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

core/src/main/java/hudson/util/XStream2.java

@@ -40,6 +40,7 @@ import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
 import com.thoughtworks.xstream.mapper.CannotResolveClassException;
 import hudson.diagnosis.OldDataMonitor;
 import hudson.model.Hudson;
+import hudson.model.Label;
 import hudson.model.Result;
 import hudson.model.Saveable;
 
@@ -96,6 +97,7 @@ public class XStream2 extends XStream {
         registerConverter(new ConcurrentHashMapConverter(getMapper(),getReflectionProvider()),10);
         registerConverter(new CopyOnWriteMap.Tree.ConverterImpl(getMapper()),10); // needs to override MapConverter
         registerConverter(new DescribableList.ConverterImpl(getMapper()),10); // explicitly added to handle subtypes
+        registerConverter(new Label.ConverterImpl(),10);
 
         // this should come after all the XStream's default simpler converters,
         // but before reflection-based one kicks in.

debian/debian/changelog

+hudson (1.372) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Fri, 13 Aug 2010 22:02:00 -0700
+
 hudson (1.371) unstable; urgency=low
 
   * See http://hudson.dev.java.net/changelog.html for more details.

maven-agent/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.372-SNAPSHOT</version>
+    <version>1.373-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   

maven-interceptor/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.372-SNAPSHOT</version>
+    <version>1.373-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   

maven-plugin/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.372-SNAPSHOT</version>
+    <version>1.373-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin</artifactId>

pom.xml

@@ -33,7 +33,7 @@ THE SOFTWARE.
   
   <groupId>org.jvnet.hudson.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.372-SNAPSHOT</version>
+  <version>1.373-SNAPSHOT</version>
   <packaging>pom</packaging>
   
   <name>Hudson main module</name>

remoting/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.372-SNAPSHOT</version>
+    <version>1.373-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   

test/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.372-SNAPSHOT</version>
+    <version>1.373-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jvnet.hudson.main</groupId>

ui-samples-plugin/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.372-SNAPSHOT</version>
+    <version>1.373-SNAPSHOT</version>
   </parent>
 
   <artifactId>ui-samples-plugin</artifactId>

war/pom.xml

@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.372-SNAPSHOT</version>
+    <version>1.373-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>