Merged revisions 17033,17035-17037,17039,17041 via svnmerge from

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

........
  r17033 | kohsuke | 2009-04-10 15:22:13 -0700 (Fri, 10 Apr 2009) | 1 line
  
  [maven-release-plugin] prepare release hudson-1_298
........
  r17035 | kohsuke | 2009-04-10 15:22:42 -0700 (Fri, 10 Apr 2009) | 1 line
  
  [maven-release-plugin] prepare for next development iteration
........
  r17036 | kohsuke | 2009-04-10 17:52:13 -0700 (Fri, 10 Apr 2009) | 1 line
  
  remove JDK6 dependency
........
  r17037 | kohsuke | 2009-04-10 18:21:37 -0700 (Fri, 10 Apr 2009) | 1 line
  
  [maven-release-plugin] prepare release hudson-1_299
........
  r17039 | kohsuke | 2009-04-10 18:27:36 -0700 (Fri, 10 Apr 2009) | 1 line
  
  [maven-release-plugin] prepare for next development iteration
........
  r17041 | kohsuke | 2009-04-10 19:14:19 -0700 (Fri, 10 Apr 2009) | 1 line
  
  updated changelog as a part of the release
........


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

core/pom.xml

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

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

@@ -20,7 +20,7 @@ public class ChoiceParameterDefinition extends ParameterDefinition {
     public ChoiceParameterDefinition(String name, String choices, String description) {
         super(name, description);
         this.choices = Arrays.asList(choices.split("\\r?\\n"));
-        if (choices.isEmpty()) {
+        if (choices.length()==0) {
             throw new IllegalArgumentException("No choices found");
         }
     }

debian/changelog

+hudson (1.299) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Fri, 10 Apr 2009 19:15:13 -0700
+
 hudson (1.297) 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.298-SNAPSHOT</version>
+    <version>1.300-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.298-SNAPSHOT</version>
+    <version>1.300-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.298-SNAPSHOT</version>
+    <version>1.300-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.298-SNAPSHOT</version>
+  <version>1.300-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.298-SNAPSHOT</version>
+    <version>1.300-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.298-SNAPSHOT</version>
+    <version>1.300-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jvnet.hudson.main</groupId>

war/pom.xml

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