merged back the RC branch

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

merged back the RC branch
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@30919 71c3de6d-444a-0410-be80-ed276b4c234a
df51a920 · kohsuke · c1cd42f0 · df51a920 · df51a920 · df51a920
11 changed file
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -4,7 +4,7 @@
  <parent>
    <artifactId>pom</artifactId>
    <groupId>org.jvnet.hudson.main</groupId>
-    <version>1.357-SNAPSHOT</version>
+    <version>1.358-SNAPSHOT</version>
  </parent>
  <artifactId>cli</artifactId>
  <name>Hudson CLI</name>

--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,7 +28,7 @@ THE SOFTWARE.
  <parent>
    <groupId>org.jvnet.hudson.main</groupId>
    <artifactId>pom</artifactId>
-    <version>1.357-SNAPSHOT</version>
+    <version>1.358-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>


--- a/debian/debian/changelog
+++ b/debian/debian/changelog
+hudson (1.357) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Fri, 07 May 2010 22:33:51 -0700
+
 hudson (1.356) unstable; urgency=low

  * See http://hudson.dev.java.net/changelog.html for more details.

--- 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.357-SNAPSHOT</version>
+    <version>1.358-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>
  

--- 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.357-SNAPSHOT</version>
+    <version>1.358-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>
  

--- 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.357-SNAPSHOT</version>
+    <version>1.358-SNAPSHOT</version>
  </parent>

  <artifactId>maven-plugin</artifactId>

--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@ THE SOFTWARE.
  
  <groupId>org.jvnet.hudson.main</groupId>
  <artifactId>pom</artifactId>
-  <version>1.357-SNAPSHOT</version>
+  <version>1.358-SNAPSHOT</version>
  <packaging>pom</packaging>
  
  <name>Hudson main module</name>

--- 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.357-SNAPSHOT</version>
+    <version>1.358-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>
  

--- 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.357-SNAPSHOT</version>
+    <version>1.358-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <groupId>org.jvnet.hudson.main</groupId>

--- a/ui-samples-plugin/pom.xml
+++ b/ui-samples-plugin/pom.xml
@@ -27,7 +27,7 @@ THE SOFTWARE.
  <parent>
    <groupId>org.jvnet.hudson.main</groupId>
    <artifactId>pom</artifactId>
-    <version>1.357-SNAPSHOT</version>
+    <version>1.358-SNAPSHOT</version>
  </parent>

  <artifactId>ui-samples-plugin</artifactId>

--- 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.357-SNAPSHOT</version>
+    <version>1.358-SNAPSHOT</version>
    <relativePath>../pom.xml</relativePath>
  </parent>
  
@@ -129,18 +129,10 @@ THE SOFTWARE.
                <resolveArtifact groupId="org.jvnet.hudson.winstone" artifactId="winstone" version="0.9.10-hudson-18" type="jar" tofile="${basedir}/target/generated-resources/winstone.jar" />

                <!-- bundled plugins -->
-                <resolveArtifact type="hpi" groupId="${project.groupId}"
-                 artifactId="maven-plugin" version="${project.version}"
-                 tofile="${basedir}/target/generated-resources/WEB-INF/plugins/maven-plugin.hpi" />
-                <resolveArtifact type="hpi" groupId="org.jvnet.hudson.plugins"
-                 artifactId="ssh-slaves" version="0.10"
-                 tofile="${basedir}/target/generated-resources/WEB-INF/plugins/ssh-slaves.hpi" />
-                <resolveArtifact type="hpi" groupId="org.jvnet.hudson.plugins"
-                 artifactId="subversion" version="1.17"
-                 tofile="${basedir}/target/generated-resources/WEB-INF/plugins/subversion.hpi" />
-                <resolveArtifact type="hpi" groupId="org.jvnet.hudson.plugins"
-                 artifactId="cvs" version="1.1"
-                 tofile="${basedir}/target/generated-resources/WEB-INF/plugins/cvs.hpi" />
+                <resolveArtifact type="hpi" groupId="${project.groupId}" artifactId="maven-plugin" version="${project.version}" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/maven-plugin.hpi" />
+                <resolveArtifact type="hpi" groupId="org.jvnet.hudson.plugins" artifactId="ssh-slaves" version="0.10" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/ssh-slaves.hpi" />
+                <resolveArtifact type="hpi" groupId="org.jvnet.hudson.plugins" artifactId="subversion" version="1.17" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/subversion.hpi" />
+                <resolveArtifact type="hpi" groupId="org.jvnet.hudson.plugins" artifactId="cvs" version="1.1" tofile="${basedir}/target/generated-resources/WEB-INF/plugins/cvs.hpi" />
              </tasks>
            </configuration>
          </execution>