merged back the RC branch

changelog.html

@@ -48,7 +48,10 @@ Upcoming changes</a>
 
 <!-- these changes are controlled by the release process. DO NOT MODIFY -->
 <div id="rc" style="display:none;"><!--=BEGIN=-->
-<h3><a name=v1.390>What's new in 1.390</a> <!--=DATE=--></h3>
+<h3><a name=v1.391>What's new in 1.391</a> <!--=DATE=--></h3>
+<!--=RC-CHANGES=-->
+</div><!--=END=-->
+<h3><a name=v1.390>What's new in 1.390</a> (2010/12/18)</h3>
 <ul class=image>
   <li class=bug>
     " (from WhateverTest)" gratuitously appended to test result detail pages.
@@ -71,7 +74,6 @@ Upcoming changes</a>
   <li class=rfe>
     Allow the administrator to yank out dead executors.
 </ul>
-</div><!--=END=-->
 <h3><a name=v1.389>What's new in 1.389</a> (2010/12/11)</h3>
 <ul class=image>
   <li class=rfe>

debian/debian/changelog

+hudson (1.390) unstable; urgency=low
+
+  * See http://hudson.dev.java.net/changelog.html for more details.
+
+ -- Kohsuke Kawaguchi <kk@kohsuke.org>  Sat, 18 Dec 2010 01:25:30 -0800
+
 hudson (1.389) unstable; urgency=low
 
   * See http://hudson.dev.java.net/changelog.html for more details.

plugins/pom.xml

@@ -11,7 +11,7 @@
   <groupId>org.jvnet.hudson.plugins</groupId>
   <artifactId>plugin</artifactId>
   <name>Hudson plugin POM</name>
-  <version>1.389</version>
+  <version>1.390</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -39,7 +39,7 @@
       <dependency><!-- if a plugin wants to depend on the maven plugin, choose the right version automatically -->
         <groupId>org.jvnet.hudson.main</groupId>
         <artifactId>maven-plugin</artifactId>
-        <version>1.389</version>
+        <version>1.390</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -49,25 +49,25 @@
       <groupId>org.jvnet.hudson.main</groupId>
       <artifactId>hudson-war</artifactId>
       <type>war</type>
-      <version>1.389</version>
+      <version>1.390</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jvnet.hudson.main</groupId>
       <artifactId>hudson-core</artifactId>
-      <version>1.389</version>
+      <version>1.390</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jvnet.hudson.main</groupId>
       <artifactId>hudson-test-harness</artifactId>
-      <version>1.389</version>
+      <version>1.390</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.jvnet.hudson.main</groupId>
       <artifactId>ui-samples-plugin</artifactId>
-      <version>1.389</version>
+      <version>1.390</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -98,7 +98,7 @@
        <dependency>
        <groupId>org.jvnet.hudson.main</groupId>
        <artifactId>maven-plugin</artifactId>
-       <version>1.389</version>
+       <version>1.390</version>
        </dependency>
        </dependencies>
        </dependencyManagement-->
@@ -226,4 +226,18 @@
     </pluginRepository>
   </pluginRepositories>
 
+  <distributionManagement>
+    <site>
+      <id>hudson-www</id>
+      <url>scp://hudson-labs.org/home/kohsuke/www/hudson-labs.org/maven-site/</url>
+    </site>
+    <repository>
+      <id>maven.hudson-labs.org</id>
+      <url>http://maven.hudson-labs.org/content/repositories/releases</url>
+    </repository>
+    <snapshotRepository>
+      <id>maven.hudson-labs.org</id>
+      <url>http://maven.hudson-labs.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+  </distributionManagement>
 </project>

pom.xml

@@ -148,12 +148,13 @@ THE SOFTWARE.
     <plugins>
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.0-beta-9</version>
+        <version>2.1</version>
         <configuration>
           <!-- enable release profile during the release, create IPS package, and sign bits. -->
           <prepareVerifyArgs>-P release,sign</prepareVerifyArgs>
           <goals>-DskipTests javadoc:javadoc animal-sniffer:check deploy javadoc:aggregate</goals>
-          <remoteTagging>true</remoteTagging><!-- work around http://jira.codehaus.org/browse/SCM-406 -->
+          <pushChanges>false</pushChanges>
+          <localCheckout>true</localCheckout>
         </configuration>
       </plugin>
       <plugin>
@@ -237,6 +238,14 @@ THE SOFTWARE.
         </executions>
       </plugin>-->
     </plugins>
+
+    <extensions>
+      <extension>
+        <groupId>org.apache.maven.wagon</groupId>
+        <artifactId>wagon-http</artifactId>
+        <version>1.0-beta-5</version>
+      </extension>
+    </extensions>
   </build>
 
   <dependencies>
@@ -389,5 +398,13 @@ THE SOFTWARE.
       <id>hudson-www</id>
       <url>scp://hudson-labs.org/home/kohsuke/www/hudson-labs.org/maven-site/</url>
     </site>
+    <repository>
+      <id>maven.hudson-labs.org</id>
+      <url>http://maven.hudson-labs.org/content/repositories/releases</url>
+    </repository>
+    <snapshotRepository>
+      <id>maven.hudson-labs.org</id>
+      <url>http://maven.hudson-labs.org/content/repositories/snapshots</url>
+    </snapshotRepository>
   </distributionManagement>
 </project>