diff --git a/cli/pom.xml b/cli/pom.xml
index 92f4c869a6..f86af58a75 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -4,7 +4,7 @@
pom
org.jvnet.hudson.main
- 1.329-SNAPSHOT
+ 1.330-SNAPSHOT
cli
Hudson CLI
diff --git a/core/pom.xml b/core/pom.xml
index d599e64060..05ee7efd34 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.329-SNAPSHOT
+ 1.330-SNAPSHOT
../pom.xml
diff --git a/core/src/main/java/hudson/scm/CVSSCM.java b/core/src/main/java/hudson/scm/CVSSCM.java
index d62f414029..b614699343 100644
--- a/core/src/main/java/hudson/scm/CVSSCM.java
+++ b/core/src/main/java/hudson/scm/CVSSCM.java
@@ -1105,6 +1105,11 @@ public class CVSSCM extends SCM implements Serializable {
return cvsExe;
}
+ public void setCvsExe(String value) {
+ this.cvsExe = value;
+ save();
+ }
+
public String getCvsExeOrDefault() {
if(Util.fixEmpty(cvsExe)==null) return "cvs";
else return cvsExe;
@@ -1121,7 +1126,7 @@ public class CVSSCM extends SCM implements Serializable {
@Override
public boolean configure( StaplerRequest req, JSONObject o ) {
- cvsPassFile = fixEmptyAndTrim(req.getParameter("cvspassFile"));
+ cvsPassFile = fixEmptyAndTrim(o.getString("cvspassFile"));
cvsExe = fixEmptyAndTrim(o.getString("cvsExe"));
noCompression = req.getParameter("cvs_noCompression")!=null;
save();
diff --git a/debian/changelog b/debian/changelog
index 719064f6ac..93ce392fe1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hudson (1.329) unstable; urgency=low
+
+ * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi Fri, 16 Oct 2009 18:22:38 -0700
+
hudson (1.328) 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 973f03bc5e..ae7437091e 100644
--- a/maven-agent/pom.xml
+++ b/maven-agent/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.329-SNAPSHOT
+ 1.330-SNAPSHOT
../pom.xml
diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml
index 2d344afefe..14db77af0b 100644
--- a/maven-interceptor/pom.xml
+++ b/maven-interceptor/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.329-SNAPSHOT
+ 1.330-SNAPSHOT
../pom.xml
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 8a98a2c826..db7887b2a1 100644
--- a/maven-plugin/pom.xml
+++ b/maven-plugin/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.329-SNAPSHOT
+ 1.330-SNAPSHOT
maven-plugin
diff --git a/pom.xml b/pom.xml
index 095c69bf06..ea30308472 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.329-SNAPSHOT
+ 1.330-SNAPSHOT
pom
Hudson main module
diff --git a/release.sh b/release.sh
index 79ed661b1c..829c829dc5 100755
--- a/release.sh
+++ b/release.sh
@@ -73,11 +73,6 @@ jarUrl=$(cat target/upload.log | grep "^Posted" | sed -e "s/Posted //g")
perl -p -i.bak -e "s|https://.+hudson\.jar|$jarUrl|" $WWW/hudson.jnlp
cp $WWW/hudson.jnlp $WWW/$id.jnlp
-# push the permalink
-echo "Redirect 302 /latest/hudson.war $warUrl" > /tmp/latest.htaccess.war
-scp /tmp/latest.htaccess.war hudson.gotdns.com:/home/kohsuke/public_html_hudson/latest/.htaccess.war
-ssh hudson.gotdns.com "cd /home/kohsuke/public_html_hudson/latest; cat .htaccess.* > .htaccess"
-
# update changelog.html
ruby update.changelog.rb $id < $WWW/changelog.html > $WWW/changelog.new
mv $WWW/changelog.new $WWW/changelog.html
diff --git a/remoting/pom.xml b/remoting/pom.xml
index e7007d4e90..1537ef29da 100644
--- a/remoting/pom.xml
+++ b/remoting/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.329-SNAPSHOT
+ 1.330-SNAPSHOT
../pom.xml
diff --git a/test/pom.xml b/test/pom.xml
index b53fae1354..48c1cc7d3c 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
pom
org.jvnet.hudson.main
- 1.329-SNAPSHOT
+ 1.330-SNAPSHOT
4.0.0
org.jvnet.hudson.main
diff --git a/test/src/test/java/hudson/scm/CVSSCMTest.java b/test/src/test/java/hudson/scm/CVSSCMTest.java
index 41fa599c25..c373591ac5 100644
--- a/test/src/test/java/hudson/scm/CVSSCMTest.java
+++ b/test/src/test/java/hudson/scm/CVSSCMTest.java
@@ -1,6 +1,7 @@
package hudson.scm;
import org.jvnet.hudson.test.HudsonTestCase;
+import org.jvnet.hudson.test.Bug;
import hudson.model.FreeStyleProject;
/**
@@ -27,6 +28,17 @@ public class CVSSCMTest extends HudsonTestCase {
assertEquals(scm1, (CVSSCM)p.getScm());
}
+ @Bug(4456)
+ public void testGlobalConfigRoundtrip() throws Exception {
+ CVSSCM.DescriptorImpl d = hudson.getDescriptorByType(CVSSCM.DescriptorImpl.class);
+ d.setCvspassFile("a");
+ d.setCvsExe("b");
+
+ submit(createWebClient().goTo("configure").getFormByName("config"));
+ assertEquals("a",d.getCvspassFile());
+ assertEquals("b",d.getCvsExe());
+ }
+
private void roundtrip(FreeStyleProject p) throws Exception {
submit(new WebClient().getPage(p,"configure").getFormByName("config"));
}
diff --git a/war/pom.xml b/war/pom.xml
index 70f441d313..47039119f2 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
org.jvnet.hudson.main
pom
- 1.329-SNAPSHOT
+ 1.330-SNAPSHOT
../pom.xml