Merge branch 'rc'

core/src/main/java/hudson/model/Descriptor.java

@@ -223,7 +223,7 @@ public abstract class Descriptor<T extends Describable<T>> implements Saveable {
      *
      * @see #getHelpFile(String) 
      */
-    private final Map<String,String> helpRedirect = new HashMap<String, String>();
+    private transient final Map<String,String> helpRedirect = new HashMap<String, String>();
 
     /**
      *

core/src/main/java/jenkins/model/JenkinsLocationConfiguration.java

@@ -4,6 +4,7 @@ import hudson.Extension;
 import hudson.Util;
 import hudson.XmlFile;
 import hudson.util.FormValidation;
+import hudson.util.XStream2;
 import net.sf.json.JSONObject;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
@@ -29,17 +30,26 @@ public class JenkinsLocationConfiguration extends GlobalConfiguration {
     private String adminAddress;
     private String jenkinsUrl;
 
+    // just to suppress warnings
+    private transient String charset,useSsl;
+
     public static JenkinsLocationConfiguration get() {
         return GlobalConfiguration.all().get(JenkinsLocationConfiguration.class);
     }
 
+    public JenkinsLocationConfiguration() {
+        load();
+    }
+
     @Override
     public synchronized void load() {
         // for backward compatibility, if we don't have our own data yet, then
         // load from Mailer.
         XmlFile file = getConfigFile();
         if(!file.exists()) {
-            file = new XmlFile(new File(Jenkins.getInstance().getRootDir(),"hudson.tasks.Mailer.xml"));
+            XStream2 xs = new XStream2();
+            xs.addCompatibilityAlias("hudson.tasks.Mailer$DescriptorImpl",JenkinsLocationConfiguration.class);
+            file = new XmlFile(xs,new File(Jenkins.getInstance().getRootDir(),"hudson.tasks.Mailer.xml"));
             if (file.exists()) {
                 try {
                     file.unmarshal(this);

test/pom.xml

@@ -79,7 +79,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>mailer</artifactId>
-      <version>1.4-SNAPSHOT</version>
+      <version>1.4</version>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>

war/pom.xml

@@ -319,7 +319,7 @@ THE SOFTWARE.
                 <artifactItem>
                   <groupId>org.jenkins-ci.plugins</groupId>
                   <artifactId>mailer</artifactId>
-                  <version>1.4-SNAPSHOT</version>
+                  <version>1.4</version>
                   <type>hpi</type>
                 </artifactItem>
               </artifactItems>