diff --git a/cli/pom.xml b/cli/pom.xml index 67391466d03e7209bb8c4e02e1e3cfed96f32f04..442099c6d7f21e8b6176d6ed75894aa5e701eb2e 100644 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -4,7 +4,7 @@ pom org.jvnet.hudson.main - 1.372-SNAPSHOT + 1.373-SNAPSHOT cli Hudson CLI diff --git a/core/pom.xml b/core/pom.xml index 5167a9421f0122ef141e46bc90dec60ca3409bf2..cdbe44e51ada7414f550a63fde3e7a4026741ea2 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.372-SNAPSHOT + 1.373-SNAPSHOT ../pom.xml diff --git a/core/src/main/java/hudson/util/XStream2.java b/core/src/main/java/hudson/util/XStream2.java index 8ce3daa6258d34dccc055ce70eb2070ada651284..72da2b8bc146d924f2aa9eea714c2953d626f0b1 100644 --- a/core/src/main/java/hudson/util/XStream2.java +++ b/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. diff --git a/debian/debian/changelog b/debian/debian/changelog index ceb56893ec836e3b72d05714dd7d239b6b0805b9..4429e3e18e0ad9ec2abd47d80ed6a680612eb280 100644 --- a/debian/debian/changelog +++ b/debian/debian/changelog @@ -1,3 +1,9 @@ +hudson (1.372) unstable; urgency=low + + * See http://hudson.dev.java.net/changelog.html for more details. + + -- Kohsuke Kawaguchi 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. diff --git a/maven-agent/pom.xml b/maven-agent/pom.xml index 938c94240f7fdecc7d404e81cb415433ea7ef340..f5fdc7d7e145dd10860ffbb38548e36aa872889e 100644 --- a/maven-agent/pom.xml +++ b/maven-agent/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.372-SNAPSHOT + 1.373-SNAPSHOT ../pom.xml diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml index dc79fdf33a6426fb842b4e55f898cda7e9ecb35c..38d32cf5cec0a5b81eb4055955eff8f39202dc5c 100644 --- a/maven-interceptor/pom.xml +++ b/maven-interceptor/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.372-SNAPSHOT + 1.373-SNAPSHOT ../pom.xml diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 8b88f31b6f78eab59017d5f21bc632648be0b725..81d2ecdf5795da664ca50bc8f1af59c0b7eaeb3e 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.372-SNAPSHOT + 1.373-SNAPSHOT maven-plugin diff --git a/pom.xml b/pom.xml index 77cc9b292cc7064bdf2cd754a6c3f43d5fb64c2e..3b2ae5eb22385cc7314dc51a6d9d9a4d2d5b751f 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.372-SNAPSHOT + 1.373-SNAPSHOT pom Hudson main module diff --git a/remoting/pom.xml b/remoting/pom.xml index ef32fa65b7420e09e37ac8418c778ebdd3a287d1..68732774c3ac5d723925e1d7a9e6510934611aa8 100644 --- a/remoting/pom.xml +++ b/remoting/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.372-SNAPSHOT + 1.373-SNAPSHOT ../pom.xml diff --git a/test/pom.xml b/test/pom.xml index f45bfe2245340cbcf709e0ce76d276d76d7ca719..831177e897e15bb80e20015188b8bcbaf269e07f 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. pom org.jvnet.hudson.main - 1.372-SNAPSHOT + 1.373-SNAPSHOT 4.0.0 org.jvnet.hudson.main diff --git a/ui-samples-plugin/pom.xml b/ui-samples-plugin/pom.xml index 26ac4f06afba4ba7c7c9de5746e5b303ed8ba5d9..19227a9ec0b25894ce61e0d3fb230852cb8b2dd3 100644 --- a/ui-samples-plugin/pom.xml +++ b/ui-samples-plugin/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.372-SNAPSHOT + 1.373-SNAPSHOT ui-samples-plugin diff --git a/war/pom.xml b/war/pom.xml index b8f6d6de83480308aaf25373fa1b02ddbc503f0e..eed0027748b9a33a549a559973d9c3b0b8a75755 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -27,7 +27,7 @@ THE SOFTWARE. org.jvnet.hudson.main pom - 1.372-SNAPSHOT + 1.373-SNAPSHOT ../pom.xml