diff --git a/cli/pom.xml b/cli/pom.xml
index 8e0e4f3d3d94076210fa356317851990a948ebd2..d183e8c7dc195e234cd91887e622a568cca1e4db 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>pom</artifactId>
     <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.302-SNAPSHOT</version>
+    <version>1.304-SNAPSHOT</version>
   </parent>
   <artifactId>cli</artifactId>
   <name>Hudson CLI</name>
diff --git a/core/pom.xml b/core/pom.xml
index 4cad5c4d426540ae593a9605698b5bb3e76c5e69..3f1739cee836b71ec60ad4a4b56eb0e2a0cb0932 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
   <parent>
     <groupId>org.jvnet.hudson.main</groupId>
     <artifactId>pom</artifactId>
-    <version>1.302-SNAPSHOT</version>
+    <version>1.304-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/core/src/main/java/hudson/cli/GroovyshCommand.java b/core/src/main/java/hudson/cli/GroovyshCommand.java
index e8d7e09384f1f75e5f76118ba2508165d59655be..6672fcf5aa8435d299a2ccf777c604baefe18c01 100644
--- a/core/src/main/java/hudson/cli/GroovyshCommand.java
+++ b/core/src/main/java/hudson/cli/GroovyshCommand.java
@@ -9,6 +9,7 @@ import java.util.List;
 import java.io.PrintStream;
 import java.io.InputStream;
 import java.io.BufferedInputStream;
+import java.io.PrintWriter;
 
 import jline.UnsupportedTerminal;
 import jline.Terminal;
@@ -35,6 +36,8 @@ public class GroovyshCommand extends CLICommand {
         Terminal.resetTerminal();
 
         Groovysh shell = new Groovysh(new IO(new BufferedInputStream(stdin),stdout,stderr));
+        // redirect "println" to the CLI
+        shell.getInterp().getContext().setProperty("out",new PrintWriter(stdout,true));
         return shell.run(args.toArray(new String[args.size()]));
     }
 
diff --git a/debian/changelog b/debian/changelog
index 02614db21288084334371575f0eaf4fb144eba12..368b82265fde5edef9d6012d792a77ee4780b1fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+hudson (1.303) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sun, 03 May 2009 15:48:44 -0700
+
+hudson (1.302) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Fri, 01 May 2009 19:15:31 -0700
+
 hudson (1.301) 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 f721f576a8d72557485ede789c1dbc744cc13dfb..6cf8c019931d62185a4440b11577764fd1fed2f8 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.302-SNAPSHOT</version>
+    <version>1.304-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/maven-interceptor/pom.xml b/maven-interceptor/pom.xml
index 115abb1eda22793c708035eab7b833f5bf377f1b..ce87c2f53af5c0b1cd925398635b86d81c870bf8 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.302-SNAPSHOT</version>
+    <version>1.304-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml
index 5ef7637c835bab61b52f21f7551c97394523b63a..f8b2a857342adc962c44a8d4f42201ca7ac5e273 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.302-SNAPSHOT</version>
+    <version>1.304-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index b2ecf3cced638a2825429140a7c0dbcb54ad3877..d9a6b3a85d632acd317e23b552958fcac921df40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
   
   <groupId>org.jvnet.hudson.main</groupId>
   <artifactId>pom</artifactId>
-  <version>1.302-SNAPSHOT</version>
+  <version>1.304-SNAPSHOT</version>
   <packaging>pom</packaging>
   
   <name>Hudson main module</name>
@@ -51,9 +51,10 @@ THE SOFTWARE.
   </modules>
   
   <scm>
-    <connection>scm:svn:https://guest@svn.dev.java.net/svn/hudson/trunk/hudson/main/</connection>
-    <developerConnection>scm:svn:https://svn.dev.java.net/svn/hudson/trunk/hudson/main/</developerConnection>
-    <url>https://hudson.dev.java.net/source/browse/hudson/trunk/hudson/main</url>
+    <!-- release comes from the RC branch now -->
+    <connection>scm:svn:https://guest@svn.dev.java.net/svn/hudson/branches/rc/</connection>
+    <developerConnection>scm:svn:https://svn.dev.java.net/svn/hudson/branches/rc/</developerConnection>
+    <url>https://hudson.dev.java.net/source/browse/hudson/branches/rc/</url>
   </scm>
 
   <build>
@@ -102,7 +103,7 @@ THE SOFTWARE.
             also run assembly during the release.
             http://www.nabble.com/Release-Plugin%3A-Include-assemblies-for-deploying-tf2642295s177.html#a7377938
            -->
-          <goals>install javadoc:javadoc animal-sniffer:check assembly:attached deploy</goals>
+          <goals>-DskipTests install javadoc:javadoc animal-sniffer:check assembly:attached deploy</goals>
           <remoteTagging>true</remoteTagging><!-- work around http://jira.codehaus.org/browse/SCM-406 -->
         </configuration>
       </plugin>
diff --git a/release.sh b/release.sh
index 6a9a28b97e9e46fd9841d224f63a8d9f5be9c476..5ae191c331338818d34655c1ec66db59da4c3e20 100755
--- a/release.sh
+++ b/release.sh
@@ -33,7 +33,7 @@ rm hudson.war || true
 
 tag=hudson-$(show-pom-version pom.xml | sed -e "s/-SNAPSHOT//g" -e "s/\\./_/g")
 export MAVEN_OPTS="-Xmx512m -XX:MaxPermSize=256m"
-mvn -B -Dtag=$tag release:prepare || mvn -B -Dtag=$tag install release:prepare || true
+mvn -B -Dtag=$tag -DskipTests release:prepare || mvn -B -Dtag=$tag -DskipTests install release:prepare || true
 #svn up -r head
 #mvn -B -Dtag=$tag -Dresume release:prepare
 mvn release:perform
diff --git a/remoting/pom.xml b/remoting/pom.xml
index dabbdb43234e9b80d5f7d9dffa7cf39ae86afd6d..1e54dad4ab477a299cb897c46dfd069a8130a2c3 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.302-SNAPSHOT</version>
+    <version>1.304-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/remoting/src/main/java/hudson/remoting/Pipe.java b/remoting/src/main/java/hudson/remoting/Pipe.java
index 019ffc8eafbcfc546a6284e8928ea9dea37f6e64..a6d184b54c9799abcbf499068dd7746f8d6bf0be 100644
--- a/remoting/src/main/java/hudson/remoting/Pipe.java
+++ b/remoting/src/main/java/hudson/remoting/Pipe.java
@@ -153,13 +153,14 @@ public final class Pipe implements Serializable {
 
             // we want 'oidRos' to send data to this PipedOutputStream
             PipedOutputStream pos = new PipedOutputStream();
+            PipedInputStream pis = new PipedInputStream(pos);
             final int oidPos = channel.export(pos);
 
             // tell 'ros' to connect to our 'pos'.
             channel.send(new ConnectCommand(oidRos, oidPos));
 
             out = null;
-            in = new PipedInputStream(pos);
+            in = pis;
         }
     }
 
diff --git a/test/pom.xml b/test/pom.xml
index 848fd108abaec85790fc7eb8b679424c59d4a603..49d41eb286bcdddd6b72fcf10e299f00d485c254 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.302-SNAPSHOT</version>
+    <version>1.304-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jvnet.hudson.main</groupId>
diff --git a/test/src/test/java/hudson/slaves/JNLPLauncherTest.java b/test/src/test/java/hudson/slaves/JNLPLauncherTest.java
index 9f9dcd5baded2b77b803d50e130cb6bcd64665d2..d49747bf208e62e8998dbd1c6d8ab2be756ceda6 100644
--- a/test/src/test/java/hudson/slaves/JNLPLauncherTest.java
+++ b/test/src/test/java/hudson/slaves/JNLPLauncherTest.java
@@ -51,9 +51,7 @@ public class JNLPLauncherTest extends HudsonTestCase {
      * Starts a JNLP slave agent and makes sure it successfully connects to Hudson. 
      */
     public void testLaunch() throws Exception {
-        try {
-            GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
-        } catch (HeadlessException e) {
+        if(GraphicsEnvironment.isHeadless()) {
             System.err.println("Skipping JNLPLauncherTest.testLaunch because we are running headless");
             return;
         }
diff --git a/war/pom.xml b/war/pom.xml
index 63c1de8dcbd24b2aa29660ac45a5c142b581222f..e2f7bc6a12a26f8ccc2b5224b983f1e3d52d0eda 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.302-SNAPSHOT</version>
+    <version>1.304-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   
@@ -106,9 +106,7 @@ THE SOFTWARE.
                 <!-- dependencies that goes to unusual locations -->
                 <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="${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-9" type="jar" tofile="${basedir}/target/generated-resources/winstone.jar" />
 
                 <!-- bundled plugins -->